[Mulgara-svn] r1907 - in trunk: . lib src/jar/querylang

[alexhall at mulgara.org]

Author: alexhall
Date: 2010-02-05 12:41:12 -0800 (Fri, 05 Feb 2010)
New Revision: 1907

Added:
   trunk/lib/interruptiblermi-1.1.jar
Modified:
   trunk/.classpath
   trunk/LEGAL.txt
   trunk/build.properties
   trunk/build.xml
   trunk/common.xml
   trunk/src/jar/querylang/build.xml
Log:
Adding the Interruptible RMI library.

Modified: trunk/.classpath
===================================================================
--- trunk/.classpath	2010-02-05 20:37:18 UTC (rev 1906)
+++ trunk/.classpath	2010-02-05 20:41:12 UTC (rev 1907)
@@ -93,6 +93,7 @@
 	<classpathentry kind="lib" path="lib/jboss-j2ee.jar"/>
 	<classpathentry kind="lib" path="lib/jena-2.5.6.jar"/>
 	<classpathentry kind="lib" path="lib/jenatest-2.5.6.jar"/>
+	<classpathentry kind="lib" path="lib/interruptiblermi-1.1.jar"/>
 	<classpathentry kind="lib" path="lib/iri-0.5.jar"/>
 	<classpathentry kind="lib" path="lib/jetty-6.1.11.jar"/>
 	<classpathentry kind="lib" path="lib/jetty-util-6.1.11.jar"/>

Modified: trunk/LEGAL.txt
===================================================================
--- trunk/LEGAL.txt	2010-02-05 20:37:18 UTC (rev 1906)
+++ trunk/LEGAL.txt	2010-02-05 20:41:12 UTC (rev 1907)
@@ -222,6 +222,12 @@
     LICENSE:  Bull S.A.
               http://howl.objectweb.org/license.html
 
+    Interruptible RMI
+    JARs:     interruptiblermi-1.1.jar
+    URL:      https://interruptiblermi.dev.java.net/
+    LICENSE:  Apache Software License, v2.0
+              http://www.apache.org/licenses/LICENSE-2.0
+
     Java Transaction API
     JARs:     jta-spec1_0_1.jar
     URL:      http://java.sun.com/products/jta

Modified: trunk/build.properties
===================================================================
--- trunk/build.properties	2010-02-05 20:37:18 UTC (rev 1906)
+++ trunk/build.properties	2010-02-05 20:41:12 UTC (rev 1907)
@@ -114,6 +114,7 @@
 http-core.jar            =httpcore-4.0-beta3.jar
 http-mime.jar            =httpmime-4.0-beta2.jar
 icu4j.jar                =icu4j_3_4.jar
+interruptiblermi.jar     =interruptiblermi-1.1.jar
 jargs.jar                =jargs-0.2.jar
 jasper.compiler.jar      =jasper-compiler-4.2.29.jar
 jasper.runtime.jar       =jasper-runtime-4.2.29.jar

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2010-02-05 20:37:18 UTC (rev 1906)
+++ trunk/build.xml	2010-02-05 20:41:12 UTC (rev 1907)
@@ -318,7 +318,12 @@
   <!-- Creates the distribution files                                      -->
   <!-- =================================================================== -->
   <!-- Removed server-local, jrdf -->
-  <target name="dist"
+  <target name="dist" unless="dist.already.built">
+    <property name="dist.already.built" value="true"/>
+    <ant antfile="build.xml" target="_dist"/>
+  </target>
+
+  <target name="_dist"
           depends="querylang-dist, driver-dist, descriptor-dist,
                    embedded-dist, lite-dist, raw-dist, core-dist, mulgara-war"
           description="Creates the distribution files">
@@ -515,6 +520,7 @@
       <zipfileset src="${lib.dir}/${jca.jar}" excludes="META-INF/**"/>
       <zipfileset src="${lib.dir}/${jena.jar}" excludes="META-INF/**"/>
       <zipfileset src="${lib.dir}/${iri.jar}" excludes="META-INF/**"/>
+      <zipfileset src="${lib.dir}/${interruptiblermi.jar}" excludes="META-INF/**"/>
       <zipfileset src="${lib.dir}/${jetty.jar}" excludes="META-INF/**"/>
       <zipfileset src="${lib.dir}/${jetty.plus.jar}" excludes="META-INF/**"/>
       <zipfileset src="${lib.dir}/${jid3.jar}" excludes="META-INF/**"/>
@@ -1689,6 +1695,7 @@
       <zipfileset src="${lib.dir}/${jaxrpc.jar}" excludes="META-INF/**"/>
       <zipfileset src="${lib.dir}/${jca.jar}" excludes="META-INF/**"/>
       <zipfileset src="${lib.dir}/${jena.jar}" excludes="META-INF/**"/>
+      <zipfileset src="${lib.dir}/${interruptiblermi.jar}" excludes="META-INF/**"/>
       <zipfileset src="${lib.dir}/${iri.jar}" excludes="META-INF/**"/>
       <zipfileset src="${lib.dir}/${jetty.jar}" excludes="META-INF/**"/>
       <zipfileset src="${lib.dir}/${jetty.plus.jar}" excludes="META-INF/**"/>
@@ -2136,6 +2143,7 @@
       <zipfileset src="${lib.dir}/${jaxrpc.jar}" excludes="META-INF/**"/>
       <zipfileset src="${lib.dir}/${jca.jar}" excludes="META-INF/**"/>
       <zipfileset src="${lib.dir}/${jena.jar}" excludes="META-INF/**"/>
+      <zipfileset src="${lib.dir}/${interruptiblermi.jar}" excludes="META-INF/**"/>
       <zipfileset src="${lib.dir}/${iri.jar}" excludes="META-INF/**"/>
       <zipfileset src="${lib.dir}/${jetty.jar}" excludes="META-INF/**"/>
       <zipfileset src="${lib.dir}/${jetty.plus.jar}" excludes="META-INF/**"/>

Modified: trunk/common.xml
===================================================================
--- trunk/common.xml	2010-02-05 20:37:18 UTC (rev 1906)
+++ trunk/common.xml	2010-02-05 20:41:12 UTC (rev 1907)
@@ -149,7 +149,7 @@
                        commons-codec-*.jar, connector-*.jar, jaxrpc-*.jar,
                        ${apache-mime4j.jar}, ${http-client.jar}, ${http-core.jar}, ${http-mime.jar},
                        carol*.jar, howl-logger*.jar, javax.servlet*.jar, servlet-api*.jar,
-                       ${joda-time.jar}, mulgara-sparql*.jar, sesame-model-*.jar"
+                       ${joda-time.jar}, mulgara-sparql*.jar, sesame-model-*.jar, ${interruptiblermi.jar}"
              excludes="jboss-j2ee.jar"/>
   </path>
 
@@ -550,7 +550,6 @@
           description="Starts an embedded Mulgara server with a supplied classpath">
 
     <ant antfile="build.xml" target="dist"/>
-    <ant antfile="build.xml" target="lite-dist"/>
 
     <echo>
       Starting embedded Mulgara server on ${os.name} with output to

Added: trunk/lib/interruptiblermi-1.1.jar
===================================================================
(Binary files differ)


Property changes on: trunk/lib/interruptiblermi-1.1.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/src/jar/querylang/build.xml
===================================================================
--- trunk/src/jar/querylang/build.xml	2010-02-05 20:37:18 UTC (rev 1906)
+++ trunk/src/jar/querylang/build.xml	2010-02-05 20:41:12 UTC (rev 1907)
@@ -148,6 +148,7 @@
       <zipfileset src="${lib.dir}/${axis.jar}" excludes="META-INF/**"/>
       <zipfileset src="${lib.dir}/${jline.jar}" excludes="META-INF/**"/>
       <zipfileset src="${lib.dir}/${jena.jar}" excludes="META-INF/**"/>
+      <zipfileset src="${lib.dir}/${interruptiblermi.jar}" excludes="META-INF/**"/>
     </jar>
   </target>