Author: blin
Date: Fri Oct 20 04:37:53 2006
New Revision: 466071
URL: http://svn.apache.org/viewvc?view=rev&rev=466071
Log:
1. remove rhino from distribution because of licensing requirement.
2. remove activemq from distribution
3. remove maven from trunk. developers would need to download maven 2.0.4 and
install it to another directory for build if they have been using maven
installation under trunk directory.
4. rename trunk/test to trunk/benchmark, it really just contains performance
benchmark code.
Added:
incubator/cxf/trunk/benchmark/
- copied from r466014, incubator/cxf/trunk/test/
incubator/cxf/trunk/benchmark/benchmark1/
- copied from r466061, incubator/cxf/trunk/test/benchmark1/
incubator/cxf/trunk/benchmark/performance/
- copied from r466061, incubator/cxf/trunk/test/performance/
Removed:
incubator/cxf/trunk/maven/
incubator/cxf/trunk/test/
Modified:
incubator/cxf/trunk/distribution/pom.xml
incubator/cxf/trunk/distribution/src/main/assembly/bin.xml
incubator/cxf/trunk/distribution/src/main/assembly/src.xml
incubator/cxf/trunk/distribution/src/main/release/samples/js_provider/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/restful/src/demo/restful/client/Client.java
incubator/cxf/trunk/rt/transports/jms/pom.xml
incubator/cxf/trunk/systests/pom.xml
Modified: incubator/cxf/trunk/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/pom.xml?view=diff&rev=466071&r1=466070&r2=466071
==============================================================================
--- incubator/cxf/trunk/distribution/pom.xml (original)
+++ incubator/cxf/trunk/distribution/pom.xml Fri Oct 20 04:37:53 2006
@@ -152,7 +152,11 @@
<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>
</dependencies>
@@ -197,33 +201,6 @@
</artifactItems>
</configuration>
</execution>
- <execution>
- <id>add-jars</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
-
<outputDirectory>${project.build.directory}/additional-libs</outputDirectory>
- <artifactItems>
- <artifactItem>
- <groupId>${pom.groupId}</groupId>
- <artifactId>cxf-rt-frontend-js</artifactId>
- <version>${pom.version}</version>
- </artifactItem>
- <artifactItem>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>2.1.0</version>
- </artifactItem>
- <artifactItem>
- <groupId>rhino</groupId>
- <artifactId>js</artifactId>
- <version>1.6R2</version>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
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=466071&r1=466070&r2=466071
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/assembly/bin.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/assembly/bin.xml Fri Oct 20
04:37:53 2006
@@ -89,20 +89,6 @@
<include>cxf-incubator.jar</include>
</includes>
</fileSet>
- <fileSet>
- <directory>src/main/release/lib</directory>
- <outputDirectory>cxf-${cxf.version}/lib</outputDirectory>
- <includes>
- <include>activemq/**/*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target/additional-libs</directory>
- <outputDirectory>cxf-${cxf.version}/lib</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
Modified: incubator/cxf/trunk/distribution/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/assembly/src.xml?view=diff&rev=466071&r1=466070&r2=466071
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/assembly/src.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/assembly/src.xml Fri Oct 20
04:37:53 2006
@@ -45,6 +45,7 @@
<include>**/*</include>
</includes>
<excludes>
+ <exclude>build.xml</exclude>
<exclude>**/target</exclude>
<exclude>**/target/**/*</exclude>
<exclude>**/build</exclude>
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=466071&r1=466070&r2=466071
==============================================================================
---
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
Fri Oct 20 04:37:53 2006
@@ -19,7 +19,7 @@
Prerequisite
------------
-If your environment already includes cxf.jar on the
+If your environment already includes cxf-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
@@ -27,6 +27,10 @@
javac, and java to build and run the demos, you must set the
environment by running the script.
+You also need to download js-1.6R2.jar from
+(http://repo1.maven.org/maven2/rhino/js/1.6R2/) and xbean-2.1.0.jar
+from (http://repo1.maven.org/maven2/xmlbeans/xbean/2.1.0/) and place
+these two jars under CXF_HOME/lib directory.
Building and running the demo using ant
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/restful/src/demo/restful/client/Client.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/restful/src/demo/restful/client/Client.java?view=diff&rev=466071&r1=466070&r2=466071
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/restful/src/demo/restful/client/Client.java
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/restful/src/demo/restful/client/Client.java
Fri Oct 20 04:37:53 2006
@@ -81,7 +81,8 @@
DOMSource reqMsg = new DOMSource(doc);
// Sent HTTP POST request to update customer info
- Dispatch<DOMSource> disp = cutomerservice.createDispatch(portName,
DOMSource.class, Service.Mode.PAYLOAD);
+ Dispatch<DOMSource> disp = cutomerservice.createDispatch(portName,
DOMSource.class,
+ Service.Mode.PAYLOAD);
System.out.println("Invoking server through HTTP POST to update
customer info");
DOMSource result = disp.invoke(reqMsg);
printSource(result);
Modified: incubator/cxf/trunk/rt/transports/jms/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/pom.xml?view=diff&rev=466071&r1=466070&r2=466071
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/jms/pom.xml Fri Oct 20 04:37:53 2006
@@ -116,7 +116,7 @@
<groupId>activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>3.2</version>
- <scope>runtime</scope>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
@@ -187,7 +187,7 @@
<artifactId>xbean</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
</dependencies>
Modified: incubator/cxf/trunk/systests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/pom.xml?view=diff&rev=466071&r1=466070&r2=466071
==============================================================================
--- incubator/cxf/trunk/systests/pom.xml (original)
+++ incubator/cxf/trunk/systests/pom.xml Fri Oct 20 04:37:53 2006
@@ -134,6 +134,83 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>3.2</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>activesoap</groupId>
+ <artifactId>jaxp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-full</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jmock</groupId>
+ <artifactId>jmock-cglib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>howl</groupId>
+ <artifactId>howl-logger</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>activemq</groupId>
+ <artifactId>smack</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>activemq</groupId>
+ <artifactId>smackx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>axion</groupId>
+ <artifactId>axion</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xmlpublic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean_xpath</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
