Merge pull request #3 from mdiggory/additional-patch

[DS-981] API Project and build assembly restructure
DSpace · Jun 8, 2012 · bcfe56e · bcfe56e
2 parents 00860d0 + 32ad3c4
commit bcfe56e
Show file tree

Hide file tree

Showing 14 changed files with 343 additions and 196 deletions.
diff --git a/dspace/modules/additions/pom.xml b/dspace/modules/additions/pom.xml
@@ -0,0 +1,118 @@
+<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>additions</artifactId>
+   <name>DSpace Kernel :: Additions and Local Customization</name>
+   <packaging>jar</packaging>
+
+   <!--
+   A Parent POM that Maven inherits DSpace Defaults
+   POM atrributes from.
+   -->
+   <parent>
+      <groupId>org.dspace</groupId>
+      <artifactId>modules</artifactId>
+      <version>3.0-SNAPSHOT</version>
+      <relativePath>..</relativePath>
+   </parent>
+
+   <profiles>
+      <profile>
+         <id>oracle-support</id>
+         <activation>
+            <property>
+               <name>db.name</name>
+               <value>oracle</value>
+            </property>
+         </activation>
+         <dependencies>
+            <dependency>
+               <groupId>com.oracle</groupId>
+               <artifactId>ojdbc6</artifactId>
+            </dependency>
+         </dependencies>
+      </profile>
+
+      <!--
+         Using xpdf filters requires the inclusion
+         Of Sun dependencies these are not redistributable
+         and you will need to install them locally in your
+         maven repository prior to building your dspace instance
+      -->
+      <profile>
+         <id>xpdf-mediafilter-support</id>
+         <activation>
+            <activeByDefault>false</activeByDefault>
+         </activation>
+         <dependencies>
+            <dependency>
+               <groupId>com.sun.media</groupId>
+               <artifactId>jai_imageio</artifactId>
+            </dependency>
+            <dependency>
+               <groupId>javax.media</groupId>
+               <artifactId>jai_core</artifactId>
+            </dependency>
+         </dependencies>
+      </profile>
+
+   </profiles>
+
+   <!--
+   Runtime and Compile Time dependencies for DSpace.
+   -->
+   <dependencies>
+      <dependency>
+         <groupId>org.dspace</groupId>
+         <artifactId>dspace-api</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.dspace</groupId>
+         <artifactId>dspace-api-lang</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.dspace</groupId>
+         <artifactId>dspace-services-impl</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.dspace</groupId>
+         <artifactId>dspace-services-utils</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.dspace</groupId>
+         <artifactId>dspace-stats</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.dspace</groupId>
+         <artifactId>dspace-discovery-provider</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.dspace</groupId>
+         <artifactId>dspace-discovery-solr</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>javax.servlet</groupId>
+         <artifactId>servlet-api</artifactId>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>ant-contrib</groupId>
+         <artifactId>ant-contrib</artifactId>
+         <version>1.0b3</version>
+         <exclusions>
+            <exclusion>
+               <groupId>ant</groupId>
+               <artifactId>ant</artifactId>
+            </exclusion>
+         </exclusions>
+      </dependency>
+
+      <dependency>
+         <groupId>postgresql</groupId>
+         <artifactId>postgresql</artifactId>
+      </dependency>
+
+   </dependencies>
+
+</project>
diff --git a/dspace/modules/additions/src/main/java/org/dspace/example/Example.java b/dspace/modules/additions/src/main/java/org/dspace/example/Example.java
@@ -0,0 +1,9 @@
+package org.dspace.example;
+
+/**
+ * TODO: Add Description
+ *
+ * @author mdiggory @ atmire.com
+ */
+public interface Example {
+}
diff --git a/dspace/modules/additions/src/main/java/org/dspace/example/impl/ExampleImpl.java b/dspace/modules/additions/src/main/java/org/dspace/example/impl/ExampleImpl.java
@@ -0,0 +1,11 @@
+package org.dspace.example.impl;
+
+import org.dspace.example.Example;
+
+/**
+ * TODO: Add Description
+ *
+ * @author mdiggory @ atmire.com
+ */
+public class ExampleImpl implements Example {
+}
diff --git a/dspace/modules/additions/src/main/resource/spring/spring-dspace-addon-example-services.xml b/dspace/modules/additions/src/main/resource/spring/spring-dspace-addon-example-services.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    The contents of this file are subject to the license and copyright
+    detailed in the LICENSE and NOTICE files at the root of the source
+    tree and available online at
+
+    http://www.dspace.org/license/
+
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:context="http://www.springframework.org/schema/context"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd"
+    default-autowire-candidates="*Service,*DAO,javax.sql.DataSource">
+
+    <context:annotation-config /> <!-- allows us to use spring annotations in beans -->
+
+    <bean id="org.dspace.example.Example" class="org.dspace.example.impl.ExampleImpl" />
+
+</beans>
diff --git a/dspace/modules/jspui/pom.xml b/dspace/modules/jspui/pom.xml
@@ -10,7 +10,7 @@
 		<groupId>org.dspace</groupId>
 		<artifactId>modules</artifactId>
 		<version>3.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
+      <relativePath>..</relativePath>
 	</parent>
 
 	<profiles>
@@ -103,6 +103,11 @@
 
 	<dependencies>
 
+      <dependency>
+         <groupId>org.dspace.modules</groupId>
+         <artifactId>additions</artifactId>
+      </dependency>
+
 		<dependency>
 			<groupId>org.dspace</groupId>
 			<artifactId>dspace-jspui-webapp</artifactId>

diff --git a/dspace/modules/lni/pom.xml b/dspace/modules/lni/pom.xml
@@ -12,7 +12,7 @@
       <groupId>org.dspace</groupId>
       <artifactId>modules</artifactId>
       <version>3.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
+      <relativePath>..</relativePath>
    </parent>
 
    <build>
@@ -98,6 +98,11 @@
 
    <dependencies>
 
+      <dependency>
+         <groupId>org.dspace.modules</groupId>
+         <artifactId>additions</artifactId>
+      </dependency>
+
       <dependency>
          <groupId>org.dspace</groupId>
          <artifactId>dspace-lni-webapp</artifactId>

diff --git a/dspace/modules/oai/pom.xml b/dspace/modules/oai/pom.xml
@@ -16,7 +16,7 @@
       <groupId>org.dspace</groupId>
       <artifactId>modules</artifactId>
       <version>3.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
+      <relativePath>..</relativePath>
    </parent>
 
    <build>
@@ -99,6 +99,10 @@
    </profiles>
 
    <dependencies>
+      <dependency>
+         <groupId>org.dspace.modules</groupId>
+         <artifactId>additions</artifactId>
+      </dependency>
       <dependency>
          <groupId>org.dspace</groupId>
          <artifactId>dspace-oai-webapp</artifactId>

diff --git a/dspace/modules/pom.xml b/dspace/modules/pom.xml
@@ -25,6 +25,15 @@
          compiling of the corresponding source module.
     -->
     <profiles>
+       <profile>
+          <id>dspace-additions</id>
+          <activation>
+             <activeByDefault>true</activeByDefault>
+          </activation>
+          <modules>
+             <module>additions</module>
+          </modules>
+       </profile>
         <profile>
             <id>dspace-xmlui</id>
             <activation>

diff --git a/dspace/modules/sword/pom.xml b/dspace/modules/sword/pom.xml
@@ -101,6 +101,10 @@
    </profiles>
 
    <dependencies>
+      <dependency>
+         <groupId>org.dspace.modules</groupId>
+         <artifactId>additions</artifactId>
+      </dependency>
       <dependency>
          <groupId>org.dspace</groupId>
          <artifactId>dspace-sword-webapp</artifactId>

diff --git a/dspace/modules/swordv2/pom.xml b/dspace/modules/swordv2/pom.xml
@@ -102,6 +102,11 @@
 
    <dependencies>
 
+      <dependency>
+         <groupId>org.dspace.modules</groupId>
+         <artifactId>additions</artifactId>
+      </dependency>
+
       <!-- DSpace Custom SWORDv2 Web application -->
       <dependency>
         <groupId>org.dspace</groupId>

diff --git a/dspace/modules/xmlui/pom.xml b/dspace/modules/xmlui/pom.xml
@@ -121,6 +121,11 @@
 
    <dependencies>
 
+      <dependency>
+         <groupId>org.dspace.modules</groupId>
+         <artifactId>additions</artifactId>
+      </dependency>
+
       <!-- DSpace XMLUI Languages -->
       <dependency>
          <groupId>org.dspace</groupId>