Updated the pom.xml and the readme

cgueret · Jan 7, 2011 · 37f90b1 · 37f90b1
1 parent 1e309f7
commit 37f90b1
Show file tree

Hide file tree

Showing 8 changed files with 82 additions and 21 deletions.
diff --git a/README b/README
@@ -0,0 +1,4 @@
+eRDF is a query engine able to solve SPARQL queries over a set of RDF sources, abstracted through a single data layer.
+
+There is a component for the core optimisation algorithm and one per datalayer. 
+(an other component is reserved for the webapp, not available yet).
diff --git a/nl.erdf.core/pom.xml b/nl.erdf.core/pom.xml
@@ -16,18 +16,23 @@
 			<groupId>com.hp.hpl.jena</groupId>
 			<artifactId>jena</artifactId>
 			<version>2.6.4</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>log4j</artifactId>
+					<groupId>log4j</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.hp.hpl.jena</groupId>
 			<artifactId>arq</artifactId>
 			<version>2.8.7</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-cli</groupId>
-			<artifactId>commons-cli</artifactId>
-			<version>1.2</version>
-			<type>jar</type>
-			<scope>compile</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>log4j</artifactId>
+					<groupId>log4j</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 	<build>

diff --git a/nl.erdf.datalayer-hbase/src/main/java/nl/erdf/datalayer/hbase/NodeSerializer.java b/nl.erdf.datalayer-hbase/src/main/java/nl/erdf/datalayer/hbase/NodeSerializer.java
@@ -9,7 +9,7 @@ public class NodeSerializer {
 	 * @return
 	 */
 	public static Node fromBytes(byte[] bytes) {
-		// TODO Auto-generated method stub
+		// TODO Import code from SVN
 		return null;
 	}
 
@@ -18,7 +18,7 @@ public static Node fromBytes(byte[] bytes) {
 	 * @return
 	 */
 	public static byte[] toBytes(Node resource) {
-		// TODO Auto-generated method stub
+		// TODO Import code from SVN
 		return null;
 	}
 

diff --git a/nl.erdf.datalayer-sparql/pom.xml b/nl.erdf.datalayer-sparql/pom.xml
@@ -11,6 +11,7 @@
 	<version>0.1-SNAPSHOT</version>
 	<name>eRDF SPARQL DataLayer</name>
 	<build>
+		<finalName>${groupId}.${artifactId}-${version}</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -20,23 +21,35 @@
 					<archive>
 						<manifest>
 							<mainClass>nl.erdf.main.SPARQLEngine</mainClass>
+							<addClasspath>true</addClasspath>
+							<classpathPrefix>lib/</classpathPrefix>
 						</manifest>
 					</archive>
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.dstovall</groupId>
-				<artifactId>onejar-maven-plugin</artifactId>
-				<version>1.4.4</version>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.1</version>
 				<executions>
 					<execution>
+						<id>copy-dependencies</id>
+						<phase>prepare-package</phase>
 						<goals>
-							<goal>one-jar</goal>
+							<goal>copy-dependencies</goal>
 						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/lib</outputDirectory>
+							<overWriteReleases>false</overWriteReleases>
+							<overWriteSnapshots>false</overWriteSnapshots>
+							<overWriteIfNewer>true</overWriteIfNewer>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
 		</plugins>
+		<!-- <resources> <resource> <directory>${basedir}/target/dependency</directory> 
+			</resource> </resources> -->
 	</build>
 	<dependencies>
 		<dependency>
@@ -45,6 +58,20 @@
 			<version>2.6.4</version>
 			<type>jar</type>
 			<scope>compile</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>log4j</artifactId>
+					<groupId>log4j</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>slf4j-log4j12</artifactId>
+					<groupId>org.slf4j</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>slf4j-api</artifactId>
+					<groupId>org.slf4j</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
@@ -59,6 +86,16 @@
 			<version>2.8.7</version>
 			<type>jar</type>
 			<scope>compile</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>log4j</artifactId>
+					<groupId>log4j</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>slf4j-api</artifactId>
+					<groupId>org.slf4j</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>nl.erdf</groupId>
@@ -74,12 +111,18 @@
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>0.9.27</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
 	</dependencies>
 	<pluginRepositories>
 		<pluginRepository>
 			<id>onejar-maven-plugin.googlecode.com</id>
 			<url>http://onejar-maven-plugin.googlecode.com/svn/mavenrepo</url>
 		</pluginRepository>
 	</pluginRepositories>
-
 </project>
diff --git a/nl.erdf.datalayer-sparql/src/main/java/nl/erdf/datalayer/sparql/Directory.java b/nl.erdf.datalayer-sparql/src/main/java/nl/erdf/datalayer/sparql/Directory.java
@@ -147,7 +147,6 @@ public void writeTo(OutputStream output) {
 			StringBuffer buffer = new StringBuffer();
 			buffer.append(endPoint.getName()).append(";").append(endPoint.getURI().toString()).append("\n");
 			try {
-				logger.info(buffer.toString());
 				writer.write(buffer.toString());
 				writer.flush();
 			} catch (Exception e) {
@@ -159,7 +158,7 @@ public void writeTo(OutputStream output) {
 	 * 
 	 */
 	public void close() {
-		logger.info("Shutdown connections");
+		logger.info("Shutdown connections from the directory");
 		for (EndPoint endPoint: listOfEndPoints)
 			endPoint.shutdown();
 

diff --git a/nl.erdf.datalayer-sparql/src/main/java/nl/erdf/main/GetEndPointsFromCKAN.java b/nl.erdf.datalayer-sparql/src/main/java/nl/erdf/main/GetEndPointsFromCKAN.java
@@ -99,5 +99,8 @@ public static void main(String[] args) throws ClientProtocolException, IOExcepti
 		OutputStream os = new FileOutputStream("ckan-endpoints.csv");
 		d.writeTo(os);
 		os.close();
+
+		// Close the directory
+		d.close();
 	}
 }
diff --git a/nl.erdf.datalayer-sparql/src/main/java/nl/erdf/main/SPARQLEngine.java b/nl.erdf.datalayer-sparql/src/main/java/nl/erdf/main/SPARQLEngine.java
@@ -88,7 +88,8 @@ public SearchProcess(File queryFile, File endPoints) throws IOException, URISynt
 		/*
 		 * (non-Javadoc)
 		 * 
-		 * @see java.util.Observer#update(java.util.Observable, java.lang.Object)
+		 * @see java.util.Observer#update(java.util.Observable,
+		 * java.lang.Object)
 		 */
 		@Override
 		public void update(Observable source, Object arg) {
@@ -125,18 +126,24 @@ public void update(Observable source, Object arg) {
 				if (query.isSelectType()) {
 					ResultSet results = qe.execSelect();
 					ResultSetFormatter.out(System.out, results, query);
-					qe.close();
 				} else if (query.isAskType()) {
 					boolean result = qe.execAsk();
 					ResultSetFormatter.out(System.out, result);
-					qe.close();
+				} else if (query.isDescribeType()) {
+					Model result = qe.execDescribe();
+					result.write(System.out);
+				} else if (query.isConstructType()) {
+					Model result = qe.execConstruct();
+					result.write(System.out);
 				}
+				qe.close();
 
 				// Print a list of informative sources
 				logger.info("List of end points that provided information");
 				for (EndPoint endPoint : directory.endPoints()) {
 					if (endPoint.getInformativeCounter() > 0)
-						logger.info(endPoint.getName() + " gave results to " + endPoint.getInformativeCounter() + " queries");
+						logger.info(endPoint.getName() + " had results for " + endPoint.getInformativeCounter()
+								+ " queries");
 				}
 			}
 		}

diff --git a/pom.xml b/pom.xml
@@ -38,6 +38,6 @@
 		<module>nl.erdf.core</module>
 		<!-- Ignored because of compilation problems <module>nl.erdf.datalayer-hbase</module> -->
 		<module>nl.erdf.datalayer-sparql</module>
-		<module>nl.erdf.www</module>
+		<!-- Not ready yet <module>nl.erdf.www</module> -->
 	</modules>
 </project>