浏览代码

SEC-562: Sandbox repackaging.

Luke Taylor 18 年之前
父节点
当前提交
e5e4f040a1
共有 37 个文件被更改,包括 23 次插入23 次删除
  1. 5 5
      sandbox/openid/pom.xml
  2. 0 0
      sandbox/openid/src/main/java/org/springframework/security/providers/openid/AuthenticationCancelledException.java
  3. 0 0
      sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationProvider.java
  4. 0 0
      sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationStatus.java
  5. 0 0
      sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationToken.java
  6. 0 0
      sandbox/openid/src/main/java/org/springframework/security/providers/openid/package.html
  7. 0 0
      sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConstants.java
  8. 0 0
      sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumer.java
  9. 0 0
      sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumerException.java
  10. 0 0
      sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDLoginInitiationServlet.java
  11. 0 0
      sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilter.java
  12. 0 0
      sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationProcessingFilter.java
  13. 0 0
      sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationRequiredException.java
  14. 0 0
      sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/JanRainOpenIDConsumer.java
  15. 0 0
      sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/OpenId4JavaConsumer.java
  16. 0 0
      sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/package.html
  17. 0 0
      sandbox/openid/src/main/java/org/springframework/security/ui/openid/package.html
  18. 0 0
      sandbox/openid/src/test/java/org/springframework/security/providers/openid/MockAuthoritiesPopulator.java
  19. 0 0
      sandbox/openid/src/test/java/org/springframework/security/providers/openid/OpenIDAuthenticationProviderTests.java
  20. 0 0
      sandbox/openid/src/test/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilterTests.java
  21. 0 0
      sandbox/openid/src/test/java/org/springframework/security/ui/openid/consumers/MockOpenIDConsumer.java
  22. 7 7
      sandbox/other/pom.xml
  23. 0 0
      sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/AccountLockedException.java
  24. 0 0
      sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/OracleIDPasswordPolicyControl.java
  25. 0 0
      sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordExpiredException.java
  26. 0 0
      sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordInHistoryException.java
  27. 0 0
      sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControl.java
  28. 0 0
      sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactory.java
  29. 0 0
      sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyException.java
  30. 0 0
      sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControl.java
  31. 0 0
      sandbox/other/src/main/java/org/springframework/security/providers/ldap/authenticator/OracleIDBindAuthenticator.java
  32. 0 0
      sandbox/other/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControlTests.java
  33. 6 6
      sandbox/pom.xml
  34. 1 1
      sandbox/spring-security-config/src/test/resources/log4j.properties
  35. 4 4
      sandbox/webwork/pom.xml
  36. 0 0
      sandbox/webwork/src/main/java/org/springframework/security/webwork/AcegiDispatcherUtils.java
  37. 0 0
      sandbox/webwork/src/main/java/org/springframework/security/webwork/FilterDispatcher.java

+ 5 - 5
sandbox/openid/pom.xml

@@ -2,13 +2,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <parent>
     <parent>
-        <groupId>org.acegisecurity</groupId>
-        <artifactId>acegi-security-sandbox</artifactId>
+        <groupId>org.springframework.security</groupId>
+        <artifactId>spring-security-sandbox</artifactId>
         <version>2.0-SNAPSHOT</version>
         <version>2.0-SNAPSHOT</version>
     </parent>
     </parent>
-    <artifactId>acegi-security-openid</artifactId>
-    <name>Acegi Security System for Spring - OpenID support</name>
-    <description>Acegi Security System for Spring - Support for OpenID</description>
+    <artifactId>spring-security-openid</artifactId>
+    <name>Spring Security System - OpenID support</name>
+    <description>Spring Security - Support for OpenID</description>
     <version>0.1-SNAPSHOT</version>
     <version>0.1-SNAPSHOT</version>
 
 
     <repositories>
     <repositories>

+ 0 - 0
sandbox/openid/src/main/java/org/acegisecurity/providers/openid/AuthenticationCancelledException.java → sandbox/openid/src/main/java/org/springframework/security/providers/openid/AuthenticationCancelledException.java


+ 0 - 0
sandbox/openid/src/main/java/org/acegisecurity/providers/openid/OpenIDAuthenticationProvider.java → sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationProvider.java


+ 0 - 0
sandbox/openid/src/main/java/org/acegisecurity/providers/openid/OpenIDAuthenticationStatus.java → sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationStatus.java


+ 0 - 0
sandbox/openid/src/main/java/org/acegisecurity/providers/openid/OpenIDAuthenticationToken.java → sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationToken.java


+ 0 - 0
sandbox/openid/src/main/java/org/acegisecurity/providers/openid/package.html → sandbox/openid/src/main/java/org/springframework/security/providers/openid/package.html


+ 0 - 0
sandbox/openid/src/main/java/org/acegisecurity/ui/openid/OpenIDConstants.java → sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConstants.java


+ 0 - 0
sandbox/openid/src/main/java/org/acegisecurity/ui/openid/OpenIDConsumer.java → sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumer.java


+ 0 - 0
sandbox/openid/src/main/java/org/acegisecurity/ui/openid/OpenIDConsumerException.java → sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumerException.java


+ 0 - 0
sandbox/openid/src/main/java/org/acegisecurity/ui/openid/OpenIDLoginInitiationServlet.java → sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDLoginInitiationServlet.java


+ 0 - 0
sandbox/openid/src/main/java/org/acegisecurity/ui/openid/OpenIDResponseProcessingFilter.java → sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilter.java


+ 0 - 0
sandbox/openid/src/main/java/org/acegisecurity/ui/openid/OpenIdAuthenticationProcessingFilter.java → sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationProcessingFilter.java


+ 0 - 0
sandbox/openid/src/main/java/org/acegisecurity/ui/openid/OpenIdAuthenticationRequiredException.java → sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationRequiredException.java


+ 0 - 0
sandbox/openid/src/main/java/org/acegisecurity/ui/openid/consumers/JanRainOpenIDConsumer.java → sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/JanRainOpenIDConsumer.java


+ 0 - 0
sandbox/openid/src/main/java/org/acegisecurity/ui/openid/consumers/OpenId4JavaConsumer.java → sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/OpenId4JavaConsumer.java


+ 0 - 0
sandbox/openid/src/main/java/org/acegisecurity/ui/openid/consumers/package.html → sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/package.html


+ 0 - 0
sandbox/openid/src/main/java/org/acegisecurity/ui/openid/package.html → sandbox/openid/src/main/java/org/springframework/security/ui/openid/package.html


+ 0 - 0
sandbox/openid/src/test/java/org/acegisecurity/providers/openid/MockAuthoritiesPopulator.java → sandbox/openid/src/test/java/org/springframework/security/providers/openid/MockAuthoritiesPopulator.java


+ 0 - 0
sandbox/openid/src/test/java/org/acegisecurity/providers/openid/OpenIDAuthenticationProviderTests.java → sandbox/openid/src/test/java/org/springframework/security/providers/openid/OpenIDAuthenticationProviderTests.java


+ 0 - 0
sandbox/openid/src/test/java/org/acegisecurity/ui/openid/OpenIDResponseProcessingFilterTests.java → sandbox/openid/src/test/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilterTests.java


+ 0 - 0
sandbox/openid/src/test/java/org/acegisecurity/ui/openid/consumers/MockOpenIDConsumer.java → sandbox/openid/src/test/java/org/springframework/security/ui/openid/consumers/MockOpenIDConsumer.java


+ 7 - 7
sandbox/other/pom.xml

@@ -4,17 +4,17 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <modelVersion>4.0.0</modelVersion>
   <parent>
   <parent>
-    <groupId>org.acegisecurity</groupId>
-    <artifactId>acegi-security-sandbox</artifactId>
+    <groupId>org.springframework.security</groupId>
+    <artifactId>spring-security-sandbox</artifactId>
     <version>2.0-SNAPSHOT</version>
     <version>2.0-SNAPSHOT</version>
   </parent>
   </parent>
-  <artifactId>acegi-security-sandbox-other</artifactId>
-  <name>Acegi Security System for Spring - Sandbox other</name>
-  <description>Acegi Security System for Spring Miscellaneus sandbox utilities</description>
+  <artifactId>spring-security-sandbox-other</artifactId>
+  <name>Spring Security - Sandbox other</name>
+  <description>Spring Security Miscellaneus sandbox utilities</description>
   <dependencies>
   <dependencies>
     <dependency>
     <dependency>
-      <groupId>org.acegisecurity</groupId>
-      <artifactId>acegi-security</artifactId>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
       <version>${project.version}</version>
       <version>${project.version}</version>
     </dependency>
     </dependency>
     <dependency>
     <dependency>

+ 0 - 0
sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/AccountLockedException.java → sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/AccountLockedException.java


+ 0 - 0
sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/OracleIDPasswordPolicyControl.java → sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/OracleIDPasswordPolicyControl.java


+ 0 - 0
sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/PasswordExpiredException.java → sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordExpiredException.java


+ 0 - 0
sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/PasswordInHistoryException.java → sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordInHistoryException.java


+ 0 - 0
sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/PasswordPolicyControl.java → sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControl.java


+ 0 - 0
sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/PasswordPolicyControlFactory.java → sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactory.java


+ 0 - 0
sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/PasswordPolicyException.java → sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyException.java


+ 0 - 0
sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/PasswordPolicyResponseControl.java → sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControl.java


+ 0 - 0
sandbox/other/src/main/java/org/acegisecurity/providers/ldap/authenticator/OracleIDBindAuthenticator.java → sandbox/other/src/main/java/org/springframework/security/providers/ldap/authenticator/OracleIDBindAuthenticator.java


+ 0 - 0
sandbox/other/src/test/java/org/acegisecurity/ldap/ppolicy/PasswordPolicyResponseControlTests.java → sandbox/other/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControlTests.java


+ 6 - 6
sandbox/pom.xml

@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <modelVersion>4.0.0</modelVersion>
   <parent>
   <parent>
-    <groupId>org.acegisecurity</groupId>
-    <artifactId>acegi-security-parent</artifactId>
+    <groupId>org.springframework.security</groupId>
+    <artifactId>spring-security-parent</artifactId>
     <version>2.0-SNAPSHOT</version>
     <version>2.0-SNAPSHOT</version>
   </parent>
   </parent>
-  <artifactId>acegi-security-sandbox</artifactId>
-  <name>Acegi Security System for Spring - Sandbox</name>
+  <artifactId>spring-security-sandbox</artifactId>
+  <name>Spring Security - Sandbox</name>
   <packaging>pom</packaging>
   <packaging>pom</packaging>
 
 
   <scm>
   <scm>
@@ -25,8 +25,8 @@
 
 
   <dependencies>
   <dependencies>
     <dependency>
     <dependency>
-      <groupId>org.acegisecurity</groupId>
-      <artifactId>acegi-security</artifactId>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
       <version>2.0-SNAPSHOT</version>
       <version>2.0-SNAPSHOT</version>
     </dependency>
     </dependency>
   </dependencies>
   </dependencies>

+ 1 - 1
sandbox/spring-security-config/src/test/resources/log4j.properties

@@ -8,5 +8,5 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d %p %c - %m%n
 log4j.appender.stdout.layout.ConversionPattern=%d %p %c - %m%n
 
 
-log4j.category.org.acegisecurity=DEBUG
+log4j.category.org.springframework.security=DEBUG
 log4j.category.org.springframework=INFO
 log4j.category.org.springframework=INFO

+ 4 - 4
sandbox/webwork/pom.xml

@@ -1,12 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <modelVersion>4.0.0</modelVersion>
   <parent>
   <parent>
-    <groupId>org.acegisecurity</groupId>
-    <artifactId>acegi-security-sandbox</artifactId>
+    <groupId>org.springframework.security</groupId>
+    <artifactId>spring-security-sandbox</artifactId>
     <version>2.0-SNAPSHOT</version>
     <version>2.0-SNAPSHOT</version>
   </parent>
   </parent>
-  <artifactId>acegi-security-webwork</artifactId>
-  <name>Acegi Security System for Spring - Webwork support</name>
+  <artifactId>spring-security-webwork</artifactId>
+  <name>Spring Security - Webwork support</name>
   <description>Acegi Security System for Spring - Support for WebWork 2</description>
   <description>Acegi Security System for Spring - Support for WebWork 2</description>
   <version>0.3-SNAPSHOT</version>
   <version>0.3-SNAPSHOT</version>
 
 

+ 0 - 0
sandbox/webwork/src/main/java/org/acegisecurity/webwork/AcegiDispatcherUtils.java → sandbox/webwork/src/main/java/org/springframework/security/webwork/AcegiDispatcherUtils.java


+ 0 - 0
sandbox/webwork/src/main/java/org/acegisecurity/webwork/FilterDispatcher.java → sandbox/webwork/src/main/java/org/springframework/security/webwork/FilterDispatcher.java