From eb606228b6a44ba28ba18a5ad1f931acffc393f1 Mon Sep 17 00:00:00 2001
From: Mark Diggory <mdiggory@atmire.com>
Date: Tue, 29 Jan 2008 23:43:58 +0000
Subject: [PATCH] Importing the changes from the binary build prototype
 (mis-named). Provides example overlays where customization can occur.

git-svn-id: http://scm.dspace.org/svn/repo/branches/dspace-1_5_x@2584 9c30dcfa-912a-0410-8fc2-9e0234be79fd
---
 dspace/modules/dspace-jspui/pom.xml      | 175 +++++++++++++++++++++
 dspace/modules/dspace-lni/pom.xml        | 166 ++++++++++++++++++++
 dspace/modules/dspace-oai/pom.xml        | 185 +++++++++++++++++++++++
 dspace/modules/dspace-xmlui/pom.xml      | 167 ++++++++++++++++++++
 dspace/modules/pom.xml                   |  43 ++++++
 dspace/pom.xml                           |  39 +++--
 dspace/src/assemble/assembly-release.xml |  75 ---------
 dspace/src/assemble/assembly.xml         | 150 +++++++++---------
 8 files changed, 834 insertions(+), 166 deletions(-)
 create mode 100644 dspace/modules/dspace-jspui/pom.xml
 create mode 100644 dspace/modules/dspace-lni/pom.xml
 create mode 100644 dspace/modules/dspace-oai/pom.xml
 create mode 100644 dspace/modules/dspace-xmlui/pom.xml
 create mode 100644 dspace/modules/pom.xml
 delete mode 100644 dspace/src/assemble/assembly-release.xml

diff --git a/dspace/modules/dspace-jspui/pom.xml b/dspace/modules/dspace-jspui/pom.xml
new file mode 100644
index 0000000000..02454a20a9
--- /dev/null
+++ b/dspace/modules/dspace-jspui/pom.xml
@@ -0,0 +1,175 @@
+<?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/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.dspace.modules</groupId>
+	<artifactId>dspace-jspui</artifactId>
+	<packaging>war</packaging>
+	<name>DSpace JSPUI :: Web Application</name>
+	<url>http://www.dspace.org</url>
+	<description>DSpace JSPUI :: Overlay</description>
+
+	<parent>
+		<groupId>org.dspace</groupId>
+		<artifactId>modules</artifactId>
+		<version>1.5-SNAPSHOT</version>
+	</parent>
+
+	<profiles>
+
+		<!-- 
+			This profile is used by all children such that
+			when activated a dspace.config configuration
+			file location passed on the commandline 
+			(-Ddspace.config=...) can be passed through 
+			to be used as a filter source by projects for 
+			tasks such as updating the ${dspace.dir} in
+			web.xml etc.
+			
+			When activated, the child project will inherit
+			the configuration.
+		-->
+		<profile>
+			<activation>
+				<property>
+					<name>dspace.config</name>
+				</property>
+			</activation>
+			<build>
+				<filters>
+					<filter>${dspace.config}</filter>
+				</filters>
+			</build>
+		</profile>
+
+		<profile>
+			<id>postgres-support</id>
+			<activation>
+				<property>
+					<name>!db.name</name>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>postgresql</groupId>
+					<artifactId>postgresql</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>oracle-support</id>
+			<activation>
+				<property>
+					<name>db.name</name>
+					<value>oracle</value>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>com.oracle</groupId>
+					<artifactId>ojdbc14</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+
+	</profiles>
+
+	<repositories>
+		<repository>
+			<id>maven.dspace.org-snapshot</id>
+			<name>DSpace Maven Snapshot Repository</name>
+			<url>http://maven.dspace.org/snapshot</url>
+			<releases>
+				<enabled>false</enabled>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<scm>
+		<connection>
+			scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules/dspace-jspui
+		</connection>
+		<developerConnection>
+			scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules/dspace-jspui
+		</developerConnection>
+		<url>
+			http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace/modules/dspace-jspui
+		</url>
+	</scm>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.0</version>
+				<configuration>
+					<archiveClasses>false</archiveClasses>
+					<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>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>dspace-jspui-webapp</artifactId>
+			<version>${pom.version}</version>
+			<type>war</type>
+			<classifier>skinny</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>dspace-jspui-api</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>dspace-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>language-packs</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.3</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jstl</artifactId>
+			<version>1.1.2</version>
+		</dependency>
+		<dependency>
+			<groupId>taglibs</groupId>
+			<artifactId>standard</artifactId>
+			<version>1.1.2</version>
+		</dependency>
+	</dependencies>
+
+</project>
+
diff --git a/dspace/modules/dspace-lni/pom.xml b/dspace/modules/dspace-lni/pom.xml
new file mode 100644
index 0000000000..87319ac9c5
--- /dev/null
+++ b/dspace/modules/dspace-lni/pom.xml
@@ -0,0 +1,166 @@
+<?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/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.dspace.modules</groupId>
+	<artifactId>dspace-lni</artifactId>
+	<packaging>war</packaging>
+	<name>DSpace LNI :: Web Application Overlay</name>
+	<description>
+		DSpace Lightweight Network Interface Webapplication
+	</description>
+	<url>http://projects.dspace.org/dspace-lni/dspace-lni-webapp</url>
+
+	<parent>
+		<groupId>org.dspace</groupId>
+		<artifactId>modules</artifactId>
+		<version>1.5-SNAPSHOT</version>
+	</parent>
+
+	<repositories>
+		<repository>
+			<id>maven.dspace.org/snapshot</id>
+			<name>DSpace Maven Snapshot Repository</name>
+			<url>http://maven.dspace.org/snapshot</url>
+			<releases>
+				<enabled>false</enabled>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>maven.dspace.org/snapshot</id>
+			<name>DSpace Maven Repository</name>
+			<url>http://maven.dspace.org/snapshot</url>
+			<releases>
+				<updatePolicy>never</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<scm>
+		<connection>
+			scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-lni/dspace-lni-webapp
+		</connection>
+		<developerConnection>
+			scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-lni/dspace-lni-webapp
+		</developerConnection>
+		<url>
+			http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-lni/dspace-lni-webapp
+		</url>
+	</scm>
+
+	<build>
+		<plugins>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<archiveClasses>false</archiveClasses>
+					<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>
+
+	<profiles>
+		<!-- 
+			when activated a dspace.config configuration
+			file location passed on the commandline 
+			(-Ddspace.config=...) can be passed through 
+			to be used as a filter source by projects for 
+			tasks such as updating the ${dspace.dir} in
+			web.xml etc.
+		-->
+		<profile>
+			<activation>
+				<property>
+					<name>dspace.config</name>
+				</property>
+			</activation>
+			<build>
+				<filters>
+					<filter>${dspace.config}</filter>
+				</filters>
+			</build>
+		</profile>
+		<profile>
+			<id>postgres-support</id>
+			<activation>
+				<property>
+					<name>!db.name</name>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>postgresql</groupId>
+					<artifactId>postgresql</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>oracle-support</id>
+			<activation>
+				<property>
+					<name>db.name</name>
+					<value>oracle</value>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>com.oracle</groupId>
+					<artifactId>ojdbc14</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>dspace-lni-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>dspace-lni-webapp</artifactId>
+			<version>${pom.version}</version>
+			<classifier>skinny</classifier>
+			<type>war</type>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+</project>
\ No newline at end of file
diff --git a/dspace/modules/dspace-oai/pom.xml b/dspace/modules/dspace-oai/pom.xml
new file mode 100644
index 0000000000..2caef56af1
--- /dev/null
+++ b/dspace/modules/dspace-oai/pom.xml
@@ -0,0 +1,185 @@
+<?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/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.dspace.modules</groupId>
+	<artifactId>dspace-oai</artifactId>
+	<packaging>war</packaging>
+	<name>DSpace OAI :: Web Application Overlay</name>
+	<description>DSpace OAI Service Provider</description>
+	<url>http://projects.dspace.org/dspace-oai</url>
+
+	<!-- 
+		A Parent POM that Maven inherits DSpace Default 
+		POM atrributes from. 
+	-->
+	<parent>
+		<groupId>org.dspace</groupId>
+		<artifactId>modules</artifactId>
+		<version>1.5-SNAPSHOT</version>
+	</parent>
+
+	<repositories>
+		<repository>
+			<id>maven.dspace.org/snapshot</id>
+			<name>DSpace Maven Snapshot Repository</name>
+			<url>http://maven.dspace.org/snapshot</url>
+			<releases>
+				<enabled>false</enabled>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>maven.dspace.org/snapshot</id>
+			<name>DSpace Maven Repository</name>
+			<url>http://maven.dspace.org/snapshot</url>
+			<releases>
+				<updatePolicy>never</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<!-- 
+		The Subversion repository location is used by Continuum to update against
+		when changes have occured, this spawns a new build cycle and releases snapshots
+		into the snapshot repository below.
+	-->
+	<scm>
+		<connection>
+			scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-oai
+		</connection>
+		<developerConnection>
+			scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-oai
+		</developerConnection>
+		<url>
+			http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-oai
+		</url>
+	</scm>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<archiveClasses>false</archiveClasses>
+					<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>
+
+	<profiles>
+		<!-- 
+			when activated a dspace.config configuration
+			file location passed on the commandline 
+			(-Ddspace.config=...) can be passed through 
+			to be used as a filter source by projects for 
+			tasks such as updating the ${dspace.dir} in
+			web.xml etc.
+		-->
+		<profile>
+			<activation>
+				<property>
+					<name>dspace.config</name>
+				</property>
+			</activation>
+			<build>
+				<filters>
+					<filter>${dspace.config}</filter>
+				</filters>
+			</build>
+		</profile>
+		<profile>
+			<id>postgres-support</id>
+			<activation>
+				<property>
+					<name>!db.name</name>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>postgresql</groupId>
+					<artifactId>postgresql</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>oracle-support</id>
+			<activation>
+				<property>
+					<name>db.name</name>
+					<value>oracle</value>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>com.oracle</groupId>
+					<artifactId>ojdbc14</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>dspace-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>language-packs</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>dspace-oai-api</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>dspace-oai-webapp</artifactId>
+			<version>${pom.version}</version>
+			<type>war</type>
+			<classifier>skinny</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>oaicat</artifactId>
+			<version>1.5.48</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+</project>
diff --git a/dspace/modules/dspace-xmlui/pom.xml b/dspace/modules/dspace-xmlui/pom.xml
new file mode 100644
index 0000000000..7631a05d2b
--- /dev/null
+++ b/dspace/modules/dspace-xmlui/pom.xml
@@ -0,0 +1,167 @@
+<?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/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.dspace.modules</groupId>
+	<artifactId>dspace-xmlui</artifactId>
+	<packaging>war</packaging>
+	<name>DSpace XMLUI (Manakin) :: Web Application Overlay</name>
+	<url>http://projects.dspace.org/dspace-xmlui</url>
+	<description>
+		DSpace/Manakin XML UI Based Webapplication using the Cocoon and
+		Wing frameworks
+	</description>
+
+	<parent>
+		<groupId>org.dspace</groupId>
+		<artifactId>modules</artifactId>
+		<version>1.5-SNAPSHOT</version>
+	</parent>
+
+	<repositories>
+		<repository>
+			<id>maven.dspace.org/snapshot</id>
+			<name>DSpace Maven Snapshot Repository</name>
+			<url>http://maven.dspace.org/snapshot</url>
+			<releases>
+				<enabled>false</enabled>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>maven.dspace.org/snapshot</id>
+			<name>DSpace Maven Repository</name>
+			<url>http://maven.dspace.org/snapshot</url>
+			<releases>
+				<updatePolicy>never</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<scm>
+		<connection>
+			scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-xmlui
+		</connection>
+		<developerConnection>
+			scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-xmlui
+		</developerConnection>
+		<url>
+			http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-xmlui
+		</url>
+	</scm>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<archiveClasses>false</archiveClasses>
+					<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>
+
+	<profiles>
+		<!-- 
+			when activated a dspace.config configuration
+			file location passed on the commandline 
+			(-Ddspace.config=...) can be passed through 
+			to be used as a filter source by projects for 
+			tasks such as updating the ${dspace.dir} in
+			web.xml etc.
+		-->
+		<profile>
+			<activation>
+				<property>
+					<name>dspace.config</name>
+				</property>
+			</activation>
+			<build>
+				<filters>
+					<filter>${dspace.config}</filter>
+				</filters>
+			</build>
+		</profile>
+		<profile>
+			<id>postgres-support</id>
+			<activation>
+				<property>
+					<name>!db.name</name>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>postgresql</groupId>
+					<artifactId>postgresql</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>oracle-support</id>
+			<activation>
+				<property>
+					<name>db.name</name>
+					<value>oracle</value>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>com.oracle</groupId>
+					<artifactId>ojdbc14</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
+
+	<dependencies>
+		<!-- DSpace XMLUI Webapp -->
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>dspace-xmlui-webapp</artifactId>
+			<version>${project.version}</version>
+			<classifier>skinny</classifier>
+			<type>war</type>
+		</dependency>
+
+		<!-- DSpace XMLUI API -->
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>dspace-xmlui-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+	</dependencies>
+
+</project>
+
diff --git a/dspace/modules/pom.xml b/dspace/modules/pom.xml
new file mode 100644
index 0000000000..68a1b6f50e
--- /dev/null
+++ b/dspace/modules/pom.xml
@@ -0,0 +1,43 @@
+<?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/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.dspace</groupId>
+	<artifactId>modules</artifactId>
+	<packaging>pom</packaging>
+	<name>DSpace Addon Modules</name>
+	<url>http://www.dspace.org</url>
+	<description>DSpace Addon Modules</description>
+
+	<parent>
+		<groupId>org.dspace</groupId>
+		<artifactId>dspace-parent</artifactId>
+		<version>1.5-SNAPSHOT</version>
+	</parent>
+
+	<repositories>
+		<repository>
+			<id>maven.dspace.org-snapshot</id>
+			<name>DSpace Maven Snapshot Repository</name>
+			<url>http://maven.dspace.org/snapshot</url>
+			<releases>
+				<enabled>false</enabled>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<modules>
+		<module>dspace-xmlui</module>
+		<module>dspace-lni</module>
+		<module>dspace-oai</module>
+		<module>dspace-jspui</module>
+	</modules>
+	
+</project>
+
diff --git a/dspace/pom.xml b/dspace/pom.xml
index 5fbd893904..46e0fc1abc 100644
--- a/dspace/pom.xml
+++ b/dspace/pom.xml
@@ -422,8 +422,24 @@
             </dependency>
          </dependencies>
       </profile>
+      
+      <!-- 
+         Builds Overlay Modules for DSpace
+      -->
+      <profile>
+         <id>modules</id>
+         <activation>
+            <file>
+               <exists>modules/pom.xml</exists>
+            </file>
+         </activation>
+         <modules>
+            <module>modules</module>
+         </modules>
+      </profile>
+      
    </profiles>
-
+	
    <build>
       <plugins>
          <!--  overall project assembly -->
@@ -446,14 +462,15 @@
       </plugins>
    </build>
 
-   <dependencies>
-      <dependency>
-         <groupId>org.dspace</groupId>
-         <artifactId>dspace-api</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.dspace</groupId>
-         <artifactId>language-packs</artifactId>
-      </dependency>
-   </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>dspace-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>language-packs</artifactId>
+		</dependency>
+	</dependencies>
+	
 </project>
diff --git a/dspace/src/assemble/assembly-release.xml b/dspace/src/assemble/assembly-release.xml
deleted file mode 100644
index 758dff1b44..0000000000
--- a/dspace/src/assemble/assembly-release.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<assembly>
-  <id>bin</id>
-  <formats>
-  	<format>zip</format>
-    <format>tar.gz</format>
-    <format>tar.bz2</format>
-  </formats>
-  <includeBaseDirectory>true</includeBaseDirectory>
-  <baseDirectory>${artifactId}-${version}</baseDirectory>
-  <fileSets>
-    <fileSet>
-      <includes>
-        <include>bin/**</include>
-        <include>config/**</include>
-        <include>docs/**</include>
-        <include>etc/**</include>
-        <include>build.xml</include>
-        <include>LICENSE*</include>
-        <include>CHANGES</include>
-        <include>KNOWN_BUGS</include>
-        <include>README</include>
-      </includes>
-      <excludes>
-         <exclude>src</exclude>
-         <exclude>config/dspace.cfg</exclude>
-      </excludes>
-    </fileSet>
-  </fileSets>
-
-  <files>
-    <file>
-      <source>config/dspace.cfg</source>
-      <outputDirectory>config</outputDirectory>
-      <filtered>true</filtered>
-    </file>
-  </files>
-  
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>lib</outputDirectory>
-      <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <excludes>
-        <exclude>junit:junit</exclude>
-      </excludes>
-    </dependencySet>
-  </dependencySets>
-  
-  <moduleSets>
-    <moduleSet>
-      <includes>
-        <include>*:jar</include>
-      </includes>
-      <binaries>
-        <includeDependencies>true</includeDependencies>
-        <outputDirectory>lib</outputDirectory>
-        <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
-        <unpack>false</unpack>
-      </binaries>
-    </moduleSet>
-    <moduleSet>
-      <includes>
-        <include>*:war</include>
-      </includes>
-      <binaries>
-      	<includeDependencies>false</includeDependencies>
-        <outputDirectory>webapps</outputDirectory>
-        <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
-        <unpack>false</unpack>
-      </binaries>
-    </moduleSet>
-  </moduleSets>
-  
-</assembly>
\ No newline at end of file
diff --git a/dspace/src/assemble/assembly.xml b/dspace/src/assemble/assembly.xml
index 154aee2ae4..21a6a4e822 100644
--- a/dspace/src/assemble/assembly.xml
+++ b/dspace/src/assemble/assembly.xml
@@ -1,84 +1,74 @@
-<assembly>
-   <formats>
-      <format>dir</format>
-   </formats>
-   <includeBaseDirectory>false</includeBaseDirectory>
- 
-   <fileSets> 
-      <fileSet>
-         <directory>src/main/config</directory>
-         <outputDirectory>.</outputDirectory>
-         <includes>
-            <include>build.xml</include>
-         </includes>
-      </fileSet>
-      <fileSet>
-         <outputDirectory>.</outputDirectory>
-         <includes>
-            <include>bin/**</include>
-            <include>config/**</include>
-            <include>docs/**</include>
-            <include>etc/**</include>
-            <include>build.xml</include>
-            <include>LICENSE*</include>
-            <include>CHANGES</include>
-            <include>KNOWN_BUGS</include>
-            <include>README</include>
-         </includes>
-         <excludes>
-            <exclude>src</exclude>
-            <exclude>config/dspace.cfg</exclude>
-         </excludes>
-      </fileSet>
-   </fileSets>
+<assembly 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/assembly-1.1.0-SNAPSHOT.xsd">
+	<id>build</id>
+	<formats>
+		<format>dir</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
 
-   <files>
-     <file>
-       <source>config/dspace.cfg</source>
-       <outputDirectory>config</outputDirectory>
-       <filtered>true</filtered>
-     </file>
-   </files>
+	<fileSets>
+		<fileSet>
+			<directory>src/main/config</directory>
+			<outputDirectory>.</outputDirectory>
+			<includes>
+				<include>build.xml</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<outputDirectory>.</outputDirectory>
+			<includes>
+				<include>bin/**</include>
+				<include>config/**</include>
+				<include>docs/**</include>
+				<include>etc/**</include>
+				<include>build.xml</include>
+				<include>LICENSE*</include>
+				<include>CHANGES</include>
+				<include>KNOWN_BUGS</include>
+				<include>README</include>
+			</includes>
+			<excludes>
+				<exclude>src</exclude>
+				<exclude>config/dspace.cfg</exclude>
+			</excludes>
+		</fileSet>
+	</fileSets>
 
-   <dependencySets>
-      <dependencySet>
-         <outputDirectory>lib</outputDirectory>
-         <unpack>false</unpack>
-         <scope>runtime</scope>
-      </dependencySet>
-   </dependencySets>
+	<files>
+		<file>
+			<source>config/dspace.cfg</source>
+			<outputDirectory>config</outputDirectory>
+			<filtered>true</filtered>
+		</file>
+	</files>
 
-   <moduleSets>
-      <moduleSet>
-         <includes>
-            <include>*:jar</include>
-         </includes>
-         <excludes>
-            <exclude>org.dspace:dspace-jspui-api</exclude>
-            <exclude>org.dspace:dspace-oai-api</exclude>
-         	<exclude>org.dspace:dspace-xmlui-api</exclude>
-         	<exclude>org.dspace:dspace-xmlui-wing</exclude>
-         	<exclude>org.dspace:dspace-lni-core</exclude>
-         </excludes>
-         <binaries>
-            <includeDependencies>true</includeDependencies>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <includes>
-            <include>*:war</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>webapps</outputDirectory>
-            <outputFileNameMapping>
-               ${artifactId}
-            </outputFileNameMapping>
-            <unpack>true</unpack>
-         </binaries>
-      </moduleSet>
-   </moduleSets>
+	<dependencySets>
+		<dependencySet>
+			<excludes>
+				<exclude>*:war:*</exclude>
+			</excludes>
+			<outputDirectory>lib</outputDirectory>
+		</dependencySet>
+	</dependencySets>
 
-</assembly>
\ No newline at end of file
+	<moduleSets>
+		<moduleSet>
+			<includes>
+				<include>*:war:*</include>
+			</includes>
+			<excludes>
+				<exclude>org.dspace:dspace-xmlui-webapp</exclude>
+				<exclude>org.dspace:dspace-lni-webapp</exclude>
+				<exclude>org.dspace:dspace-jspui-webapp</exclude>
+				<exclude>org.dspace:dspace-oai-webapp</exclude>
+			</excludes>
+			<binaries>
+				<includeDependencies>false</includeDependencies>
+				<outputDirectory>webapps</outputDirectory>
+				<unpack>true</unpack>
+			</binaries>
+		</moduleSet>
+	</moduleSets>
+
+</assembly>