You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by eg...@apache.org on 2009/10/14 18:48:20 UTC
svn commit: r825189 - in /servicemix/smx4/features/trunk: ./
assembly/src/main/filtered-resources/ cxf/ cxf/cxf-transport-nmr/
cxf/cxf-transport-osgi/ examples/cxf-jaxrs/
examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/
exampl...
Author: eglynn
Date: Wed Oct 14 16:48:19 2009
New Revision: 825189
URL: http://svn.apache.org/viewvc?rev=825189&view=rev
Log:
Applying patch for [SMX4-400] on behalf of Sergey Beryozkin.
Removed:
servicemix/smx4/features/trunk/cxf/cxf-transport-osgi/
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml
servicemix/smx4/features/trunk/cxf/pom.xml
servicemix/smx4/features/trunk/examples/cxf-jaxrs/README.txt
servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml
servicemix/smx4/features/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/CustomerService.java
servicemix/smx4/features/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/Order.java
servicemix/smx4/features/trunk/examples/cxf-osgi/README.txt
servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml
servicemix/smx4/features/trunk/examples/cxf-ws-addressing/README.txt
servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml
servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml
servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml
servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml
servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=825189&r1=825188&r2=825189&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Wed Oct 14 16:48:19 2009
@@ -82,12 +82,11 @@
<feature version="${cxf.version}">cxf</feature>
<feature version="${version}">web-core</feature>
<bundle>mvn:org.ops4j.pax.web-extender/pax-web-ex-whiteboard/${pax.web.extender.version}</bundle>
- <bundle>mvn:org.apache.servicemix.cxf/org.apache.servicemix.cxf.transport.osgi/${version}</bundle>
</feature>
<feature name="cxf-jaxrs" version="${version}">
<feature version="${version}">cxf-osgi</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jettison/${jettison.version}</bundle>
+ <bundle>mvn:org.codehaus.jettison/jettison/${jettison.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-${jaxrs.api.version}/${servicemix.specs.version}</bundle>
</feature>
Modified: servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml?rev=825189&r1=825188&r2=825189&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml Wed Oct 14 16:48:19 2009
@@ -172,6 +172,13 @@
</goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-common-utilities</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<!-- exclude generated class from Cobertura reports -->
<plugin>
Modified: servicemix/smx4/features/trunk/cxf/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/pom.xml?rev=825189&r1=825188&r2=825189&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/pom.xml Wed Oct 14 16:48:19 2009
@@ -34,7 +34,6 @@
<modules>
<module>cxf-transport-nmr</module>
- <module>cxf-transport-osgi</module>
<module>cxf-binding-nmr</module>
</modules>
Modified: servicemix/smx4/features/trunk/examples/cxf-jaxrs/README.txt
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-jaxrs/README.txt?rev=825189&r1=825188&r2=825189&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-jaxrs/README.txt (original)
+++ servicemix/smx4/features/trunk/examples/cxf-jaxrs/README.txt Wed Oct 14 16:48:19 2009
@@ -96,6 +96,20 @@
Running a Client
----------------
+
+You can browse WADL at
+
+http://localhost:8191/cxf/crm/customerservice?_wadl&_type=xml
+
+or
+
+http://localhost:8191/cxf/crm?_wadl&_type=xml
+
+The latter URI can be used to see the desription of multiple root resource classes.
+
+You can see the services listing at http://localhost:8191/cxf.
+
+
You can make invocations on the web service in several ways, including
using a web client, using a Java client and using a command-line
utility such a curl or Wget. See below for more details.
@@ -148,7 +162,17 @@
#
curl -X DELETE http://localhost:8181/cxf/crm/customerservice/customers/123
-
+Changing /cxf servlet alias
+---------------------------
+By default CXF Servlet is assigned a '/cxf' alias. You can change it in a couple of ways
+
+a. Add org.apache.cxf.osgi.cfg to /etc directory and set the 'org.apache.cxf.servlet.context' property, for example :
+ org.apache.cxf.servlet.context=/custom
+b. Use shell config commands, for example :
+ config:edit org.apache.cxf.osgi
+ config:propset org.apache.cxf.servlet.context /super
+ config:update
+
B. Building the Example Bundle Yourself
---------------------------------------
To install and run the example where you build the example bundle
Modified: servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml?rev=825189&r1=825188&r2=825189&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml Wed Oct 14 16:48:19 2009
@@ -36,7 +36,7 @@
<dependencies>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jsr311-api-0.8</artifactId>
+ <artifactId>org.apache.servicemix.specs.jsr311-api-1.0</artifactId>
<version>1.3.0</version>
</dependency>
<dependency>
@@ -74,7 +74,7 @@
org.apache.cxf.configuration.spring,
org.apache.cxf.binding,
org.apache.cxf.jaxrs.utils,
- org.apache.servicemix.cxf.transport.http_osgi,
+ org.apache.cxf.transport.http_osgi,
org.springframework.beans.factory.config,
org.apache.servicemix.examples.cxf.jaxrs,
org.apache.commons.httpclient,
Modified: servicemix/smx4/features/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/CustomerService.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/CustomerService.java?rev=825189&r1=825188&r2=825189&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/CustomerService.java (original)
+++ servicemix/smx4/features/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/CustomerService.java Wed Oct 14 16:48:19 2009
@@ -27,9 +27,10 @@
import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
import javax.ws.rs.core.Response;
-@Path("/cxf/crm/customerservice/")
+@Path("/customerservice/")
public class CustomerService {
long currentId = 123;
Map<Long, Customer> customers = new HashMap<Long, Customer>();
@@ -41,6 +42,7 @@
@GET
@Path("/customers/{id}/")
+ @Produces("application/xml")
public Customer getCustomer(@PathParam("id") String id) {
System.out.println("----invoking getCustomer, Customer id is: " + id);
long idNumber = Long.parseLong(id);
@@ -72,7 +74,7 @@
customers.put(customer.getId(), customer);
- return Response.ok(customer).build();
+ return Response.ok().type("application/xml").entity(customer).build();
}
@DELETE
Modified: servicemix/smx4/features/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/Order.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/Order.java?rev=825189&r1=825188&r2=825189&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/Order.java (original)
+++ servicemix/smx4/features/trunk/examples/cxf-jaxrs/src/main/java/org/apache/servicemix/examples/cxf/jaxrs/Order.java Wed Oct 14 16:48:19 2009
@@ -23,6 +23,7 @@
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
import javax.xml.bind.annotation.XmlRootElement;
@@ -54,6 +55,7 @@
@GET
@Path("products/{productId}/")
+ @Produces("application/xml")
public Product getProduct(@PathParam("productId")int productId) {
System.out.println("----invoking getProduct with id: " + productId);
Product p = products.get(new Long(productId));
Modified: servicemix/smx4/features/trunk/examples/cxf-osgi/README.txt
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-osgi/README.txt?rev=825189&r1=825188&r2=825189&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-osgi/README.txt (original)
+++ servicemix/smx4/features/trunk/examples/cxf-osgi/README.txt Wed Oct 14 16:48:19 2009
@@ -117,6 +117,17 @@
mvn compile exec:java
+Changing /cxf servlet alias
+---------------------------
+By default CXF Servlet is assigned a '/cxf' alias. You can change it in a couple of ways
+
+a. Add org.apache.cxf.osgi.cfg to /etc directory and set the 'org.apache.cxf.servlet.context' property, for example :
+ org.apache.cxf.servlet.context=/custom
+b. Use shell config commands, for example :
+ config:edit org.apache.cxf.osgi
+ config:propset org.apache.cxf.servlet.context /super
+ config:update
+
B. Building the Example Bundle Yourself
---------------------------------------
To install and run the example where you build the example bundle
Modified: servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml?rev=825189&r1=825188&r2=825189&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml Wed Oct 14 16:48:19 2009
@@ -64,7 +64,7 @@
org.apache.cxf.bus.resource,
org.apache.cxf.configuration.spring,
org.apache.cxf.resource,
- org.apache.servicemix.cxf.transport.http_osgi,
+ org.apache.cxf.transport.http_osgi,
org.apache.servicemix.util,
org.springframework.beans.factory.config
</Import-Package>
Modified: servicemix/smx4/features/trunk/examples/cxf-ws-addressing/README.txt
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-ws-addressing/README.txt?rev=825189&r1=825188&r2=825189&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-ws-addressing/README.txt (original)
+++ servicemix/smx4/features/trunk/examples/cxf-ws-addressing/README.txt Wed Oct 14 16:48:19 2009
@@ -175,6 +175,16 @@
It makes an invocation with WS-Addressing headers and displays
the response.
+Changing /cxf servlet alias
+---------------------------
+By default CXF Servlet is assigned a '/cxf' alias. You can change it in a couple of ways
+
+a. Add org.apache.cxf.osgi.cfg to /etc directory and set the 'org.apache.cxf.servlet.context' property, for example :
+ org.apache.cxf.servlet.context=/custom
+b. Use shell config commands, for example :
+ config:edit org.apache.cxf.osgi
+ config:propset org.apache.cxf.servlet.context /super
+ config:update
B. Building the Example Bundle Yourself
---------------------------------------
Modified: servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml?rev=825189&r1=825188&r2=825189&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml Wed Oct 14 16:48:19 2009
@@ -100,7 +100,7 @@
org.apache.cxf.bus.resource,
org.apache.cxf.configuration.spring,
org.apache.cxf.resource,
- org.apache.servicemix.cxf.transport.http_osgi,
+ org.apache.cxf.transport.http_osgi,
org.apache.servicemix.util,
org.springframework.beans.factory.config
</Import-Package>
Modified: servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml?rev=825189&r1=825188&r2=825189&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml Wed Oct 14 16:48:19 2009
@@ -95,7 +95,7 @@
org.apache.cxf.bus.resource,
org.apache.cxf.configuration.spring,
org.apache.cxf.resource,
- org.apache.servicemix.cxf.transport.http_osgi,
+ org.apache.cxf.transport.http_osgi,
org.springframework.beans.factory.config
</Import-Package>
<Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
Modified: servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml?rev=825189&r1=825188&r2=825189&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml Wed Oct 14 16:48:19 2009
@@ -91,7 +91,7 @@
org.apache.cxf.bus.resource,
org.apache.cxf.configuration.spring,
org.apache.cxf.resource,
- org.apache.servicemix.cxf.transport.http_osgi,
+ org.apache.cxf.transport.http_osgi,
org.springframework.beans.factory.config
</Import-Package>
<!--<Private-Package>org.apache.servicemix.examples.cxf</Private-Package>-->
Modified: servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml?rev=825189&r1=825188&r2=825189&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml Wed Oct 14 16:48:19 2009
@@ -95,7 +95,7 @@
org.apache.cxf.bus.resource,
org.apache.cxf.configuration.spring,
org.apache.cxf.resource,
- org.apache.servicemix.cxf.transport.http_osgi,
+ org.apache.cxf.transport.http_osgi,
org.springframework.beans.factory.config
</Import-Package>
<Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
Modified: servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/pom.xml?rev=825189&r1=825188&r2=825189&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Wed Oct 14 16:48:19 2009
@@ -175,12 +175,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.cxf</groupId>
- <artifactId>org.apache.servicemix.cxf.transport.osgi</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.cxf</groupId>
<artifactId>org.apache.servicemix.cxf.transport.nmr</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -204,9 +198,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.examples</groupId>
- <artifactId>cxf-jaxrs</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.servicemix.examples</groupId>
+ <artifactId>cxf-jaxrs</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.examples</groupId>
@@ -433,8 +427,8 @@
<version>${abdera.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jettison</artifactId>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
<version>${jettison.version}</version>
</dependency>
<dependency>
Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java?rev=825189&r1=825188&r2=825189&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java Wed Oct 14 16:48:19 2009
@@ -105,7 +105,7 @@
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.javax.mail"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-codec"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.abdera"),
- getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jettison"),
+ getBundle("org.codehaus.jettison", "jettison"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xmlbeans"),
getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jsr311-api-1.0"),
getBundle("org.ops4j.pax.web", "pax-web-bundle"),
Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=825189&r1=825188&r2=825189&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java Wed Oct 14 16:48:19 2009
@@ -120,7 +120,7 @@
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-codec"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-httpclient"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.abdera"),
- getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jettison"),
+ getBundle("org.codehaus.jettison", "jettison"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xmlbeans"),
getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jsr311-api-1.0"),
getBundle("org.ops4j.pax.web", "pax-web-bundle"),
@@ -129,7 +129,6 @@
getBundle("org.fusesource.commonman", "commons-management"),
getBundle("org.apache.felix.karaf", "org.apache.felix.karaf.management"),
getBundle("org.apache.cxf", "cxf-bundle"),
- getBundle("org.apache.servicemix.cxf", "org.apache.servicemix.cxf.transport.osgi"),
getBundle("org.apache.servicemix.cxf", "org.apache.servicemix.cxf.transport.nmr"),
getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.api"),
getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.core"),
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=825189&r1=825188&r2=825189&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Wed Oct 14 16:48:19 2009
@@ -87,7 +87,7 @@
<commons.pool.version>1.4</commons.pool.version>
<commons.vfs.version>1.0_1</commons.vfs.version>
<commons.jexl.version>1.1_1</commons.jexl.version>
- <cxf.version>2.2.3</cxf.version>
+ <cxf.version>2.2.4</cxf.version>
<dom4j.version>1.6_1</dom4j.version>
<drools.version>4.0.7_1</drools.version>
<depends.maven.plugin.version>1.2-SNAPSHOT</depends.maven.plugin.version>
@@ -144,7 +144,7 @@
<jetty.version>6.1.14</jetty.version>
<jetty.bundle.version>6.1.14_1</jetty.bundle.version>
<jexcelapi.version>2.4.2_1</jexcelapi.version>
- <jettison.version>1.0.1_1</jettison.version>
+ <jettison.version>1.1</jettison.version>
<jing.version>20030619_1</jing.version>
<jline.version>0.9.94</jline.version>
<jruby.version>1.1.2_1</jruby.version>