Skip to content

Commit f9a7ae0

Browse files
Update links to point to migrated samples
Closes gh-9816
1 parent 425d008 commit f9a7ae0

File tree

13 files changed

+14
-21
lines changed

13 files changed

+14
-21
lines changed

docs/guides/spring-security-docs-guides.gradle

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ asciidoctor {
1717
idseparator: '-',
1818
doctype: 'book',
1919
'spring-security-version' : project.version,
20-
'download-url' : getDownloadUrl(),
2120
'include-maven-repository' : getMavenRepositoryInclude(),
2221
revnumber : project.version,
2322
'gh-samples-url': ghSamplesUrl,
@@ -31,11 +30,6 @@ ext.spec = copySpec {
3130
}
3231
}
3332

34-
def getDownloadUrl() {
35-
snapshotBuild ? "https://github.com/spring-projects/spring-security/archive/main.zip" : "https://github.com/spring-projects/spring-security/archive/${project.version}.zip"
36-
}
37-
38-
3933
def getMavenRepositoryInclude() {
4034
if(snapshotBuild) {
4135
return "_includes/maven-repository-snapshot.asc"

docs/manual/src/docs/asciidoc/_includes/reactive/method.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,4 +234,4 @@ class SecurityConfig {
234234
----
235235
====
236236

237-
You can find a complete sample in {gh-samples-url}/javaconfig/hellowebflux-method[hellowebflux-method]
237+
You can find a complete sample in {gh-samples-url}/reactive/webflux/java/method[hellowebflux-method]

docs/manual/src/docs/asciidoc/_includes/reactive/oauth2/login.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ NOTE: OAuth 2.0 Login is implemented by using the *Authorization Code Grant*, as
1212

1313
Spring Boot 2.0 brings full auto-configuration capabilities for OAuth 2.0 Login.
1414

15-
This section shows how to configure the {gh-samples-url}/boot/oauth2login-webflux[*OAuth 2.0 Login WebFlux sample*] using _Google_ as the _Authentication Provider_ and covers the following topics:
15+
This section shows how to configure the {gh-samples-url}/reactive/webflux/java/oauth2/login[*OAuth 2.0 Login WebFlux sample*] using _Google_ as the _Authentication Provider_ and covers the following topics:
1616

1717
* <<webflux-oauth2-login-sample-setup,Initial setup>>
1818
* <<webflux-oauth2-login-sample-redirect,Setting the redirect URI>>

docs/manual/src/docs/asciidoc/_includes/reactive/oauth2/resource-server.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This authorization server can be consulted by resource servers to authorize requ
1111

1212
[NOTE]
1313
====
14-
A complete working example for {gh-samples-url}/boot/oauth2resourceserver-webflux[*JWTs*] is available in the {gh-samples-url}[Spring Security repository].
14+
A complete working example for {gh-samples-url}/reactive/webflux/java/oauth2/resource-server[*JWTs*] is available in the {gh-samples-url}[Spring Security repository].
1515
====
1616

1717
[[webflux-oauth2resourceserver-jwt-minimaldependencies]]

docs/manual/src/docs/asciidoc/_includes/reactive/registered-oauth2-authorized-client.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Spring Security allows resolving an access token using `@RegisteredOAuth2Authori
55

66
[NOTE]
77
====
8-
A working example can be found in {gh-samples-url}/boot/oauth2webclient-webflux[*OAuth 2.0 WebClient WebFlux sample*].
8+
A working example can be found in {gh-samples-url}/reactive/webflux/java/oauth2/webclient[*OAuth 2.0 WebClient WebFlux sample*].
99
====
1010

1111
After configuring Spring Security for <<webflux-oauth2-login,OAuth2 Login>> or as an <<webflux-oauth2-client,OAuth2 Client>>, an `OAuth2AuthorizedClient` can be resolved using the following:

docs/manual/src/docs/asciidoc/_includes/reactive/rsocket.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The main entry point into security is found in the `PayloadSocketAcceptorInterce
66

77
You can find a few sample applications that demonstrate the code below:
88

9-
* Hello RSocket {gh-samples-url}/boot/hellorsocket[hellorsocket]
9+
* Hello RSocket {gh-samples-url}/reactive/rsocket/hello-security[hellorsocket]
1010
* https://github.com/rwinch/spring-flights/tree/security[Spring Flights]
1111

1212

docs/manual/src/docs/asciidoc/_includes/reactive/webflux.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
Spring Security's WebFlux support relies on a `WebFilter` and works the same for Spring WebFlux and Spring WebFlux.Fn.
55
You can find a few sample applications that demonstrate the code below:
66

7-
* Hello WebFlux {gh-samples-url}/boot/hellowebflux[hellowebflux]
8-
* Hello WebFlux.Fn {gh-samples-url}/boot/hellowebfluxfn[hellowebfluxfn]
9-
* Hello WebFlux Method {gh-samples-url}/boot/hellowebflux-method[hellowebflux-method]
7+
* Hello WebFlux {gh-samples-url}/reactive/webflux/java/hello-security[hellowebflux]
8+
* Hello WebFlux.Fn {gh-samples-url}/reactive/webflux-fn/hello-security[hellowebfluxfn]
9+
* Hello WebFlux Method {gh-samples-url}/reactive/webflux/java/method[hellowebflux-method]
1010

1111

1212
== Minimal WebFlux Security Configuration

docs/manual/src/docs/asciidoc/_includes/servlet/authentication/preauth.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,5 +147,4 @@ It's also assumed that you have added a `UserDetailsService` (called "userDetail
147147
The class `J2eePreAuthenticatedProcessingFilter` will extract the username from the `userPrincipal` property of the `HttpServletRequest`.
148148
Use of this filter would usually be combined with the use of Java EE roles as described above in <<j2ee-preauth-details>>.
149149

150-
There is a sample application in the codebase which uses this approach, so get hold of the code from github and have a look at the application context file if you are interested.
151-
The code is in the `samples/xml/preauth` directory.
150+
There is a {gh-old-samples-url}/xml/preauth[sample application] in the samples project which uses this approach, so get hold of the code from GitHub and have a look at the application context file if you are interested.

docs/manual/src/docs/asciidoc/_includes/servlet/authentication/x509.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ This means that you can easily use X.509 authentication with other options such
5252

5353
[[x509-ssl-config]]
5454
=== Setting up SSL in Tomcat
55-
There are some pre-generated certificates in the `samples/certificate` directory in the Spring Security project.
55+
There are some pre-generated certificates in the {gh-samples-url}/servlet/java-configuration/authentication/x509/server[Spring Security Samples repository].
5656
You can use these to enable SSL for testing if you don't want to generate your own.
5757
The file `server.jks` contains the server certificate, private key and the issuing certificate authority certificate.
5858
There are also some client certificate files for the users from the sample applications.

docs/manual/src/docs/asciidoc/_includes/servlet/hello/index.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This section covers the minimum setup for how to use Spring Security with Spring
55

66
[NOTE]
77
====
8-
The completed application can be found at {gh-samples-url}/boot/helloworld[samples/boot/helloworld]
8+
The completed application can be found {gh-samples-url}/servlet/spring-boot/java/hello-security[in our samples repository].
99
For your convenience, you can download a minimal Spring Boot + Spring Security application by https://start.spring.io/starter.zip?type=maven-project&language=java&packaging=jar&jvmVersion=1.8&groupId=example&artifactId=hello-security&name=hello-security&description=Hello%20Security&packageName=example.hello-security&dependencies=web,security[clicking here].
1010
====
1111

0 commit comments

Comments
 (0)