Cleaned out CXF stuff and moved version control to fcrepo/pom.xml

fcrepo · Apr 18, 2013 · d49a167 · d49a167
1 parent 134551c
commit d49a167
Show file tree

Hide file tree

Showing 132 changed files with 1,452 additions and 1,344 deletions.
diff --git a/fcrepo-audit/src/main/java/org/fcrepo/audit/Auditor.java b/fcrepo-audit/src/main/java/org/fcrepo/audit/Auditor.java
@@ -1,3 +1,4 @@
+
 package org.fcrepo.audit;
 
 import javax.jcr.RepositoryException;
@@ -18,6 +19,6 @@ public interface Auditor {
      * 
      * @throws RepositoryException 
      */
-	@Subscribe
-    void recordEvent(Event e) throws RepositoryException;
+    @Subscribe
+    void recordEvent(final Event e) throws RepositoryException;
 }
diff --git a/fcrepo-audit/src/main/java/org/fcrepo/audit/LogbackAuditor.java b/fcrepo-audit/src/main/java/org/fcrepo/audit/LogbackAuditor.java
@@ -1,3 +1,4 @@
+
 package org.fcrepo.audit;
 
 import static org.fcrepo.utils.EventType.getEventName;
@@ -20,12 +21,12 @@ public class LogbackAuditor implements Auditor {
     /**
      * Logger for this class.
      */
-    private Logger logger = LoggerFactory.getLogger(LogbackAuditor.class);
+    private final Logger logger = LoggerFactory.getLogger(LogbackAuditor.class);
 
-	@Override
-	@Subscribe
+    @Override
+    @Subscribe
     public void recordEvent(final Event e) throws RepositoryException {
-		logger.info(e.getUserID() + " " + getEventName(e.getType()) + " "
-				+ e.getPath());
-	}
+        logger.info(e.getUserID() + " " + getEventName(e.getType()) + " " +
+                e.getPath());
+    }
 }
diff --git a/fcrepo-audit/src/test/java/org/fcrepo/audit/LogbackAuditorTest.java b/fcrepo-audit/src/test/java/org/fcrepo/audit/LogbackAuditorTest.java
@@ -1,3 +1,4 @@
+
 package org.fcrepo.audit;
 
 import static org.mockito.Matchers.argThat;
@@ -23,11 +24,11 @@
 
 public class LogbackAuditorTest {
 
-    private int jcrEventType = 1;
+    private final int jcrEventType = 1;
 
-    private String jcrEventUserID = "jdoe";
+    private final String jcrEventUserID = "jdoe";
 
-    private String jcrEventPath = "/foo/bar";
+    private final String jcrEventPath = "/foo/bar";
 
     @Mock
     private Appender<ILoggingEvent> mockAppender;
@@ -39,19 +40,20 @@ public void setUp() throws Exception {
 
     @Test
     public void testEventAuditing() throws Exception {
-        Logger root = (Logger) LoggerFactory.getLogger(LogbackAuditor.class);
+        final Logger root =
+                (Logger) LoggerFactory.getLogger(LogbackAuditor.class);
 
         when(mockAppender.getName()).thenReturn("MockAppender");
 
-        Event mockEvent = mock(Event.class);
+        final Event mockEvent = mock(Event.class);
         when(mockEvent.getType()).thenReturn(jcrEventType);
         when(mockEvent.getUserID()).thenReturn(jcrEventUserID);
         when(mockEvent.getPath()).thenReturn(jcrEventPath);
 
         root.addAppender(mockAppender);
 
-        EventBus eventBus = new EventBus("Test EventBus");
-        Auditor auditor = new LogbackAuditor();
+        final EventBus eventBus = new EventBus("Test EventBus");
+        final Auditor auditor = new LogbackAuditor();
         eventBus.register(auditor);
         eventBus.post(mockEvent);
 

diff --git a/fcrepo-generator-dc/pom.xml b/fcrepo-generator-dc/pom.xml
@@ -70,25 +70,21 @@
     <dependency>
       <groupId>com.sun.grizzly</groupId>
       <artifactId>grizzly-servlet-webserver</artifactId>
-      <version>1.9.57</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-grizzly</artifactId>
-      <version>1.17.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>
-      <version>1.4.4</version>
       <scope>test</scope>
     </dependency>
 	<dependency>
 		<groupId>com.sun.jersey.contribs</groupId>
 		<artifactId>jersey-spring</artifactId>
-		<version>1.17.1</version>
 		<scope>test</scope>
 		<exclusions>
 			<exclusion>

diff --git a/fcrepo-generator-dc/src/main/java/org/fcrepo/generator/DublinCoreGenerator.java b/fcrepo-generator-dc/src/main/java/org/fcrepo/generator/DublinCoreGenerator.java
@@ -29,7 +29,7 @@ public class DublinCoreGenerator extends AbstractResource {
 
     @Resource
     List<DCGenerator> dcgenerators;
-    
+
     @Autowired
     ObjectService objectService;
 
@@ -40,8 +40,8 @@ public Response getObjectAsDublinCore(@PathParam("pid")
 
         final Node obj = objectService.getObjectNode(pid);
 
-        for (DCGenerator indexer : dcgenerators) {
-            InputStream inputStream = indexer.getStream(obj);
+        for (final DCGenerator indexer : dcgenerators) {
+            final InputStream inputStream = indexer.getStream(obj);
 
             if (inputStream != null) {
                 return ok(inputStream).build();

diff --git a/fcrepo-generator-dc/src/main/java/org/fcrepo/generator/dublincore/DCGenerator.java b/fcrepo-generator-dc/src/main/java/org/fcrepo/generator/dublincore/DCGenerator.java
@@ -1,12 +1,12 @@
-package org.fcrepo.generator.dublincore;
 
+package org.fcrepo.generator.dublincore;
 
 import java.io.InputStream;
 
 import javax.jcr.Node;
 
 public interface DCGenerator {
 
-    public abstract InputStream getStream(Node node);
+    public abstract InputStream getStream(final Node node);
 
 }
diff --git a/...po-generator-dc/src/main/java/org/fcrepo/generator/dublincore/JcrPropertiesGenerator.java b/...po-generator-dc/src/main/java/org/fcrepo/generator/dublincore/JcrPropertiesGenerator.java
@@ -1,49 +1,62 @@
+
 package org.fcrepo.generator.dublincore;
 
-import org.slf4j.Logger;
+import static org.slf4j.LoggerFactory.getLogger;
 
-import javax.jcr.*;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 
-import static org.slf4j.LoggerFactory.getLogger;
+import javax.jcr.Node;
+import javax.jcr.Property;
+import javax.jcr.PropertyIterator;
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+
+import org.slf4j.Logger;
 
 public class JcrPropertiesGenerator implements DCGenerator {
 
-    private static final Logger logger = getLogger(JcrPropertiesGenerator.class);
-    public static final String[] SALIENT_DC_PROPERTY_NAMESPACES = new String[] { "dc:*" };
+    private static final Logger logger =
+            getLogger(JcrPropertiesGenerator.class);
+
+    public static final String[] SALIENT_DC_PROPERTY_NAMESPACES =
+            new String[] {"dc:*"};
 
     @Override
-    public InputStream getStream(Node node) {
+    public InputStream getStream(final Node node) {
 
-        StringBuilder str = new StringBuilder();
+        final StringBuilder str = new StringBuilder();
 
         str.append("<oai_dc:dc xmlns:oai_dc=\"http://www.openarchives.org/OAI/2.0/oai_dc/\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\">\n");
 
         try {
-            PropertyIterator iter = node.getProperties(SALIENT_DC_PROPERTY_NAMESPACES);
+            final PropertyIterator iter =
+                    node.getProperties(SALIENT_DC_PROPERTY_NAMESPACES);
 
-            while(iter.hasNext()) {
-                Property property = iter.nextProperty();
-                if(property.isMultiple()) {
-                    for(final Value v : property.getValues()) {
-                        str.append("\t<" + property.getName() + ">" + v.getString() + "</" + property.getName() + ">\n");
+            while (iter.hasNext()) {
+                final Property property = iter.nextProperty();
+                if (property.isMultiple()) {
+                    for (final Value v : property.getValues()) {
+                        str.append("\t<" + property.getName() + ">" +
+                                v.getString() + "</" + property.getName() +
+                                ">\n");
                     }
-                }
-                else {
-                    str.append("\t<" + property.getName() + ">" + property.getValue().getString() + "</" + property.getName() + ">\n");
+                } else {
+                    str.append("\t<" + property.getName() + ">" +
+                            property.getValue().getString() + "</" +
+                            property.getName() + ">\n");
 
                 }
             }
 
             str.append("</oai_dc:dc>");
 
             return new ByteArrayInputStream(str.toString().getBytes("UTF-8"));
-        } catch (UnsupportedEncodingException e) {
+        } catch (final UnsupportedEncodingException e) {
             logger.warn("Exception rendering properties: {}", e);
             return null;
-        } catch (RepositoryException e) {
+        } catch (final RepositoryException e) {
             logger.error("Repository exception: {}", e);
             return null;
         }

diff --git a/...erator-dc/src/main/java/org/fcrepo/generator/dublincore/WellKnownDatastreamGenerator.java b/...erator-dc/src/main/java/org/fcrepo/generator/dublincore/WellKnownDatastreamGenerator.java
@@ -1,8 +1,6 @@
 
 package org.fcrepo.generator.dublincore;
 
-import org.slf4j.Logger;
-
 import static org.modeshape.jcr.api.JcrConstants.JCR_CONTENT;
 import static org.modeshape.jcr.api.JcrConstants.JCR_DATA;
 import static org.slf4j.LoggerFactory.getLogger;
@@ -13,9 +11,12 @@
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
+import org.slf4j.Logger;
+
 public class WellKnownDatastreamGenerator implements DCGenerator {
 
-    private static final Logger logger = getLogger(WellKnownDatastreamGenerator.class);
+    private static final Logger logger =
+            getLogger(WellKnownDatastreamGenerator.class);
 
     private String wellKnownDsid;
 
@@ -24,7 +25,7 @@ public InputStream getStream(final Node node) {
 
         try {
             return getContentInputStream(node);
-        } catch (RepositoryException e) {
+        } catch (final RepositoryException e) {
 
             logger.warn("logged exception", e);
 
@@ -34,10 +35,10 @@ public InputStream getStream(final Node node) {
 
     private InputStream getContentInputStream(final Node node)
             throws RepositoryException {
-        if (node.hasNode(this.wellKnownDsid)) {
-            final Node dc = node.getNode(this.wellKnownDsid);
+        if (node.hasNode(wellKnownDsid)) {
+            final Node dc = node.getNode(wellKnownDsid);
 
-            Binary binary =
+            final Binary binary =
                     dc.getNode(JCR_CONTENT).getProperty(JCR_DATA).getBinary();
 
             return binary.getStream();
@@ -46,7 +47,7 @@ private InputStream getContentInputStream(final Node node)
         }
     }
 
-    public void setWellKnownDsid(String wellKnownDsid) {
+    public void setWellKnownDsid(final String wellKnownDsid) {
         this.wellKnownDsid = wellKnownDsid;
     }
 }
diff --git a/fcrepo-generator-dc/src/main/java/org/fcrepo/generator/dublincore/WorstCaseGenerator.java b/fcrepo-generator-dc/src/main/java/org/fcrepo/generator/dublincore/WorstCaseGenerator.java
@@ -1,25 +1,28 @@
+
 package org.fcrepo.generator.dublincore;
 
-import org.slf4j.Logger;
+import static org.slf4j.LoggerFactory.getLogger;
 
-import javax.jcr.Node;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 
-import static org.slf4j.LoggerFactory.getLogger;
+import javax.jcr.Node;
+
+import org.slf4j.Logger;
 
 public class WorstCaseGenerator implements DCGenerator {
 
     private static final Logger logger = getLogger(WorstCaseGenerator.class);
 
     @Override
-    public InputStream getStream(Node node) {
-        String str = "<oai_dc:dc xmlns:oai_dc=\"http://www.openarchives.org/OAI/2.0/oai_dc/\" ></oai_dc:dc>";
+    public InputStream getStream(final Node node) {
+        final String str =
+                "<oai_dc:dc xmlns:oai_dc=\"http://www.openarchives.org/OAI/2.0/oai_dc/\" ></oai_dc:dc>";
 
         try {
             return new ByteArrayInputStream(str.getBytes("UTF-8"));
-        } catch (UnsupportedEncodingException e) {
+        } catch (final UnsupportedEncodingException e) {
             logger.warn("logged exception", e);
             return null;
         }