[java-shib-common COMMIT] in /branches/REL_1: pom.xml src/main/java/edu/internet2/middleware/shibboleth/common/config...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Aug  8 22:22:18 2014
New Revision: 1099

URL: http://svn.shibboleth.net/view/java-shib-common?rev=1099&view=rev
Log:
SIDP-611 - implement a conditional "missing" SVNResource parser, make svnkit optional

Added:
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/MissingSVNResourceBeanDefinitionParser.java   (with props)
Modified:
    branches/REL_1/pom.xml
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/ResourceNamespaceHandler.java
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/SVNResourceBeanDefinitionParser.java

Modified: branches/REL_1/pom.xml
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/pom.xml?rev=1099&r1=1098&r2=1099&view=diff
==============================================================================
--- branches/REL_1/pom.xml (original)
+++ branches/REL_1/pom.xml Fri Aug  8 22:22:18 2014
@@ -131,6 +131,7 @@
             <groupId>org.tmatesoft.svnkit</groupId>
             <artifactId>svnkit</artifactId>
             <version>1.3.8</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>jargs</groupId>

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/ResourceNamespaceHandler.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/ResourceNamespaceHandler.java?rev=1099&r1=1098&r2=1099&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/ResourceNamespaceHandler.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/ResourceNamespaceHandler.java Fri Aug  8 22:22:18 2014
@@ -16,6 +16,8 @@
  */
 
 package edu.internet2.middleware.shibboleth.common.config.resource;
+
+import org.slf4j.LoggerFactory;
 
 import edu.internet2.middleware.shibboleth.common.config.BaseSpringNamespaceHandler;
 
@@ -39,8 +41,19 @@
         registerBeanDefinitionParser(FileBackedHttpResourceBeanDefinitionParser.SCHEMA_TYPE,
                 new FileBackedHttpResourceBeanDefinitionParser());
 
-        registerBeanDefinitionParser(SVNResourceBeanDefinitionParser.SCHEMA_TYPE, 
-                new SVNResourceBeanDefinitionParser());
+        try {
+            if (Class.forName("org.tmatesoft.svn.core.wc.SVNClientManager") != null) {
+                registerBeanDefinitionParser(SVNResourceBeanDefinitionParser.SCHEMA_TYPE, 
+                        new SVNResourceBeanDefinitionParser());
+            } else {
+                throw new ClassNotFoundException();
+            }
+        } catch (ClassNotFoundException e) {
+            LoggerFactory.getLogger(ResourceNamespaceHandler.class).info(
+                    "svnkit jar not found, the SVNResource type will nt be supported");
+            registerBeanDefinitionParser(MissingSVNResourceBeanDefinitionParser.SCHEMA_TYPE, 
+                    new MissingSVNResourceBeanDefinitionParser());
+        }
 
         registerBeanDefinitionParser(PropertyReplacementResourceFilterBeanDefinitionParser.SCHEMA_TYPE,
                 new PropertyReplacementResourceFilterBeanDefinitionParser());

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/SVNResourceBeanDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/SVNResourceBeanDefinitionParser.java?rev=1099&r1=1098&r2=1099&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/SVNResourceBeanDefinitionParser.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/SVNResourceBeanDefinitionParser.java Fri Aug  8 22:22:18 2014
@@ -23,7 +23,6 @@
 import javax.xml.namespace.QName;
 
 import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.BeanCreationException;