Changeset 1143

Timestamp:

06/08/10 14:36:21 (3 years ago)

Author:

cbuil

Message:

solved problems in building jars

Location:

ogsa-dai/trunk/extensions/rdf

Files:

• client/ant.properties (modified) (1 diff)
• client/build.xml (modified) (2 diffs)
• client/src/main/java/upm/fi/oeg/ogsadai/rdfactivity/client/query/QueryEPR.java (modified) (1 diff)
• client/src/main/java/upm/fi/oeg/ogsadai/rdfactivity/client/query/QueryEPRClient.java (modified) (1 diff)
• client/src/main/java/upm/fi/oeg/ogsadai/rdfactivity/client/query/QueryRDFDB.java (modified) (1 diff)
• client/src/main/java/upm/fi/oeg/ogsadai/rdfactivity/client/query/QueryRDFDBClient.java (modified) (1 diff)
• client/src/main/java/upm/fi/oeg/ogsadai/rdfactivity/client/update/RDFUpdate.java (modified) (1 diff)
• client/src/main/java/upm/fi/oeg/ogsadai/rdfactivity/client/update/UpdateClient.java (modified) (1 diff)
• client/src/main/java/upm/fi/oeg/ogsadai/rdfactivity/exception/ActivitySPARQLException.java (modified) (1 diff)
• client/src/test/unit/java/upm/fi/oeg/ogsadai/test/rdfResourceTest/client/QuerySDBClientTest.java (modified) (1 diff)
• client/src/test/unit/java/upm/fi/oeg/ogsadai/test/rdfResourceTest/client/QuerySPARQLEPRTest.java (modified) (1 diff)
• client/src/test/unit/java/upm/fi/oeg/ogsadai/test/rdfResourceTest/client/UpdateTest.java (modified) (1 diff)
• server/build.xml (modified) (4 diffs)
• server/src/main/java/upm/fi/oeg/ogsadai/rdfactivity/exception/SPARQLActivityException.java (modified) (1 diff)
• server/src/main/java/upm/fi/oeg/ogsadai/rdfactivity/server/RDFUtilities.java (modified) (1 diff)
• server/src/main/java/upm/fi/oeg/ogsadai/rdfactivity/server/query/EPRQueryActivity.java (modified) (1 diff)
• server/src/main/java/upm/fi/oeg/ogsadai/rdfactivity/server/query/RDFDBQueryActivity.java (modified) (1 diff)
• server/src/main/java/upm/fi/oeg/ogsadai/rdfresource/RDFConnectionProvider.java (modified) (1 diff)
• server/src/main/java/upm/fi/oeg/ogsadai/rdfresource/RDFDataResourceState.java (modified) (1 diff)
• server/src/main/java/upm/fi/oeg/ogsadai/rdfresource/RDFModelUseException.java (modified) (1 diff)
• server/src/main/java/upm/fi/oeg/ogsadai/rdfresource/RDFResource.java (modified) (1 diff)
• server/src/main/java/upm/fi/oeg/ogsadai/rdfresource/SimpleRDFConnectionProvider.java (modified) (1 diff)
• server/src/main/java/upm/fi/oeg/ogsadai/rdfresource/SimpleRDFDataresourceState.java (modified) (1 diff)
• server/src/main/java/upm/fi/oeg/ogsadai/rdfresource/exception/RDFModelUseException.java (modified) (1 diff)
• server/src/main/java/upm/fi/oeg/ogsadai/rdfresource/repositoryaccess/QueryResults.java (modified) (1 diff)
• server/src/main/java/upm/fi/oeg/ogsadai/rdfresource/utilities/QueryResults.java (modified) (1 diff)
• server/src/main/java/upm/fi/oeg/ogsadai/rdfresource/utilities/QueryResultsParser.java (modified) (2 diffs)
• server/src/test/ext/java/upm/fi/oeg/test/dummy_tests/testQuery.java (modified) (1 diff)
• server/src/test/unit/java/upm/fi/oeg/test/rdfResourceTest/server/TestRDFDataResourceState.java (modified) (1 diff)
• server/src/test/unit/java/upm/fi/oeg/test/rdfResourceTest/server/activity/RDFDBQueryActivityTest.java (modified) (1 diff)
• server/src/test/unit/java/upm/fi/oeg/test/rdfResourceTest/server/activity/SPARQLEndpointQueryActivityTest.java (modified) (1 diff)
• server/src/test/unit/java/upm/fi/oeg/test/rdfResourceTest/server/activity/TestUpdateRepository.java (modified) (1 diff)
• server/src/test/unit/java/upm/fi/oeg/test/rdfResourceTest/server/resource/RDFResourceTest.java (modified) (1 diff)

ogsa-dai/trunk/extensions/rdf/client/ant.properties

@@ -14 +14 @@
 ogsadai.clientserver.lib.dir=../../../core/clientserver/build/lib
 ogsadai.client.lib.dir=../../../core/client/build/lib
+ogsadai.extensions.relational.client=../../../extensions/relational/client/build/lib
 # Jena
 jena.lib.dir=${dependencies.dir}/jena/jena/2.6.2/

ogsa-dai/trunk/extensions/rdf/client/build.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
 
+<!-- Copyright (c) The University of Edinburgh, 2009. -->
 <!-- Copyright (c) Universidad Politecnica de Madrid, 2009-2010. -->
 <!--
@@ -53 +54 @@
       <include name="**/*.jar"/>
     </fileset>
+    <fileset dir="${ogsadai.extensions.relational.client}">
+      <include name="**/*.jar"/>
+    </fileset>
   </path>
 

ogsa-dai/trunk/extensions/rdf/client/src/main/java/upm/fi/oeg/ogsadai/rdfactivity/client/query/QueryEPR.java

@@ -33 +33 @@
  * @author cbuil
  * @email cbuil@fi.upm.es
- * @institution Universidad Politécnica de Madrid
+ * @institution Universidad Politecnica de Madrid
  *
  */

ogsa-dai/trunk/extensions/rdf/client/src/main/java/upm/fi/oeg/ogsadai/rdfactivity/client/query/QueryEPRClient.java

@@ -35 +35 @@
  * @author cbuil
  * @email cbuil@fi.upm.es
- * @institution Universidad Politécnica de Madrid
+ * @institution Universidad Politecnica de Madrid
  * 
  */

ogsa-dai/trunk/extensions/rdf/client/src/main/java/upm/fi/oeg/ogsadai/rdfactivity/client/query/QueryRDFDB.java

@@ -33 +33 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @institution Universidad Politécnica de Madrid
+ * @institution Universidad Politecnica de Madrid
  * 
  */

ogsa-dai/trunk/extensions/rdf/client/src/main/java/upm/fi/oeg/ogsadai/rdfactivity/client/query/QueryRDFDBClient.java

@@ -35 +35 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @institution Universidad Politécnica de Madrid
+ * @institution Universidad Politecnica de Madrid
  * 
  */

ogsa-dai/trunk/extensions/rdf/client/src/main/java/upm/fi/oeg/ogsadai/rdfactivity/client/update/RDFUpdate.java

@@ -33 +33 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @institution Universidad Politécnica de Madrid (UPM)
+ * @institution Universidad Politecnica de Madrid (UPM)
  * 
  */

ogsa-dai/trunk/extensions/rdf/client/src/main/java/upm/fi/oeg/ogsadai/rdfactivity/client/update/UpdateClient.java

@@ -34 +34 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  * 
  */

ogsa-dai/trunk/extensions/rdf/client/src/main/java/upm/fi/oeg/ogsadai/rdfactivity/exception/ActivitySPARQLException.java

@@ -23 +23 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  * 
  */

ogsa-dai/trunk/extensions/rdf/client/src/test/unit/java/upm/fi/oeg/ogsadai/test/rdfResourceTest/client/QuerySDBClientTest.java

@@ -43 +43 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  *
  */

ogsa-dai/trunk/extensions/rdf/client/src/test/unit/java/upm/fi/oeg/ogsadai/test/rdfResourceTest/client/QuerySPARQLEPRTest.java

@@ -41 +41 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  *
  */

ogsa-dai/trunk/extensions/rdf/client/src/test/unit/java/upm/fi/oeg/ogsadai/test/rdfResourceTest/client/UpdateTest.java

@@ -44 +44 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  *
  */

ogsa-dai/trunk/extensions/rdf/server/build.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
 
+<!-- Copyright (c) The University of Edinburgh, 2009. -->
 <!-- Copyright (c) Universidad Politecnica de Madrid, 2009-2010. -->
 <!--
@@ -62 +63 @@
               <include name="**/*.jar"/>
         </fileset>
-  </path>
-
-  <path id="module.test.build.classpath">
-    <pathelement path="${unit.test.bin.dir}"/>
-    <pathelement path="${ext.test.bin.dir}"/>
-    <path refid="module.build.classpath"/>
-    <fileset dir="${junit.lib.dir}">
-      <include name="**/*.jar"/>
-    </fileset>
-        <fileset dir="${ogsadai.server.lib.dir}">
-          <include name="**/*.jar"/>
-        </fileset>
     <fileset dir="${jena.lib.dir}">
       <include name="**/*.jar"/>
@@ -83 +72 @@
       <include name="**/*.jar"/>
     </fileset>
+    <fileset dir="${log4j.lib.dir}">
+      <include name="**/*.jar"/>
+    </fileset>
+  </path>
+
+  <path id="module.test.build.classpath">
+    <pathelement path="${unit.test.bin.dir}"/>
+    <pathelement path="${ext.test.bin.dir}"/>
+    <path refid="module.build.classpath"/>
+    <fileset dir="${log4j.lib.dir}">
+      <include name="**/*.jar"/>
+    </fileset>
+    <fileset dir="${junit.lib.dir}">
+      <include name="**/*.jar"/>
+    </fileset>
+        <fileset dir="${ogsadai.server.lib.dir}">
+          <include name="**/*.jar"/>
+        </fileset>
   </path>
 
   <path id="module.test.run.classpath">
     <path refid="module.test.build.classpath"/>
-    <fileset dir="${log4j.lib.dir}">
-      <include name="**/*.jar"/>
-    </fileset>
     <fileset dir="${slf4j.lib.dir}">
       <include name="**/*.jar"/>
@@ -99 +103 @@
       <include name="**/*.jar"/>
     </fileset>
-    <fileset dir="${icu.lib.dir}">
+    <fileset dir="${icu4j.lib.dir}">
       <include name="**/*.jar"/>
     </fileset>

ogsa-dai/trunk/extensions/rdf/server/src/main/java/upm/fi/oeg/ogsadai/rdfactivity/exception/SPARQLActivityException.java

@@ -23 +23 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  * 
  */

ogsa-dai/trunk/extensions/rdf/server/src/main/java/upm/fi/oeg/ogsadai/rdfactivity/server/RDFUtilities.java

@@ -49 +49 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  * 
  */

ogsa-dai/trunk/extensions/rdf/server/src/main/java/upm/fi/oeg/ogsadai/rdfactivity/server/query/EPRQueryActivity.java

@@ -25 +25 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @institution Universidad Politécnica de Madrid
+ * @institution Universidad Politecnica de Madrid
  *
  */

ogsa-dai/trunk/extensions/rdf/server/src/main/java/upm/fi/oeg/ogsadai/rdfactivity/server/query/RDFDBQueryActivity.java

@@ -40 +40 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @institution Universidad Politécnica de Madrid
+ * @institution Universidad Politecnica de Madrid
  * 
  */

ogsa-dai/trunk/extensions/rdf/server/src/main/java/upm/fi/oeg/ogsadai/rdfresource/RDFConnectionProvider.java

@@ -28 +28 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  * 
  */

ogsa-dai/trunk/extensions/rdf/server/src/main/java/upm/fi/oeg/ogsadai/rdfresource/RDFDataResourceState.java

@@ -22 +22 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  *
  */

ogsa-dai/trunk/extensions/rdf/server/src/main/java/upm/fi/oeg/ogsadai/rdfresource/RDFModelUseException.java

@@ -23 +23 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  *
  */

ogsa-dai/trunk/extensions/rdf/server/src/main/java/upm/fi/oeg/ogsadai/rdfresource/RDFResource.java

@@ -38 +38 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  * 
  */

ogsa-dai/trunk/extensions/rdf/server/src/main/java/upm/fi/oeg/ogsadai/rdfresource/SimpleRDFConnectionProvider.java

@@ -30 +30 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  *
  */

ogsa-dai/trunk/extensions/rdf/server/src/main/java/upm/fi/oeg/ogsadai/rdfresource/SimpleRDFDataresourceState.java

@@ -27 +27 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  *
  */

ogsa-dai/trunk/extensions/rdf/server/src/main/java/upm/fi/oeg/ogsadai/rdfresource/exception/RDFModelUseException.java

@@ -23 +23 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  *
  */

ogsa-dai/trunk/extensions/rdf/server/src/main/java/upm/fi/oeg/ogsadai/rdfresource/repositoryaccess/QueryResults.java

@@ -20 +20 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  * 
  */

ogsa-dai/trunk/extensions/rdf/server/src/main/java/upm/fi/oeg/ogsadai/rdfresource/utilities/QueryResults.java

@@ -20 +20 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  *
  */

ogsa-dai/trunk/extensions/rdf/server/src/main/java/upm/fi/oeg/ogsadai/rdfresource/utilities/QueryResultsParser.java

@@ -38 +38 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  *
  */
@@ -113 +113 @@
      * @author carlos Buil Aranda
      * @email cbuil@fi.upm.es
-     * @insitution Universidad Politécnica de Madrid
+     * @insitution Universidad Politecnica de Madrid
      *
      */

ogsa-dai/trunk/extensions/rdf/server/src/test/ext/java/upm/fi/oeg/test/dummy_tests/testQuery.java

@@ -46 +46 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  *
  */

ogsa-dai/trunk/extensions/rdf/server/src/test/unit/java/upm/fi/oeg/test/rdfResourceTest/server/TestRDFDataResourceState.java

@@ -28 +28 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  *
  */

ogsa-dai/trunk/extensions/rdf/server/src/test/unit/java/upm/fi/oeg/test/rdfResourceTest/server/activity/RDFDBQueryActivityTest.java

@@ -40 +40 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  *
  */

ogsa-dai/trunk/extensions/rdf/server/src/test/unit/java/upm/fi/oeg/test/rdfResourceTest/server/activity/SPARQLEndpointQueryActivityTest.java

@@ -40 +40 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  *
  */

ogsa-dai/trunk/extensions/rdf/server/src/test/unit/java/upm/fi/oeg/test/rdfResourceTest/server/activity/TestUpdateRepository.java

@@ -36 +36 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  *
  */

ogsa-dai/trunk/extensions/rdf/server/src/test/unit/java/upm/fi/oeg/test/rdfResourceTest/server/resource/RDFResourceTest.java

@@ -27 +27 @@
  * @author Carlos Buil Aranda
  * @email cbuil@fi.upm.es
- * @insitution Universidad Politécnica de Madrid
+ * @insitution Universidad Politecnica de Madrid
  *
  */