cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r530614 - in /incubator/cxf/trunk: benchmark/performance/etc/ distribution/src/main/assembly/ distribution/src/main/release/bin/ distribution/src/main/release/samples/ distribution/src/main/release/samples/callback/ distribution/src/main/re...
Date Fri, 20 Apr 2007 02:36:56 GMT
Author: ffang
Date: Thu Apr 19 19:36:53 2007
New Revision: 530614

URL: http://svn.apache.org/viewvc?view=rev&rev=530614
Log:
[CXF-552, 553, 555, 556] patch provided by Jonathan Anstey for cxf-552,553,555,556
 

Modified:
    incubator/cxf/trunk/benchmark/performance/etc/common_build.xml
    incubator/cxf/trunk/distribution/src/main/assembly/jbi.xml
    incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl
    incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl.bat
    incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java
    incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java.bat
    incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service
    incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service.bat
    incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap
    incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap.bat
    incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml
    incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml.bat
    incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator
    incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator.bat
    incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl
    incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl.bat
    incubator/cxf/trunk/distribution/src/main/release/samples/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/callback/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/handlers/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/hello_world/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_async/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_https/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_bare/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_wrapped/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-engine/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-unit/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-engine/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-unit/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-engine/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-engine/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-unit/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-engine/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-unit/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/js_provider/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/mtom/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/README.TXT
    incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/restful_dispatch/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/soap12/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/spring_http/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/src/demo/stream/interceptor/StreamInterceptor.java
    incubator/cxf/trunk/distribution/src/main/release/samples/ws_addressing/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/README.txt
    incubator/cxf/trunk/integration/jbi/src/test/resources/components/CXFServiceEngine/version_1/META-INF/jbi.xml
    incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdltojavalib.properties
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java

Modified: incubator/cxf/trunk/benchmark/performance/etc/common_build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/etc/common_build.xml?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/benchmark/performance/etc/common_build.xml (original)
+++ incubator/cxf/trunk/benchmark/performance/etc/common_build.xml Thu Apr 19 19:36:53 2007
@@ -14,7 +14,7 @@
 
     <!-- Setup for building in a source build -->
     <condition property="srcbuild_paths.file" value="./srcbuild_paths.xml"> 
-        <available file="../../lib/cxf-incubator.jar"/>
+        <available file="../../modules/cxf-manifest-incubator.jar"/>
     </condition> 
     <!-- default setting --> 
     <property name="srcbuild_paths.file" value="../../../distribution/target/srcbuild_paths.xml"/> 
@@ -58,7 +58,7 @@
     <path id="cxf.classpath">
         <pathelement location="${build.classes.dir}"/>
         <pathelement path="${srcbuild.classpath}"/>
-        <pathelement location="${cxf.home}/lib/cxf-incubator.jar"/>
+        <pathelement location="${cxf.home}/modules/cxf-manifest-incubator.jar"/>
 	<pathelement location="${testbase.classes.dir}"/>
     </path>
     <condition property="thirdparty.classpath" value="">

Modified: incubator/cxf/trunk/distribution/src/main/assembly/jbi.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/assembly/jbi.xml?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/assembly/jbi.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/assembly/jbi.xml Thu Apr 19 19:36:53 2007
@@ -28,12 +28,12 @@
     <component-class-name description="description">org.apache.cxf.jbi.se.CXFServiceEngine</component-class-name> 
     <component-class-path> 
       <path-element>cxf-integration-jbi-@CXF_VERSION@.jar</path-element> 
-      <path-element>cxf-incubator.jar</path-element>
+      <path-element>cxf-manifest-incubator.jar</path-element>
     </component-class-path> 
     <bootstrap-class-name>org.apache.cxf.jbi.se.CXFBootstrap</bootstrap-class-name> 
     <bootstrap-class-path> 
       <path-element>cxf-integration-jbi-@CXF_VERSION@.jar</path-element> 
-      <path-element>cxf-incubator.jar</path-element>
+      <path-element>cxf-manifest-incubator.jar</path-element>
     </bootstrap-class-path> 
   </component> 
 </jbi>

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl Thu Apr 19 19:36:53 2007
@@ -24,16 +24,16 @@
 
 me=`basename $0`
 cxf_home=$CXF_HOME
-if [ ! -f  $cxf_home/lib/cxf-incubator.jar ]; then
+if [ ! -f  $cxf_home/modules/cxf-manifest-incubator.jar ]; then
     cxf_home=`dirname $0`/..
 fi
                                                                                                                                                              
-cxf_jar=$cxf_home/lib/cxf-incubator.jar
+cxf_jar=$cxf_home/modules/cxf-manifest-incubator.jar
 
 
 if [ ! -f $cxf_jar ]; then 
     if [ ! -f ${cxf_home}/../../target/srcbuild_env ]; then
-        echo "ERROR: Unable to find cxf-incubator.jar in $cxf_home/lib"
+        echo "ERROR: Unable to find cxf-manifest-incubator.jar in $cxf_home/modules"
         exit 1
     else
         . ${cxf_home}/../../target/srcbuild_env

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl.bat
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl.bat?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl.bat Thu Apr 19 19:36:53 2007
@@ -32,9 +32,9 @@
 
 set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
 
-if not exist "%CXF_HOME%\lib\cxf-incubator.jar" goto no_cxf_jar
+if not exist "%CXF_HOME%\modules\cxf-manifest-incubator.jar" goto no_cxf_jar
 
-set CXF_JAR=%CXF_HOME%\lib\cxf-incubator.jar
+set CXF_JAR=%CXF_HOME%\modules\cxf-manifest-incubator.jar
 
 "%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.java2wsdl.JavaToWSDL %*
 
@@ -43,7 +43,7 @@
 goto end
 
 :no_cxf_jar
-echo ERROR: Unable to find cxf-incubator.jar in %cxf_home/lib
+echo ERROR: Unable to find cxf-manifest-incubator.jar in %cxf_home/modules
 goto end
 
 :no_java_home

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java Thu Apr 19 19:36:53 2007
@@ -24,15 +24,15 @@
 
 me=`basename $0`
 cxf_home=$CXF_HOME
-if [ ! -f  $cxf_home/lib/cxf-incubator.jar ]; then
+if [ ! -f  $cxf_home/modules/cxf-manifest-incubator.jar ]; then
     cxf_home=`dirname $0`/..
 fi
 
-cxf_jar=$cxf_home/lib/cxf-incubator.jar
+cxf_jar=$cxf_home/modules/cxf-manifest-incubator.jar
 
 if [ ! -f $cxf_jar ]; then 
     if [ ! -f ${cxf_home}/../../target/srcbuild_env ]; then
-        echo "ERROR: Unable to find cxf-incubator.jar in $cxf_home/lib"
+        echo "ERROR: Unable to find cxf-manifest-incubator.jar in $cxf_home/modules"
         exit 1
     else
         . ${cxf_home}/../../target/srcbuild_env

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java.bat
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java.bat?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java.bat Thu Apr 19 19:36:53 2007
@@ -32,9 +32,9 @@
 
 set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
 
-if not exist "%CXF_HOME%\lib\cxf-incubator.jar" goto no_cxf_jar
+if not exist "%CXF_HOME%\modules\cxf-manifest-incubator.jar" goto no_cxf_jar
 
-set CXF_JAR=%CXF_HOME%\lib\cxf-incubator.jar
+set CXF_JAR=%CXF_HOME%\modules\cxf-manifest-incubator.jar
 
 
 "%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.wsdlto.WSDLToJava %*
@@ -44,7 +44,7 @@
 goto end
 
 :no_cxf_jar
-echo ERROR: Unable to find cxf-incubator.jar in %cxf_home/lib
+echo ERROR: Unable to find cxf-manifest-incubator.jar in %cxf_home/modules
 goto end
 
 :no_java_home

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service Thu Apr 19 19:36:53 2007
@@ -24,15 +24,15 @@
 
 me=`basename $0`
 cxf_home=$CXF_HOME
-if [ ! -f  $cxf_home/lib/cxf-incubator.jar ]; then
+if [ ! -f  $cxf_home/modules/cxf-manifest-incubator.jar ]; then
     cxf_home=`dirname $0`/..
 fi
 
-cxf_jar=$cxf_home/lib/cxf-incubator.jar
+cxf_jar=$cxf_home/modules/cxf-manifest-incubator.jar
 
 if [ ! -f $cxf_jar ]; then 
     if [ ! -f ${cxf_home}/../../target/srcbuild_env ]; then
-        echo "ERROR: Unable to find cxf-incubator.jar in $cxf_home/lib"
+        echo "ERROR: Unable to find cxf-manifest-incubator.jar in $cxf_home/modules"
         exit 1
     else
         . ${cxf_home}/../../target/srcbuild_env

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service.bat
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service.bat?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service.bat Thu Apr 19 19:36:53 2007
@@ -32,9 +32,9 @@
 
 set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
 
-if not exist "%CXF_HOME%\lib\cxf-incubator.jar" goto no_cxf_jar
+if not exist "%CXF_HOME%\modules\cxf-manifest-incubator.jar" goto no_cxf_jar
 
-set CXF_JAR=%CXF_HOME%\lib\cxf-incubator.jar
+set CXF_JAR=%CXF_HOME%\modules\cxf-manifest-incubator.jar
 
 "%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.misc.WSDLToService %*
 
@@ -43,7 +43,7 @@
 goto end
 
 :no_cxf_jar
-echo ERROR: Unable to find cxf-incubator.jar in %cxf_home/lib
+echo ERROR: Unable to find cxf-manifest-incubator.jar in %cxf_home/modules
 goto end
 
 :no_java_home

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap Thu Apr 19 19:36:53 2007
@@ -24,15 +24,15 @@
 
 me=`basename $0`
 cxf_home=$CXF_HOME
-if [ ! -f  $cxf_home/lib/cxf-incubator.jar ]; then
+if [ ! -f  $cxf_home/modules/cxf-manifest-incubator.jar ]; then
     cxf_home=`dirname $0`/..
 fi
 
-cxf_jar=$cxf_home/lib/cxf-incubator.jar
+cxf_jar=$cxf_home/modules/cxf-manifest-incubator.jar
 
 if [ ! -f $cxf_jar ]; then 
     if [ ! -f ${cxf_home}/../../target/srcbuild_env ]; then
-        echo "ERROR: Unable to find cxf-incubator.jar in $cxf_home/lib"
+        echo "ERROR: Unable to find cxf-manifest-incubator.jar in $cxf_home/modules"
         exit 1
     else
         . ${cxf_home}/../../target/srcbuild_env

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap.bat
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap.bat?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap.bat Thu Apr 19 19:36:53 2007
@@ -32,9 +32,9 @@
 
 set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
 
-if not exist "%CXF_HOME%\lib\cxf-incubator.jar" goto no_cxf_jar
+if not exist "%CXF_HOME%\modules\cxf-manifest-incubator.jar" goto no_cxf_jar
 
-set CXF_JAR=%CXF_HOME%\lib\cxf-incubator.jar
+set CXF_JAR=%CXF_HOME%\modules\cxf-manifest-incubator.jar
 
 "%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.misc.WSDLToSoap %*
 
@@ -43,7 +43,7 @@
 goto end
 
 :no_cxf_jar
-echo ERROR: Unable to find cxf-incubator.jar in %cxf_home/lib
+echo ERROR: Unable to find cxf-manifest-incubator.jar in %cxf_home/modules
 goto end
 
 :no_java_home

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml Thu Apr 19 19:36:53 2007
@@ -23,15 +23,15 @@
 
 me=`basename $0`
 cxf_home=$CXF_HOME
-if [ ! -f  $cxf_home/lib/cxf-incubator.jar ]; then
+if [ ! -f  $cxf_home/modules/cxf-manifest-incubator.jar ]; then
     cxf_home=`dirname $0`/..
 fi
 
-cxf_jar=$cxf_home/lib/cxf-incubator.jar
+cxf_jar=$cxf_home/modules/cxf-manifest-incubator.jar
 
 if [ ! -f $cxf_jar ]; then 
     if [ ! -f ${cxf_home}/../../target/srcbuild_env ]; then
-        echo "ERROR: Unable to find cxf-incubator.jar in $cxf_home/lib"
+        echo "ERROR: Unable to find cxf-manifest-incubator.jar in $cxf_home/modules"
         exit 1
     else
         . ${cxf_home}/../../target/srcbuild_env

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml.bat
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml.bat?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml.bat Thu Apr 19 19:36:53 2007
@@ -32,9 +32,9 @@
 
 set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
 
-if not exist "%CXF_HOME%\lib\cxf-incubator.jar" goto no_cxf_jar
+if not exist "%CXF_HOME%\modules\cxf-manifest-incubator.jar" goto no_cxf_jar
 
-set CXF_JAR=%CXF_HOME%\lib\cxf-incubator.jar
+set CXF_JAR=%CXF_HOME%\modules\cxf-manifest-incubator.jar
 
 "%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.misc.WSDLToXML %*
 
@@ -43,7 +43,7 @@
 goto end
 
 :no_cxf_jar
-echo ERROR: Unable to find cxf-incubator.jar in %cxf_home/lib
+echo ERROR: Unable to find cxf-manifest-incubator.jar in %cxf_home/modules
 goto end
 
 :no_java_home

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator Thu Apr 19 19:36:53 2007
@@ -24,15 +24,15 @@
 
 me=`basename $0`
 cxf_home=$CXF_HOME
-if [ ! -f  $cxf_home/lib/cxf-incubator.jar ]; then
+if [ ! -f  $cxf_home/modules/cxf-manifest-incubator.jar ]; then
     cxf_home=`dirname $0`/..
 fi
 
-cxf_jar=$cxf_home/lib/cxf-incubator.jar
+cxf_jar=$cxf_home/modules/cxf-manifest-incubator.jar
 
 if [ ! -f $cxf_jar ]; then 
     if [ ! -f ${cxf_home}/../../target/srcbuild_env ]; then
-        echo "ERROR: Unable to find cxf-incubator.jar in $cxf_home/lib"
+        echo "ERROR: Unable to find cxf-manifest-incubator.jar in $cxf_home/modules"
         exit 1
     else
         . ${cxf_home}/../../target/srcbuild_env

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator.bat
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator.bat?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator.bat Thu Apr 19 19:36:53 2007
@@ -31,9 +31,9 @@
 
 set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
 
-if not exist "%CXF_HOME%\lib\cxf-incubator.jar" goto no_cxf_jar
+if not exist "%CXF_HOME%\modules\cxf-manifest-incubator.jar" goto no_cxf_jar
 
-set CXF_JAR=%CXF_HOME%\lib\cxf-incubator.jar
+set CXF_JAR=%CXF_HOME%\modules\cxf-manifest-incubator.jar
 
 "%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.validator.WSDLValidator %*
 

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl Thu Apr 19 19:36:53 2007
@@ -24,15 +24,15 @@
 
 me=`basename $0`
 cxf_home=$CXF_HOME
-if [ ! -f  $cxf_home/lib/cxf-incubator.jar ]; then
+if [ ! -f  $cxf_home/modules/cxf-manifest-incubator.jar ]; then
     cxf_home=`dirname $0`/..
 fi
 
-cxf_jar=$cxf_home/lib/cxf-incubator.jar
+cxf_jar=$cxf_home/modules/cxf-manifest-incubator.jar
 
 if [ ! -f $cxf_jar ]; then 
     if [ ! -f ${cxf_home}/../../target/srcbuild_env ]; then
-        echo "ERROR: Unable to find cxf-incubator.jar in $cxf_home/lib"
+        echo "ERROR: Unable to find cxf-manifest-incubator.jar in $cxf_home/modules"
         exit 1
     else
         . ${cxf_home}/../../target/srcbuild_env

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl.bat
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl.bat?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl.bat Thu Apr 19 19:36:53 2007
@@ -32,9 +32,9 @@
 
 set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
 
-if not exist "%CXF_HOME%\lib\cxf-incubator.jar" goto no_cxf_jar
+if not exist "%CXF_HOME%\modules\cxf-manifest-incubator.jar" goto no_cxf_jar
 
-set CXF_JAR=%CXF_HOME%\lib\cxf-incubator.jar
+set CXF_JAR=%CXF_HOME%\modules\cxf-manifest-incubator.jar
 
 "%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.misc.XSDToWSDL %*
 
@@ -43,7 +43,7 @@
 goto end
 
 :no_cxf_jar
-echo ERROR: Unable to find cxf-incubator.jar in %cxf_home/lib
+echo ERROR: Unable to find cxf-manifest-incubator.jar in %cxf_home/modules
 goto end
 
 :no_java_home

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/README.txt?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/README.txt Thu Apr 19 19:36:53 2007
@@ -14,7 +14,7 @@
 
 To build and run the demos provided in the Apache CXF binary
 distribution using either ant or wsdl2java, javac and java,
-you need to set the environment so that the file cxf-incubator.jar
+you need to set the environment so that the file cxf-manifest-incubator.jar
 is on the CLASSPATH and to insure that the JDK, ant and
 CXF_HOME/bin directories are on the PATH.
 
@@ -38,7 +38,7 @@
   ANT_HOME=/<ant_installation_directory>/apache-ant-1.6.5
 
   export PATH=$JAVA_HOME/bin:$ANT_HOME/bin:$CXF_HOME/bin:$PATH
-  export CLASSPATH=.:$CXF_HOME/lib/cxf-incubator.jar:./build/classes
+  export CLASSPATH=.:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
 
 For Windows:
   set CXF_HOME=C:\<installation_directory>\cxf
@@ -46,7 +46,7 @@
   set ANT_HOME=C:\<ant_installation_directory>\apache-ant-1.6.5
 
   set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin;%CXF_HOME%\bin;%PATH%
-  set CLASSPATH=.;%CXF_HOME%\lib\cxf-incubator.jar;.\build\classes
+  set CLASSPATH=.;%CXF_HOME%\modules\cxf-manifest-incubator.jar;.\build\classes
 
 Save a copy of this script in CXF_HOME/samples.  Run the
 script prior to building and running the demos.

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/callback/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/callback/README.txt?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/callback/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/callback/README.txt Thu Apr 19 19:36:53 2007
@@ -14,7 +14,7 @@
 Prerequisite
 ------------
 
-If your environment already includes cxf-incubator.jar on the
+If your environment already includes cxf-manifest-incubator.jar on the
 CLASSPATH, and the JDK and ant bin directories on the PATH
 it is not necessary to set the environment as described in
 the samples directory's README.  If your environment is not
@@ -66,12 +66,12 @@
 
 For UNIX:  
   
-  export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-incubator.jar:./build/classes
+  export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
   javac -d build/classes src/demo/callback/client/*.java
   javac -d build/classes src/demo/callback/server/*.java
 
 For Windows:
-  set classpath=%classpath%;%CXF_HOME%\lib\cxf-incubator.jar;.\build\classes
+  set classpath=%classpath%;%CXF_HOME%\modules\cxf-manifest-incubator.jar;.\build\classes
   javac -d build\classes src\demo\callback\client\*.java
   javac -d build\classes src\demo\callback\server\*.java
 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml Thu Apr 19 19:36:53 2007
@@ -252,7 +252,7 @@
     <target name="validate-tomcat">
 	<fail unless="env.CATALINA_HOME" message="You should set the CATALINA_HOME, if you want to deploy into tomcat"/>
 	
-	<available property="cxf.jars.present.in.tomcat" file="${env.CATALINA_HOME}/shared/lib/cxf-incubator.jar" type="file"/>
+	<available property="cxf.jars.present.in.tomcat" file="${env.CATALINA_HOME}/shared/modules/cxf-manifest-incubator.jar" type="file"/>
 	<fail unless="cxf.jars.present.in.tomcat" message="In order to run Apache CXF service under TOMCAT, 
 							   you MUST copy jars under ${cxf.home}/lib/ into ${env.CATALINA_HOME}/shared/lib/ first"/>
 	

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/README.txt?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/README.txt Thu Apr 19 19:36:53 2007
@@ -16,7 +16,7 @@
 Prerequisite
 ------------
 
-If your environment already includes cxf-incubator.jar on the
+If your environment already includes cxf-manifest-incubator.jar on the
 CLASSPATH, and the JDK and ant bin directories on the PATH
 it is not necessary to set the environment as described in
 the samples directory's README.  If your environment is not
@@ -68,12 +68,12 @@
 
 For UNIX:  
   
-  export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-incubator.jar:./build/classes
+  export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
   javac -d build/classes src/demo/hwDispatch/client/*.java
   javac -d build/classes src/demo/hwDispatch/server/*.java
 
 For Windows:
-  set classpath=%classpath%;%CXF_HOME%\lib\cxf-incubator.jar;.\build\classes
+  set classpath=%classpath%;%CXF_HOME%\modules\cxf-manifest-incubator.jar;.\build\classes
   javac -d build\classes src\demo\hwDispatch\client\*.java
   javac -d build\classes src\demo\hwDispatch\server\*.java
   

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/handlers/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/handlers/README.txt?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/handlers/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/handlers/README.txt Thu Apr 19 19:36:53 2007
@@ -19,7 +19,7 @@
 Prerequisite
 ------------
 
-If your environment already includes cxf-incubator.jar on the CLASSPATH,
+If your environment already includes cxf-manifest-incubator.jar on the CLASSPATH,
 and the JDK and ant bin directories on the PATH, it is not necessary to
 set the environment as described in the samples directory's README.
 If your environment is not properly configured, or if you are planning
@@ -89,13 +89,13 @@
 
 For UNIX:  
   
-  export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-incubator.jar:./build/classes
+  export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
   javac -d build/classes src/demo/handlers/common/*.java
   javac -d build/classes src/demo/handlers/client/*.java
   javac -d build/classes src/demo/handlers/server/*.java
 
 For Windows:
-  set classpath=%classpath%;%CXF_HOME%\lib\cxf-incubator.jar;.\build\classes
+  set classpath=%classpath%;%CXF_HOME%\modules\cxf-manifest-incubator.jar;.\build\classes
   javac -d build\classes src\demo\handlers\common\*.java
   javac -d build\classes src\demo\handlers\client\*.java
   javac -d build\classes src\demo\handlers\server\*.java

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/hello_world/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world/README.txt?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/hello_world/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/hello_world/README.txt Thu Apr 19 19:36:53 2007
@@ -9,7 +9,7 @@
 Prerequisite
 ------------
 
-If your environment already includes cxf-incubator.jar on the
+If your environment already includes cxf-manifest-incubator.jar on the
 CLASSPATH, and the JDK and ant bin directories on the PATH
 it is not necessary to set the environment as described in
 the samples directory README.  If your environment is not
@@ -61,12 +61,12 @@
 
 For UNIX:  
   
-  export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-incubator.jar:./build/classes
+  export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
   javac -d build/classes src/demo/hw/client/*.java
   javac -d build/classes src/demo/hw/server/*.java
 
 For Windows:
-  set classpath=%classpath%;%CXF_HOME%\lib\cxf-incubator.jar;.\build\classes
+  set classpath=%classpath%;%CXF_HOME%\modules\cxf-manifest-incubator.jar;.\build\classes
   javac -d build\classes src\demo\hw\client\*.java
   javac -d build\classes src\demo\hw\server\*.java
 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/README.txt?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/README.txt Thu Apr 19 19:36:53 2007
@@ -12,7 +12,7 @@
 Prerequisites
 -------------
 
-If your environment already includes cxf-incubator.jar on the
+If your environment already includes cxf-manifest-incubator.jar on the
 CLASSPATH, and the JDK and ant bin directories on the PATH
 it is not necessary to set the environment as described in
 the samples directory's README.  If your environment is not
@@ -64,12 +64,12 @@
 
 For UNIX:  
   
-  export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-incubator.jar:./build/classes
+  export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
   javac -d build/classes src/demo/hwRPCLit/client/*.java
   javac -d build/classes src/demo/hwRPCLit/server/*.java
 
 For Windows:
-  set classpath=%classpath%;%CXF_HOME%\lib\cxf-incubator.jar;.\build\classes
+  set classpath=%classpath%;%CXF_HOME%\modules\cxf-manifest-incubator.jar;.\build\classes
   javac -d build\classes src\demo\hwRPCLit\client\*.java
   javac -d build\classes src\demo\hwRPCLit\server\*.java
 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_async/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_async/README.txt?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_async/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_async/README.txt Thu Apr 19 19:36:53 2007
@@ -41,7 +41,7 @@
 Prerequisite
 ------------
 
-If your environment already includes cxf-incubator.jar on the
+If your environment already includes cxf-manifest-incubator.jar on the
 CLASSPATH, and the JDK and ant bin directories on the PATH
 it is not necessary to set the environment as described in
 the samples directory README.  If your environment is not
@@ -91,12 +91,12 @@
 
 For UNIX:  
   
-  export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-incubator.jar:./build/classes
+  export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
   javac -d build/classes src/demo/hw/client/*.java
   javac -d build/classes src/demo/hw/server/*.java
 
 For Windows:
-  set classpath=%classpath%;%CXF_HOME%\lib\cxf-incubator.jar;.\build\classes
+  set classpath=%classpath%;%CXF_HOME%\modules\cxf-manifest-incubator.jar;.\build\classes
   javac -d build\classes src\demo\hw\client\*.java
   javac -d build\classes src\demo\hw\server\*.java
 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_https/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_https/README.txt?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_https/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_https/README.txt Thu Apr 19 19:36:53 2007
@@ -12,7 +12,7 @@
 Prerequisite
 ------------
 
-If your environment already includes cxf-incubator.jar on the
+If your environment already includes cxf-manifest-incubator.jar on the
 CLASSPATH, and the JDK and ant bin directories on the PATH
 it is not necessary to run the environment script described in
 the samples directory README.  If your environment is not

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_bare/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_bare/README.txt?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_bare/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_bare/README.txt Thu Apr 19 19:36:53 2007
@@ -12,7 +12,7 @@
 Prerequisite
 ------------
 
-If your environment already includes cxf-incubator.jar on the
+If your environment already includes cxf-manifest-incubator.jar on the
 CLASSPATH, and the JDK and ant bin directories on the PATH
 it is not necessary to set the environment as described in
 the samples directory's README.  If your environment is not
@@ -64,12 +64,12 @@
 
 For UNIX:  
   
-  export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-incubator.jar:./build/classes
+  export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
   javac -d build/classes src/demo/hw/client/*.java
   javac -d build/classes src/demo/hw/server/*.java
 
 For Windows:
-  set classpath=%classpath%;%CXF_HOME%\lib\cxf-incubator.jar;.\build\classes
+  set classpath=%classpath%;%CXF_HOME%\modules\cxf-manifest-incubator.jar;.\build\classes
   javac -d build\classes src\demo\hw\client\*.java
   javac -d build\classes src\demo\hw\server\*.java
 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_wrapped/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_wrapped/README.txt?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_wrapped/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_wrapped/README.txt Thu Apr 19 19:36:53 2007
@@ -12,7 +12,7 @@
 Prerequisite
 ------------
 
-If your environment already includes cxf-incubator.jar on the
+If your environment already includes cxf-manifest-incubator.jar on the
 CLASSPATH, and the JDK and ant bin directories on the PATH
 it is not necessary to set the environment as described in
 the samples directory's README.  If your environment is not
@@ -64,12 +64,12 @@
 
 For UNIX:  
   
-  export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-incubator.jar:./build/classes
+  export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
   javac -d build/classes src/demo/hw/client/*.java
   javac -d build/classes src/demo/hw/server/*.java
 
 For Windows:
-  set classpath=%classpath%;%CXF_HOME%\lib\cxf-incubator.jar;.\build\classes
+  set classpath=%classpath%;%CXF_HOME%\modules\cxf-manifest-incubator.jar;.\build\classes
   javac -d build\classes src\demo\hw\client\*.java
   javac -d build\classes src\demo\hw\server\*.java
 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-engine/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-engine/build.xml?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-engine/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-engine/build.xml Thu Apr 19 19:36:53 2007
@@ -27,8 +27,8 @@
   <property environment="env"/>
   
   <path id="build.classpath">
-    <fileset dir="${evn.CXF_HOME}/lib">
-      <include name="cxf-incubator.jar"/>
+    <fileset dir="${evn.CXF_HOME}/modules">
+      <include name="cxf-manifest-incubator.jar"/>
     </fileset>
     <pathelement location="./build/classes"/>
   </path>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-unit/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-unit/build.xml?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-unit/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-unit/build.xml Thu Apr 19 19:36:53 2007
@@ -32,8 +32,8 @@
   <path id="build.classpath">
     <pathelement location="${build.classes.dir}"/>
     <pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.0-incubating.jar"/>
-    <fileset dir="${env.CXF_HOME}/lib">
-      <include name="cxf-incubator.jar"/>
+    <fileset dir="${env.CXF_HOME}/modules">
+      <include name="cxf-manifest-incubator.jar"/>
       <include name="cxf-integration-jbi-${cxf.version}.jar"/>    
     </fileset>
   </path>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-engine/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-engine/build.xml?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-engine/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-engine/build.xml Thu Apr 19 19:36:53 2007
@@ -28,8 +28,8 @@
 
   <property environment="env"/>  
   <path id="build.classpath">
-    <fileset dir="${env.CXF_HOME}/lib">
-      <include name="cxf-incubator.jar"/>
+    <fileset dir="${env.CXF_HOME}/modules">
+      <include name="cxf-manifest-incubator.jar"/>
     </fileset>
     <pathelement location="./build/classes"/>
   </path>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-unit/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-unit/build.xml?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-unit/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-unit/build.xml Thu Apr 19 19:36:53 2007
@@ -35,8 +35,8 @@
   <path id="build.classpath">
     <pathelement location="${build.classes.dir}"/>
     <pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.0-incubating.jar"/>
-    <fileset dir="${env.CXF_HOME}/lib">
-      <include name="cxf-incubator.jar"/>
+    <fileset dir="${env.CXF_HOME}/modules">
+      <include name="cxf-manifest-incubator.jar"/>
       <include name="cxf-integration-jbi-${cxf.version}.jar"/>
     </fileset>
   </path>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-engine/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-engine/build.xml?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-engine/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-engine/build.xml Thu Apr 19 19:36:53 2007
@@ -25,8 +25,8 @@
   <property environment="env"/>
   
   <path id="build.classpath">
-    <fileset dir="${env.CXF_HOME}/lib">
-      <include name="cxf-incubator.jar"/>
+    <fileset dir="${env.CXF_HOME}/modules">
+      <include name="cxf-manifest-incubator.jar"/>
     </fileset>
     <pathelement location="./build/classes"/>
   </path>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/build.xml?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/build.xml Thu Apr 19 19:36:53 2007
@@ -33,8 +33,8 @@
   <path id="build.classpath">
     <pathelement location="${build.classes.dir}"/>
     <pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.0-incubating.jar"/>
-    <fileset dir="${env.CXF_HOME}/lib">
-      <include name="cxf-incubator.jar"/>
+    <fileset dir="${env.CXF_HOME}/modules">
+      <include name="cxf-manifest-incubator.jar"/>
       <include name="cxf-integration-jbi-${cxf.version}.jar"/>
     </fileset>
   </path>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-engine/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-engine/build.xml?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-engine/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-engine/build.xml Thu Apr 19 19:36:53 2007
@@ -27,8 +27,8 @@
 
   <property environment="env"/>  
   <path id="build.classpath">
-    <fileset dir="${env.CXF_HOME}/lib">
-      <include name="cxf-incubator.jar"/>
+    <fileset dir="${env.CXF_HOME}/modules">
+      <include name="cxf-manifest-incubator.jar"/>
     </fileset>
     <pathelement location="./build/classes"/>
   </path>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-unit/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-unit/build.xml?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-unit/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-unit/build.xml Thu Apr 19 19:36:53 2007
@@ -35,8 +35,8 @@
   <path id="build.classpath">
     <pathelement location="${build.classes.dir}"/>
     <pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.0-incubating.jar"/>
-    <fileset dir="${env.CXF_HOME}/lib">
-      <include name="cxf-incubator.jar"/>
+    <fileset dir="${env.CXF_HOME}/modules">
+      <include name="cxf-manifest-incubator.jar"/>
       <include name="cxf-integration-jbi-${cxf.version}.jar"/>
     </fileset>
   </path>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-engine/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-engine/build.xml?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-engine/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-engine/build.xml Thu Apr 19 19:36:53 2007
@@ -26,8 +26,8 @@
 
   <property environment="env"/> 
   <path id="build.classpath">
-    <fileset dir="${env.CXF_HOME}/lib">
-      <include name="cxf-incubator.jar"/>
+    <fileset dir="${env.CXF_HOME}/modules">
+      <include name="cxf-manifest-incubator.jar"/>
     </fileset>
     <pathelement location="./build/classes"/>
   </path>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-unit/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-unit/build.xml?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-unit/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-unit/build.xml Thu Apr 19 19:36:53 2007
@@ -33,8 +33,8 @@
   <path id="build.classpath">
     <pathelement location="${build.classes.dir}"/>
     <pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.0-incubating.jar"/>
-    <fileset dir="${env.CXF_HOME}/lib">
-      <include name="cxf-incubator.jar"/>
+    <fileset dir="${env.CXF_HOME}/modules">
+      <include name="cxf-manifest-incubator.jar"/>
       <include name="cxf-integration-jbi-${cxf.version}.jar"/>
     </fileset>
   </path>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/build.xml?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/build.xml Thu Apr 19 19:36:53 2007
@@ -114,7 +114,7 @@
     <javac srcdir="${basedir}/src" destdir="${build.classes.dir}" debug="true" fork="yes">
       <include name="**/*.java"/>
       <classpath>
-	<pathelement location="${cxf.home}/lib/cxf-incubator.jar"/>
+	<pathelement location="${cxf.home}/modules/cxf-manifest-incubator.jar"/>
 	<pathelement location="${build.classes.dir}"/>
 	<!--path refid="cxf.classpath"/-->
 	<path refid="other.classpath"/>
@@ -171,7 +171,7 @@
 	<arg value="${wsdl.location}"/> 
 	<classpath> 
 	  <pathelement location="${build.classes.dir}"/>
-	  <pathelement path="${cxf.home}/lib/cxf-incubator.jar"/>
+	  <pathelement path="${cxf.home}/modules/cxf-manifest-incubator.jar"/>
 	</classpath>
       </java> 
     </target> 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/README.txt?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/README.txt Thu Apr 19 19:36:53 2007
@@ -17,7 +17,7 @@
 Prerequisite
 ------------
 
-If your environment already includes cxf-incubator.jar on the
+If your environment already includes cxf-manifest-incubator.jar on the
 CLASSPATH, and the JDK and ant bin directories on the PATH
 it is not necessary to set the environment as described in
 the samples directory README.  If your environment is not
@@ -99,13 +99,13 @@
 
 For UNIX:  
   
-  export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-incubator.jar:./build/classes:
+  export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes:
 $ACTIVEMQ_HOME/apache-activemq-$ACTIVEMQ_VERSION.jar
   javac -d build/classes src/demo/jms_greeter/client/*.java
   javac -d build/classes src/demo/jms_greeter/server/*.java
 
 For Windows:
-  set classpath=%classpath%;%CXF_HOME%\lib\cxf-incubator.jar;.\build\classes;
+  set classpath=%classpath%;%CXF_HOME%\modules\cxf-manifest-incubator.jar;.\build\classes;
 %ACTIVEMQ_HOME%\apache-activemq-%ACTIVEMQ_VERSION%.jar
   javac -d build\classes src\demo\jms_greeter\client\*.java
   javac -d build\classes src\demo\jms_greeter\server\*.java

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/README.txt?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/README.txt Thu Apr 19 19:36:53 2007
@@ -17,7 +17,7 @@
 Prerequisite
 ------------
 
-If your environment already includes cxf-incubator.jar on the
+If your environment already includes cxf-manifest-incubator.jar on the
 CLASSPATH, and the JDK and ant bin directories on the PATH
 it is not necessary to set the environment as described in
 the samples directory README.  If your environment is not
@@ -98,13 +98,13 @@
 
 For UNIX:  
   
-  export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-incubator.jar:./build/classes:
+  export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes:
 $ACTIVEMQ_HOME/apache-activemq-$ACTIVEMQ_VERSION.jar
   javac -d build/classes src/demo/jms_greeter/client/*.java
   javac -d build/classes src/demo/jms_greeter/server/*.java
 
 For Windows:
-  set classpath=%classpath%;%CXF_HOME%\lib\cxf-incubator.jar;.\build\classes;
+  set classpath=%classpath%;%CXF_HOME%\modules\cxf-manifest-incubator.jar;.\build\classes;
 %ACTIVEMQ_HOME%\apache-activemq-%ACTIVEMQ_VERSION%.jar
   javac -d build\classes src\demo\jms_greeter\client\*.java
   javac -d build\classes src\demo\jms_greeter\server\*.java

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/js_provider/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/js_provider/README.txt?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/js_provider/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/js_provider/README.txt Thu Apr 19 19:36:53 2007
@@ -19,7 +19,7 @@
 Prerequisite
 ------------
 
-If your environment already includes cxf-incubator.jar on the
+If your environment already includes cxf-manifest-incubator.jar on the
 CLASSPATH, and the JDK and ant bin directories on the PATH
 it is not necessary to set the environment as described in
 the samples directory's README.  If your environment is not
@@ -75,13 +75,13 @@
 application with the commands:
 
 For UNIX:
-  export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-incubator.jar:
+  export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:
 	$CXF_HOME/lib/js-1.6R5.jar:$CXF_HOME/lib/xbean-2.2.0.jar:
 	build/classes
   javac -d build/classes src/demo/hwDispatch/client/*.java
 
 For Windows:
-  set CLASSPATH=%CLASSPATH%;%CXF_HOME%\lib\cxf-incubator.jar;
+  set CLASSPATH=%CLASSPATH%;%CXF_HOME%\modules\cxf-manifest-incubator.jar;
 	%CXF_HOME%\lib\js-1.6R5.jar;%CXF_HOME%\lib\xbean-2.2.0.jar;
 	build\classes
   javac -d build\classes src\demo\hwDispatch\client\*.java

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/mtom/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/mtom/README.txt?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/mtom/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/mtom/README.txt Thu Apr 19 19:36:53 2007
@@ -12,7 +12,7 @@
 Prerequisite
 ------------
 
-If your environment already includes cxf-incubator.jar on the
+If your environment already includes cxf-manifest-incubator.jar on the
 CLASSPATH, and the JDK and ant bin directories on the PATH
 it is not necessary to set the environment as described in
 the samples directory's README.  If your environment is not
@@ -64,13 +64,13 @@
 
 For UNIX:  
   
-  export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-incubator.jar:./build/classes
+  export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
   javac -d build/classes src/demo/mtom/client/*.java
   javac -d build/classes src/demo/mtom/server/*.java
   cp src/demo/mtom/client/me.bmp build/classes/demo/mtom/client/me.bmp
 
 For Windows:
-  set classpath=%classpath%;%CXF_HOME%\lib\cxf-incubator.jar;.\build\classes
+  set classpath=%classpath%;%CXF_HOME%\modules\cxf-manifest-incubator.jar;.\build\classes
   javac -d build\classes src\demo\mtom\client\*.java
   javac -d build\classes src\demo\mtom\server\*.java
   copy src\demo\mtom\client\me.bmp build\classes\demo\mtom\client\me.bmp

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/README.TXT
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/README.TXT?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/README.TXT (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/README.TXT Thu Apr 19 19:36:53 2007
@@ -9,7 +9,7 @@
 Prerequisite
 ------------
 
-If your environment already includes cxf-incubator.jar on the
+If your environment already includes cxf-manifest-incubator.jar on the
 CLASSPATH, and the JDK and ant bin directories on the PATH
 it is not necessary to run the environment script described in
 the samples directory README.  If your environment is not

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/build.xml?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/build.xml Thu Apr 19 19:36:53 2007
@@ -47,8 +47,8 @@
         <echo level="info" message="Generating code using wsdl2java..."/>
         <wsdl2java
             file="FaultServiceSOAP_HTTP.wsdl"
-            dir="${basedir}/../wsdl/transport/http"
-            package="ws.v1.tmf854.fault.http -p tmf854.v1=v1.tmf854.fault"
+            dir="${wsdl.dir}/transport/http"
+            package="tmf854.v1.ws=ws.v1.tmf854.fault.http -p tmf854.v1=v1.tmf854.fault"
             bindingfile="${basedir}/build/async_binding.xml"/>
     </target>
 </project>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/restful_dispatch/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/restful_dispatch/README.txt?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/restful_dispatch/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/restful_dispatch/README.txt Thu Apr 19 19:36:53 2007
@@ -56,7 +56,7 @@
 Prerequisites
 ------------
 
-If your environment already includes cxf-incubator.jar on the
+If your environment already includes cxf-manifest-incubator.jar on the
 CLASSPATH, and the JDK and ant bin directories on the PATH
 it is not necessary to set the environment as described in
 the samples directory README.  If your environment is not
@@ -96,7 +96,7 @@
 For UNIX:  
   mkdir -p build/classes
   
-  export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-incubator.jar:./build/classes
+  export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
   javac -d build/classes src/demo/restful/client/*.java
   javac -d build/classes src/demo/restful/server/*.java
 
@@ -104,7 +104,7 @@
   mkdir build\classes
     Must use back slashes.
 
-  set classpath=%classpath%;%CXF_HOME%\lib\cxf-incubator.jar;.\build\classes
+  set classpath=%classpath%;%CXF_HOME%\modules\cxf-manifest-incubator.jar;.\build\classes
   javac -d build\classes src\demo\restful\client\*.java
   javac -d build\classes src\demo\restful\server\*.java
 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/soap12/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/soap12/README.txt?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/soap12/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/soap12/README.txt Thu Apr 19 19:36:53 2007
@@ -11,7 +11,7 @@
 Prerequisites
 -------------
 
-If your environment already includes cxf-incubator.jar on the
+If your environment already includes cxf-manifest-incubator.jar on the
 CLASSPATH, and the JDK and ant bin directories on the PATH
 it is not necessary to set the environment as described in
 the samples directory's README.  If your environment is not
@@ -63,12 +63,12 @@
 
 For UNIX:  
   
-  export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-incubator.jar:./build/classes
+  export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
   javac -d build/classes src/demo/hw/client/*.java
   javac -d build/classes src/demo/hw/server/*.java
 
 For Windows:
-  set classpath=%classpath%;%CXF_HOME%\lib\cxf-incubator.jar;.\build\classes
+  set classpath=%classpath%;%CXF_HOME%\modules\cxf-manifest-incubator.jar;.\build\classes
   javac -d build\classes src\demo\hw\client\*.java
   javac -d build\classes src\demo\hw\server\*.java
 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/spring_http/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/spring_http/README.txt?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/spring_http/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/spring_http/README.txt Thu Apr 19 19:36:53 2007
@@ -14,7 +14,7 @@
 Prerequisite
 ------------
 
-If your environment already includes cxf-incubator.jar on the
+If your environment already includes cxf-manifest-incubator.jar on the
 CLASSPATH, and the JDK and ant bin directories on the PATH
 it is not necessary to set the environment as described in
 the samples directory README.  If your environment is not

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/README.txt?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/README.txt Thu Apr 19 19:36:53 2007
@@ -9,7 +9,7 @@
 Prerequisite
 ------------
 
-If your environment already includes cxf-incubator.jar on the
+If your environment already includes cxf-manifest-incubator.jar on the
 CLASSPATH, and the JDK and ant bin directories on the PATH
 it is not necessary to set the environment as described in
 the samples directory README.  If your environment is not
@@ -58,13 +58,13 @@
 
 For UNIX:  
   
-  export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-incubator.jar:./build/classes
+  export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
   javac -d build/classes src/demo/stream/interceptor/*.java
   javac -d build/classes src/demo/stream/client/*.java
   javac -d build/classes src/demo/stream/server/*.java
 
 For Windows:
-  set classpath=%classpath%;%CXF_HOME%\lib\cxf-incubator.jar;.\build\classes
+  set classpath=%classpath%;%CXF_HOME%\modules\cxf-manifest-incubator.jar;.\build\classes
   javac -d build\classes src\demo\stream\interceptor\*.java
   javac -d build\classes src\demo\stream\client\*.java
   javac -d build\classes src\demo\stream\server\*.java

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/src/demo/stream/interceptor/StreamInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/src/demo/stream/interceptor/StreamInterceptor.java?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/src/demo/stream/interceptor/StreamInterceptor.java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/src/demo/stream/interceptor/StreamInterceptor.java Thu Apr 19 19:36:53 2007
@@ -51,7 +51,7 @@
             CachedStream cs = new CachedStream();
             message.setContent(OutputStream.class, cs);
             
-            message.getInterceptorChain().doInterceptInSubChain(message);
+            message.getInterceptorChain().doIntercept(message);
 
             try {
                 cs.flush();

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/ws_addressing/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/ws_addressing/README.txt?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/ws_addressing/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/ws_addressing/README.txt Thu Apr 19 19:36:53 2007
@@ -38,7 +38,7 @@
 Prerequisite
 ------------
 
-If your environment already includes cxf-incubator.jar on the CLASSPATH,
+If your environment already includes cxf-manifest-incubator.jar on the CLASSPATH,
 and the JDK and ant bin directories on the PATH, it is not necessary to
 run the environment script described in the samples directory README.
 If your environment is not properly configured, or if you are planning
@@ -89,13 +89,13 @@
 
 For UNIX:  
   
-  export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-incubator.jar:./build/classes:.
+  export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes:.
   javac -d build/classes src/demo/ws_addressing/common/*.java
   javac -d build/classes src/demo/ws_addressing/client/*.java
   javac -d build/classes src/demo/ws_addressing/server/*.java
 
 For Windows:
-  set classpath=%classpath%;%CXF_HOME%\lib\cxf-incubator.jar;.\build\classes;.
+  set classpath=%classpath%;%CXF_HOME%\modules\cxf-manifest-incubator.jar;.\build\classes;.
   javac -d build\classes src\demo\ws_addressing\common\*.java
   javac -d build\classes src\demo\ws_addressing\client\*.java
   javac -d build\classes src\demo\ws_addressing\server\*.java

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/README.txt?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/ws_rm/README.txt Thu Apr 19 19:36:53 2007
@@ -53,7 +53,7 @@
 Prerequisite
 ------------
 
-If your environment already includes cxf-incubator.jar on the CLASSPATH,
+If your environment already includes cxf-manifest-incubator.jar on the CLASSPATH,
 and the JDK and ant bin directories on the PATH, it is not necessary to
 run the environment script described in the samples directory README.
 If your environment is not properly configured, or if you are planning

Modified: incubator/cxf/trunk/integration/jbi/src/test/resources/components/CXFServiceEngine/version_1/META-INF/jbi.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/src/test/resources/components/CXFServiceEngine/version_1/META-INF/jbi.xml?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/integration/jbi/src/test/resources/components/CXFServiceEngine/version_1/META-INF/jbi.xml (original)
+++ incubator/cxf/trunk/integration/jbi/src/test/resources/components/CXFServiceEngine/version_1/META-INF/jbi.xml Thu Apr 19 19:36:53 2007
@@ -27,11 +27,11 @@
     </identification> 
     <component-class-name description="description">org.apache.cxf.jbi.se.CXFServiceEngine</component-class-name> 
     <component-class-path> 
-      <path-element>cxf-incubator.jar</path-element> 
+      <path-element>cxf-manifest-incubator.jar</path-element> 
     </component-class-path> 
     <bootstrap-class-name>org.apache.cxf.jbi.se.CXFBootstrap</bootstrap-class-name> 
     <bootstrap-class-path> 
-      <path-element>cxf-incubator.jar</path-element> 
+      <path-element>cxf-manifest-incubator.jar</path-element> 
     </bootstrap-class-path> 
   </component> 
 </jbi>

Modified: incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdltojavalib.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdltojavalib.properties?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdltojavalib.properties (original)
+++ incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/wsdltojavalib.properties Thu Apr 19 19:36:53 2007
@@ -21,4 +21,4 @@
 jaxrpc.version=1.1
 saaj.version=1.2.1
 
-library.references=${cxf.version}/lib/cxf-incubator.jar
+library.references=${cxf.version}/modules/cxf-manifest-incubator.jar

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java Thu Apr 19 19:36:53 2007
@@ -395,7 +395,12 @@
 
             }
 
-            if (wsdlURI.toString().equals(this.wsdlURL)) {
+            String normalizedURL = null;
+            if (this.wsdlURL != null) {
+                normalizedURL = URI.create(this.wsdlURL).normalize().toString();
+            }
+
+            if (wsdlURI.toString().equals(normalizedURL)) {
                 jaxwsBindings.add(root);
             } else {
                 String wsdl = (String)env.get(ToolConstants.CFG_WSDLURL);

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm Thu Apr 19 19:36:53 2007
@@ -56,18 +56,18 @@
     <fail message="Please set CXF_HOME environment variable." unless="cxf.home"/>
 
     <!-- Determine cxf.jar.file, either ${cxf.home}/build/lib/cxf.jar
-	 - in a source distribution, or ${cxf.home}/lib/cxf-incubator.jar in a binary
+	 - in a source distribution, or ${cxf.home}/modules/cxf-manifest-incubator.jar in a binary
 	 - distribution.
     -->
-    <condition property="cxf-incubator.jar.file" value="${cxf.home}/build/lib/cxf-incubator.jar">
-	<available file="cxf-incubator.jar" type="file" filepath="${cxf.home}/build/lib"/>
+    <condition property="cxf-manifest-incubator.jar.file" value="${cxf.home}/build/modules/cxf-manifest-incubator.jar">
+	<available file="cxf-manifest-incubator.jar" type="file" filepath="${cxf.home}/build/lib"/>
     </condition>
-    <property name="cxf-incubator.jar.file" value="${cxf.home}/lib/cxf-incubator.jar"/>
+    <property name="cxf-manifest-incubator.jar.file" value="${cxf.home}/modules/cxf-manifest-incubator.jar"/>
 
     <fail message="The location ${cxf.home} does not seem to contain a cxf installation; if you are importing this common build file from a location other than the cxf samples directory then you need to set the cxf_HOME environment variable.">
 	<condition>
 	    <not>
-		<isset property="cxf-incubator.jar.file" />
+		<isset property="cxf-manifest-incubator.jar.file" />
 	    </not>
 	</condition>
     </fail>
@@ -88,7 +88,7 @@
 
     <path id="cxf.classpath">
 	<pathelement location="${build.classes.dir}"/>
-	<pathelement location="${cxf-incubator.jar.file}"/>
+	<pathelement location="${cxf-manifest-incubator.jar.file}"/>
     </path>
 
 #foreach ($interface in $intfs)

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java?view=diff&rev=530614&r1=530613&r2=530614
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java Thu Apr 19 19:36:53 2007
@@ -200,4 +200,24 @@
             .getJaxwsPara().getMessageName());
         assertEquals("customized parameter name does not parsered", "num1", binding.getJaxwsPara().getName());
     }
+
+    // tests the error case described in JIRA CXF-556
+    public void testCustomizationWhereURINotAnExactStringMatch() {
+        // set up a URI with ./../wsdl11/hello_world.wsdl instead of
+        // ./hello_world.wsdl 
+        env.put(ToolConstants.CFG_WSDLURL, 
+            getClass().getResource(".").toString() + "../wsdl11/hello_world.wsdl");
+        env.put(ToolConstants.CFG_BINDING, 
+            getClass().getResource("./cxf556_binding.xml").toString());
+
+        JAXWSDefinitionBuilder builder = new JAXWSDefinitionBuilder();
+        builder.setContext(env);
+        builder.build();
+        
+        // this call will fail before CXF-556
+        builder.customize();
+
+        assertTrue(true);
+    }
+
 }



Mime
View raw message