Atualizacao de versao do componente Any23 (dependencia do SparqlUpdat…

…eOutput).
rogersmendonca · Jul 14, 2014 · 1b20b7f · 1b20b7f
1 parent 5b957b0
commit 1b20b7f
Show file tree

Hide file tree

Showing 54 changed files with 61 additions and 44 deletions.
diff --git a/SparqlUpdateOutput/etc/plugin.xml b/SparqlUpdateOutput/etc/plugin.xml
@@ -9,50 +9,16 @@
    <libraries>
 		<library name="SparqlUpdateOutput.jar"/>
 		<library name="KettlePluginTools.jar"/>
-		<library name="aduna-commons-collections-2.3.jar"/>
-		<library name="aduna-commons-concurrent-2.2.jar"/>
-		<library name="aduna-commons-i18n-1.0.jar"/>
-		<library name="aduna-commons-io-2.4.jar"/>
-		<library name="aduna-commons-iteration-2.3.jar"/>
-		<library name="aduna-commons-lang-2.3.jar"/>
-		<library name="aduna-commons-net-2.2.jar"/>
-		<library name="aduna-commons-text-2.2.jar"/>
-		<library name="aduna-commons-xml-2.2.jar"/>
-		<library name="any23-core-0.6.1.jar"/>
-		<library name="commons-cli-1.2.jar"/>
-		<library name="commons-codec-1.3.jar"/>
-		<library name="commons-codec-1.4.jar"/>
-		<library name="commons-compress-1.0.jar"/>
-		<library name="commons-httpclient-3.1.jar"/>
-		<library name="commons-lang-2.4.jar"/>
-		<library name="commons-logging-1.1.1.jar"/>
+		<library name="apache-any23-core-1.0.jar"/>
+		<library name="apache-any23-api-1.0.jar"/>
+		<library name="apache-any23-csvutils-1.0.jar"/>
+		<library name="apache-any23-encoding-1.0.jar"/>
+		<library name="apache-any23-mime-1.0.jar"/>
+		<library name="apache-any23-nquads-1.0.jar"/>
 		<library name="httpclient-4.1.1.jar"/>
 		<library name="httpclient-cache-4.1.1.jar"/>
 		<library name="httpcore-4.1.jar"/>
-		<library name="httpmime-4.1.1.jar"/>
-		<library name="icu4j-3.4.4.jar"/>
-		<library name="iri-0.8.jar"/>
-		<library name="jena-2.6.4.jar"/>		
-		<library name="sesame-model-2.2.4.jar"/>
-		<library name="sesame-query-2.2.4.jar"/>
-		<library name="sesame-queryalgebra-evaluation-2.2.4.jar"/>
-		<library name="sesame-queryalgebra-model-2.2.4.jar"/>
-		<library name="sesame-queryparser-api-2.2.4.jar"/>
-		<library name="sesame-queryparser-serql-2.2.4.jar"/>
-		<library name="sesame-repository-api-2.2.4.jar"/>
-		<library name="sesame-repository-sail-2.2.4.jar"/>
-		<library name="sesame-rio-api-2.2.4.jar"/>
-		<library name="sesame-rio-ntriples-2.2.4.jar"/>
-		<library name="sesame-rio-rdfxml-2.2.4.jar"/>
-		<library name="sesame-rio-turtle-2.2.4.jar"/>
-		<library name="sesame-sail-api-2.2.4.jar"/>
-		<library name="sesame-sail-inferencer-2.2.4.jar"/>
-		<library name="sesame-sail-memory-2.2.4.jar"/>
-		<library name="slf4j-api-1.5.6.jar"/>
-		<library name="slf4j-jdk14-1.5.6.jar"/>
-		<library name="stax-api-1.0.1.jar"/>		
-		<library name="tika-core-0.6.jar"/>
-		<library name="tika-parsers-0.6.jar"/>
-		<library name="wstx-asl-3.2.9.jar"/>
+		<library name="jena-2.6.4.jar"/>
+		<library name="xstream-1.3.1.jar"/>
     </libraries>
 </plugin>
diff --git a/SparqlUpdateOutput/libs/aduna-commons-collections-2.3.jar b/SparqlUpdateOutput/libs/aduna-commons-collections-2.3.jar
diff --git a/SparqlUpdateOutput/libs/aduna-commons-concurrent-2.2.jar b/SparqlUpdateOutput/libs/aduna-commons-concurrent-2.2.jar
diff --git a/SparqlUpdateOutput/libs/aduna-commons-i18n-1.0.jar b/SparqlUpdateOutput/libs/aduna-commons-i18n-1.0.jar
diff --git a/SparqlUpdateOutput/libs/aduna-commons-io-2.4.jar b/SparqlUpdateOutput/libs/aduna-commons-io-2.4.jar
diff --git a/SparqlUpdateOutput/libs/aduna-commons-iteration-2.3.jar b/SparqlUpdateOutput/libs/aduna-commons-iteration-2.3.jar
diff --git a/SparqlUpdateOutput/libs/aduna-commons-lang-2.3.jar b/SparqlUpdateOutput/libs/aduna-commons-lang-2.3.jar
diff --git a/SparqlUpdateOutput/libs/aduna-commons-net-2.2.jar b/SparqlUpdateOutput/libs/aduna-commons-net-2.2.jar
diff --git a/SparqlUpdateOutput/libs/aduna-commons-text-2.2.jar b/SparqlUpdateOutput/libs/aduna-commons-text-2.2.jar
diff --git a/SparqlUpdateOutput/libs/aduna-commons-xml-2.2.jar b/SparqlUpdateOutput/libs/aduna-commons-xml-2.2.jar
diff --git a/SparqlUpdateOutput/libs/any23-core-0.6.1.jar b/SparqlUpdateOutput/libs/any23-core-0.6.1.jar
diff --git a/SparqlUpdateOutput/libs/apache-any23-api-1.0.jar b/SparqlUpdateOutput/libs/apache-any23-api-1.0.jar
diff --git a/SparqlUpdateOutput/libs/apache-any23-core-1.0.jar b/SparqlUpdateOutput/libs/apache-any23-core-1.0.jar
diff --git a/SparqlUpdateOutput/libs/apache-any23-csvutils-1.0.jar b/SparqlUpdateOutput/libs/apache-any23-csvutils-1.0.jar
diff --git a/SparqlUpdateOutput/libs/apache-any23-encoding-1.0.jar b/SparqlUpdateOutput/libs/apache-any23-encoding-1.0.jar
diff --git a/SparqlUpdateOutput/libs/apache-any23-mime-1.0.jar b/SparqlUpdateOutput/libs/apache-any23-mime-1.0.jar
diff --git a/SparqlUpdateOutput/libs/apache-any23-nquads-1.0.jar b/SparqlUpdateOutput/libs/apache-any23-nquads-1.0.jar
diff --git a/SparqlUpdateOutput/libs/commons-cli-1.2.jar b/SparqlUpdateOutput/libs/commons-cli-1.2.jar
diff --git a/SparqlUpdateOutput/libs/commons-codec-1.3.jar b/SparqlUpdateOutput/libs/commons-codec-1.3.jar
diff --git a/SparqlUpdateOutput/libs/commons-codec-1.4.jar b/SparqlUpdateOutput/libs/commons-codec-1.4.jar
diff --git a/SparqlUpdateOutput/libs/commons-compress-1.0.jar b/SparqlUpdateOutput/libs/commons-compress-1.0.jar
diff --git a/SparqlUpdateOutput/libs/commons-httpclient-3.1.jar b/SparqlUpdateOutput/libs/commons-httpclient-3.1.jar
diff --git a/SparqlUpdateOutput/libs/commons-lang-2.4.jar b/SparqlUpdateOutput/libs/commons-lang-2.4.jar
diff --git a/SparqlUpdateOutput/libs/commons-logging-1.1.1.jar b/SparqlUpdateOutput/libs/commons-logging-1.1.1.jar
diff --git a/SparqlUpdateOutput/libs/httpclient-4.1.1.jar b/SparqlUpdateOutput/libs/httpclient-4.1.1.jar
diff --git a/SparqlUpdateOutput/libs/httpclient-cache-4.1.1.jar b/SparqlUpdateOutput/libs/httpclient-cache-4.1.1.jar
diff --git a/SparqlUpdateOutput/libs/httpmime-4.1.1.jar b/SparqlUpdateOutput/libs/httpmime-4.1.1.jar
diff --git a/SparqlUpdateOutput/libs/icu4j-3.4.4.jar b/SparqlUpdateOutput/libs/icu4j-3.4.4.jar
diff --git a/SparqlUpdateOutput/libs/iri-0.8.jar b/SparqlUpdateOutput/libs/iri-0.8.jar
diff --git a/SparqlUpdateOutput/libs/sesame-model-2.2.4.jar b/SparqlUpdateOutput/libs/sesame-model-2.2.4.jar
diff --git a/SparqlUpdateOutput/libs/sesame-query-2.2.4.jar b/SparqlUpdateOutput/libs/sesame-query-2.2.4.jar
diff --git a/SparqlUpdateOutput/libs/sesame-queryalgebra-evaluation-2.2.4.jar b/SparqlUpdateOutput/libs/sesame-queryalgebra-evaluation-2.2.4.jar
diff --git a/SparqlUpdateOutput/libs/sesame-queryalgebra-model-2.2.4.jar b/SparqlUpdateOutput/libs/sesame-queryalgebra-model-2.2.4.jar
diff --git a/SparqlUpdateOutput/libs/sesame-queryparser-api-2.2.4.jar b/SparqlUpdateOutput/libs/sesame-queryparser-api-2.2.4.jar
diff --git a/SparqlUpdateOutput/libs/sesame-queryparser-serql-2.2.4.jar b/SparqlUpdateOutput/libs/sesame-queryparser-serql-2.2.4.jar
diff --git a/SparqlUpdateOutput/libs/sesame-repository-api-2.2.4.jar b/SparqlUpdateOutput/libs/sesame-repository-api-2.2.4.jar
diff --git a/SparqlUpdateOutput/libs/sesame-repository-sail-2.2.4.jar b/SparqlUpdateOutput/libs/sesame-repository-sail-2.2.4.jar
diff --git a/SparqlUpdateOutput/libs/sesame-rio-api-2.2.4.jar b/SparqlUpdateOutput/libs/sesame-rio-api-2.2.4.jar
diff --git a/SparqlUpdateOutput/libs/sesame-rio-ntriples-2.2.4.jar b/SparqlUpdateOutput/libs/sesame-rio-ntriples-2.2.4.jar
diff --git a/SparqlUpdateOutput/libs/sesame-rio-rdfxml-2.2.4.jar b/SparqlUpdateOutput/libs/sesame-rio-rdfxml-2.2.4.jar
diff --git a/SparqlUpdateOutput/libs/sesame-rio-turtle-2.2.4.jar b/SparqlUpdateOutput/libs/sesame-rio-turtle-2.2.4.jar
diff --git a/SparqlUpdateOutput/libs/sesame-sail-api-2.2.4.jar b/SparqlUpdateOutput/libs/sesame-sail-api-2.2.4.jar
diff --git a/SparqlUpdateOutput/libs/sesame-sail-inferencer-2.2.4.jar b/SparqlUpdateOutput/libs/sesame-sail-inferencer-2.2.4.jar
diff --git a/SparqlUpdateOutput/libs/sesame-sail-memory-2.2.4.jar b/SparqlUpdateOutput/libs/sesame-sail-memory-2.2.4.jar
diff --git a/SparqlUpdateOutput/libs/slf4j-api-1.5.6.jar b/SparqlUpdateOutput/libs/slf4j-api-1.5.6.jar
diff --git a/SparqlUpdateOutput/libs/slf4j-jdk14-1.5.6.jar b/SparqlUpdateOutput/libs/slf4j-jdk14-1.5.6.jar
diff --git a/SparqlUpdateOutput/libs/stax-api-1.0.1.jar b/SparqlUpdateOutput/libs/stax-api-1.0.1.jar
diff --git a/SparqlUpdateOutput/libs/tika-core-0.6.jar b/SparqlUpdateOutput/libs/tika-core-0.6.jar
diff --git a/SparqlUpdateOutput/libs/tika-parsers-0.6.jar b/SparqlUpdateOutput/libs/tika-parsers-0.6.jar
diff --git a/SparqlUpdateOutput/libs/wstx-asl-3.2.9.jar b/SparqlUpdateOutput/libs/wstx-asl-3.2.9.jar
diff --git a/SparqlUpdateOutput/libs/xstream-1.3.1.jar b/SparqlUpdateOutput/libs/xstream-1.3.1.jar
diff --git a/SparqlUpdateOutput/pom.xml b/SparqlUpdateOutput/pom.xml
@@ -39,11 +39,20 @@
 	</developers>
 
 	<dependencies>		
+		<!--
 		<dependency>
 			<groupId>org.deri.any23</groupId>
 			<artifactId>any23-core</artifactId>
 			<version>0.6.1</version>
+			<version>1.0</version>
 		</dependency>		
+		 -->
+		<!-- Rogers (07/2014): Atualizacao da dependencia any23 --> 
+		<dependency>
+			<groupId>org.apache.any23</groupId>
+			<artifactId>apache-any23-core</artifactId>
+			<version>1.0</version>
+		</dependency>				 
 
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
@@ -72,6 +81,30 @@
 
 	<build>
 		<plugins>
+			<!-- 
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.8</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+						  	<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/alternateLocation</outputDirectory>
+							<overWriteReleases>false</overWriteReleases>
+							<overWriteSnapshots>false</overWriteSnapshots>
+							<overWriteIfNewer>true</overWriteIfNewer>
+							<excludeTransitive>false</excludeTransitive>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>		
+			-->
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>

diff --git a/SparqlUpdateOutput/src/main/java/br/ufrj/ppgi/greco/lodbr/sparqlupdate/SparqlUpdate.java b/SparqlUpdateOutput/src/main/java/br/ufrj/ppgi/greco/lodbr/sparqlupdate/SparqlUpdate.java
@@ -5,6 +5,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.any23.Any23;
+import org.apache.any23.source.DocumentSource;
+import org.apache.any23.source.StringDocumentSource;
+import org.apache.any23.writer.NTriplesWriter;
+import org.apache.any23.writer.RDFXMLWriter;
+import org.apache.any23.writer.TripleHandler;
+import org.apache.any23.writer.TurtleWriter;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
@@ -23,13 +30,15 @@
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.protocol.BasicHttpContext;
 import org.apache.http.protocol.HTTP;
+/*
 import org.deri.any23.Any23;
 import org.deri.any23.source.DocumentSource;
 import org.deri.any23.source.StringDocumentSource;
 import org.deri.any23.writer.NTriplesWriter;
 import org.deri.any23.writer.RDFXMLWriter;
 import org.deri.any23.writer.TripleHandler;
 import org.deri.any23.writer.TurtleWriter;
+*/
 
 public class SparqlUpdate
 {

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>br.ufrj.ppgi.greco.kettle</groupId>
 	<artifactId>etl4lod-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.0</version>
+    <version>1.1</version>
     <name>ETL4LOD</name>
     <description>Componentes do Kettle relacionados a Linked Data</description>
 	<url>https://github.com/rogersmendonca/etl4lod.git</url>
@@ -32,17 +32,26 @@
 			<url>http://repo.pentaho.org/artifactory/third-party/</url>
 		</repository>
 
+		<!-- Rogers (07/2014) -->
+		<!-- O componente Any23 foi incorporado ao repositorio Maven Central. -->
+		<!-- Por isso, os 2 repositorios do googlecope nao sao mais necessarios. -->
+
 		<!-- Specific repository for Any23 dependencies without a dedicated repository. -->
+		<!--
 		<repository>
 			<id>any23-repository-external</id>
 			<url>http://any23.googlecode.com/svn/repo-ext</url>
 		</repository>
+		-->
+
 		<!-- The Any23 modules repository. -->
+		<!--
 		<repository>
 			<id>any23-repository</id>
 			<url>http://any23.googlecode.com/svn/repo</url>
 		</repository>
-
+		-->
+
 		<!-- Run ${basedir}/libs/maven_install_libs.bat to install the local libraries 
 			into maven local repository -->
 		<repository>