[Bigdata-commit] SF.net SVN: bigdata:[4840] branches

[<tho...@us...>]

Revision: 4840
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4840&view=rev
Author:   thompsonbry
Date:     2011-07-05 16:24:31 +0000 (Tue, 05 Jul 2011)

Log Message:
-----------
Fixed the WAR target to properly exclude various jars.

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/build.xml
    branches/TERMS_REFACTOR_BRANCH/build.xml

Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml	2011-07-05 15:48:58 UTC (rev 4839)
+++ branches/QUADS_QUERY_BRANCH/build.xml	2011-07-05 16:24:31 UTC (rev 4840)
@@ -374,7 +374,7 @@
 		  	<!-- jars which are not currently used. -->
 		  	<exclude name="iris*.jar"/>
 		  	<exclude name="jgrapht*.jar"/>
-		  	<exclude name="tuprolog*.jar"/>
+		  	<exclude name="2p-*.jar"/>
 		  	<!-- test suite stuff is not needed. -->
 		  	<exclude name="junit*.jar"/>
 		  	<exclude name="cweb-junit*.jar"/>
@@ -385,24 +385,9 @@
 	  		<exclude name="jetty*.jar"/>
 	  		<exclude name="servlet-api*.jar"/>
 		  	<!-- zookeeper only used in scale-out. -->
-	  		<exclude name="zookeeper*.jar"/>
+	  		<exclude name="apache/zookeeper*.jar"/>
 	  		<!-- jini only used in scale-out. -->
-		  	<exclude name="jini*.jar"/>
-		  	<exclude name="jsk*.jar"/>
-		  	<exclude name="mahalo*.jar"/>
-		  	<exclude name="mercury*.jar"/>
-		  	<exclude name="norm*.jar"/>
-		  	<exclude name="outrigger*.jar"/>
-		  	<exclude name="phoenix*.jar"/>
-		  	<exclude name="reggie*.jar"/>
-		  	<exclude name="sdm*.jar"/>
-		  	<exclude name="start*.jar"/>
-		  	<exclude name="sun-util*.jar"/>
-		  	<exclude name="tools*.jar"/>
-		  	<exclude name="browser*.jar"/>
-		  	<exclude name="classserver*.jar"/>
-		  	<exclude name="fiddler*.jar"/>
-		  	<exclude name="group*.jar"/>
+		  	<exclude name="jini/**.jar"/>
 		  </lib>
 		  <classes file="bigdata-war/src/resources/log4j.properties"/>
 		</war>

Modified: branches/TERMS_REFACTOR_BRANCH/build.xml
===================================================================
--- branches/TERMS_REFACTOR_BRANCH/build.xml	2011-07-05 15:48:58 UTC (rev 4839)
+++ branches/TERMS_REFACTOR_BRANCH/build.xml	2011-07-05 16:24:31 UTC (rev 4840)
@@ -374,7 +374,7 @@
 		  	<!-- jars which are not currently used. -->
 		  	<exclude name="iris*.jar"/>
 		  	<exclude name="jgrapht*.jar"/>
-		  	<exclude name="tuprolog*.jar"/>
+		  	<exclude name="2p-*.jar"/>
 		  	<!-- test suite stuff is not needed. -->
 		  	<exclude name="junit*.jar"/>
 		  	<exclude name="sesame*testsuite*.jar"/>
@@ -384,24 +384,9 @@
 	  		<exclude name="jetty*.jar"/>
 	  		<exclude name="servlet-api*.jar"/>
 		  	<!-- zookeeper only used in scale-out. -->
-	  		<exclude name="zookeeper*.jar"/>
+	  		<exclude name="apache/zookeeper*.jar"/>
 	  		<!-- jini only used in scale-out. -->
-		  	<exclude name="jini*.jar"/>
-		  	<exclude name="jsk*.jar"/>
-		  	<exclude name="mahalo*.jar"/>
-		  	<exclude name="mercury*.jar"/>
-		  	<exclude name="norm*.jar"/>
-		  	<exclude name="outrigger*.jar"/>
-		  	<exclude name="phoenix*.jar"/>
-		  	<exclude name="reggie*.jar"/>
-		  	<exclude name="sdm*.jar"/>
-		  	<exclude name="start*.jar"/>
-		  	<exclude name="sun-util*.jar"/>
-		  	<exclude name="tools*.jar"/>
-		  	<exclude name="browser*.jar"/>
-		  	<exclude name="classserver*.jar"/>
-		  	<exclude name="fiddler*.jar"/>
-		  	<exclude name="group*.jar"/>
+		  	<exclude name="jini/**.jar"/>
 		  </lib>
 		  <classes file="bigdata-war/src/resources/log4j.properties"/>
 		</war>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.