Repackaging: moved everything into dspace-api except the webapp.

The modules dspace-rdf contains the webapp to provide the converted data
as rdf serialization only. Everything else (classes for conversion,
storage, content negotiation, ...) moved into dspace-api so it can be
used easily by every other part of DSpace.

dspace-api/pom.xml

@@ -279,6 +279,11 @@
             <groupId>org.apache.lucene</groupId>
             <artifactId>lucene-queryparser</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.jena</groupId>
+            <artifactId>apache-jena-libs</artifactId>
+            <type>pom</type>
+        </dependency>
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>

dspace-api/src/main/java/org/dspace/rdf/negotiation/MediaRange.java

@@ -6,7 +6,7 @@
  * http://www.dspace.org/license/
  */
 
-package org.dspace.rdf.providing.negotiation;
+package org.dspace.rdf.negotiation;
 
 import java.util.ArrayList;
 import java.util.List;

dspace-api/src/main/java/org/dspace/rdf/negotiation/NegotiationFilter.java

@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.rdf.providing.negotiation;
+package org.dspace.rdf.negotiation;
 
 import java.io.IOException;
 import java.util.regex.Matcher;
@@ -18,7 +18,7 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang.StringUtils;
+
 import org.apache.log4j.Logger;
 
 import org.dspace.rdf.RDFConfiguration;

dspace-api/src/main/java/org/dspace/rdf/negotiation/Negotiator.java

@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.rdf.providing.negotiation;
+package org.dspace.rdf.negotiation;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -14,7 +14,6 @@ import java.util.Comparator;
 import java.util.Iterator;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang.StringUtils;
-import org.apache.http.client.utils.URIBuilder;
 import org.apache.log4j.Logger;
 import org.dspace.content.Site;
 import org.dspace.rdf.RDFConfiguration;

dspace-jspui/pom.xml

@@ -100,12 +100,6 @@
             <groupId>org.dspace</groupId>
             <artifactId>dspace-api-lang</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.dspace</groupId>
-            <artifactId>dspace-rdf</artifactId>
-            <type>jar</type>
-            <classifier>classes</classifier>
-        </dependency>
         <dependency>
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>

dspace-jspui/src/main/webapp/WEB-INF/web.xml

@@ -72,7 +72,7 @@
   
   <filter>
       <filter-name>rdf-content-negotiation</filter-name>
-      <filter-class>org.dspace.rdf.providing.negotiation.NegotiationFilter</filter-class>
+      <filter-class>org.dspace.rdf.negotiation.NegotiationFilter</filter-class>
   </filter>
 
   <!-- Filter mappings -->

dspace-rdf/pom.xml

@@ -23,40 +23,14 @@
             <!-- Filter using the properties file defined by dspace-parent POM -->
             <filter>${filters.file}</filter>
         </filters>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <attachClasses>true</attachClasses>
-                    <!-- In version 2.1-alpha-1, this was incorrectly named warSourceExcludes -->
-                    <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
-                    <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
-                    <webResources>
-                        <resource>
-                            <filtering>true</filtering>
-                            <directory>${basedir}/src/main/webapp</directory>
-                            <includes>
-                                <include>WEB-INF/web.xml</include>
-                            </includes>
-                        </resource>
-                    </webResources>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
     </build>
+
     <dependencies>
         <!-- Use jena to create, store and load rdf -->
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>apache-jena-libs</artifactId>
             <type>pom</type>
-            <version>2.12.0</version>
         </dependency>
 
         <dependency>
@@ -97,9 +71,5 @@
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-        </dependency>
     </dependencies>
 </project>

dspace-rdf/src/main/java/org/dspace/rdf/providing/LocalURIRedirectionServlet.java

@@ -16,11 +16,9 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.dspace.content.DSpaceObject;
-import org.dspace.content.Site;
 import org.dspace.core.Context;
 import org.dspace.handle.HandleManager;
-import org.dspace.rdf.RDFUtil;
+import org.dspace.rdf.negotiation.Negotiator;
-import org.dspace.rdf.providing.negotiation.Negotiator;
 import org.dspace.utils.DSpace;
 
 /**

dspace-xmlui/pom.xml

@@ -101,12 +101,6 @@
             <groupId>org.dspace</groupId>
             <artifactId>dspace-services</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.dspace</groupId>
-            <artifactId>dspace-rdf</artifactId>
-            <type>jar</type>
-            <classifier>classes</classifier>
-        </dependency>
 
         <!-- Custom build DSpace cocoon -->
         <dependency>

dspace/modules/rdf/pom.xml

@@ -78,12 +78,6 @@
             <artifactId>dspace-rdf</artifactId>
             <type>war</type>
         </dependency>
-        <dependency>
-            <groupId>org.dspace</groupId>
-            <artifactId>dspace-rdf</artifactId>
-            <type>jar</type>
-            <classifier>classes</classifier>
-        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>

dspace/pom.xml

@@ -124,14 +124,6 @@
             <type>jar</type>
             <classifier>classes</classifier>
     	</dependency>
-        <!-- Add dspace-rdf to [dspace]/lib/ as well as it is needed to convert
-             new and changed items to rdf.-->
-        <dependency>
-            <groupId>org.dspace</groupId>
-            <artifactId>dspace-rdf</artifactId>
-            <type>jar</type>
-            <classifier>classes</classifier>
-        </dependency>
         <!-- The Servlet API is also needed by the 'dspace oai' launcher.xml
              command. -->
     	<dependency>

pom.xml

@@ -33,6 +33,7 @@
         <java.version>1.7</java.version>
         <lucene.version>4.4.0</lucene.version>
         <solr.version>4.4.0</solr.version>
+        <jena.version>2.12.0</jena.version>
         <slf4j.version>1.6.1</slf4j.version>
         <!-- 'root.basedir' is the path to the root [dspace-src] dir. It must be redefined by each child POM,
              as it is used to reference the LICENSE_HEADER and *.properties file(s) in that directory. -->
@@ -676,13 +677,6 @@
             <artifactId>dspace-services</artifactId>
             <version>5.0-SNAPSHOT</version>
          </dependency>
-         <dependency>
-             <groupId>org.dspace</groupId>
-             <artifactId>dspace-rdf</artifactId>
-             <version>5.0-SNAPSHOT</version>
-             <type>jar</type>
-             <classifier>classes</classifier>
-         </dependency>
          <dependency>
              <groupId>org.dspace</groupId>
              <artifactId>dspace-rdf</artifactId>
@@ -804,6 +798,12 @@
             <artifactId>lucene-queryparser</artifactId>
             <version>${lucene.version}</version>
          </dependency>
+        <dependency>
+            <groupId>org.apache.jena</groupId>
+            <artifactId>apache-jena-libs</artifactId>
+            <type>pom</type>
+            <version>${jena.version}</version>
+        </dependency>
          <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>handle</artifactId>