You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2011/10/21 18:24:41 UTC

svn commit: r1187449 - in /incubator/jena/Jena2: ARQ/trunk/pom2.xml Fuseki/trunk/.classpath TDB/trunk/pom2.xml jena/trunk/pom.xml jena/trunk/pom2.xml

Author: andy
Date: Fri Oct 21 16:24:41 2011
New Revision: 1187449

URL: http://svn.apache.org/viewvc?rev=1187449&view=rev
Log:
JENA-145 and also .classpath files.
JENA-139: Put back vocabularies/assembler.n3 into the build.

Modified:
    incubator/jena/Jena2/ARQ/trunk/pom2.xml
    incubator/jena/Jena2/Fuseki/trunk/.classpath
    incubator/jena/Jena2/TDB/trunk/pom2.xml
    incubator/jena/Jena2/jena/trunk/pom.xml
    incubator/jena/Jena2/jena/trunk/pom2.xml

Modified: incubator/jena/Jena2/ARQ/trunk/pom2.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/pom2.xml?rev=1187449&r1=1187448&r2=1187449&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/pom2.xml (original)
+++ incubator/jena/Jena2/ARQ/trunk/pom2.xml Fri Oct 21 16:24:41 2011
@@ -37,14 +37,14 @@
   <dependencies>
 
     <dependency>
-      <groupId>com.hp.hpl.jena</groupId>
-      <artifactId>jena</artifactId>
+      <groupId>org.apache.jena</groupId>
+      <artifactId>jena-core</artifactId>
       <version>${ver.jena}</version>
     </dependency>
 
     <dependency>
-      <groupId>com.hp.hpl.jena</groupId>
-      <artifactId>jena</artifactId>
+      <groupId>org.apache.jena</groupId>
+      <artifactId>jena-core</artifactId>
       <classifier>tests</classifier>
       <version>${ver.jena}</version>
       <scope>test</scope>

Modified: incubator/jena/Jena2/Fuseki/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/.classpath?rev=1187449&r1=1187448&r2=1187449&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/.classpath (original)
+++ incubator/jena/Jena2/Fuseki/trunk/.classpath Fri Oct 21 16:24:41 2011
@@ -1,45 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src-dev"/>
-	<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/hp/hpl/jena/arq/2.8.9-SNAPSHOT/arq-2.8.9-SNAPSHOT-tests.jar" sourcepath="M2_REPO/com/hp/hpl/jena/arq/2.8.9-SNAPSHOT/arq-2.8.9-SNAPSHOT-test-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/hp/hpl/jena/arq/2.8.9-SNAPSHOT/arq-2.8.9-SNAPSHOT.jar" sourcepath="M2_REPO/com/hp/hpl/jena/arq/2.8.9-SNAPSHOT/arq-2.8.9-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/hp/hpl/jena/tdb/0.8.11-SNAPSHOT/tdb-0.8.11-SNAPSHOT.jar" sourcepath="M2_REPO/com/hp/hpl/jena/tdb0.8.11-SNAPSHOT/tdb-0.8.11-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2.jar" sourcepath="M2_REPO/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/compiler/ecj/3.5.1/ecj-3.5.1.jar" sourcepath="M2_REPO/org/eclipse/jdt/core/compiler/ecj/3.5.1/ecj-3.5.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.0.3/httpclient-4.0.3.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.0.3/httpclient-4.0.3-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar" sourcepath="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/hp/hpl/jena/iri/0.8/iri-0.8.jar" sourcepath="M2_REPO/com/hp/hpl/jena/iri/0.8/iri-0.8-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/hp/hpl/jena/jena/2.6.4/jena-2.6.4.jar" sourcepath="M2_REPO/com/hp/hpl/jena/jena/2.6.4/jena-2.6.4-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/hp/hpl/jena/jena/2.6.4/jena-2.6.4-tests.jar" sourcepath="M2_REPO/com/hp/hpl/jena/jena/2.6.4/jena-2.6.4-test-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-continuation/7.2.1.v20101111/jetty-continuation-7.2.1.v20101111.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-continuation/7.2.1.v20101111/jetty-continuation-7.2.1.v20101111-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-http/7.2.1.v20101111/jetty-http-7.2.1.v20101111.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-http/7.2.1.v20101111/jetty-http-7.2.1.v20101111-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-io/7.2.1.v20101111/jetty-io-7.2.1.v20101111.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-io/7.2.1.v20101111/jetty-io-7.2.1.v20101111-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-jsp-2.1/7.2.1.v20101111/jetty-jsp-2.1-7.2.1.v20101111.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-jsp-2.1/7.2.1.v20101111/jetty-jsp-2.1-7.2.1.v20101111-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-security/7.2.1.v20101111/jetty-security-7.2.1.v20101111.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-security/7.2.1.v20101111/jetty-security-7.2.1.v20101111-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-server/7.2.1.v20101111/jetty-server-7.2.1.v20101111.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-server/7.2.1.v20101111/jetty-server-7.2.1.v20101111-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-servlet/7.2.1.v20101111/jetty-servlet-7.2.1.v20101111.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-servlet/7.2.1.v20101111/jetty-servlet-7.2.1.v20101111-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-util/7.2.1.v20101111/jetty-util-7.2.1.v20101111.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-util/7.2.1.v20101111/jetty-util-7.2.1.v20101111-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-webapp/7.2.1.v20101111/jetty-webapp-7.2.1.v20101111.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-webapp/7.2.1.v20101111/jetty-webapp-7.2.1.v20101111-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-xml/7.2.1.v20101111/jetty-xml-7.2.1.v20101111.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-xml/7.2.1.v20101111/jetty-xml-7.2.1.v20101111-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jsp-2.1-glassfish/2.1.v20100127/jsp-2.1-glassfish-2.1.v20100127.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jsp-api-2.1-glassfish/2.1.v20100127/jsp-api-2.1-glassfish-2.1.v20100127.jar"/>
-	<classpathentry kind="var" path="M2_REPO/junit/junit/4.8.2/junit-4.8.2.jar" sourcepath="M2_REPO/junit/junit/4.8.2/junit-4.8.2-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.3.1/lucene-core-2.3.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-core/2.3.1/lucene-core-2.3.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/hp/hpl/jena/sdb/1.3.2/sdb-1.3.2.jar" sourcepath="M2_REPO/com/hp/hpl/jena/sdb/1.3.2/sdb-1.3.2-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.9/wstx-asl-3.2.9.jar" sourcepath="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.9/wstx-asl-3.2.9-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="output" path="classes"/>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="src/test/java"/>
+  <classpathentry kind="src" path="src-dev"/>
+  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
+
+  <classpathentry kind="var" 
+		  path="M2_REPO/org/apache/jena/jena-arq/2.8.9-incubating-SNAPSHOT/jena-arq-2.8.9-incubating-SNAPSHOT.jar" 
+		  sourcepath="M2_REPO/org/apache/jena/jena-arq/2.8.9-incubating-SNAPSHOT/jena-arq-2.8.9-incubating-SNAPSHOT-sources.jar"/>
+
+  <classpathentry kind="var" 
+		  path="M2_REPO/org/apache/jena/jena-iri/0.9.0-incubating-SNAPSHOT/jena-iri-0.9.0-incubating-SNAPSHOT.jar"
+		  sourcepath="M2_REPO/org/apache/jena/jena-iri/0.9.0-incubating-SNAPSHOT/jena-iri-0.9.0-incubating-SNAPSHOT-sources.jar"/>
+  
+  <classpathentry kind="var" 
+		  path="M2_REPO/org/apache/jena/jena-core/2.6.5-incubating-SNAPSHOT/jena-core-2.6.5-incubating-SNAPSHOT.jar" 
+		  sourcepath="M2_REPO/org/apache/jena/jena-core/2.6.5-incubating-SNAPSHOT/jena-core-2.6.5-incubating-SNAPSHOT-sources.jar"/>
+
+  <classpathentry kind="var"
+		  path="M2_REPO/org/apache/jena/jena-arq/2.8.9-incubating-SNAPSHOT/jena-arq-2.8.9-incubating-SNAPSHOT-tests.jar" 
+		  sourcepath="M2_REPO/org/apache/jena/jena-arq/2.8.9-incubating-SNAPSHOT/jena-arq-2.8.9-incubating-SNAPSHOT-test-sources.jar"/>
+
+  <classpathentry kind="var" 
+		  path="M2_REPO/org/apache/jena/jena-core/2.6.5-incubating-SNAPSHOT/jena-core-2.6.5-incubating-SNAPSHOT-tests.jar" 
+		  sourcepath="M2_REPO/org/apache/jena/jena-core/2.6.5-incubating-SNAPSHOT/jena-core-2.6.5-incubating-SNAPSHOT-test-sources.jar"/>
+
+  <classpathentry kind="var" 
+		  path="M2_REPO/org/apache/jena/jena-tdb/0.9.0-incubating-SNAPSHOT/jena-tdb-0.9.0-incubating-SNAPSHOT.jar" 
+		  sourcepath="M2_REPO/org/apache/jena/jena-tdb/0.9.0-incubating-SNAPSHOT/jena-tdb-0.9.0-incubating-SNAPSHOT-sources.jar"/>
+
+  <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2.jar" sourcepath="M2_REPO/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/compiler/ecj/3.5.1/ecj-3.5.1.jar" sourcepath="M2_REPO/org/eclipse/jdt/core/compiler/ecj/3.5.1/ecj-3.5.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.0.3/httpclient-4.0.3.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.0.3/httpclient-4.0.3-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar" sourcepath="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-continuation/7.2.1.v20101111/jetty-continuation-7.2.1.v20101111.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-continuation/7.2.1.v20101111/jetty-continuation-7.2.1.v20101111-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-http/7.2.1.v20101111/jetty-http-7.2.1.v20101111.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-http/7.2.1.v20101111/jetty-http-7.2.1.v20101111-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-io/7.2.1.v20101111/jetty-io-7.2.1.v20101111.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-io/7.2.1.v20101111/jetty-io-7.2.1.v20101111-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-jsp-2.1/7.2.1.v20101111/jetty-jsp-2.1-7.2.1.v20101111.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-jsp-2.1/7.2.1.v20101111/jetty-jsp-2.1-7.2.1.v20101111-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-security/7.2.1.v20101111/jetty-security-7.2.1.v20101111.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-security/7.2.1.v20101111/jetty-security-7.2.1.v20101111-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-server/7.2.1.v20101111/jetty-server-7.2.1.v20101111.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-server/7.2.1.v20101111/jetty-server-7.2.1.v20101111-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-servlet/7.2.1.v20101111/jetty-servlet-7.2.1.v20101111.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-servlet/7.2.1.v20101111/jetty-servlet-7.2.1.v20101111-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-util/7.2.1.v20101111/jetty-util-7.2.1.v20101111.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-util/7.2.1.v20101111/jetty-util-7.2.1.v20101111-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-webapp/7.2.1.v20101111/jetty-webapp-7.2.1.v20101111.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-webapp/7.2.1.v20101111/jetty-webapp-7.2.1.v20101111-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-xml/7.2.1.v20101111/jetty-xml-7.2.1.v20101111.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-xml/7.2.1.v20101111/jetty-xml-7.2.1.v20101111-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jsp-2.1-glassfish/2.1.v20100127/jsp-2.1-glassfish-2.1.v20100127.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jsp-api-2.1-glassfish/2.1.v20100127/jsp-api-2.1-glassfish-2.1.v20100127.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/4.8.2/junit-4.8.2.jar" sourcepath="M2_REPO/junit/junit/4.8.2/junit-4.8.2-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.3.1/lucene-core-2.3.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-core/2.3.1/lucene-core-2.3.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/hp/hpl/jena/sdb/1.3.2/sdb-1.3.2.jar" sourcepath="M2_REPO/com/hp/hpl/jena/sdb/1.3.2/sdb-1.3.2-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.9/wstx-asl-3.2.9.jar" sourcepath="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.9/wstx-asl-3.2.9-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+  <classpathentry kind="output" path="classes"/>
 </classpath>

Modified: incubator/jena/Jena2/TDB/trunk/pom2.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/pom2.xml?rev=1187449&r1=1187448&r2=1187449&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/pom2.xml (original)
+++ incubator/jena/Jena2/TDB/trunk/pom2.xml Fri Oct 21 16:24:41 2011
@@ -47,14 +47,14 @@
     </dependency>
 
      <dependency>
-      <groupId>com.hp.hpl.jena</groupId>
-      <artifactId>jena</artifactId>
+      <groupId>org.apache.jena</groupId>
+      <artifactId>jena-core</artifactId>
       <version>${ver.jena}</version>
     </dependency>
 
     <dependency>
-      <groupId>com.hp.hpl.jena</groupId>
-      <artifactId>jena</artifactId>
+      <groupId>org.apache.jena</groupId>
+      <artifactId>jena-core</artifactId>
       <classifier>tests</classifier>
       <version>${ver.jena}</version>
       <scope>test</scope>

Modified: incubator/jena/Jena2/jena/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/pom.xml?rev=1187449&r1=1187448&r2=1187449&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/pom.xml (original)
+++ incubator/jena/Jena2/jena/trunk/pom.xml Fri Oct 21 16:24:41 2011
@@ -299,6 +299,16 @@
         <targetPath>etc</targetPath>
         <filtering>false</filtering>
       </resource>
+
+      <resource>
+	<directory>vocabularies</directory>
+	<targetPath>vocabularies</targetPath>
+	<filtering>false</filtering>
+	<includes>
+	  <include>assembler.n3</include>
+        </includes>
+      </resource>
+
       <resource>
         <directory>src/main/java</directory>
         <includes>

Modified: incubator/jena/Jena2/jena/trunk/pom2.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/pom2.xml?rev=1187449&r1=1187448&r2=1187449&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/pom2.xml (original)
+++ incubator/jena/Jena2/jena/trunk/pom2.xml Fri Oct 21 16:24:41 2011
@@ -30,8 +30,12 @@
     <assembly.root.name>apache-${project.artifactId}-${project.version}</assembly.root.name>
   </properties>
 
-  <!-- See JenaTop -->
   <dependencies>
+    <dependency>
+       <groupId>org.apache.jena</groupId>
+       <artifactId>jena-iri</artifactId>
+       <version>0.9.0-incubating-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -179,11 +183,22 @@
     </plugins>
 
     <resources>
+
       <resource>
         <directory>etc</directory>
         <targetPath>etc</targetPath>
         <filtering>false</filtering>
       </resource>
+
+      <resource>
+        <directory>vocabularies</directory>
+	<targetPath>vocabularies</targetPath>
+        <filtering>false</filtering>
+        <includes>
+          <include>assembler.n3</include>
+        </includes>
+      </resource>
+
       <resource>
         <directory>src/main/java</directory>
         <includes>