You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by da...@apache.org on 2007/04/23 04:59:53 UTC
svn commit: r531318 - in /incubator/cxf/trunk: distribution/
distribution/bundle/ distribution/manifest/ distribution/src/main/assembly/
distribution/src/main/release/bin/ distribution/src/main/release/lib/
distribution/src/main/release/samples/ distri...
Author: dandiep
Date: Sun Apr 22 19:59:51 2007
New Revision: 531318
URL: http://svn.apache.org/viewvc?view=rev&rev=531318
Log:
o put cxf.jar and manifest.jar inside /lib and use them for the samples
o Fix small bug with reading empty lines inside BusApplicationcontext
o rename bundle artifactId to cxf-bundle, as cxf-distribution-bundle is
awkward from a user perspective when adding it to the classpath.
o Add a WHICH_JARS file which details which jars are needed.
Added:
incubator/cxf/trunk/distribution/src/main/release/lib/
incubator/cxf/trunk/distribution/src/main/release/lib/WHICH_JARS (with props)
Modified:
incubator/cxf/trunk/distribution/bundle/pom.xml
incubator/cxf/trunk/distribution/manifest/pom.xml
incubator/cxf/trunk/distribution/pom.xml
incubator/cxf/trunk/distribution/src/main/assembly/bin.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_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/restful_dispatch/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/soap12/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/ws_addressing/README.txt
incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/cxf.extension
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
Modified: incubator/cxf/trunk/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/bundle/pom.xml?view=diff&rev=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/bundle/pom.xml (original)
+++ incubator/cxf/trunk/distribution/bundle/pom.xml Sun Apr 22 19:59:51 2007
@@ -21,7 +21,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-distribution-bundle</artifactId>
+ <artifactId>cxf-bundle</artifactId>
<packaging>jar</packaging>
<name>Apache CXF Bundle Jar</name>
<version>2.0-incubator-RC-SNAPSHOT</version>
@@ -248,7 +248,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>shade-maven-plugin</artifactId>
- <version>1.0-alpha-6</version>
+ <version>1.0-alpha-7</version>
<executions>
<execution>
<phase>package</phase>
Modified: incubator/cxf/trunk/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/manifest/pom.xml?view=diff&rev=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/manifest/pom.xml (original)
+++ incubator/cxf/trunk/distribution/manifest/pom.xml Sun Apr 22 19:59:51 2007
@@ -1,236 +1,245 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-distribution-manifest</artifactId>
- <packaging>jar</packaging>
- <name>Apache CXF Manifest Jar</name>
- <version>2.0-incubator-RC-SNAPSHOT</version>
- <url>http://cwiki.apache.org/CXF</url>
-
- <parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-parent</artifactId>
- <version>2.0-incubator-RC-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
- </parent>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- <cxf.version>${pom.version}</cxf.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-common-utilities</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-common-schemas</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-tools-common</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-tools-validator</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-tools-wsdlto-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-tools-misctools</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-tools-java2wsdl</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-xjc-dv</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-api</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-rt-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-rt-management</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-rt-transports-local</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-rt-transports-jms</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-rt-bindings-soap</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-rt-bindings-xml</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-rt-bindings-object</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-rt-bindings-coloc</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-rt-bindings-http</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-rt-databinding-aegis</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-rt-ws-addr</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-rt-ws-rm</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-rt-ws-policy</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-rt-ws-security</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-rt-frontend-js</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-rt-frontend-simple</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <finalName>cxf-manifest-incubator</finalName>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/distribution</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/distribution</developerConnection>
- </scm>
-
-</project>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-distribution-manifest</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache CXF Manifest Jar</name>
+ <version>2.0-incubator-RC-SNAPSHOT</version>
+ <url>http://cwiki.apache.org/CXF</url>
+
+ <parent>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-parent</artifactId>
+ <version>2.0-incubator-RC-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ <cxf.version>${pom.version}</cxf.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-common-utilities</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-common-schemas</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-tools-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-tools-validator</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-tools-wsdlto-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-tools-misctools</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-tools-java2wsdl</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-xjc-dv</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-api</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-management</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-transports-local</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-transports-jms</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-bindings-soap</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-bindings-xml</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-bindings-object</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-bindings-coloc</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-bindings-http</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-databinding-aegis</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-ws-addr</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-ws-rm</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-ws-policy</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-frontend-js</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-frontend-simple</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-bundle</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <finalName>cxf-manifest-incubator</finalName>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ <manifestEntries>
+ <!-- Add an entry for the renamed bundle jar in the distro -->
+ <Class-Path>cxf-${pom.version}.jar</Class-Path>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/distribution</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/distribution</developerConnection>
+ </scm>
+
+</project>
Modified: incubator/cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/pom.xml?view=diff&rev=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/pom.xml (original)
+++ incubator/cxf/trunk/distribution/pom.xml Sun Apr 22 19:59:51 2007
@@ -213,7 +213,7 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>cxf-distribution-bundle</artifactId>
+ <artifactId>cxf-bundle</artifactId>
<version>${pom.version}</version>
</dependency>
</dependencies>
Modified: incubator/cxf/trunk/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/assembly/bin.xml?view=diff&rev=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/assembly/bin.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/assembly/bin.xml Sun Apr 22 19:59:51 2007
@@ -92,10 +92,13 @@
</fileSet>
<fileSet>
<directory>target/additional-libs</directory>
- <outputDirectory>cxf-${cxf.version}/modules</outputDirectory>
+ <outputDirectory>cxf-${cxf.version}/modules/integration</outputDirectory>
<includes>
<include>**/*</include>
</includes>
+ <excludes>
+ <exclude>cxf-bundle*.jar</exclude>
+ </excludes>
</fileSet>
<fileSet>
<directory>manifest/target</directory>
@@ -105,6 +108,13 @@
</includes>
</fileSet>
<fileSet>
+ <directory>manifest/target</directory>
+ <outputDirectory>cxf-${cxf.version}/lib</outputDirectory>
+ <includes>
+ <include>cxf-manifest-incubator.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>target</directory>
<outputDirectory>cxf-${cxf.version}/etc</outputDirectory>
<includes>
@@ -203,7 +213,7 @@
<exclude>org.apache.cxf:cxf-rt-frontend-jaxws</exclude>
<exclude>org.apache.cxf:cxf-rt-frontend-js</exclude>
<exclude>org.apache.cxf:cxf-rt-frontend-simple</exclude>
- <exclude>org.apache.cxf:cxf-distribution-bundle</exclude>
+ <exclude>org.apache.cxf:cxf-bundle</exclude>
</excludes>
<scope>runtime</scope>
</dependencySet>
@@ -243,16 +253,13 @@
<include>org.apache.cxf:cxf-rt-frontend-js</include>
<include>org.apache.cxf:cxf-rt-frontend-simple</include>
</includes>
- <excludes>
- <exclude>org.apache.cxf:cxf-distribution-bundle</exclude>
- </excludes>
<scope>runtime</scope>
</dependencySet>
<dependencySet>
- <outputDirectory>cxf-${cxf.version}/</outputDirectory>
+ <outputDirectory>cxf-${cxf.version}/lib</outputDirectory>
<unpack>false</unpack>
<includes>
- <include>org.apache.cxf:cxf-distribution-bundle</include>
+ <include>org.apache.cxf:cxf-bundle</include>
</includes>
<scope>runtime</scope>
<outputFileNameMapping>cxf-${version}.${extension}</outputFileNameMapping>
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=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl Sun Apr 22 19:59:51 2007
@@ -24,16 +24,16 @@
me=`basename $0`
cxf_home=$CXF_HOME
-if [ ! -f $cxf_home/modules/cxf-manifest-incubator.jar ]; then
+if [ ! -f $cxf_home/lib/cxf-manifest-incubator.jar ]; then
cxf_home=`dirname $0`/..
fi
-cxf_jar=$cxf_home/modules/cxf-manifest-incubator.jar
+cxf_jar=$cxf_home/lib/cxf-manifest-incubator.jar
if [ ! -f $cxf_jar ]; then
if [ ! -f ${cxf_home}/../../target/srcbuild_env ]; then
- echo "ERROR: Unable to find cxf-manifest-incubator.jar in $cxf_home/modules"
+ echo "ERROR: Unable to find cxf-manifest-incubator.jar in $cxf_home/lib"
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=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl.bat Sun Apr 22 19:59:51 2007
@@ -32,9 +32,9 @@
set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
-if not exist "%CXF_HOME%\modules\cxf-manifest-incubator.jar" goto no_cxf_jar
+if not exist "%CXF_HOME%\lib\cxf-manifest-incubator.jar" goto no_cxf_jar
-set CXF_JAR=%CXF_HOME%\modules\cxf-manifest-incubator.jar
+set CXF_JAR=%CXF_HOME%\lib\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-manifest-incubator.jar in %cxf_home/modules
+echo ERROR: Unable to find cxf-manifest-incubator.jar in %cxf_home/lib
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=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java Sun Apr 22 19:59:51 2007
@@ -24,15 +24,15 @@
me=`basename $0`
cxf_home=$CXF_HOME
-if [ ! -f $cxf_home/modules/cxf-manifest-incubator.jar ]; then
+if [ ! -f $cxf_home/lib/cxf-manifest-incubator.jar ]; then
cxf_home=`dirname $0`/..
fi
-cxf_jar=$cxf_home/modules/cxf-manifest-incubator.jar
+cxf_jar=$cxf_home/lib/cxf-manifest-incubator.jar
if [ ! -f $cxf_jar ]; then
if [ ! -f ${cxf_home}/../../target/srcbuild_env ]; then
- echo "ERROR: Unable to find cxf-manifest-incubator.jar in $cxf_home/modules"
+ echo "ERROR: Unable to find cxf-manifest-incubator.jar in $cxf_home/lib"
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=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java.bat Sun Apr 22 19:59:51 2007
@@ -32,9 +32,9 @@
set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
-if not exist "%CXF_HOME%\modules\cxf-manifest-incubator.jar" goto no_cxf_jar
+if not exist "%CXF_HOME%\lib\cxf-manifest-incubator.jar" goto no_cxf_jar
-set CXF_JAR=%CXF_HOME%\modules\cxf-manifest-incubator.jar
+set CXF_JAR=%CXF_HOME%\lib\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-manifest-incubator.jar in %cxf_home/modules
+echo ERROR: Unable to find cxf-manifest-incubator.jar in %cxf_home/lib
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=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service Sun Apr 22 19:59:51 2007
@@ -24,15 +24,15 @@
me=`basename $0`
cxf_home=$CXF_HOME
-if [ ! -f $cxf_home/modules/cxf-manifest-incubator.jar ]; then
+if [ ! -f $cxf_home/lib/cxf-manifest-incubator.jar ]; then
cxf_home=`dirname $0`/..
fi
-cxf_jar=$cxf_home/modules/cxf-manifest-incubator.jar
+cxf_jar=$cxf_home/lib/cxf-manifest-incubator.jar
if [ ! -f $cxf_jar ]; then
if [ ! -f ${cxf_home}/../../target/srcbuild_env ]; then
- echo "ERROR: Unable to find cxf-manifest-incubator.jar in $cxf_home/modules"
+ echo "ERROR: Unable to find cxf-manifest-incubator.jar in $cxf_home/lib"
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=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service.bat Sun Apr 22 19:59:51 2007
@@ -32,9 +32,9 @@
set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
-if not exist "%CXF_HOME%\modules\cxf-manifest-incubator.jar" goto no_cxf_jar
+if not exist "%CXF_HOME%\lib\cxf-manifest-incubator.jar" goto no_cxf_jar
-set CXF_JAR=%CXF_HOME%\modules\cxf-manifest-incubator.jar
+set CXF_JAR=%CXF_HOME%\lib\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-manifest-incubator.jar in %cxf_home/modules
+echo ERROR: Unable to find cxf-manifest-incubator.jar in %cxf_home/lib
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=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap Sun Apr 22 19:59:51 2007
@@ -24,15 +24,15 @@
me=`basename $0`
cxf_home=$CXF_HOME
-if [ ! -f $cxf_home/modules/cxf-manifest-incubator.jar ]; then
+if [ ! -f $cxf_home/lib/cxf-manifest-incubator.jar ]; then
cxf_home=`dirname $0`/..
fi
-cxf_jar=$cxf_home/modules/cxf-manifest-incubator.jar
+cxf_jar=$cxf_home/lib/cxf-manifest-incubator.jar
if [ ! -f $cxf_jar ]; then
if [ ! -f ${cxf_home}/../../target/srcbuild_env ]; then
- echo "ERROR: Unable to find cxf-manifest-incubator.jar in $cxf_home/modules"
+ echo "ERROR: Unable to find cxf-manifest-incubator.jar in $cxf_home/lib"
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=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap.bat Sun Apr 22 19:59:51 2007
@@ -32,9 +32,9 @@
set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
-if not exist "%CXF_HOME%\modules\cxf-manifest-incubator.jar" goto no_cxf_jar
+if not exist "%CXF_HOME%\lib\cxf-manifest-incubator.jar" goto no_cxf_jar
-set CXF_JAR=%CXF_HOME%\modules\cxf-manifest-incubator.jar
+set CXF_JAR=%CXF_HOME%\lib\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-manifest-incubator.jar in %cxf_home/modules
+echo ERROR: Unable to find cxf-manifest-incubator.jar in %cxf_home/lib
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=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml Sun Apr 22 19:59:51 2007
@@ -23,15 +23,15 @@
me=`basename $0`
cxf_home=$CXF_HOME
-if [ ! -f $cxf_home/modules/cxf-manifest-incubator.jar ]; then
+if [ ! -f $cxf_home/lib/cxf-manifest-incubator.jar ]; then
cxf_home=`dirname $0`/..
fi
-cxf_jar=$cxf_home/modules/cxf-manifest-incubator.jar
+cxf_jar=$cxf_home/lib/cxf-manifest-incubator.jar
if [ ! -f $cxf_jar ]; then
if [ ! -f ${cxf_home}/../../target/srcbuild_env ]; then
- echo "ERROR: Unable to find cxf-manifest-incubator.jar in $cxf_home/modules"
+ echo "ERROR: Unable to find cxf-manifest-incubator.jar in $cxf_home/lib"
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=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml.bat Sun Apr 22 19:59:51 2007
@@ -32,9 +32,9 @@
set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
-if not exist "%CXF_HOME%\modules\cxf-manifest-incubator.jar" goto no_cxf_jar
+if not exist "%CXF_HOME%\lib\cxf-manifest-incubator.jar" goto no_cxf_jar
-set CXF_JAR=%CXF_HOME%\modules\cxf-manifest-incubator.jar
+set CXF_JAR=%CXF_HOME%\lib\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-manifest-incubator.jar in %cxf_home/modules
+echo ERROR: Unable to find cxf-manifest-incubator.jar in %cxf_home/lib
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=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator Sun Apr 22 19:59:51 2007
@@ -24,15 +24,15 @@
me=`basename $0`
cxf_home=$CXF_HOME
-if [ ! -f $cxf_home/modules/cxf-manifest-incubator.jar ]; then
+if [ ! -f $cxf_home/lib/cxf-manifest-incubator.jar ]; then
cxf_home=`dirname $0`/..
fi
-cxf_jar=$cxf_home/modules/cxf-manifest-incubator.jar
+cxf_jar=$cxf_home/lib/cxf-manifest-incubator.jar
if [ ! -f $cxf_jar ]; then
if [ ! -f ${cxf_home}/../../target/srcbuild_env ]; then
- echo "ERROR: Unable to find cxf-manifest-incubator.jar in $cxf_home/modules"
+ echo "ERROR: Unable to find cxf-manifest-incubator.jar in $cxf_home/lib"
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=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator.bat Sun Apr 22 19:59:51 2007
@@ -31,9 +31,9 @@
set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
-if not exist "%CXF_HOME%\modules\cxf-manifest-incubator.jar" goto no_cxf_jar
+if not exist "%CXF_HOME%\lib\cxf-manifest-incubator.jar" goto no_cxf_jar
-set CXF_JAR=%CXF_HOME%\modules\cxf-manifest-incubator.jar
+set CXF_JAR=%CXF_HOME%\lib\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=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl Sun Apr 22 19:59:51 2007
@@ -24,15 +24,15 @@
me=`basename $0`
cxf_home=$CXF_HOME
-if [ ! -f $cxf_home/modules/cxf-manifest-incubator.jar ]; then
+if [ ! -f $cxf_home/lib/cxf-manifest-incubator.jar ]; then
cxf_home=`dirname $0`/..
fi
-cxf_jar=$cxf_home/modules/cxf-manifest-incubator.jar
+cxf_jar=$cxf_home/lib/cxf-manifest-incubator.jar
if [ ! -f $cxf_jar ]; then
if [ ! -f ${cxf_home}/../../target/srcbuild_env ]; then
- echo "ERROR: Unable to find cxf-manifest-incubator.jar in $cxf_home/modules"
+ echo "ERROR: Unable to find cxf-manifest-incubator.jar in $cxf_home/lib"
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=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl.bat Sun Apr 22 19:59:51 2007
@@ -32,9 +32,9 @@
set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
-if not exist "%CXF_HOME%\modules\cxf-manifest-incubator.jar" goto no_cxf_jar
+if not exist "%CXF_HOME%\lib\cxf-manifest-incubator.jar" goto no_cxf_jar
-set CXF_JAR=%CXF_HOME%\modules\cxf-manifest-incubator.jar
+set CXF_JAR=%CXF_HOME%\lib\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-manifest-incubator.jar in %cxf_home/modules
+echo ERROR: Unable to find cxf-manifest-incubator.jar in %cxf_home/lib
goto end
:no_java_home
Added: incubator/cxf/trunk/distribution/src/main/release/lib/WHICH_JARS
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/lib/WHICH_JARS?view=auto&rev=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/lib/WHICH_JARS (added)
+++ incubator/cxf/trunk/distribution/src/main/release/lib/WHICH_JARS Sun Apr 22 19:59:51 2007
@@ -0,0 +1,52 @@
+This directory includes the CXF jar, the CXF manifest jar, the required
+dependencies, and many optional dependencies. The "modules" directory
+contains the cxf.jar split up into smaller pieces if you wish to use only
+specific parts of CXF.
+
+The following jars are required for all CXF usage:
+- cxf.jar
+- commons-logging.jar
+- geronimo-activation.jar (Or the Sun equivalent)
+- geronimo-annotation.jar (Or the Sun equivalent)
+- geronimo-javamail.jar (Or the Sun equivalent)
+- neethi.jar
+- jaxb-api.jar
+- jaxb-impl.jar
+- stax-api.jar
+- XmlSchema.jar
+- wstx-asl.jar
+
+For Java2WSDL and WSDL2Java:
+- The above jars
+- jaxb-xjc.jar
+- veliocity.jar
+- velocity-dep.jar
+
+For JAX-WS support:
+- jaxws-api.jar
+- saaj-api.jar
+- saaj-impl.jar
+
+For XML Configuration support:
+- aopalliance.jar
+- spring-beans.jar
+- spring-context.jar
+- spring-core.jar
+- spring.web.jar
+
+For standalone HTTP support:
+- geronimo-servlet.jar
+- jetty.jar
+- jetty-sslengine.jar
+- jetty-util.jar
+- sl4j.jar & sl4j-jdk14.jar (optional - but improves logging)
+
+For Aegis support:
+- jaxen.jar
+- jdom.jar
+- stax-utils.jar
+
+For WS-Security support:
+- wss4j.jar
+- xalan.jar
+- xmlsec.jar
\ No newline at end of file
Propchange: incubator/cxf/trunk/distribution/src/main/release/lib/WHICH_JARS
------------------------------------------------------------------------------
svn:executable = *
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=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/README.txt Sun Apr 22 19:59:51 2007
@@ -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/modules/cxf-manifest-incubator.jar:./build/classes
+ export CLASSPATH=.:$CXF_HOME/lib/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%\modules\cxf-manifest-incubator.jar;.\build\classes
+ set CLASSPATH=.;%CXF_HOME%\lib\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=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/callback/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/callback/README.txt Sun Apr 22 19:59:51 2007
@@ -66,12 +66,12 @@
For UNIX:
- export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
+ export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/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%\modules\cxf-manifest-incubator.jar;.\build\classes
+ set classpath=%classpath%;%CXF_HOME%\lib\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=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml Sun Apr 22 19:59:51 2007
@@ -81,10 +81,7 @@
<pathelement location="${basedir}"/>
<pathelement location="${build.classes.dir}"/>
<pathelement path="${srcbuild.classpath}"/>
- <pathelement location="${cxf.home}/modules/cxf-manifest-incubator.jar"/>
- <fileset dir="${cxf.home}/lib">
- <include name="**/*.jar"/>
- </fileset>
+ <pathelement location="${cxf.home}/lib/cxf-manifest-incubator.jar"/>
</path>
<condition property="thirdparty.classpath" value="">
<not> <isset property="thirdparty.classpath"/> </not>
@@ -252,7 +249,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/modules/cxf-manifest-incubator.jar" type="file"/>
+ <available property="cxf.jars.present.in.tomcat" file="${env.CATALINA_HOME}/shared/lib/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=531318&r1=531317&r2=531318
==============================================================================
--- 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 Sun Apr 22 19:59:51 2007
@@ -68,12 +68,12 @@
For UNIX:
- export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
+ export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/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%\modules\cxf-manifest-incubator.jar;.\build\classes
+ set classpath=%classpath%;%CXF_HOME%\lib\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=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/handlers/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/handlers/README.txt Sun Apr 22 19:59:51 2007
@@ -89,13 +89,13 @@
For UNIX:
- export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
+ export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/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%\modules\cxf-manifest-incubator.jar;.\build\classes
+ set classpath=%classpath%;%CXF_HOME%\lib\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=531318&r1=531317&r2=531318
==============================================================================
--- 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 Sun Apr 22 19:59:51 2007
@@ -61,12 +61,12 @@
For UNIX:
- export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
+ export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/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%\modules\cxf-manifest-incubator.jar;.\build\classes
+ set classpath=%classpath%;%CXF_HOME%\lib\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=531318&r1=531317&r2=531318
==============================================================================
--- 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 Sun Apr 22 19:59:51 2007
@@ -64,12 +64,12 @@
For UNIX:
- export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
+ export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/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%\modules\cxf-manifest-incubator.jar;.\build\classes
+ set classpath=%classpath%;%CXF_HOME%\lib\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=531318&r1=531317&r2=531318
==============================================================================
--- 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 Sun Apr 22 19:59:51 2007
@@ -91,12 +91,12 @@
For UNIX:
- export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
+ export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/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%\modules\cxf-manifest-incubator.jar;.\build\classes
+ set classpath=%classpath%;%CXF_HOME%\lib\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_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=531318&r1=531317&r2=531318
==============================================================================
--- 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 Sun Apr 22 19:59:51 2007
@@ -64,12 +64,12 @@
For UNIX:
- export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
+ export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/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%\modules\cxf-manifest-incubator.jar;.\build\classes
+ set classpath=%classpath%;%CXF_HOME%\lib\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=531318&r1=531317&r2=531318
==============================================================================
--- 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 Sun Apr 22 19:59:51 2007
@@ -64,12 +64,12 @@
For UNIX:
- export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
+ export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/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%\modules\cxf-manifest-incubator.jar;.\build\classes
+ set classpath=%classpath%;%CXF_HOME%\lib\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=531318&r1=531317&r2=531318
==============================================================================
--- 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 Sun Apr 22 19:59:51 2007
@@ -27,7 +27,7 @@
<property environment="env"/>
<path id="build.classpath">
- <fileset dir="${evn.CXF_HOME}/modules">
+ <lib dir="${evn.CXF_HOME}/modules">
<include name="cxf-manifest-incubator.jar"/>
</fileset>
<pathelement location="./build/classes"/>
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=531318&r1=531317&r2=531318
==============================================================================
--- 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 Sun Apr 22 19:59:51 2007
@@ -32,7 +32,7 @@
<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}/modules">
+libleset dir="${env.CXF_HOME}/modules">
<include name="cxf-manifest-incubator.jar"/>
<include name="cxf-integration-jbi-${cxf.version}.jar"/>
</fileset>
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=531318&r1=531317&r2=531318
==============================================================================
--- 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 Sun Apr 22 19:59:51 2007
@@ -28,7 +28,7 @@
<property environment="env"/>
<path id="build.classpath">
- <fileset dir="${env.CXF_HOME}/modules">
+ libt dir="${env.CXF_HOME}/modules">
<include name="cxf-manifest-incubator.jar"/>
</fileset>
<pathelement location="./build/classes"/>
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=531318&r1=531317&r2=531318
==============================================================================
--- 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 Sun Apr 22 19:59:51 2007
@@ -34,8 +34,7 @@
<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}/modules">
+ <pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.0-incubating.jar"/lib<fileset dir="${env.CXF_HOME}/modules">
<include name="cxf-manifest-incubator.jar"/>
<include name="cxf-integration-jbi-${cxf.version}.jar"/>
</fileset>
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=531318&r1=531317&r2=531318
==============================================================================
--- 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 Sun Apr 22 19:59:51 2007
@@ -25,7 +25,7 @@
<property environment="env"/>
<path id="build.classpath">
- <fileset dir="${env.CXF_HOME}/modules">
+ <fileset dir="${env.CXF_HOME}/lib">
<include name="cxf-manifest-incubator.jar"/>
</fileset>
<pathelement location="./build/classes"/>
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=531318&r1=531317&r2=531318
==============================================================================
--- 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 Sun Apr 22 19:59:51 2007
@@ -33,7 +33,7 @@
<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}/modules">
+libileset dir="${env.CXF_HOME}/modules">
<include name="cxf-manifest-incubator.jar"/>
<include name="cxf-integration-jbi-${cxf.version}.jar"/>
</fileset>
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=531318&r1=531317&r2=531318
==============================================================================
--- 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 Sun Apr 22 19:59:51 2007
@@ -27,7 +27,7 @@
<property environment="env"/>
<path id="build.classpath">
- <fileset dir="${env.CXF_HOME}/modules">
+ <lib dir="${env.CXF_HOME}/modules">
<include name="cxf-manifest-incubator.jar"/>
</fileset>
<pathelement location="./build/classes"/>
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=531318&r1=531317&r2=531318
==============================================================================
--- 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 Sun Apr 22 19:59:51 2007
@@ -34,8 +34,7 @@
<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}/modules">
+ <pathelement location="${env.SERVICEMIX_HOME}/lib/servicemix-jbi-3.0-incubating.jar"/lib<fileset dir="${env.CXF_HOME}/modules">
<include name="cxf-manifest-incubator.jar"/>
<include name="cxf-integration-jbi-${cxf.version}.jar"/>
</fileset>
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=531318&r1=531317&r2=531318
==============================================================================
--- 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 Sun Apr 22 19:59:51 2007
@@ -26,7 +26,7 @@
<property environment="env"/>
<path id="build.classpath">
- <fileset dir="${env.CXF_HOME}/modules">
+ <flibdir="${env.CXF_HOME}/modules">
<include name="cxf-manifest-incubator.jar"/>
</fileset>
<pathelement location="./build/classes"/>
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=531318&r1=531317&r2=531318
==============================================================================
--- 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 Sun Apr 22 19:59:51 2007
@@ -33,7 +33,7 @@
<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}/modules">
+libileset dir="${env.CXF_HOME}/modules">
<include name="cxf-manifest-incubator.jar"/>
<include name="cxf-integration-jbi-${cxf.version}.jar"/>
</fileset>
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=531318&r1=531317&r2=531318
==============================================================================
--- 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 Sun Apr 22 19:59:51 2007
@@ -111,7 +111,7 @@
<target name="j2ee.compile">
- <javac srcdir="${basedir}/src" destdir="${build.classes.dir}" debug="true" fork="yes">
+ <javac srcdir="${basedir}/src" destdir="${build.classes.dir}" libtrue" fork="yes">
<include name="**/*.java"/>
<classpath>
<pathelement location="${cxf.home}/modules/cxf-manifest-incubator.jar"/>
@@ -167,7 +167,7 @@
<target name="client">
- <java classname="demo.client.GreeterClient" fork="true">
+ <java classname="demolib.GreeterClient" fork="true">
<arg value="${wsdl.location}"/>
<classpath>
<pathelement location="${build.classes.dir}"/>
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=531318&r1=531317&r2=531318
==============================================================================
--- 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 Sun Apr 22 19:59:51 2007
@@ -99,13 +99,13 @@
For UNIX:
- export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes:
+ export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/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%\modules\cxf-manifest-incubator.jar;.\build\classes;
+ set classpath=%classpath%;%CXF_HOME%\lib\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=531318&r1=531317&r2=531318
==============================================================================
--- 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 Sun Apr 22 19:59:51 2007
@@ -98,13 +98,13 @@
For UNIX:
- export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes:
+ export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/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%\modules\cxf-manifest-incubator.jar;.\build\classes;
+ set classpath=%classpath%;%CXF_HOME%\lib\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=531318&r1=531317&r2=531318
==============================================================================
--- 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 Sun Apr 22 19:59:51 2007
@@ -75,13 +75,13 @@
application with the commands:
For UNIX:
- export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:
+ export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/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%\modules\cxf-manifest-incubator.jar;
+ set CLASSPATH=%CLASSPATH%;%CXF_HOME%\lib\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=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/mtom/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/mtom/README.txt Sun Apr 22 19:59:51 2007
@@ -64,13 +64,13 @@
For UNIX:
- export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
+ export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/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%\modules\cxf-manifest-incubator.jar;.\build\classes
+ set classpath=%classpath%;%CXF_HOME%\lib\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/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=531318&r1=531317&r2=531318
==============================================================================
--- 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 Sun Apr 22 19:59:51 2007
@@ -96,7 +96,7 @@
For UNIX:
mkdir -p build/classes
- export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
+ export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/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%\modules\cxf-manifest-incubator.jar;.\build\classes
+ set classpath=%classpath%;%CXF_HOME%\lib\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=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/soap12/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/soap12/README.txt Sun Apr 22 19:59:51 2007
@@ -63,12 +63,12 @@
For UNIX:
- export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
+ export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/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%\modules\cxf-manifest-incubator.jar;.\build\classes
+ set classpath=%classpath%;%CXF_HOME%\lib\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/streamInterceptor/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/README.txt?view=diff&rev=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/streamInterceptor/README.txt Sun Apr 22 19:59:51 2007
@@ -58,13 +58,13 @@
For UNIX:
- export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes
+ export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/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%\modules\cxf-manifest-incubator.jar;.\build\classes
+ set classpath=%classpath%;%CXF_HOME%\lib\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/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=531318&r1=531317&r2=531318
==============================================================================
--- 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 Sun Apr 22 19:59:51 2007
@@ -89,13 +89,13 @@
For UNIX:
- export CLASSPATH=$CLASSPATH:$CXF_HOME/modules/cxf-manifest-incubator.jar:./build/classes:.
+ export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/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%\modules\cxf-manifest-incubator.jar;.\build\classes;.
+ set classpath=%classpath%;%CXF_HOME%\lib\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/rt/bindings/http/src/main/resources/META-INF/cxf/cxf.extension
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/cxf.extension?view=diff&rev=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/cxf.extension (original)
+++ incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/cxf.extension Sun Apr 22 19:59:51 2007
@@ -1 +1 @@
-META-INF/cxf/cxf-extension-http-binding.xml
+META-INF/cxf/cxf-extension-http-binding.xml
\ No newline at end of file
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java?view=diff&rev=531318&r1=531317&r2=531318
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java Sun Apr 22 19:59:51 2007
@@ -89,7 +89,9 @@
BufferedReader rd = new BufferedReader(new InputStreamReader(is, "UTF-8"));
String line = rd.readLine();
while (line != null) {
- resources.add(resolver.getResource(line));
+ if (!"".equals(line)) {
+ resources.add(resolver.getResource(line));
+ }
line = rd.readLine();
}
is.close();