[jbossws-commits] JBossWS SVN: r4191 - in stack: cxf/trunk/ant-import and 3 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Fri Aug 3 11:15:29 EDT 2007


Author: thomas.diesler at jboss.com
Date: 2007-08-03 11:15:29 -0400 (Fri, 03 Aug 2007)
New Revision: 4191

Removed:
   stack/cxf/trunk/IntegrationIssues.txt
Modified:
   stack/cxf/trunk/ant-import/build-thirdparty.xml
   stack/cxf/trunk/build.bat
   stack/cxf/trunk/build.sh
   stack/cxf/trunk/version.properties
   stack/metro/trunk/ant-import/build-thirdparty.xml
   stack/metro/trunk/build.bat
   stack/metro/trunk/build.sh
   stack/metro/trunk/version.properties
   stack/native/trunk/build.bat
   stack/native/trunk/build.sh
Log:
Fix local ant installation

Deleted: stack/cxf/trunk/IntegrationIssues.txt
===================================================================
--- stack/cxf/trunk/IntegrationIssues.txt	2007-08-03 15:12:45 UTC (rev 4190)
+++ stack/cxf/trunk/IntegrationIssues.txt	2007-08-03 15:15:29 UTC (rev 4191)
@@ -1,11 +0,0 @@
-# $Id$
-
-* WSServletContextListener is final and loads sun-jaxws.xml from context classloader.
-We need to provide sun-jaxws.xml dynamically.
-
-* WSServletException is package protected
-
-* WSServlet is final
-
-* WSServletDelegate is final
-

Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-thirdparty.xml	2007-08-03 15:12:45 UTC (rev 4190)
+++ stack/cxf/trunk/ant-import/build-thirdparty.xml	2007-08-03 15:15:29 UTC (rev 4191)
@@ -81,7 +81,7 @@
     <checksum file="${int.xfire.dir}/version.properties" fileext=".md5"/>
   </target>
   
-  <target name="thirdparty-classpath" depends="thirdparty-init">
+  <target name="thirdparty-classpath" depends="thirdparty-get">
     
     <path id="xfire.integration.classpath">
         <!-- A stack MUST NOT have a compile time dependency on jbossws-framework.jar -->

Modified: stack/cxf/trunk/build.bat
===================================================================
--- stack/cxf/trunk/build.bat	2007-08-03 15:12:45 UTC (rev 4190)
+++ stack/cxf/trunk/build.bat	2007-08-03 15:15:29 UTC (rev 4191)
@@ -40,7 +40,7 @@
 REM   with some WIN32 systems.
 REM ******************************************************
 
-set NAMES=build\tools;build\tools\ant;build\tools\apache\ant
+set NAMES=tools\ant
 set SUBFOLDERS=..;..\..;..\..\..;..\..\..\..
 
 REM ******************************************************

Modified: stack/cxf/trunk/build.sh
===================================================================
--- stack/cxf/trunk/build.sh	2007-08-03 15:12:45 UTC (rev 4190)
+++ stack/cxf/trunk/build.sh	2007-08-03 15:15:29 UTC (rev 4191)
@@ -24,14 +24,7 @@
 #USE_JDK6=true
 
 # the default search path for ant
-ANT_SEARCH_PATH="\
-    tools
-    tools/ant \
-    tools/apache/ant \
-    ant \
-    ../build/tools/ant \
-    ../../build/tools/ant \
-    ../../../build/tools/ant "
+ANT_SEARCH_PATH="tools/ant"
 
 # the default build file name
 ANT_BUILD_FILE="build.xml"
@@ -99,7 +92,7 @@
 #
 main() {
     # if there is a build config file. then source it
-    maybe_source "$DIRNAME/build.conf" "../build/build.conf" "../../build/build.conf" "../../../build/build.conf"
+    maybe_source "$DIRNAME/build.conf"
 
     # Increase the maximum file descriptors if we can
     if [ $cygwin = "false" ]; then

Modified: stack/cxf/trunk/version.properties
===================================================================
--- stack/cxf/trunk/version.properties	2007-08-03 15:12:45 UTC (rev 4190)
+++ stack/cxf/trunk/version.properties	2007-08-03 15:15:29 UTC (rev 4191)
@@ -18,4 +18,8 @@
 jboss-javaee=5.0.0-SNAPSHOT
 jboss-jaxr=1.2.0.GA
 jboss-security-spi=2.0.0.Beta
+stax-api=1.0
+sun-jaxb=2.1.4
+sun-servlet=2.5
+woodstox=3.1.1
 

Modified: stack/metro/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/metro/trunk/ant-import/build-thirdparty.xml	2007-08-03 15:12:45 UTC (rev 4190)
+++ stack/metro/trunk/ant-import/build-thirdparty.xml	2007-08-03 15:15:29 UTC (rev 4191)
@@ -80,7 +80,7 @@
     <checksum file="${int.sunri.dir}/version.properties" fileext=".md5"/>
   </target>
   
-  <target name="thirdparty-classpath" depends="thirdparty-init">
+  <target name="thirdparty-classpath" depends="thirdparty-get">
     
     <!-- The compile classpath for jboss50 integration -->
     <path id="sunri.integration.classpath">

Modified: stack/metro/trunk/build.bat
===================================================================
--- stack/metro/trunk/build.bat	2007-08-03 15:12:45 UTC (rev 4190)
+++ stack/metro/trunk/build.bat	2007-08-03 15:15:29 UTC (rev 4191)
@@ -40,7 +40,7 @@
 REM   with some WIN32 systems.
 REM ******************************************************
 
-set NAMES=build\tools;build\tools\ant;build\tools\apache\ant
+set NAMES=tools\ant
 set SUBFOLDERS=..;..\..;..\..\..;..\..\..\..
 
 REM ******************************************************

Modified: stack/metro/trunk/build.sh
===================================================================
--- stack/metro/trunk/build.sh	2007-08-03 15:12:45 UTC (rev 4190)
+++ stack/metro/trunk/build.sh	2007-08-03 15:15:29 UTC (rev 4191)
@@ -24,14 +24,7 @@
 #USE_JDK6=true
 
 # the default search path for ant
-ANT_SEARCH_PATH="\
-    tools
-    tools/ant \
-    tools/apache/ant \
-    ant \
-    ../build/tools/ant \
-    ../../build/tools/ant \
-    ../../../build/tools/ant "
+ANT_SEARCH_PATH="tools/ant"
 
 # the default build file name
 ANT_BUILD_FILE="build.xml"
@@ -99,7 +92,7 @@
 #
 main() {
     # if there is a build config file. then source it
-    maybe_source "$DIRNAME/build.conf" "../build/build.conf" "../../build/build.conf" "../../../build/build.conf"
+    maybe_source "$DIRNAME/build.conf"
 
     # Increase the maximum file descriptors if we can
     if [ $cygwin = "false" ]; then

Modified: stack/metro/trunk/version.properties
===================================================================
--- stack/metro/trunk/version.properties	2007-08-03 15:12:45 UTC (rev 4190)
+++ stack/metro/trunk/version.properties	2007-08-03 15:15:29 UTC (rev 4191)
@@ -13,7 +13,10 @@
 jboss-common-core=2.0.2.GA
 jboss-common-logging-spi=2.0.2.GA
 jboss-javaee=5.0.0-SNAPSHOT
+jboss-jaxr=1.2.0.GA
 jboss-security-spi=2.0.0.Beta
+sun-jaxb=2.1.4
 sun-jaxws=2.1.1
 sun-servlet=2.5
 ibm-wsdl4j=1.6.2
+woodstox=3.1.1

Modified: stack/native/trunk/build.bat
===================================================================
--- stack/native/trunk/build.bat	2007-08-03 15:12:45 UTC (rev 4190)
+++ stack/native/trunk/build.bat	2007-08-03 15:15:29 UTC (rev 4191)
@@ -40,7 +40,7 @@
 REM   with some WIN32 systems.
 REM ******************************************************
 
-set NAMES=build\tools;build\tools\ant;build\tools\apache\ant
+set NAMES=tools\ant
 set SUBFOLDERS=..;..\..;..\..\..;..\..\..\..
 
 REM ******************************************************

Modified: stack/native/trunk/build.sh
===================================================================
--- stack/native/trunk/build.sh	2007-08-03 15:12:45 UTC (rev 4190)
+++ stack/native/trunk/build.sh	2007-08-03 15:15:29 UTC (rev 4191)
@@ -24,14 +24,7 @@
 #USE_JDK6=true
 
 # the default search path for ant
-ANT_SEARCH_PATH="\
-    tools
-    tools/ant \
-    tools/apache/ant \
-    ant \
-    ../build/tools/ant \
-    ../../build/tools/ant \
-    ../../../build/tools/ant "
+ANT_SEARCH_PATH="tools/ant"
 
 # the default build file name
 ANT_BUILD_FILE="build.xml"
@@ -99,7 +92,7 @@
 #
 main() {
     # if there is a build config file. then source it
-    maybe_source "$DIRNAME/build.conf" "../build/build.conf" "../../build/build.conf" "../../../build/build.conf"
+    maybe_source "$DIRNAME/build.conf"
 
     # Increase the maximum file descriptors if we can
     if [ $cygwin = "false" ]; then




More information about the jbossws-commits mailing list