Backout pull request #112

DSpace · Oct 31, 2012 · 9205de1 · 9205de1
1 parent 2a03800
commit 9205de1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 34 deletions.
diff --git a/pom.xml b/pom.xml
@@ -200,12 +200,13 @@
            relative to this file.
         -->
 
+       <!--
+           Builds central API for DSpace
+        -->
         <profile>
             <id>dspace</id>
             <activation>
-            <file>
+                <activeByDefault>true</activeByDefault>
-                <exists>dspace/pom.xml</exists>
-            </file>
             </activation>
             <modules>
                 <module>dspace</module>
@@ -218,9 +219,7 @@
         <profile>
             <id>dspace-api</id>
             <activation>
- 		<file>
+                <activeByDefault>true</activeByDefault>
-                    <exists>dspace-api/pom.xml</exists>
-                </file>
             </activation>
             <modules>
                 <module>dspace-api</module>
@@ -233,9 +232,7 @@
         <profile>
             <id>dspace-services</id>
             <activation>
-                <file>
+                <activeByDefault>true</activeByDefault>
-                    <exists>dspace-services/pom.xml</exists>
-                </file>
             </activation>
             <modules>
                 <module>dspace-services</module>
@@ -248,9 +245,7 @@
         <profile>
             <id>dspace-oai</id>
             <activation>
-                <file>
+                <activeByDefault>true</activeByDefault>
-                    <exists>dspace-oai/pom.xml</exists>
-                </file>
             </activation>
             <modules>
                 <module>dspace-oai</module>
@@ -261,11 +256,10 @@
            Builds JSPUI WAR for DSpace
         -->
         <profile>
+
             <id>dspace-jspui</id>
             <activation>
-                <file>
+                <activeByDefault>true</activeByDefault>
-                    <exists>dspace-jspui/pom.xml</exists>
-                </file>
             </activation>
             <modules>
                 <module>dspace-jspui</module>
@@ -279,9 +273,7 @@
         <profile>
             <id>dspace-sword</id>
             <activation>
-                <file>
+                <activeByDefault>true</activeByDefault>
-                    <exists>dspace-sword/pom.xml</exists>
-                </file>
             </activation>
             <modules>
                 <module>dspace-sword</module>
@@ -294,9 +286,7 @@
         <profile>
             <id>dspace-swordv2</id>
             <activation>
-                <file>
+                <activeByDefault>true</activeByDefault>
-                    <exists>dspace-swordv2/pom.xml</exists>
-                </file>
             </activation>
             <modules>
                 <module>dspace-swordv2</module>
@@ -309,9 +299,7 @@
         <profile>
             <id>dspace-xmlui</id>
             <activation>
-                <file>
+                <activeByDefault>true</activeByDefault>
-                    <exists>dspace-xmlui/pom.xml</exists>
-                </file>
             </activation>
             <modules>
                 <module>dspace-xmlui</module>
@@ -324,9 +312,7 @@
         <profile>
             <id>dspace-lni</id>
             <activation>
-                <file>
+                <activeByDefault>true</activeByDefault>
-                    <exists>dspace-lni/pom.xml</exists>
-                </file>
             </activation>
             <modules>
                 <module>dspace-lni</module>

diff --git a/src/main/assembly/release.xml b/src/main/assembly/release.xml
@@ -17,20 +17,18 @@
       <format>tar.gz</format>
       <format>tar.bz2</format>
    </formats>
-   <baseDirectory>${finalName}-release</baseDirectory>
    <includeBaseDirectory>true</includeBaseDirectory>
+   <baseDirectory>${finalName}-release</baseDirectory>
    <fileSets>
       <fileSet>
          <useDefaultExcludes>true</useDefaultExcludes>
          <includes>
             <include>dspace/**</include>
-            <include>LICENSE*</include>
+            <include>LICENSE</include>
             <include>NOTICE</include>
             <include>README</include>
-            <include>build.properties</include>
+            <include>CHANGES</include>
-            <include>pom.xml</include>
+            <include>KNOWN_BUGS</include>
-            <include>src/main/assembly/testEnvironment.xml</include>
-            <include>src/main/filters/testEnvironment.properties</include>
          </includes>
          <excludes>
             <exclude>**/target/**</exclude>
@@ -40,4 +38,4 @@
       </fileSet>
    </fileSets>
 
-</assembly>
+</assembly>