Ds 1510

.gitignore

@@ -11,6 +11,7 @@ target/
 *.ipr
 *.iws
 .idea/
+overlays/
 
 ## Ignore project files created by NetBeans
 nbproject/private/
@@ -22,6 +23,6 @@ nbactions.xml
 nb-configuration.xml
 META-INF/
 
-## Ignore all *.properties file, EXCEPT build.properties (the default)
-*.properties
-!build.properties
+## Ignore all *.properties file in root folder, EXCEPT build.properties (the default)
+/*.properties
+!/build.properties

.travis.yml

@@ -0,0 +1 @@
+language: java

build.properties

@@ -140,6 +140,14 @@ handle.canonical.prefix = http://hdl.handle.net/
 # CNRI Handle prefix
 handle.prefix = 123456789
 
+
+########################
+# LDAP CONFIGURATION #
+########################
+
+search.user =
+search.password =
+
 #######################
 # PROXY CONFIGURATION #
 #######################
@@ -149,3 +157,13 @@ http.proxy.host =
 
 # port number of proxy server
 http.proxy.port =
+
+#####################
+# LOGLEVEL SETTINGS #
+#####################
+loglevel.other = INFO
+# loglevel.other: Log level for other third-party tools/APIs used by DSpace
+# Possible values (from most to least info): DEBUG, INFO, WARN, ERROR, FATAL
+loglevel.dspace = INFO
+# loglevel.dspace: Log level for all DSpace-specific code (org.dspace.*)
+# Possible values (from most to least info): DEBUG, INFO, WARN, ERROR, FATAL

dspace-api/pom.xml

@@ -25,6 +25,24 @@
        Runtime and Compile Time dependencies for DSpace.
     -->
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>maven.properties</include>
+                    <include>scm.properties</include>
+                </includes>
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>maven.properties</exclude>
+                    <exclude>scm.properties</exclude>
+                </excludes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -78,6 +96,18 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>com.mycila.maven-license-plugin</groupId>
+                <artifactId>maven-license-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/src/test/resources/**</exclude>
+                        <exclude>**/src/test/data/**</exclude>
+                        <exclude>**/.gitignore</exclude>
+                        <exclude>src/test/data/dspaceFolder/config/spiders/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
             <!-- This plugin allows us to run a Groovy script in our Maven POM
                     (see: http://gmaven.codehaus.org/Executing+Groovy+Code )
                     We are generating a OS-agnostic version (agnostic.build.dir) of
@@ -177,6 +207,34 @@
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.7</version>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>maven-version</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>buildnumber-maven-plugin</artifactId>
+                <version>1.2</version>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>create</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -243,6 +301,10 @@
             <groupId>commons-pool</groupId>
             <artifactId>commons-pool</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-validator</groupId>
+            <artifactId>commons-validator</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.mail</groupId>
             <artifactId>mail</artifactId>
@@ -423,6 +485,12 @@
             <version>0.18.6</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.coverity.security</groupId>
+            <artifactId>coverity-escapers</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+
         <!--  Gson: Java to Json conversion -->
         <dependency>
             <groupId>com.google.code.gson</groupId>

dspace-api/src/main/java/org/dspace/app/bulkedit/package-info.java

@@ -0,0 +1,22 @@
+/**
+ * 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/
+ */
+
+/**
+ * <p>The DSpace Batch Metadata Editor, which uses a CSV file to export/import
+ * item metadata.</p>
+ * <p>
+ * <ul>
+ *   <li>works on items, communities, collections or the whole site</li>
+ *   <li>can also create new items, delete items and withdraw/restore them</li>
+ *   <li>cannot export/import bitstreams</li>
+ * </ul>
+ */
+
+package org.dspace.app.bulkedit;
+
+

dspace-api/src/main/java/org/dspace/app/configuration/APISpringLoader.java

@@ -14,9 +14,7 @@
 import java.net.MalformedURLException;
 
 /**
- * User: kevin (kevin at atmire.com)
- * Date: 3-aug-2011
- * Time: 11:31:21
+ * @author Kevin Van de Velde (kevin at atmire dot com)
  */
 public class APISpringLoader implements SpringLoader {
 

dspace-api/src/main/java/org/dspace/app/harvest/Harvest.java

@@ -37,7 +37,7 @@
  */
 public class Harvest
 {
-	private static Context context;
+    private static Context context;
 
     public static void main(String[] argv) throws Exception
     {
@@ -251,6 +251,8 @@ else if ("ping".equals(command))
                 System.out.println(" (run with -h flag for details)");
                 System.exit(1);
             }
+
+            pingResponder(oaiSource, oaiSetID, metadataKey);
         }
     }
 
@@ -435,49 +437,80 @@ private void runHarvest(String collectionID, String email) {
 
         System.out.println("Harvest complete. ");
     }
-
-
+
     /**
      * Resets harvest_status and harvest_start_time flags for all collections that have a row in the harvested_collections table 
      */
     private static void resetHarvesting() {
     	System.out.print("Resetting harvest status flag on all collections... ");
-    	
-    	try 
+
+    	try
     	{
-	    	List<Integer> cids = HarvestedCollection.findAll(context);
-	    	for (Integer cid : cids) 
-	    	{
-	    		HarvestedCollection hc = HarvestedCollection.find(context, cid);
-	    		//hc.setHarvestResult(null,"");
-	    		hc.setHarvestStartTime(null);
-	    		hc.setHarvestStatus(HarvestedCollection.STATUS_READY);
-	    		hc.update();
-	    	}
-	    	context.commit();
-	    	System.out.println("success. ");
+            List<Integer> cids = HarvestedCollection.findAll(context);
+            for (Integer cid : cids)
+            {
+                HarvestedCollection hc = HarvestedCollection.find(context, cid);
+                //hc.setHarvestResult(null,"");
+                hc.setHarvestStartTime(null);
+                hc.setHarvestStatus(HarvestedCollection.STATUS_READY);
+                hc.update();
+            }
+            context.commit();
+            System.out.println("success. ");
     	}
     	catch (Exception ex) {
-    		System.out.println("failed. ");
-    		ex.printStackTrace();
+            System.out.println("failed. ");
+            ex.printStackTrace();
     	}    	
     }
-
-
+
     /**
      * Starts up the harvest scheduler. Terminating this process will stop the scheduler.
      */
     private static void startHarvester() 
     {
-	    try 
-	    {
-	    	System.out.print("Starting harvest loop... ");
-	    	OAIHarvester.startNewScheduler();
-	    	System.out.println("running. ");
+        try
+        {
+            System.out.print("Starting harvest loop... ");
+            OAIHarvester.startNewScheduler();
+            System.out.println("running. ");
     	}
     	catch (Exception ex) {
-    		ex.printStackTrace();
+            ex.printStackTrace();
     	}
     }
-
+
+    /**
+     * See if the responder is alive and working.
+     *
+     * @param server address of the responder's host.
+     * @param set name of an item set.
+     * @param metadataFormat local prefix name, or null for "dc".
+     */
+    private static void pingResponder(String server, String set, String metadataFormat)
+    {
+        List<String> errors;
+
+        System.out.print("Testing basic PMH access:  ");
+        errors = OAIHarvester.verifyOAIharvester(server, set,
+                (null != metadataFormat) ? metadataFormat : "dc", false);
+        if (errors.isEmpty())
+            System.out.println("OK");
+        else
+        {
+            for (String error : errors)
+                System.err.println(error);
+        }
+
+        System.out.print("Testing ORE support:  ");
+        errors = OAIHarvester.verifyOAIharvester(server, set,
+                (null != metadataFormat) ? metadataFormat : "dc", true);
+        if (errors.isEmpty())
+            System.out.println("OK");
+        else
+        {
+            for (String error : errors)
+                System.err.println(error);
+        }
+    }
 }