[java-identity-provider COMMIT] in /trunk/idp-profile-spring/src: main/java/net/shibboleth/idp/profile/spring/relying...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Apr  1 04:21:34 2014
New Revision: 5671

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5671&view=rev
Log:
IDP388 Do not checkout the svn test files into the work space.  Its wrong at too many levels.  Plus is causes chaos if people are running recent svn versions.  Also fix warning in the parser

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ResourceBackedMetadataProviderParser.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataParserTest.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/svnEntity.xml

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ResourceBackedMetadataProviderParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ResourceBackedMetadataProviderParser.java?rev=5671&r1=5670&r2=5671&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ResourceBackedMetadataProviderParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ResourceBackedMetadataProviderParser.java Tue Apr  1 04:21:34 2014
@@ -73,7 +73,7 @@
                     "No type specified for a <Resource> within a ResourceBackedMetadataProvider");
         }
         log.debug("comparing type '{}' against known Resources", qName.getLocalPart());
-        
+
         if (ClasspathResourceParser.ELEMENT_NAME.equals(qName)) {
             return ResourceBackedMetadataResolver.class;
         } else if (SVNResourceParser.ELEMENT_NAME.equals(qName)) {
@@ -86,7 +86,8 @@
             return FilesystemMetadataResolver.class;
         }
 
-        throw new BeanCreationException("ResourceBackedMetadataProvider : Unrecognised resource type: " + qName.getLocalPart());
+        throw new BeanCreationException("ResourceBackedMetadataProvider : Unrecognised resource type: "
+                + qName.getLocalPart());
     }
 
     /** {@inheritDoc} */
@@ -104,31 +105,31 @@
 
         final QName qName = DomTypeSupport.getXSIType(resources.get(0));
         log.debug("Dispatching based on type '{}'", qName.getLocalPart());
-        
+
         if (ClasspathResourceParser.ELEMENT_NAME.equals(qName)) {
-                   
+
             parseResource(resources.get(0), parserContext, builder);
-            
+
         } else if (SVNResourceParser.ELEMENT_NAME.equals(qName)) {
-            
+
             parseResource(resources.get(0), parserContext, builder);
-            
+
         } else if (ResourceNamespaceHandler.HTTP_ELEMENT_NAME.equals(qName)) {
-            
+
             log.warn("{}: {} is deprecated. consider using {}", parserContext.getReaderContext().getResource()
                     .getDescription(), ResourceNamespaceHandler.HTTP_ELEMENT_NAME.getLocalPart(),
                     HTTPMetadataProviderParser.ELEMENT_NAME.getLocalPart());
             parseHTTPResource(resources.get(0), parserContext, builder);
-            
+
         } else if (ResourceNamespaceHandler.FILE_HTTP_ELEMENT_NAME.equals(qName)) {
-            
+
             log.warn("{}: {} is deprecated. consider using {}", parserContext.getReaderContext().getResource()
                     .getDescription(), ResourceNamespaceHandler.FILE_HTTP_ELEMENT_NAME.getLocalPart(),
                     FileBackedHTTPMetadataProviderParser.ELEMENT_NAME.getLocalPart());
             parseFileBackedHTTPResource(resources.get(0), parserContext, builder);
-            
+
         } else if (ResourceNamespaceHandler.FILESYSTEM_ELEMENT_NAME.equals(qName)) {
-            
+
             log.warn("{}: {} is deprecated. consider using {}", parserContext.getReaderContext().getResource()
                     .getDescription(), ResourceNamespaceHandler.FILESYSTEM_ELEMENT_NAME.getLocalPart(),
                     FilesystemMetadataProviderParser.ELEMENT_NAME.getLocalPart());

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataParserTest.java?rev=5671&r1=5670&r2=5671&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataParserTest.java (original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataParserTest.java Tue Apr  1 04:21:34 2014
@@ -17,7 +17,10 @@
 

[... 89 lines stripped ...]