You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/05/14 08:03:29 UTC
svn commit: r656113 - in /servicemix/smx4/features/trunk: ./
camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/
examples/cxf-camel-nmr/src/main/java/org/apache/servicemix/examples/cxfcamel/
examples/cxf-camel-nmr/src/main/resources/META-...
Author: gnodet
Date: Tue May 13 23:03:29 2008
New Revision: 656113
URL: http://svn.apache.org/viewvc?rev=656113&view=rev
Log:
Upgrade to pax-logging 1.1, kernel 1.0-m3, camel 1.4-SNAPSHOT
Added:
servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/MANIFEST.MF
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixEndpoint.java
servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/java/org/apache/servicemix/examples/cxfcamel/MyTransform.java
servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixEndpoint.java?rev=656113&r1=656112&r2=656113&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixEndpoint.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixEndpoint.java Tue May 13 23:03:29 2008
@@ -55,15 +55,15 @@
}
public ServiceMixExchange createExchange(Exchange exchange) {
- return new ServiceMixExchange(getContext(), getExchangePattern(), exchange);
+ return new ServiceMixExchange(getCamelContext(), getExchangePattern(), exchange);
}
public ServiceMixExchange createExchange(ExchangePattern pattern, Exchange exchange) {
- return new ServiceMixExchange(getContext(), pattern, exchange);
+ return new ServiceMixExchange(getCamelContext(), pattern, exchange);
}
public ServiceMixExchange createExchange(org.apache.servicemix.nmr.api.Message inMessage, Exchange exchange) {
- return new ServiceMixExchange(getContext(), getExchangePattern(), inMessage, exchange);
+ return new ServiceMixExchange(getCamelContext(), getExchangePattern(), inMessage, exchange);
}
public void setEndpointName(String endpointName) {
Modified: servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/java/org/apache/servicemix/examples/cxfcamel/MyTransform.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/java/org/apache/servicemix/examples/cxfcamel/MyTransform.java?rev=656113&r1=656112&r2=656113&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/java/org/apache/servicemix/examples/cxfcamel/MyTransform.java (original)
+++ servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/java/org/apache/servicemix/examples/cxfcamel/MyTransform.java Tue May 13 23:03:29 2008
@@ -16,19 +16,19 @@
*/
package org.apache.servicemix.examples.cxfcamel;
+import java.util.logging.Logger;
+
import javax.xml.transform.Source;
import org.apache.camel.converter.jaxp.StringSource;
import org.apache.camel.converter.jaxp.XmlConverter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* @version $Revision: 640450 $
*/
public class MyTransform {
- private static final transient Log LOG = LogFactory.getLog(MyTransform.class);
+ private static final transient Logger LOG = Logger.getLogger(MyTransform.class.getName());
private boolean verbose = true;
private String value;
Added: servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/MANIFEST.MF?rev=656113&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/MANIFEST.MF (added)
+++ servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/MANIFEST.MF Tue May 13 23:03:29 2008
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.apache.servicemix.examples.cxfcamel
+Bundle-Version: 1.0.0.SNAPSHOT
+Import-Package: META-INF.cxf,META-INF.cxf.osgi,META-INF.cxf.transport.nmr,javax.jws
Modified: servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml?rev=656113&r1=656112&r2=656113&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml Tue May 13 23:03:29 2008
@@ -33,12 +33,11 @@
<import resource="classpath:META-INF/cxf/cxf.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
<import resource="classpath:META-INF/cxf/transport/nmr/cxf-transport-nmr.xml" />
- <import resource="classpath:org/apache/servicemix/camel/camel-nmr.xml" />
<camel-osgi:camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
<!-- Route periodically sent events into the NMR -->
<route>
- <from uri="timer://myTimer?fixedRate=true&period=2000&exchangePattern=InOut" />
+ <from uri="timer://myTimer?fixedRate=true&period=5000&exchangePattern=InOut" />
<bean ref="myTransform" method="transform"/>
<to uri="nmr:{http://cxfcamel.examples.servicemix.apache.org/}HelloWorldImplPort"/>
<bean ref="myTransform" method="display" />
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=656113&r1=656112&r2=656113&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Tue May 13 23:03:29 2008
@@ -67,7 +67,7 @@
<asm.version>2.2.3</asm.version>
<bnd.version>0.0.227</bnd.version>
<cglib.version>2.1_3</cglib.version>
- <camel.version>1.3.0</camel.version>
+ <camel.version>1.4-SNAPSHOT</camel.version>
<commons.io.version>1.3.1</commons.io.version>
<commons.logging.version>1.1</commons.logging.version>
<cxf.version>2.0.6</cxf.version>
@@ -109,12 +109,12 @@
<mina.version>1.1.6</mina.version>
<openejb.version>3.0-beta-2</openejb.version>
<openjpa.version>1.0.1</openjpa.version>
- <pax.logging.version>1.1-SNAPSHOT</pax.logging.version>
+ <pax.logging.version>1.1</pax.logging.version>
<pax.url.version>0.3.0</pax.url.version>
<pax.web.version>0.4.1</pax.web.version>
<pax.web.extender.version>0.3.0</pax.web.extender.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
- <servicemix.kernel.version>1.0-m3-SNAPSHOT</servicemix.kernel.version>
+ <servicemix.kernel.version>1.0-m3</servicemix.kernel.version>
<servicemix.nmr.version>1.0-m1</servicemix.nmr.version>
<servicemix.specs.version>1.0-SNAPSHOT</servicemix.specs.version>
<spring.version>2.5.2</spring.version>