Maven-ize the EML Datamanager library. Note that we can still build t…

…he emlparser.war and the datamanager.jar using Ant, but we can also use maven to create a datamanager-x.x.x.jar artifact. But bear in mind that many of the dependencies in this project are not available or resolvable in other maven repos so any project that uses the datamanager-x.x.x.jar will need to include those (configxml.jar and Ecogrid-stub jars).

build.xml

@@ -97,9 +97,11 @@
 	<target name="init" depends="config">
 		<property name="name" value="eml"/>
 		<property name="eml-version" value="eml-${version}"/>
-		<property name="testdir" value="./test" />
-		<property name="srcdir" value="./src" />
-		<property name="invalid.dir" value="${testdir}/invalidEML"/>
+		<property name="testdir" value="./src/test/java" />
+		<property name="test.resources.dir" value="./src/test/resources" />
+		<property name="srcdir" value="./src/main/java" />
+		<property name="src.resources.dir" value="./src/main/resources" />
+		<property name="invalid.dir" value="${test.resources.dir}/invalidEML"/>
 		<property name="sample.dir" value="lib/sample"/>
 		<property name="build.dir" value="build"/>
 		<property name="build.tests" value="${build.dir}/tests"/>
@@ -137,7 +139,7 @@
 		<filter token="docrooturl" value=""/>
 		<filter token="version" value="${version}"/>
 		<filter token="eml-version" value="${eml-version}"/>
-		<filter token="testdir" value="${testdir}" />
+		<filter token="testdir" value="${test.resources.dir}" />
 		<filter token="srcdir" value="${srcdir}" />
 		<filter token="invalid.dir" value="${invalid.dir}" />
 		<filter token="config.file" value="${config.file}" />
@@ -246,7 +248,7 @@
 			</fileset>
 		</copy>
 		<copy todir="${ver.src}" filtering="yes">
-			<fileset dir="./src">
+			<fileset dir="${srcdir}">
 				<exclude name="emlconversions/**"/>
 				<exclude name="${datamanager.dir}/**"/>
 			</fileset>
@@ -466,7 +468,7 @@
 	<target name="test" depends="compile-test">
 
 		<!--copy the sample docs into the test directory so they get validated-->
-		<copy todir="${testdir}">
+		<copy todir="${test.resources.dir}">
 			<fileset dir="${sample.dir}">
 				<exclude name="**/CVS*"/>
 				<exclude name="**/.#*"/>
@@ -560,8 +562,7 @@
           tofile="${servlet.install.dir}/WEB-INF/lib/xml-apis.jar"/>
 		<copy file="${xmlp}"
           tofile="${servlet.install.dir}/WEB-INF/lib/xercesImpl.jar"/>
-		<copy file="${api}"
-          tofile="${servlet.install.dir}/WEB-INF/lib/xmlParserAPIs.jar"/>
+
 		<!--<copy todir="${servlet.install.dir}/schema/${eml-version}">
 			<fileset dir=".">
 				<include name="*.xsd"/>
@@ -720,10 +721,10 @@
 				<exclude name="**/.#*"/>
 			</fileset>
 		</copy>
-    <copy file="./src/datamanager.properties" 
+    <copy file="${src.resources.dir}/datamanager.properties" 
           todir="${build.dest}" 
     />   
-    <copy file="./src/endpoint.properties" 
+    <copy file="${src.resources.dir}/endpoint.properties" 
           todir="${build.dest}" 
     />   
 		<echo>"cpath.datamanager = ${cpath.datamanager}"</echo>

pom.xml

@@ -0,0 +1,147 @@
+<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.ecoinformatics.eml</groupId>
+	<artifactId>datamanager</artifactId>
+	<packaging>jar</packaging>
+	<version>0.9.0-SNAPSHOT</version>
+	<name>datamanager</name>
+	<url>http://maven.apache.org</url>
+	<dependencies>
+
+		<!-- HTML to PDF -->
+		<dependency>
+			<groupId>org.xhtmlrenderer</groupId>
+			<artifactId>core-renderer</artifactId>
+			<version>R8</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.jtidy</groupId>
+			<artifactId>jtidy</artifactId>
+			<version>r938</version>
+		</dependency>
+
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>2.9.1</version>
+		</dependency>
+		<dependency>
+			<groupId>xalan</groupId>
+			<artifactId>xalan</artifactId>
+			<version>2.7.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>edu.ucsb.nceas</groupId>
+			<artifactId>utilities</artifactId>
+			<version>2.0.0-SNAPSHOT</version>
+		</dependency>
+
+		<dependency>
+			<groupId>axis</groupId>
+			<artifactId>axis</artifactId>
+			<version>1.4</version>
+		</dependency>
+		<dependency>
+			<groupId>servlets.com</groupId>
+			<artifactId>cos</artifactId>
+			<version>05Nov2002</version>
+		</dependency>
+		<dependency>
+			<groupId>hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<version>1.8.0.10</version>
+		</dependency>
+		<dependency>
+			<groupId>postgresql</groupId>
+			<artifactId>postgresql</artifactId>
+			<version>8.0-312.jdbc3</version>
+		</dependency>
+		<dependency>
+			<groupId>javatar</groupId>
+			<artifactId>javatar</artifactId>
+			<version>2.5</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-net</groupId>
+			<artifactId>commons-net</artifactId>
+			<version>3.3</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.5</version>
+		</dependency>
+		<dependency>
+			<groupId>jdom</groupId>
+			<artifactId>jdom</artifactId>
+			<version>1.0b8</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.17</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.8.2</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- LOCAL libraries that are not in any maven repo -->
+		<dependency>
+			<groupId>edu.ucsb.nceas</groupId>
+			<artifactId>configxml</artifactId>
+			<version>0.9.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/configxml.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.ecoinformatics.ecogrid</groupId>
+			<artifactId>AuthenticatedQueryService-stub</artifactId>
+			<version>0.9.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/datamanager/org.ecoinformatics.ecogrid.AuthenticatedQueryService-stub.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.ecoinformatics.ecogrid</groupId>
+			<artifactId>AuthenticationService-stub</artifactId>
+			<version>0.9.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/datamanager/org.ecoinformatics.ecogrid.AuthenticationService-stub.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.ecoinformatics.ecogrid</groupId>
+			<artifactId>PutService-stub</artifactId>
+			<version>0.9.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/datamanager/org.ecoinformatics.ecogrid.PutService-stub.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.ecoinformatics.ecogrid</groupId>
+			<artifactId>QueryService-stub</artifactId>
+			<version>0.9.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/datamanager/org.ecoinformatics.ecogrid.QueryService-stub.jar</systemPath>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3</version>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>

src/org/ecoinformatics/datamanager/parser/NumericDomain.java → src/main/java/org/ecoinformatics/datamanager/parser/NumericDomain.java

@@ -58,7 +58,7 @@ public class NumericDomain implements Domain
     * Constructor of numeric domain
     * 
     * @param numberType  the number type of the numeric domain. In EML, a 
-    *                    measurement’s numberType should be defined as "real", 
+    *                    measurement's numberType should be defined as "real", 
     *                    "natural", "whole" or "integer".
     * @param minimum     lower bound for values this numeric domain
     * @param maximum     upper bound for values in this numeric domain
@@ -77,7 +77,7 @@ public NumericDomain(String numberType, Double minimum, Double maximum)
    /**
     * Method to get the numberType value.
     * 
-    * @return  the numberType, a String. In EML, a measurement’s numberType 
+    * @return  the numberType, a String. In EML, a measurement's numberType 
     *          should be defined as real, natural, whole or integer.
     */
    public String getNumberType()