[java-opensaml COMMIT] in /trunk: opensaml-core/pom.xml opensaml-core/src/main/java/org/opensaml/core/config/ESAPIIni...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Aug  5 15:17:23 2013
New Revision: 3417

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3417&view=rev
Log:
Move ESAPI config initialization into opensaml-core

Added:
    trunk/opensaml-core/src/main/java/org/opensaml/core/config/ESAPIInitializer.java
      - copied, changed from r3413, trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/config/ESAPIInitializer.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/config/ESAPISecurityConfig.java
      - copied, changed from r3413, trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/config/ESAPISecurityConfig.java
    trunk/opensaml-core/src/test/java/org/opensaml/core/config/ESAPITest.java
      - copied, changed from r3413, trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/config/ESAPITest.java
Modified:
    trunk/opensaml-core/pom.xml
    trunk/opensaml-core/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/config/ESAPIInitializer.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/config/ESAPISecurityConfig.java
    trunk/opensaml-saml-impl/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/config/ESAPITest.java

Modified: trunk/opensaml-core/pom.xml
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/pom.xml?rev=3417&r1=3416&r2=3417&view=diff
==============================================================================
--- trunk/opensaml-core/pom.xml (original)
+++ trunk/opensaml-core/pom.xml Mon Aug  5 15:17:23 2013
@@ -22,6 +22,11 @@
             <artifactId>joda-time</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.owasp.esapi</groupId>
+            <artifactId>esapi</artifactId>
+        </dependency>
+
         <!-- Provided Dependencies -->
 
         <!-- Runtime Dependencies -->

Copied: trunk/opensaml-core/src/main/java/org/opensaml/core/config/ESAPIInitializer.java (from r3413, trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/config/ESAPIInitializer.java)
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/core/config/ESAPIInitializer.java?p2=trunk/opensaml-core/src/main/java/org/opensaml/core/config/ESAPIInitializer.java&p1=trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/config/ESAPIInitializer.java&r1=3413&r2=3417&rev=3417&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/config/ESAPIInitializer.java (original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/core/config/ESAPIInitializer.java Mon Aug  5 15:17:23 2013
@@ -15,10 +15,8 @@
  * limitations under the License.
  */
 
-package org.opensaml.saml.config;
+package org.opensaml.core.config;
 
-import org.opensaml.core.config.InitializationException;
-import org.opensaml.core.config.Initializer;
 import org.owasp.esapi.ESAPI;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Copied: trunk/opensaml-core/src/main/java/org/opensaml/core/config/ESAPISecurityConfig.java (from r3413, trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/config/ESAPISecurityConfig.java)
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/core/config/ESAPISecurityConfig.java?p2=trunk/opensaml-core/src/main/java/org/opensaml/core/config/ESAPISecurityConfig.java&p1=trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/config/ESAPISecurityConfig.java&r1=3413&r2=3417&rev=3417&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/config/ESAPISecurityConfig.java (original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/core/config/ESAPISecurityConfig.java Mon Aug  5 15:17:23 2013
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.opensaml.saml.config;
+package org.opensaml.core.config;
 
 import java.io.File;
 import java.io.IOException;

Modified: trunk/opensaml-core/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer?rev=3417&r1=3416&r2=3417&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer (original)
+++ trunk/opensaml-core/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer Mon Aug  5 15:17:23 2013
@@ -1,2 +1,3 @@
+org.opensaml.core.config.ESAPIInitializer
 org.opensaml.core.xml.config.XMLObjectProviderInitializer
 org.opensaml.core.xml.config.GlobalParserPoolInitializer

Copied: trunk/opensaml-core/src/test/java/org/opensaml/core/config/ESAPITest.java (from r3413, trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/config/ESAPITest.java)

[... 27 lines stripped ...]