Fix for DS-1340. Cleanup of the OAI 2.0 related POMs so that they are in line with current POM structure. Added some extra comments to the dspace/pom.xml which has some OAI 2.0 stuff in it too.

dspace-oai/pom.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dspace-oai</artifactId>
@@ -10,9 +9,13 @@
         <artifactId>dspace-parent</artifactId>
         <groupId>org.dspace</groupId>
         <version>3.0-rc2-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
 
     <build>
+        <filters>
+            <filter>${basedir}/../${filters.file}</filter>
+        </filters>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -42,18 +45,6 @@
     </build>
 
     <profiles>
-        <profile>
-            <activation>
-                <property>
-                    <name>dspace.config</name>
-                </property>
-            </activation>
-            <build>
-                <filters>
-                    <filter>${dspace.config}</filter>
-                </filters>
-            </build>
-        </profile>
         <profile>
             <id>oracle-support</id>
             <activation>

dspace/modules/oai/pom.xml

@@ -1,21 +1,20 @@
-<?xml version="1.0"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.dspace.modules</groupId>
+    <artifactId>oai</artifactId>
+    <packaging>war</packaging>
+    <name>DSpace OAI 2.0 :: Local Customizations</name>
+    <description>
+        This project allows you to overlay your own local OAI customizations
+        on top of the default OAI 2.0 web application provided with DSpace.
+    </description>
+
     <parent>
         <artifactId>modules</artifactId>
         <groupId>org.dspace</groupId>
         <version>3.0-rc2-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
-    <groupId>org.dspace.modules</groupId>
-    <artifactId>oai</artifactId>
-    <packaging>war</packaging>
-    <name>DSpace OAI 2.0 :: Local Customizations</name>
-    <url>http://www.lyncode.com</url>
-    <description>
-        This project allows you to overlay your own local OAI customizations
-        on top of the default OAI 2.0 web application provided with DSpace.
-    </description>
 
     <build>
         <filters>
@@ -47,18 +46,6 @@
     </build>
 
     <profiles>
-        <profile>
-            <activation>
-                <property>
-                    <name>dspace.config</name>
-                </property>
-            </activation>
-            <build>
-                <filters>
-                    <filter>${dspace.config}</filter>
-                </filters>
-            </build>
-        </profile>
         <profile>
             <id>oracle-support</id>
             <activation>
@@ -77,6 +64,10 @@
     </profiles>
 
     <dependencies>
+        <dependency>
+            <groupId>org.dspace.modules</groupId>
+            <artifactId>additions</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>dspace-oai</artifactId>

dspace/pom.xml

@@ -83,17 +83,19 @@
     </build>
 
     <dependencies>
-    	<!-- Don't know how to add artifacts to dspace lib -->
+    	<!-- This dependency ensures DSpace OAI JAR is added to [dspace]/lib/,
+             so that the 'dspace oai' launcher.xml command works.  -->
     	<dependency>
             <groupId>org.dspace</groupId>
             <artifactId>dspace-oai</artifactId>
             <type>jar</type>
             <classifier>classes</classifier>
     	</dependency>
+        <!-- The Servlet API is also needed by the 'dspace oai' launcher.xml
+             command. -->
     	<dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
     	</dependency>
     </dependencies>
 </project>