[utilities COMMIT] in /java-support/trunk: pom.xml src/main/java/net/shibboleth/utilities/java/support/httpclient/Htt...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Dec 16 10:52:51 2013
New Revision: 487

URL: http://svn.shibboleth.net/view/utilities?rev=487&view=rev
Log:
IDP-209 net.shibboleth.utilities.java.support.resource.Resource becomes net.shibboleth.utilities.java.support.resource.ShibbolethResource and gains the same Methods and the spring ressource
For the sake of testing we import the ShibbolethSupportHelper from spring-extensions, but renamed to TestResourceConverter (to ensure that the correct implementaion is used elsewhere)

Several concrete (old style) resource implementations are deleted and the remaining one (the http client) becomes deprecated.

Since the tests now use Spring ClassPathResources the piom fil collects a TEST scoped dependency on Spring

Added:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/resource/ShibbolethResource.java
      - copied, changed from r486, java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/resource/Resource.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/resource/TestResourceConverter.java   (with props)
Modified:
    java-support/trunk/pom.xml
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpResource.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/resource/AbstractResource.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/resource/ClasspathResource.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/resource/FilesystemResource.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/resource/Resource.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/resource/package-info.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/SchemaBuilder.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/resource/ClasspathResourceTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/resource/FilesystemResourceTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/AttributeSupportTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/BasicParserPoolTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/DomTypeSupportTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/NamespaceSupportTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/SchemaBuilderTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/SerializeSupportTest.java
    java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/resource/classPathResourceData.dat

Modified: java-support/trunk/pom.xml
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/pom.xml?rev=487&r1=486&r2=487&view=diff
==============================================================================
--- java-support/trunk/pom.xml (original)
+++ java-support/trunk/pom.xml Mon Dec 16 10:52:51 2013
@@ -123,6 +123,11 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${spring.groupId}</groupId>
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpResource.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpResource.java?rev=487&r1=486&r2=487&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpResource.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpResource.java Mon Dec 16 10:52:51 2013
@@ -53,6 +53,7 @@
 
 /** A resource that fetches data from a remote source via HTTP. */
 @NotThreadSafe
+ at Deprecated
 public class HttpResource extends AbstractResource {
 
     /** Property name under which the ETag data is stored. */

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/resource/AbstractResource.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/resource/AbstractResource.java?rev=487&r1=486&r2=487&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/resource/AbstractResource.java (original)

[... 887 lines stripped ...]