Merge branch 'master' of git@github.com:DSpace/DSpace.git into testing-env

LICENSE_HEADER

@@ -0,0 +1,5 @@
+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/

dspace-lni/dspace-lni-client/src/main/resources/dspace-lni.wsdl

@@ -1,4 +1,13 @@
 <?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/
+
+-->
 <wsdl:definitions targetNamespace="http://dspace.org/xmlns/lni" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://dspace.org/xmlns/lni" xmlns:intf="http://dspace.org/xmlns/lni" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns1="http://lang.java" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 <!--WSDL created by Apache Axis version: 1.3
 Built on Oct 05, 2005 (05:23:37 EDT)-->

dspace-lni/dspace-lni-webapp/src/main/config/lni-deploy.wsdd

@@ -1,4 +1,13 @@
 <?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/
+
+-->
 <!--
      Description of DSpace Lightweight Network Interface (LNI) API
      This is the WSDD (Web Services Deployment Descriptor) for

dspace-lni/dspace-lni-webapp/src/main/webapp/WEB-INF/server-config.wsdd

@@ -1,4 +1,13 @@
 <?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/
+
+-->
 <deployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
 
  <!-- Server Deployment Descriptor for DSpace LNI, on Axis 1.2

dspace/modules/solr/pom.xml

@@ -9,15 +9,11 @@
       DSpace SOLR Service Provider Web Application
    </description>
 
-   <!--
-      Solr uses DSpace POM to avoid limitations forced
-      in dependencies found in dspace-parent pom. Solr is
-      a standalone webapplication.
-   -->
    <parent>
       <groupId>org.dspace</groupId>
-      <artifactId>dspace-pom</artifactId>
+      <artifactId>modules</artifactId>
-      <version>12</version>
+      <version>3.0-SNAPSHOT</version>
+      <relativePath>..</relativePath>
    </parent>
 
    <build>

pom.xml

@@ -1,3 +1,4 @@
+<?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>
@@ -12,14 +13,42 @@
       <url>http://www.dspace.org</url>
    </organization>
 
+    <!-- brings the sonatype snapshot repository and signing requirement on board -->
     <parent>
-        <artifactId>dspace-pom</artifactId>
+        <groupId>org.sonatype.oss</groupId>
-        <groupId>org.dspace</groupId>
+        <artifactId>oss-parent</artifactId>
-        <version>12</version>
+        <version>7</version>
     </parent>
 
+    <!--Force UTF-8 encoding during build on all platforms-->
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
     <build>
       <plugins>
+           <plugin>
+                <!-- DSpace requires Java 1.6 or higher -->
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+         </plugin>
          <plugin>
             <artifactId>maven-release-plugin</artifactId>
             <!-- Because of below bug, we are forced to use version 2.0-beta-9
@@ -54,6 +83,15 @@
                      http://jira.codehaus.org/browse/MNG-2742
                      Once the bug is fixed, we should put open-ended range in dspace-pom -->
                 <version>2.1.1</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -76,6 +114,56 @@
                 </executions>
                 <inherited>false</inherited>
             </plugin>
+            <plugin>
+                <groupId>com.mycila.maven-license-plugin</groupId>
+                <artifactId>maven-license-plugin</artifactId>
+                <version>1.9.0</version>
+                <configuration>
+                    <!-- external and absolute URL for use in external addon builds -->
+                    <header>https://raw.github.com/DSpace/DSpace/master/LICENSE_HEADER</header>
+                    <!--Just check headers of everything in the /src directory -->
+                    <includes>
+                        <include>src/**</include>
+                    </includes>
+                    <!--Use all default exclusions for IDE files & Maven files, see: 
+                        http://code.google.com/p/maven-license-plugin/wiki/Configuration#Default_excludes -->
+                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <!-- Add some default DSpace exclusions not covered by <useDefaultExcludes> 
+                         Individual Maven projects may choose to override these defaults. -->
+                    <excludes>
+                        <exclude>**/src/test/resources/**</exclude>
+                        <exclude>**/src/test/data/**</exclude>
+                        <exclude>**/META-INF/**</exclude>
+                        <exclude>**/robots.txt</exclude>
+                        <exclude>**/*.LICENSE</exclude>
+                        <exclude>**/LICENSE*</exclude>
+                        <exclude>**/README*</exclude>
+                        <exclude>**/readme*</exclude>
+                        <exclude>**/.gitignore</exclude>
+                    </excludes>
+                    <mapping> 
+                        <!-- Custom DSpace file extensions which are not recognized by maven-release-plugin: 
+                             *.xmap, *.xslt, *.wsdd, *.wsdl, *.LICENSE -->
+                        <xmap>XML_STYLE</xmap>
+                        <xslt>XML_STYLE</xslt>
+                        <wsdd>XML_STYLE</wsdd>
+                        <wsdl>XML_STYLE</wsdl>
+                        <LICENSE>TEXT</LICENSE>
+                    </mapping>  
+                    <encoding>UTF-8</encoding>
+                    <!-- maven-license-plugin recommends a strict check (e.g. check spaces/tabs too) -->
+                    <strictCheck>true</strictCheck>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>check-headers</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
       </plugins>
    </build>
    
@@ -275,12 +363,12 @@
                      <execution>
                         <inherited>false</inherited>
                         <configuration>
-                           <descriptorRefs>
+                           <descriptors>
-                              <descriptorRef>release</descriptorRef>
+                              <descriptor>src/main/assembly/release.xml</descriptor>
-                              <descriptorRef>src-release</descriptorRef>
+                              <descriptor>src/main/assembly/src-release.xml</descriptor>
-                           </descriptorRefs>
+                           </descriptors>
                            <tarLongFileMode>gnu</tarLongFileMode>
-                           <finalName>dspace-${pom.version}</finalName>
+                           <finalName>dspace-${project.version}</finalName>
                         </configuration>
                         <phase>package</phase>
                         <goals>
@@ -288,13 +376,6 @@
                         </goals>
                      </execution>
                   </executions>
-                  <dependencies>
-                     <dependency>
-                        <groupId>org.dspace.maven.plugins</groupId>
-                        <artifactId>dspace-assembly-plugin</artifactId>
-                        <version>1.2</version>
-                     </dependency>
-                  </dependencies>
                </plugin>
             </plugins>
          </build>
@@ -1074,4 +1155,14 @@
       <url>git@github.com:dspace/DSpace</url>
    </scm>
 
+    <!--
+        Distribution Management is currently used by the Continuum
+        server to update snapshots it generates. This will also be used
+        on release to deploy release versions to the repository by the
+        release manager.
+    -->
+    <distributionManagement>
+        <!-- further distribution management is found upstream in the sonatype parent -->
+    </distributionManagement>
+    
 </project>

src/main/assembly/release.xml

@@ -0,0 +1,41 @@
+<?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/
+
+-->
+<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>release</id>
+   <formats>
+      <format>zip</format>
+      <format>tar.gz</format>
+      <format>tar.bz2</format>
+   </formats>
+   <includeBaseDirectory>true</includeBaseDirectory>
+   <baseDirectory>${finalName}-release</baseDirectory>
+   <fileSets>
+      <fileSet>
+         <useDefaultExcludes>true</useDefaultExcludes>
+         <includes>
+            <include>dspace/**</include>
+            <include>LICENSE</include>
+            <include>NOTICE</include>
+            <include>README</include>
+            <include>CHANGES</include>
+            <include>KNOWN_BUGS</include>
+         </includes>
+         <excludes>
+            <exclude>**/target/**</exclude>
+            <exclude>make-release-package</exclude>
+            <exclude>.*</exclude>
+         </excludes>
+      </fileSet>
+   </fileSets>
+
+</assembly>

src/main/assembly/src-release.xml

@@ -0,0 +1,33 @@
+<?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/
+
+-->
+<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>src-release</id>
+   <formats>
+      <format>zip</format>
+      <format>tar.gz</format>
+      <format>tar.bz2</format>
+   </formats>
+   <baseDirectory>${finalName}-src-release</baseDirectory>
+   <includeBaseDirectory>true</includeBaseDirectory>
+   <fileSets>
+      <fileSet>
+         <useDefaultExcludes>true</useDefaultExcludes>
+         <excludes>
+            <exclude>**/target/**</exclude>
+            <exclude>make-release-package</exclude>
+            <exclude>.*</exclude>
+         </excludes>
+      </fileSet>
+   </fileSets>
+
+</assembly>