diff --git a/samples/cas/Readme.txt b/samples/cas/Readme.txt index cfa67e6ad7..c533677d9a 100644 --- a/samples/cas/Readme.txt +++ b/samples/cas/Readme.txt @@ -1,8 +1,8 @@ To run a CAS server and client application, just execute the command -./gradlew cas +../../../gradlew cas -from the project root directory. You should then be able to point your browser at +from samples/cas/sample. You should then be able to point your browser at https://localhost:8443/cas-sample/ diff --git a/samples/cas/cas.gradle b/samples/cas/sample/cassample.gradle similarity index 100% rename from samples/cas/cas.gradle rename to samples/cas/sample/cassample.gradle diff --git a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/BaseSpec.groovy b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/BaseSpec.groovy similarity index 99% rename from samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/BaseSpec.groovy rename to samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/BaseSpec.groovy index e96229f3ec..3ba8d50aaa 100644 --- a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/BaseSpec.groovy +++ b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/BaseSpec.groovy @@ -1,12 +1,12 @@ /* * Copyright 2011 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleProxySpec.groovy b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleProxySpec.groovy similarity index 99% rename from samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleProxySpec.groovy rename to samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleProxySpec.groovy index a7ffe6c1a3..0a304b9be6 100644 --- a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleProxySpec.groovy +++ b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleProxySpec.groovy @@ -1,12 +1,12 @@ /* * Copyright 2011 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleSpec.groovy b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleSpec.groovy similarity index 99% rename from samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleSpec.groovy rename to samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleSpec.groovy index 36c2517ae1..0453565e7b 100644 --- a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleSpec.groovy +++ b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleSpec.groovy @@ -1,12 +1,12 @@ /* * Copyright 2011 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/JettyCasService.groovy b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/JettyCasService.groovy similarity index 99% rename from samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/JettyCasService.groovy rename to samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/JettyCasService.groovy index 438ac0d2c0..5660a27d66 100644 --- a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/JettyCasService.groovy +++ b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/JettyCasService.groovy @@ -1,12 +1,12 @@ /* * Copyright 2011 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/modules/NavModule.groovy b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/modules/NavModule.groovy similarity index 98% rename from samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/modules/NavModule.groovy rename to samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/modules/NavModule.groovy index d6f8ecc5c9..5269610e56 100644 --- a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/modules/NavModule.groovy +++ b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/modules/NavModule.groovy @@ -1,12 +1,12 @@ /* * Copyright 2011 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/pages/AccessDeniedPage.groovy b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/AccessDeniedPage.groovy similarity index 98% rename from samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/pages/AccessDeniedPage.groovy rename to samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/AccessDeniedPage.groovy index 29d5d31be7..bad135669f 100644 --- a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/pages/AccessDeniedPage.groovy +++ b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/AccessDeniedPage.groovy @@ -1,12 +1,12 @@ /* * Copyright 2011 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/pages/ExtremelySecurePage.groovy b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/ExtremelySecurePage.groovy similarity index 98% rename from samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/pages/ExtremelySecurePage.groovy rename to samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/ExtremelySecurePage.groovy index b4e6ff11a7..6ba879f965 100644 --- a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/pages/ExtremelySecurePage.groovy +++ b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/ExtremelySecurePage.groovy @@ -1,12 +1,12 @@ /* * Copyright 2011 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/pages/HomePage.groovy b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/HomePage.groovy similarity index 98% rename from samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/pages/HomePage.groovy rename to samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/HomePage.groovy index 65020581a1..9305a04b42 100644 --- a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/pages/HomePage.groovy +++ b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/HomePage.groovy @@ -1,12 +1,12 @@ /* * Copyright 2011 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/pages/LocalLogoutPage.groovy b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/LocalLogoutPage.groovy similarity index 99% rename from samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/pages/LocalLogoutPage.groovy rename to samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/LocalLogoutPage.groovy index dacae6327f..7a91fd9748 100644 --- a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/pages/LocalLogoutPage.groovy +++ b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/LocalLogoutPage.groovy @@ -1,12 +1,12 @@ /* * Copyright 2011 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/pages/LoginPage.groovy b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/LoginPage.groovy similarity index 99% rename from samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/pages/LoginPage.groovy rename to samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/LoginPage.groovy index 10adde2097..5f7793e84e 100644 --- a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/pages/LoginPage.groovy +++ b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/LoginPage.groovy @@ -1,12 +1,12 @@ /* * Copyright 2011 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/pages/ProxyTicketSamplePage.groovy b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/ProxyTicketSamplePage.groovy similarity index 98% rename from samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/pages/ProxyTicketSamplePage.groovy rename to samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/ProxyTicketSamplePage.groovy index f9cd98657c..6d9208e8ee 100644 --- a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/pages/ProxyTicketSamplePage.groovy +++ b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/ProxyTicketSamplePage.groovy @@ -1,12 +1,12 @@ /* * Copyright 2011 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/pages/SecurePage.groovy b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/SecurePage.groovy similarity index 98% rename from samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/pages/SecurePage.groovy rename to samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/SecurePage.groovy index 3231c01eab..ce860c460b 100644 --- a/samples/cas/src/integration-test/groovy/org/springframework/security/samples/cas/pages/SecurePage.groovy +++ b/samples/cas/sample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/SecurePage.groovy @@ -1,12 +1,12 @@ /* * Copyright 2011 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/samples/cas/src/integration-test/resources/logback-test.xml b/samples/cas/sample/src/integration-test/resources/logback-test.xml similarity index 100% rename from samples/cas/src/integration-test/resources/logback-test.xml rename to samples/cas/sample/src/integration-test/resources/logback-test.xml diff --git a/samples/cas/src/main/java/org/springframework/security/samples/cas/web/ProxyTicketSampleServlet.java b/samples/cas/sample/src/main/java/org/springframework/security/samples/cas/web/ProxyTicketSampleServlet.java similarity index 99% rename from samples/cas/src/main/java/org/springframework/security/samples/cas/web/ProxyTicketSampleServlet.java rename to samples/cas/sample/src/main/java/org/springframework/security/samples/cas/web/ProxyTicketSampleServlet.java index e3e0c3bc0c..f5c7654143 100644 --- a/samples/cas/src/main/java/org/springframework/security/samples/cas/web/ProxyTicketSampleServlet.java +++ b/samples/cas/sample/src/main/java/org/springframework/security/samples/cas/web/ProxyTicketSampleServlet.java @@ -1,12 +1,12 @@ /* * Copyright 2011 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/samples/cas/src/main/webapp/403.jsp b/samples/cas/sample/src/main/webapp/403.jsp similarity index 100% rename from samples/cas/src/main/webapp/403.jsp rename to samples/cas/sample/src/main/webapp/403.jsp diff --git a/samples/cas/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/cas/sample/src/main/webapp/WEB-INF/applicationContext-security.xml similarity index 94% rename from samples/cas/src/main/webapp/WEB-INF/applicationContext-security.xml rename to samples/cas/sample/src/main/webapp/WEB-INF/applicationContext-security.xml index 3fc6a6495d..1efc9e0f56 100644 --- a/samples/cas/src/main/webapp/WEB-INF/applicationContext-security.xml +++ b/samples/cas/sample/src/main/webapp/WEB-INF/applicationContext-security.xml @@ -6,9 +6,9 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> diff --git a/samples/cas/src/main/webapp/WEB-INF/web.xml b/samples/cas/sample/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from samples/cas/src/main/webapp/WEB-INF/web.xml rename to samples/cas/sample/src/main/webapp/WEB-INF/web.xml diff --git a/samples/cas/src/main/webapp/cas-logout.jsp b/samples/cas/sample/src/main/webapp/cas-logout.jsp similarity index 100% rename from samples/cas/src/main/webapp/cas-logout.jsp rename to samples/cas/sample/src/main/webapp/cas-logout.jsp diff --git a/samples/cas/src/main/webapp/casfailed.jsp b/samples/cas/sample/src/main/webapp/casfailed.jsp similarity index 100% rename from samples/cas/src/main/webapp/casfailed.jsp rename to samples/cas/sample/src/main/webapp/casfailed.jsp diff --git a/samples/cas/src/main/webapp/index.jsp b/samples/cas/sample/src/main/webapp/index.jsp similarity index 100% rename from samples/cas/src/main/webapp/index.jsp rename to samples/cas/sample/src/main/webapp/index.jsp diff --git a/samples/cas/src/main/webapp/secure/extreme/index.jsp b/samples/cas/sample/src/main/webapp/secure/extreme/index.jsp similarity index 100% rename from samples/cas/src/main/webapp/secure/extreme/index.jsp rename to samples/cas/sample/src/main/webapp/secure/extreme/index.jsp diff --git a/samples/cas/src/main/webapp/secure/index.jsp b/samples/cas/sample/src/main/webapp/secure/index.jsp similarity index 76% rename from samples/cas/src/main/webapp/secure/index.jsp rename to samples/cas/sample/src/main/webapp/secure/index.jsp index 3ba0fec58f..d3ba43f84b 100644 --- a/samples/cas/src/main/webapp/secure/index.jsp +++ b/samples/cas/sample/src/main/webapp/secure/index.jsp @@ -5,7 +5,7 @@ or if you've authenticated this session.

<%if (request.isUserInRole("ROLE_SUPERVISOR")) { %> -

You are a supervisor! You can therefore see the extremely secure page.

+

You are a supervisor! You can therefore see the extremely secure page.

<% } %>

Home diff --git a/samples/casserver/casserver.gradle b/samples/cas/server/casserver.gradle similarity index 100% rename from samples/casserver/casserver.gradle rename to samples/cas/server/casserver.gradle diff --git a/samples/casserver/src/main/webapp/WEB-INF/classes/log4j.xml b/samples/cas/server/src/main/webapp/WEB-INF/classes/log4j.xml similarity index 100% rename from samples/casserver/src/main/webapp/WEB-INF/classes/log4j.xml rename to samples/cas/server/src/main/webapp/WEB-INF/classes/log4j.xml diff --git a/samples/casserver/src/main/webapp/WEB-INF/spring-configuration/zzzhttpClientCustomization.xml b/samples/cas/server/src/main/webapp/WEB-INF/spring-configuration/zzzhttpClientCustomization.xml similarity index 100% rename from samples/casserver/src/main/webapp/WEB-INF/spring-configuration/zzzhttpClientCustomization.xml rename to samples/cas/server/src/main/webapp/WEB-INF/spring-configuration/zzzhttpClientCustomization.xml diff --git a/settings.gradle b/settings.gradle index 4568ac249e..971618fcbe 100644 --- a/settings.gradle +++ b/settings.gradle @@ -19,8 +19,8 @@ def String[] samples = [ 'gae', 'dms', 'preauth', - 'casserver', - 'cas', + 'cas/server', + 'cas/sample', 'ldap', 'jaas' ] @@ -42,8 +42,9 @@ include samples samples.each {name -> p = findProject(":${name}") - p.name = "spring-security-samples-${name}" - p.buildFileName = "${name}.gradle" + def fullName = name.replaceAll('/','') + p.name = "spring-security-samples-${fullName}" + p.buildFileName = "${fullName}.gradle" p.projectDir = new File(settingsDir, "samples/${name}"); }