can build everything, still fails to run (dev_start can't find maven …

…deps) * renamed arith-code to arithcode * made repo also for server * removed rdf-extension pom.xml
opendatatrentino · Aug 9, 2013 · fb50158 · fb50158
1 parent d3ec2be
commit fb50158
Show file tree

Hide file tree

Showing 483 changed files with 40,406 additions and 157 deletions.
diff --git a/build.xml b/build.xml
@@ -14,7 +14,6 @@
     <property environment="env"/>
 
     <property name="version" value="trunk"/>
-    <property name="revision" value="rXXXX"/>
     <property name="full_version" value="0.0.0.0"/>
     <property name="build.dir" value="build"/>
     <property name="dist.dir" value="dist"/>
@@ -25,7 +24,7 @@
     <property name="appengine.version" value="1"/>
     <property name="appengine.sdk.dir" value="/opt/appengine"/>
 
-    <property name="fullname" value="openrefine-${version}-${revision}" />
+    <property name="fullname" value="openrefine-${version}" />
 
     <property name="main.dir" value="${basedir}/main" />
 
@@ -88,6 +87,9 @@
 
     <path id="tests.class.path">
         <path refid="webapp.class.path"/>
+        <path refid="server.class.path"/>
+    	<pathelement location="${server.tests.classes.dir}"/>
+        <pathelement location="${server.tests.lib.dir}/testng-6.8.jar"/>
         <fileset dir="${server.tests.lib.dir}">
             <include name="**/*.jar" />
         </fileset>
@@ -136,7 +138,7 @@
         <copy file="${webapp.src.dir}/log4j.properties" tofile="${webapp.classes.dir}/log4j.properties"/>
     </target>
 
-    <target name="build_tests" depends="build_webapp, build_server">
+    <target name="build_tests" depends="build">
         <mkdir dir="${server.tests.classes.dir}" />
         <javac source="${java_version}" target="${java_version}" encoding="utf-8" srcdir="${server.tests.src.dir}" destdir="${server.tests.classes.dir}" debug="true" includeAntRuntime="no">
             <classpath refid="tests.class.path" />
@@ -168,6 +170,18 @@
 
     <target name="build_broker" depends="build_broker_core, build_broker_appengine"/>
 
+    <taskdef resource="testngtasks" classpath="${server.tests.lib.dir}/testng-6.8.jar"/>
+    <mkdir dir="${build.dir}/server_tests"/>
+    <target name="server_test" depends="build_tests">
+    	<testng workingdir="${build.dir}/server_tests"
+    		listener="org.testng.reporters.DotTestListener" excludedgroups="broken"
+    		classpathref="tests.class.path">
+    	  <xmlfileset file="${server.tests.dir}/conf/tests.xml"/>
+    	</testng>
+        <!-- odr -->
+        <echo message="${line.separator}${line.separator}Test results were written to ${build.dir}/server_tests"/>
+    </target>
+
     <!-- ================================================================== -->
 
     <target name="prepare_jar">
@@ -209,7 +223,6 @@
 
         <replace file="${built.webapp.dir}/WEB-INF/web.xml">
             <replacefilter token="$VERSION" value="${version}"/>
-            <replacefilter token="$REVISION" value="${revision}"/>
         </replace>
 
         <replace file="${built.webapp.dir}/WEB-INF/butterfly.properties">
@@ -229,7 +242,7 @@
             name="OpenRefine"
             displayname="OpenRefine ${version}"
             icon="${graphics.dir}/icon/openrefine.icns"
-            identifier="org.openrefine.refine.Refine"
+            identifier="com.google.refine.Refine"
 	    shortversion="${version}"
             mainclassname="com/google/refine/Refine">
 	    <runtime dir="${env.JAVA_HOME}"/>
@@ -241,9 +254,7 @@
 	    </classpath>
 	    <option value="-Xms256M"/>
 	    <option value="-Xmx1024M"/>
-	    <option value="-Djava.awt.headless=true"/>
-	    <option value="-Drefine.headless=true"/>
-	    <option value="-Drefine.version=${revision}"/>
+	    <option value="-Drefine.version=${version}"/>
 	    <option value="-Drefine.webapp=$APP_ROOT/Contents/Resource/${built.webapp.name}"/>
         </bundleapp>
 
@@ -266,6 +277,7 @@
     </target>
 
     <target name="windows" depends="jar, prepare_webapp">
+      <echo message="Full version ${full_version} and version ${version}"/>
         <mkdir dir="${windows.dir}"/>
         <taskdef 
             name="launch4j" 
@@ -283,15 +295,15 @@
                 <cp>server/lib/*.jar</cp>
             </classPath>
             <jre minVersion="1.6.0" jdkPreference="preferJre" initialHeapSize="256" maxHeapSize="1024">
-                <opt>-Djava.library.path=server/lib/native/windows -Drefine.version=${revision}</opt>
+                <opt>-Djava.library.path=server/lib/native/windows </opt>
             </jre>
             <versionInfo
                 fileVersion="${full_version}"
                 txtFileVersion="${version}"
                 fileDescription="openrefine"
                 copyright="Copyright (c) 2013 OpenRefine contributors, 2010, Google, Inc."
                 productVersion="${full_version}"
-                txtProductVersion="${full_version}"
+                txtProductVersion="${version}"
                 productName="OpenRefine"
                 companyName="OpenRefine team"
                 internalName="openrefine"
@@ -330,7 +342,7 @@
         <copy file="${basedir}/LICENSE.txt" tofile="${windows.dir}/LICENSE.txt"/>
 
         <mkdir dir="${dist.dir}"/>
-        <zip destfile="${dist.dir}/openrefine-${version}-${revision}.zip" basedir="${windows.dir}/.." includes="${release.name}/**"/>
+        <zip destfile="${dist.dir}/openrefine-win-${version}.zip" basedir="${windows.dir}/.." includes="${release.name}/**"/>
     </target>
 
     <target name="linux" depends="jar, prepare_webapp">
@@ -361,7 +373,7 @@
         <copy file="${basedir}/refine" tofile="${linux.dir}/refine"/>
 
         <mkdir dir="${dist.dir}"/>
-        <tar longfile="gnu" compression="gzip" destfile="${dist.dir}/openrefine-${version}-${revision}.tar.gz">
+        <tar longfile="gnu" compression="gzip" destfile="${dist.dir}/openrefine-linux-${version}.tar.gz">
            <tarfileset dir="${linux.dir}/.." filemode="755">
                <include name="${release.name}/refine"/>
            </tarfileset>        

diff --git a/dev_start.bat b/dev_start.bat
@@ -4,8 +4,8 @@ rem It modifies the /d behaviour: the /d now let you to specify a data dir
 rem where refine stores data
 rem the /debug option let you to set the logging level
 rem You have also the possibility to specify a default refineport (DEVPORT) and a default datadir (setting the DEVPATH variable).
-rem This script let you also to run server TestNG test cases: use the server_test or server_tests option.
-rem This script remove the data dir each time you start Refine and replace it with a default one (stored in \backup-data-dir
+rem This script let you also to run server TestNG test cases: use the server_test option.
+rem This script remove the data dir each time you start Refine and replace it with a default one (stored in src/test/resources/backup-data-dir
 rem Created by azanella
 
 SET DEVPORT=4444
@@ -64,8 +64,8 @@ echo      default: 1024M
 echo.
 echo  "/x" enable JMX monitoring (for jconsole and friends)
 echo.
-echo  "/keepdatadir" keep the existing data dir. Do not replace with
-echo  \backup-data-dir
+echo  "/keepdatadir" keep the existing data dir. Do not replace with content of
+echo  src/test/resources/backup-data-dir 
 echo.
 echo "and <action> is one of
 echo.
@@ -75,7 +75,6 @@ echo.
 echo   clean ..................... Clean compiled classes
 echo   distclean ................. Remove all generated files
 echo   server_test ..................... Run TestNG server test
-echo   server_tests ..................... Run TestNG server test
 echo.
 goto end
 
@@ -210,7 +209,7 @@ if "%REFINE_TEST_DIR%"=="" set REFINE_TEST_DIR=main\tests
 REM added by azanella on 2013/06/13
 if not "%ODR_KEEPDATADIR%" == "" goto endRemove
 rd /S /Q %REFINE_DATA_DIR%
-xcopy /E /I /Q backup-data-dir %REFINE_DATA_DIR%
+xcopy /E /I /Q src\test\resources\backup-data-dir %REFINE_DATA_DIR%
 :endRemove
 
 if not "%REFINE_PORT%" == "" goto gotPort
@@ -245,24 +244,14 @@ if ""%ACTION%"" == ""clean"" goto doAnt
 if ""%ACTION%"" == ""distclean"" goto doAnt
 if ""%ACTION%"" == ""run"" goto doRun
 rem Added by azanella on May, 22 2013
-if ""%ACTION%"" == ""server_test"" goto doSrvTests
-if ""%ACTION%"" == ""server_tests"" goto doSrvTests
+if ""%ACTION%"" == ""server_test"" goto doAnt
 
 
 :doRun
 set CLASSPATH="%REFINE_CLASSES_DIR%;%REFINE_LIB_DIR%\*"
 "%JAVA_HOME%\bin\java.exe" -cp %CLASSPATH% %OPTS% -Djava.library.path=%REFINE_LIB_DIR%/native/windows com.google.refine.Refine
 goto end
 
-REM Added by azanella on May 22, 2013
-:doSrvTests
-call "%ANT_HOME%\bin\ant.bat" -f build.xml build_tests
-set CLASSPATH="%REFINE_TEST_DIR%\server\classes;%REFINE_WEBAPP%/WEB-INF\classes;%REFINE_CLASSES_DIR%;%REFINE_TEST_DIR%\server\lib\*;%REFINE_LIB_DIR%\*;%REFINE_WEBAPP%\WEB-INF\lib\*"
-set TESTS=-excludegroups broken %REFINE_TEST_DIR%\server\conf\tests.xml
-set RUN_CMD="%JAVA_HOME%\bin\java.exe" -cp %CLASSPATH% %OPTS% org.testng.TestNG -d %REFINE_BUILD_DIR%\server_tests -listener org.testng.reporters.DotTestListener %TESTS%
-rem echo %RUN_CMD%
-%RUN_CMD%
-goto end
 
 :doAnt
 if not "%ANT_HOME%" == "" goto gotAntHome

diff --git a/extensions/odrext/pom.xml b/extensions/odrext/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>eu.trentorise.opendata.opendatarise</groupId>
         <artifactId>odrapp</artifactId>
-        <version>0.1-SNAPSHOT</version>
+        <version>0.2-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
 
-    <groupId>eu.trentorise.opendata.opendatarise</groupId>
+
     <artifactId>odrext</artifactId>
     <version>0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
@@ -24,13 +24,13 @@
     </properties>
 
     <build>
-        <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-        <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
+        <outputDirectory>${basedir}/module/MOF-INF/classes</outputDirectory>
+
         <!--  <sourceDirectory>${basedir}/server/src/</sourceDirectory>    
         todo p3 dav review this   
          <scriptSourceDirectory>${basedir}/src/main/scripts</scriptSourceDirectory>
-        <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
-        <outputDirectory>${basedir}/target/classes</outputDirectory>
+        <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory> 
+        
         <testOutputDirectory>${basedir}/target/test-classes</testOutputDirectory>
         -->
 
@@ -39,28 +39,13 @@
     <dependencies>
         <dependency>
             <groupId>eu.trentorise.opendata.opendatarise</groupId>
-            <artifactId>odrapp</artifactId>
-            <version>0.1-SNAPSHOT</version>
+            <artifactId>main</artifactId>
+            <version>0.2-SNAPSHOT</version>
         </dependency>  
 
-        <dependency> 
-            <groupId>eu.trentorise.opendata.deps</groupId>
-            <artifactId> json </artifactId>
-            <version> 20100208 </version>
-        </dependency>
-
-        <dependency> 
-            <groupId>eu.trentorise.opendata.deps</groupId>
-            <artifactId> jetty </artifactId>
-            <version> 6.1.22 </version>            
-        </dependency>
-
-        <dependency>
-            <groupId>eu.trentorise.opendata.deps</groupId>
-            <artifactId>rdfextension</artifactId>
-            <version>0.1-SNAPSHOT</version>
-        </dependency>  
 
+
+
     </dependencies>
 
 

diff --git a/extensions/rdf-extension/.classpath b/extensions/rdf-extension/.classpath
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="resources"/>
+	<classpathentry kind="lib" path="/OpenRefine/server/lib/servlet-api-2.5.jar" sourcepath="/OpenRefine/server/lib-src/servlet-api-2.5-sources.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/butterfly-trunk.jar" sourcepath="/OpenRefine/main/webapp/WEB-INF/lib-src/butterfly-trunk.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/tests/server/lib/testng-5.12.1.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/slf4j-api-1.5.6.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/nekohtml-1.9.14.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/openrdf-sesame-2.3.2-onejar.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/tika-core-0.6.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/tika-parsers-0.6.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/arithcode-1.1.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/clojure-1.1.0.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/commons-codec-1.5.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/commons-collections-3.2.1.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/commons-io-1.4.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/commons-lang-2.5.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/dom4j-1.6.1.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/icu4j-4.2.1.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/jcl-over-slf4j-1.5.6.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/jrdf-0.5.6.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/lessen-trunk-r8.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/log4j-1.2.15.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/marc4j-2.4.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/opencsv-2.2.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/rhino-1.7R2.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/secondstring-20100303.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/slf4j-log4j12-1.5.6.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/velocity-1.5.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/vicino-1.1.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/xmlbeans-2.3.0.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/server/lib/jetty-6.1.22.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/server/lib/jetty-util-6.1.22.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/tests/server/lib/mockito-all-1.8.4.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/guava-r07.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/simmetrics_jar_v1_6_2_d07_02_07.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/apache-mime4j-0.6.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/java-rdfa-0.4.1.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/htmlparser-1.3.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/commons-fileupload-1.2.1.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/jackson-core-asl-1.9.5.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/jackson-mapper-asl-1.9.5.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/jena-arq-2.9.0-incubating.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/jena-core-2.7.0-incubating.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/jena-iri-0.9.0-incubating.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/jena-larq-1.0.0-incubating.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/lucene-core-3.6.0.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/httpcore-4.1.3.jar" sourcepath="/OpenRefine/main/webapp/WEB-INF/lib-src/httpcore-4.1.3-sources.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/httpclient-4.1.2.jar" sourcepath="/OpenRefine/main/webapp/WEB-INF/lib-src/httpclient-4.1.2-sources.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/commons-logging-1.1.1.jar"/>
+	<classpathentry kind="lib" path="module/MOD-INF/lib/any23-core-0.6.1.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/poi-3.8-20120326.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/poi-ooxml-3.8-20120326.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/poi-ooxml-schemas-3.8-20120326.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/OpenRefine"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib/signpost-commonshttp4-1.2.1.2.jar" sourcepath="/OpenRefine/main/webapp/WEB-INF/lib-src/signpost-commonshttp4-1.2.1.2-sources.jar"/>
+	<classpathentry kind="lib" path="/OpenRefine/main/webapp/WEB-INF/lib-src/signpost-core-1.2.1.2-sources.jar"/>
+	<classpathentry kind="output" path="module/MOD-INF/classes"/>
+</classpath>
diff --git a/extensions/rdf-extension/.gitignore b/extensions/rdf-extension/.gitignore
@@ -0,0 +1,5 @@
+*~
+*.class
+*.lock
+*.DS_Store
+module/MOD-INF/classes/*
diff --git a/extensions/rdf-extension/.project b/extensions/rdf-extension/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>grefine-rdf-extension</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/extensions/rdf-extension/LICENSE.txt b/extensions/rdf-extension/LICENSE.txt
@@ -0,0 +1,22 @@
+/*
+ *  External Licenses
+ */
+
+See the 'licenses' directory for a list of the licenses for the libraries we depend on,
+ordered here by license:
+
+Sesame 
+	(c)Copyright Aduna (http://www.aduna-software.com/) 2001-2007
+	http://www.openrdf.org/license.jsp
+
+Anything To Triples (any23)
+	Apache License
+	http://www.apache.org/licenses/LICENSE-2.0.html
+
+Lucene 3.0.1
+  Apache License
+  http://www.apache.org/licenses/LICENSE-2.0.html
+
+xercesImpl 2.7.1
+  Apache License
+  http://www.apache.org/licenses/LICENSE-2.0.html