Cleanup: adds explicit exclusions in pom, removes unused imports

fcrepo4-archive · May 31, 2013 · 337f731 · 337f731
1 parent 87a1338
commit 337f731
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -15,15 +15,15 @@
       <artifactId>fcrepo-serialization</artifactId>
       <version>${project.version}</version>
     </dependency>
-    
+
     <!-- test gear -->
     <dependency>
       <groupId>org.fcrepo</groupId>
       <artifactId>fcrepo-http-api</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
-        <dependency>
+    <dependency>
       <groupId>org.fcrepo</groupId>
       <artifactId>fcrepo-http-commons</artifactId>
       <version>${project.version}</version>
@@ -74,16 +74,16 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <!-- Logging: we'll use LogBack (which implements the SLF4J API); ModeShape 
-      knows what to do. -->
+    <!-- Logging: we'll use LogBack (which implements the SLF4J API); ModeShape knows 
+      what to do. -->
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
     </dependency>
-    <!-- This dependency is for compile-time: it keeps this module independent 
-      of any given choice of JAX-RS implementation. It must be _after_ the test 
-      gear. Otherwise it will get loaded during test phase, but because this is 
-      just an API, the tests will not be able to execute. -->
+    <!-- This dependency is for compile-time: it keeps this module independent of 
+      any given choice of JAX-RS implementation. It must be _after_ the test gear. Otherwise 
+      it will get loaded during test phase, but because this is just an API, the tests 
+      will not be able to execute. -->
     <dependency>
       <groupId>javax</groupId>
       <artifactId>javaee-api</artifactId>
@@ -95,16 +95,20 @@
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>
-          <artifactId>*</artifactId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging-api</artifactId>
         </exclusion>
         <exclusion>
           <groupId>log4j</groupId>
-          <artifactId>*</artifactId>
+          <artifactId>log4j</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
   </dependencies>
-  
+
   <build>
     <plugins>
       <plugin>

diff --git a/src/main/java/org/fcrepo/serialization/bagit/BagItSerializer.java b/src/main/java/org/fcrepo/serialization/bagit/BagItSerializer.java
@@ -43,7 +43,6 @@
 import org.fcrepo.FedoraObject;
 import org.fcrepo.exception.InvalidChecksumException;
 import org.fcrepo.serialization.BaseFedoraObjectSerializer;
-import org.fcrepo.utils.PropertyIterator;
 import org.slf4j.Logger;
 
 import com.google.common.base.Function;
@@ -122,10 +121,10 @@ public File serializeToFile(final Node node) throws RepositoryException,
         }
 
         // and recurse, to pick up datastream children
-        for (final Iterator i =
+        for (final Iterator<Node> i =
                 filter(node.getNodes(), isFedoraDatastream); i
                 .hasNext();) {
-            final Node dsNode = (Node)i.next();
+            final Node dsNode = i.next();
             logger.debug("Now recording child node: " + dsNode.getName());
             bag.addFileToPayload(serializeToFile(dsNode));
         }

diff --git a/src/test/java/org/fcrepo/serialization/bagit/BagItSerializerIT.java b/src/test/java/org/fcrepo/serialization/bagit/BagItSerializerIT.java
@@ -13,7 +13,6 @@
 import org.apache.http.entity.StringEntity;
 import org.apache.http.util.EntityUtils;
 import org.junit.Test;
-import org.springframework.test.context.ContextConfiguration;
 
 public class BagItSerializerIT extends AbstractResourceIT {
 

diff --git a/src/test/resources/spring-test/test-container.xml b/src/test/resources/spring-test/test-container.xml
@@ -8,9 +8,14 @@
   <context:property-placeholder/>
   <context:annotation-config/>
 
+  <!-- show stack traces for easier debugging -->
+  <bean id="wildcardExceptionmapper" class="org.fcrepo.exceptionhandlers.WildcardExceptionMapper" >
+  	<property name="showStackTrace" value="true" />
+  </bean>
+
   <bean id="containerWrapper" class="org.fcrepo.test.util.ContainerWrapper" init-method="start" destroy-method="stop" >
     <property name="port" value="${test.port:8080}"/>
-    <property name="contextConfigLocations" value="classpath:spring-test/rest.xml, classpath:spring-test/repo.xml" />
+    <property name="contextConfigLocations" value="classpath:spring-test/repo.xml, classpath:spring-test/rest.xml" />
     <property name="packagesToScan" value="org.fcrepo.api, org.fcrepo.serialization"/>
   </bean>
 

diff --git a/src/test/resources/test_repository.json b/src/test/resources/test_repository.json
@@ -2,8 +2,8 @@
     "name" : "repo",
     "jndiName" : "",
     "workspaces" : {
-        "predefined" : ["fedora"],
-        "default" : "fedora",
+        "predefined" : ["default"],
+        "default" : "default",
         "allowCreation" : true
     },
     "storage" : {