bugfixing openjava version

nkons · Oct 17, 2013 · 1ba1906 · 1ba1906
1 parent 6949712
commit 1ba1906
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -15,13 +15,27 @@
 		<resources>
             <resource>
                 <directory>src/main/resources</directory>
-                <excludes>
+                <!-- <excludes>
                     <exclude>**</exclude>
-                </excludes>
+                </excludes>-->
                 <filtering>false</filtering>
             </resource>
         </resources>
 		<plugins>
+			<plugin>
+				<!-- Build an executable JAR -->
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+						<addClasspath>true</addClasspath>
+						<classpathPrefix></classpathPrefix>
+						<mainClass>gr.ekt.r2rml.beans.Main</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
 			<!-- overall project assembly -->
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -102,6 +116,11 @@
 			<version>4.8.1</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>1.6.4</version>
+		</dependency>
 	</dependencies>
 
 	<licenses>

diff --git a/r2rml-parser.bat b/r2rml-parser.bat
@@ -1,4 +1,3 @@
 @echo off
-echo This is R2RML Parser
-
+echo This is R2RML Parser 0.3-alpha
 java -cp "./*;./lib/*;" gr.ekt.r2rml.beans.Main %1
diff --git a/r2rml-parser.sh b/r2rml-parser.sh
@@ -1,3 +1,2 @@
-echo "This is R2RML Parser"
-
-java -cp "./*;./lib/*;" gr.ekt.r2rml.beans.Main
+echo "This is R2RML Parser 0.3-alpha"
+java -cp "./*;./lib/*;" -jar lib/r2rml-0.3.jar
diff --git a/src/assemble/assembly.xml b/src/assemble/assembly.xml
@@ -23,7 +23,7 @@
 	</fileSets>
 
 	<files>
-		<file>
+		<!-- <file>
 			<source>src/main/resources/app-context.xml</source>
 			<outputDirectory>.</outputDirectory>
 			<destName>app-context.xml</destName>
@@ -34,7 +34,7 @@
 			<outputDirectory>.</outputDirectory>
 			<destName>log4j.xml</destName>
 			<filtered>false</filtered>
-		</file>
+		</file> -->
 		<file>
 			<source>r2rml.properties</source>
 			<outputDirectory>.</outputDirectory>

diff --git a/src/main/java/gr/ekt/r2rml/beans/Generator.java b/src/main/java/gr/ekt/r2rml/beans/Generator.java
@@ -515,6 +515,7 @@ public void createTriples(MappingDocument mappingDocument) {
 		    if (verbose) log.info("Generated " + triples.size() + " statements from table mapping <" + logicalTableMapping.getUri() + ">");
 	    }
 		mappingDocument.getTimestamps().add(Calendar.getInstance().getTimeInMillis()); //2 Generated jena model in memory
+		//log.info("2 Generated jena model in memory");
 
 		if (!incremental || mappingsExecuted > 0) {
 			if (!storeOutputModelInDatabase) {
@@ -556,6 +557,7 @@ public void createTriples(MappingDocument mappingDocument) {
 						}
 					}
 					mappingDocument.getTimestamps().add(Calendar.getInstance().getTimeInMillis()); //3 Wrote clean model to disk.
+					//log.info("3 Wrote clean model to disk.");
 				} else {
 					log.info("Full run: Writing model to " + destinationFileName + ". Model has " + resultModel.listStatements().toList().size() + " statements.");
 					try {
@@ -566,6 +568,7 @@ public void createTriples(MappingDocument mappingDocument) {
 				        long t1 = c1.getTimeInMillis();
 				        log.info("Writing model to disk took " + (t1 - t0) + " milliseconds.");
 						mappingDocument.getTimestamps().add(Calendar.getInstance().getTimeInMillis()); //3 Wrote clean model to disk
+						//log.info("3 Wrote clean model to disk");
 					} catch (FileNotFoundException e) {
 						e.printStackTrace();
 					}
@@ -634,10 +637,12 @@ public void createTriples(MappingDocument mappingDocument) {
 		        long t1 = c1.getTimeInMillis();
 		        log.info("Updating model in database took " + (t1 - t0) + " milliseconds.");
 		        mappingDocument.getTimestamps().add(Calendar.getInstance().getTimeInMillis()); //3 Wrote clean model to database.
+		        //log.info("3 Wrote clean model to database.");
 			}
 		} else {
 			log.info("Skipping writing the output model. No changes detected.");
 	        mappingDocument.getTimestamps().add(Calendar.getInstance().getTimeInMillis()); //3 Finished writing output model. No changes detected.
+	        //log.info("3 Finished writing output model. No changes detected.");
 		}
 
 		//log the results
@@ -703,7 +708,8 @@ public void createTriples(MappingDocument mappingDocument) {
 		Calendar c1 = Calendar.getInstance();
         long t1 = c1.getTimeInMillis();
         log.info("Logging took " + (t1 - t0) + " milliseconds.");
-        mappingDocument.getTimestamps().add(Calendar.getInstance().getTimeInMillis()); //3 Finished logging
+        mappingDocument.getTimestamps().add(Calendar.getInstance().getTimeInMillis()); //4 Finished logging.
+        //log.info("4 Finished logging.");
 	}
 
 	BaseDatatype findFieldDataType(String field, ResultSet rs) {