2
0
Эх сурвалжийг харах

Update links to point to migrated samples

Closes gh-9816
Marcus Da Coregio 4 жил өмнө
parent
commit
f9a7ae0a6f

+ 0 - 6
docs/guides/spring-security-docs-guides.gradle

@@ -17,7 +17,6 @@ asciidoctor {
 			idseparator: '-',
 			idseparator: '-',
 			doctype: 'book',
 			doctype: 'book',
 			'spring-security-version' : project.version,
 			'spring-security-version' : project.version,
-			'download-url' : getDownloadUrl(),
 			'include-maven-repository' : getMavenRepositoryInclude(),
 			'include-maven-repository' : getMavenRepositoryInclude(),
 			revnumber : project.version,
 			revnumber : project.version,
 			'gh-samples-url': ghSamplesUrl,
 			'gh-samples-url': ghSamplesUrl,
@@ -31,11 +30,6 @@ ext.spec = copySpec {
 	}
 	}
 }
 }
 
 
-def getDownloadUrl() {
-	snapshotBuild ? "https://github.com/spring-projects/spring-security/archive/main.zip" : "https://github.com/spring-projects/spring-security/archive/${project.version}.zip"
-}
-
-
 def getMavenRepositoryInclude() {
 def getMavenRepositoryInclude() {
 	if(snapshotBuild) {
 	if(snapshotBuild) {
 		return "_includes/maven-repository-snapshot.asc"
 		return "_includes/maven-repository-snapshot.asc"

+ 1 - 1
docs/manual/src/docs/asciidoc/_includes/reactive/method.adoc

@@ -234,4 +234,4 @@ class SecurityConfig {
 ----
 ----
 ====
 ====
 
 
-You can find a complete sample in {gh-samples-url}/javaconfig/hellowebflux-method[hellowebflux-method]
+You can find a complete sample in {gh-samples-url}/reactive/webflux/java/method[hellowebflux-method]

+ 1 - 1
docs/manual/src/docs/asciidoc/_includes/reactive/oauth2/login.adoc

@@ -12,7 +12,7 @@ NOTE: OAuth 2.0 Login is implemented by using the *Authorization Code Grant*, as
 
 
 Spring Boot 2.0 brings full auto-configuration capabilities for OAuth 2.0 Login.
 Spring Boot 2.0 brings full auto-configuration capabilities for OAuth 2.0 Login.
 
 
-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:
+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:
 
 
 * <<webflux-oauth2-login-sample-setup,Initial setup>>
 * <<webflux-oauth2-login-sample-setup,Initial setup>>
 * <<webflux-oauth2-login-sample-redirect,Setting the redirect URI>>
 * <<webflux-oauth2-login-sample-redirect,Setting the redirect URI>>

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

@@ -11,7 +11,7 @@ This authorization server can be consulted by resource servers to authorize requ
 
 
 [NOTE]
 [NOTE]
 ====
 ====
-A complete working example for {gh-samples-url}/boot/oauth2resourceserver-webflux[*JWTs*]  is available in the {gh-samples-url}[Spring Security repository].
+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].
 ====
 ====
 
 
 [[webflux-oauth2resourceserver-jwt-minimaldependencies]]
 [[webflux-oauth2resourceserver-jwt-minimaldependencies]]

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

@@ -5,7 +5,7 @@ Spring Security allows resolving an access token using `@RegisteredOAuth2Authori
 
 
 [NOTE]
 [NOTE]
 ====
 ====
-A working example can be found in {gh-samples-url}/boot/oauth2webclient-webflux[*OAuth 2.0 WebClient WebFlux sample*].
+A working example can be found in {gh-samples-url}/reactive/webflux/java/oauth2/webclient[*OAuth 2.0 WebClient WebFlux sample*].
 ====
 ====
 
 
 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:
 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:

+ 1 - 1
docs/manual/src/docs/asciidoc/_includes/reactive/rsocket.adoc

@@ -6,7 +6,7 @@ The main entry point into security is found in the `PayloadSocketAcceptorInterce
 
 
 You can find a few sample applications that demonstrate the code below:
 You can find a few sample applications that demonstrate the code below:
 
 
-* Hello RSocket {gh-samples-url}/boot/hellorsocket[hellorsocket]
+* Hello RSocket {gh-samples-url}/reactive/rsocket/hello-security[hellorsocket]
 * https://github.com/rwinch/spring-flights/tree/security[Spring Flights]
 * https://github.com/rwinch/spring-flights/tree/security[Spring Flights]
 
 
 
 

+ 3 - 3
docs/manual/src/docs/asciidoc/_includes/reactive/webflux.adoc

@@ -4,9 +4,9 @@
 Spring Security's WebFlux support relies on a `WebFilter` and works the same for Spring WebFlux and Spring WebFlux.Fn.
 Spring Security's WebFlux support relies on a `WebFilter` and works the same for Spring WebFlux and Spring WebFlux.Fn.
 You can find a few sample applications that demonstrate the code below:
 You can find a few sample applications that demonstrate the code below:
 
 
-* Hello WebFlux {gh-samples-url}/boot/hellowebflux[hellowebflux]
-* Hello WebFlux.Fn {gh-samples-url}/boot/hellowebfluxfn[hellowebfluxfn]
-* Hello WebFlux Method {gh-samples-url}/boot/hellowebflux-method[hellowebflux-method]
+* Hello WebFlux {gh-samples-url}/reactive/webflux/java/hello-security[hellowebflux]
+* Hello WebFlux.Fn {gh-samples-url}/reactive/webflux-fn/hello-security[hellowebfluxfn]
+* Hello WebFlux Method {gh-samples-url}/reactive/webflux/java/method[hellowebflux-method]
 
 
 
 
 == Minimal WebFlux Security Configuration
 == Minimal WebFlux Security Configuration

+ 1 - 2
docs/manual/src/docs/asciidoc/_includes/servlet/authentication/preauth.adoc

@@ -147,5 +147,4 @@ It's also assumed that you have added a `UserDetailsService` (called "userDetail
 The class `J2eePreAuthenticatedProcessingFilter` will extract the username from the `userPrincipal` property of the `HttpServletRequest`.
 The class `J2eePreAuthenticatedProcessingFilter` will extract the username from the `userPrincipal` property of the `HttpServletRequest`.
 Use of this filter would usually be combined with the use of Java EE roles as described above in <<j2ee-preauth-details>>.
 Use of this filter would usually be combined with the use of Java EE roles as described above in <<j2ee-preauth-details>>.
 
 
-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.
-The code is in the `samples/xml/preauth` directory.
+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.

+ 1 - 1
docs/manual/src/docs/asciidoc/_includes/servlet/authentication/x509.adoc

@@ -52,7 +52,7 @@ This means that you can easily use X.509 authentication with other options such
 
 
 [[x509-ssl-config]]
 [[x509-ssl-config]]
 === Setting up SSL in Tomcat
 === Setting up SSL in Tomcat
-There are some pre-generated certificates in the `samples/certificate` directory in the Spring Security project.
+There are some pre-generated certificates in the {gh-samples-url}/servlet/java-configuration/authentication/x509/server[Spring Security Samples repository].
 You can use these to enable SSL for testing if you don't want to generate your own.
 You can use these to enable SSL for testing if you don't want to generate your own.
 The file `server.jks` contains the server certificate, private key and the issuing certificate authority certificate.
 The file `server.jks` contains the server certificate, private key and the issuing certificate authority certificate.
 There are also some client certificate files for the users from the sample applications.
 There are also some client certificate files for the users from the sample applications.

+ 1 - 1
docs/manual/src/docs/asciidoc/_includes/servlet/hello/index.adoc

@@ -5,7 +5,7 @@ This section covers the minimum setup for how to use Spring Security with Spring
 
 
 [NOTE]
 [NOTE]
 ====
 ====
-The completed application can be found at {gh-samples-url}/boot/helloworld[samples/boot/helloworld]
+The completed application can be found {gh-samples-url}/servlet/spring-boot/java/hello-security[in our samples repository].
 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].
 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].
 ====
 ====
 
 

+ 1 - 1
docs/manual/src/docs/asciidoc/_includes/servlet/oauth2/oauth2-login.adoc

@@ -12,7 +12,7 @@ NOTE: OAuth 2.0 Login is implemented by using the *Authorization Code Grant*, as
 
 
 Spring Boot 2.x brings full auto-configuration capabilities for OAuth 2.0 Login.
 Spring Boot 2.x brings full auto-configuration capabilities for OAuth 2.0 Login.
 
 
-This section shows how to configure the {gh-samples-url}/boot/oauth2login[*OAuth 2.0 Login sample*] using _Google_ as the _Authentication Provider_ and covers the following topics:
+This section shows how to configure the {gh-samples-url}/servlet/spring-boot/java/oauth2/login[*OAuth 2.0 Login sample*] using _Google_ as the _Authentication Provider_ and covers the following topics:
 
 
 * <<oauth2login-sample-initial-setup,Initial setup>>
 * <<oauth2login-sample-initial-setup,Initial setup>>
 * <<oauth2login-sample-redirect-uri,Setting the redirect URI>>
 * <<oauth2login-sample-redirect-uri,Setting the redirect URI>>

+ 1 - 1
docs/manual/src/docs/asciidoc/_includes/servlet/oauth2/oauth2-resourceserver.adoc

@@ -15,7 +15,7 @@ This section provides details on how Spring Security provides support for OAuth
 
 
 [NOTE]
 [NOTE]
 ====
 ====
-Working samples for both {gh-samples-url}/boot/oauth2resourceserver[JWTs] and {gh-samples-url}/boot/oauth2resourceserver-opaque[Opaque Tokens] are available in the {gh-samples-url}[Spring Security repository].
+Working samples for both {gh-samples-url}/servlet/spring-boot/java/oauth2/resource-server/jwe[JWTs] and {gh-samples-url}/servlet/spring-boot/java/oauth2/resource-server/opaque[Opaque Tokens] are available in the {gh-samples-url}[Spring Security Samples repository].
 ====
 ====
 
 
 Let's take a look at how Bearer Token Authentication works within Spring Security.
 Let's take a look at how Bearer Token Authentication works within Spring Security.

+ 1 - 1
docs/manual/src/docs/asciidoc/_includes/servlet/saml2/saml2-login.adoc

@@ -16,7 +16,7 @@ This process is similar to the one started in 2017 for <<oauth2,Spring Security'
 
 
 [NOTE]
 [NOTE]
 ====
 ====
-A working sample for {gh-samples-url}/boot/saml2login[SAML 2.0 Login] is available in the {gh-samples-url}[Spring Security repository].
+A working sample for {gh-samples-url}/servlet/spring-boot/java/saml2-login[SAML 2.0 Login] is available in the {gh-samples-url}[Spring Security Samples repository].
 ====
 ====
 
 
 Let's take a look at how SAML 2.0 Relying Party Authentication works within Spring Security.
 Let's take a look at how SAML 2.0 Relying Party Authentication works within Spring Security.