Author: gnodet
Date: Tue Apr 1 07:27:33 2008
New Revision: 643417
URL: http://svn.apache.org/viewvc?rev=643417&view=rev
Log:
Try to fix compilation problem caused by wrong version of servlet api imported
by the compendium jar
Removed:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/spring/
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/META-INF/spring.handlers
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/META-INF/spring.schemas
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/schema/
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ServiceMixEndpointBeanTest.java
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixComponent.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixEndpoint.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/AttachmentTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/mtom.xml
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/server.xml
servicemix/smx4/features/trunk/pom.xml
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixComponent.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixComponent.java?rev=643417&r1=643416&r2=643417&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixComponent.java
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixComponent.java
Tue Apr 1 07:27:33 2008
@@ -19,29 +19,23 @@
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
import org.apache.servicemix.nmr.api.NMR;
-import org.apache.servicemix.nmr.core.ServiceMix;
import java.util.Map;
/**
- * Created by IntelliJ IDEA.
- * User: gnodet
- * Date: Sep 19, 2007
- * Time: 8:48:25 AM
- * To change this template use File | Settings | File Templates.
+ * A camel component to bridge ServiceMix NMR with Camel.
*/
public class ServiceMixComponent extends DefaultComponent {
private NMR nmr;
public ServiceMixComponent() {
- if (nmr == null) {
- nmr = new ServiceMix();
- ((ServiceMix)nmr).init();
- }
}
public NMR getNmr() {
+ if (nmr == null) {
+ nmr = getCamelContext().getRegistry().lookup("nmr", NMR.class);
+ }
return nmr;
}
@@ -54,10 +48,10 @@
}
public void registerEndpoint(org.apache.servicemix.nmr.api.Endpoint
endpoint, Map<String, ?> properties) {
- nmr.getEndpointRegistry().register(endpoint, properties);
+ getNmr().getEndpointRegistry().register(endpoint, properties);
}
public void unregisterEndpoint(org.apache.servicemix.nmr.api.Endpoint
endpoint, Map<String, ?> properties) {
- nmr.getEndpointRegistry().unregister(endpoint, properties);
+ getNmr().getEndpointRegistry().unregister(endpoint, properties);
}
}
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java?rev=643417&r1=643416&r2=643417&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java
Tue Apr 1 07:27:33 2008
@@ -16,22 +16,16 @@
*/
package org.apache.servicemix.camel;
+import java.util.Map;
+
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultConsumer;
import org.apache.servicemix.nmr.api.Channel;
import org.apache.servicemix.nmr.api.Exchange;
-import org.apache.servicemix.nmr.api.Pattern;
import org.apache.servicemix.nmr.api.Status;
import org.apache.servicemix.nmr.api.service.ServiceHelper;
-/**
- * Created by IntelliJ IDEA.
- * User: gnodet
- * Date: Sep 19, 2007
- * Time: 8:59:46 AM
- * To change this template use File | Settings | File Templates.
- */
public class ServiceMixConsumer extends DefaultConsumer<ServiceMixExchange>
implements org.apache.servicemix.nmr.api.Endpoint {
private Channel channel;
@@ -46,18 +40,20 @@
protected void doStart() throws Exception {
super.doStart();
- getEndpoint().getComponent().registerEndpoint(this,
-
ServiceHelper.createMap(org.apache.servicemix.nmr.api.Endpoint.NAME,
- getEndpoint().getEndpointName()));
+ getEndpoint().getComponent().registerEndpoint(this,
createEndpointMap());
}
protected void doStop() throws Exception {
- getEndpoint().getComponent().unregisterEndpoint(this,
-
ServiceHelper.createMap(org.apache.servicemix.nmr.api.Endpoint.NAME,
- getEndpoint().getEndpointName()));
+ getEndpoint().getComponent().unregisterEndpoint(this,
createEndpointMap());
super.doStop();
}
+ private Map<String,?> createEndpointMap() {
+ return
ServiceHelper.createMap(org.apache.servicemix.nmr.api.Endpoint.NAME,
+
getEndpoint().getEndpointName());
+
+ }
+
public void setChannel(Channel channel) {
this.channel = channel;
}
@@ -68,18 +64,15 @@
ServiceMixExchange smExchange =
getEndpoint().createExchange(exchange.getIn(), exchange);
smExchange.setPattern(ExchangePattern.fromWsdlUri(exchange.getPattern().getWsdlUri()));
getAsyncProcessor().process(smExchange);
- exchange.setStatus(Status.Done);
- if (exchange.getPattern() != Pattern.InOnly) {
-
- if (smExchange.getFault().getBody() != null) {
-
exchange.getFault().setBody(smExchange.getFault().getBody());
- } else {
-
exchange.getOut().setBody(smExchange.getOut().getBody());
- }
+ if (smExchange.getFault(false) != null) {
+
exchange.getFault().setBody(smExchange.getFault().getBody());
+ } else if (smExchange.getOut(false) != null) {
+ exchange.getOut().setBody(smExchange.getOut().getBody());
+ } else {
+ exchange.setStatus(Status.Done);
}
channel.send(exchange);
} catch (Exception e) {
- e.printStackTrace();
exchange.setError(e);
exchange.setStatus(Status.Error);
channel.send(exchange);
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=643417&r1=643416&r2=643417&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 Apr 1 07:27:33 2008
@@ -16,20 +16,12 @@
*/
package org.apache.servicemix.camel;
-import org.apache.camel.component.cxf.CxfConstants;
import org.apache.camel.impl.DefaultEndpoint;
-import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Producer;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
-import org.apache.servicemix.camel.spring.ServiceMixEndpointBean;
import org.apache.servicemix.nmr.api.Exchange;
-import org.apache.servicemix.nmr.api.NMR;
-import org.apache.servicemix.nmr.api.internal.Flow;
-import org.apache.servicemix.nmr.api.service.ServiceHelper;
-import org.apache.servicemix.nmr.core.ServiceMix;
-import org.apache.servicemix.nmr.core.StraightThroughFlow;
/**
* Created by IntelliJ IDEA. User: gnodet Date: Sep 19, 2007 Time: 8:54:34 AM
To
@@ -39,54 +31,11 @@
*/
public class ServiceMixEndpoint extends DefaultEndpoint<ServiceMixExchange> {
- public static final String SPRING_CONTEXT_ENDPOINT = "bean:";
-
private String endpointName;
- public ServiceMixEndpoint(ServiceMixComponent component, String uri,
- String endpointName) {
+ public ServiceMixEndpoint(ServiceMixComponent component, String uri,
String endpointName) {
super(uri, component);
- this.setEndpointName(endpointName);
- if
(endpointName.startsWith(CxfConstants.SPRING_CONTEXT_ENDPOINT)) {
- String beanId = endpointName
-
.substring(CxfConstants.SPRING_CONTEXT_ENDPOINT.length());
- if (beanId.startsWith("//")) {
- beanId = beanId.substring(2);
- }
- SpringCamelContext context = (SpringCamelContext)
this.getContext();
-
- ServiceMixEndpointBean smxEndpointBean =
(ServiceMixEndpointBean) context
-
.getApplicationContext().getBean(beanId);
-
- assert (smxEndpointBean != null);
- NMR nmr = smxEndpointBean.getNmr();
- Flow flow = smxEndpointBean.getFlow();
- if (nmr != null) {
- if (nmr.getFlowRegistry() != null) {
- if (flow != null) {
- // set Flow we get from
configuration file
- nmr.getFlowRegistry().register(
- flow,
-
ServiceHelper.createMap(Flow.ID, flow
-
.getClass().getName()));
- } else {
- // set defaule Flow
- nmr.getFlowRegistry().register(
- new
StraightThroughFlow(),
-
ServiceHelper.createMap(Flow.ID,
-
StraightThroughFlow.class.getName()));
- }
- }
-
- ((ServiceMix) nmr).init();
- getComponent().setNmr(nmr);
- }
-
- }
- }
-
- public ServiceMixEndpoint() {
- super("uri", new ServiceMixComponent());
+ this.endpointName = endpointName;
}
public ServiceMixComponent getComponent() {
@@ -106,19 +55,15 @@
}
public ServiceMixExchange createExchange(Exchange exchange) {
- return new ServiceMixExchange(getContext(),
getExchangePattern(),
- exchange);
+ return new ServiceMixExchange(getContext(),
getExchangePattern(), exchange);
}
- public ServiceMixExchange createExchange(ExchangePattern pattern,
- Exchange exchange) {
+ public ServiceMixExchange createExchange(ExchangePattern pattern,
Exchange exchange) {
return new ServiceMixExchange(getContext(), pattern, exchange);
}
- public ServiceMixExchange createExchange(
- org.apache.servicemix.nmr.api.Message inMessage,
Exchange exchange) {
- return new ServiceMixExchange(getContext(),
getExchangePattern(),
- inMessage, exchange);
+ public ServiceMixExchange
createExchange(org.apache.servicemix.nmr.api.Message inMessage, Exchange
exchange) {
+ return new ServiceMixExchange(getContext(),
getExchangePattern(), inMessage, exchange);
}
public void setEndpointName(String endpointName) {
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/AttachmentTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/AttachmentTest.java?rev=643417&r1=643416&r2=643417&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/AttachmentTest.java
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/AttachmentTest.java
Tue Apr 1 07:27:33 2008
@@ -97,8 +97,8 @@
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("cxf:bean:routerEndpoint").to("smx:bean:testEndpoint");
- from("smx:bean:testEndpoint").to("cxf:bean:serviceEndpoint");
+ from("cxf:bean:routerEndpoint").to("smx:testEndpoint");
+ from("smx:testEndpoint").to("cxf:bean:serviceEndpoint");
}
};
}
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfTest.java?rev=643417&r1=643416&r2=643417&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfTest.java
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfTest.java
Tue Apr 1 07:27:33 2008
@@ -16,10 +16,9 @@
*/
package org.apache.servicemix.camel;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.spring.SpringTestSupport;
+import org.apache.camel.CamelContext;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.CXFBusFactory;
@@ -27,12 +26,10 @@
import org.apache.cxf.frontend.ClientFactoryBean;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.cxf.frontend.ServerFactoryBean;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-
-
-public class SmxToCxfTest extends ContextTestSupport {
+public class SmxToCxfTest extends SpringTestSupport {
protected static final String ROUTER_ADDRESS =
"http://localhost:9000/router";;
protected static final String SERVICE_ADDRESS = "local://smx/helloworld";
protected static final String SERVICE_CLASS =
"serviceClass=org.apache.servicemix.camel.HelloService";
@@ -41,8 +38,7 @@
private String serviceEndpointURI = "cxf://" + SERVICE_ADDRESS + "?" +
SERVICE_CLASS + "&dataFormat=POJO";
private ServerImpl server;
- private CamelContext camelContext;
-
+
@Override
protected void setUp() throws Exception {
@@ -50,7 +46,15 @@
startService();
}
-
+
+ protected ClassPathXmlApplicationContext createApplicationContext() {
+ return new
ClassPathXmlApplicationContext("org/apache/servicemix/camel/spring/EndpointBeans.xml");
+ }
+
+ protected void assertValidContext(CamelContext context) {
+ assertNotNull("No context found!", context);
+ }
+
protected void startService() {
//start a service
ServerFactoryBean svrBean = new ServerFactoryBean();
@@ -81,12 +85,6 @@
}
};
}
-
- protected CamelContext createCamelContext() throws Exception {
- camelContext = new DefaultCamelContext();
- return camelContext;
- }
-
public void testInvokingServiceFromCXFClient() throws Exception {
Bus bus = BusFactory.getDefaultBus();
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml?rev=643417&r1=643416&r2=643417&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml
Tue Apr 1 07:27:33 2008
@@ -17,35 +17,25 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:cxf="http://activemq.apache.org/camel/schema/cxfEndpoint";
- xmlns:smx="http://servicemix.apache.org/camelEndpoint/";
+ xmlns:cxf="http://activemq.apache.org/camel/schema/cxfEndpoint";
+ xmlns:camel="http://activemq.apache.org/camel/schema/spring";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://activemq.apache.org/camel/schema/cxfEndpoint
http://activemq.apache.org/camel/schema/cxf/cxfEndpoint.xsd
- http://servicemix.apache.org/camelEndpoint/
http://servicemix.apache.org/camelEndpoint/.xsd
+ http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:9000/router";
- serviceClass="org.apache.servicemix.camel.HelloService"/>
+ serviceClass="org.apache.servicemix.camel.HelloService"/>
<cxf:cxfEndpoint id="serviceEndpoint" address="local://smx/helloworld"
- serviceClass="org.apache.servicemix.camel.HelloService"/>
+ serviceClass="org.apache.servicemix.camel.HelloService"/>
+
+ <camel:camelContext>
+ </camel:camelContext>
+
+ <bean id="nmr" class="org.apache.servicemix.nmr.core.ServiceMix"
init-method="init" />
- <smx:smxEndpoint id="testEndpoint" nmr="#servicemix"
flow="#staightThroughFlow"/>
-
- <bean id="servicemix" class="org.apache.servicemix.nmr.core.ServiceMix">
- <property name="endpointRegistry" ref="endpointRegistry" />
- <property name="listenerRegistry" ref="listenerRegistry" />
- <property name="flowRegistry" ref="flowRegistry" />
- </bean>
- <bean id="endpointRegistry"
class="org.apache.servicemix.nmr.core.EndpointRegistryImpl">
- <property name="nmr" ref="servicemix" />
- <property name="registry" ref="serviceRegistry"/>
- </bean>
- <bean id="listenerRegistry"
class="org.apache.servicemix.nmr.core.ListenerRegistryImpl" />
- <bean id="flowRegistry"
class="org.apache.servicemix.nmr.core.FlowRegistryImpl" />
- <bean id="staightThroughFlow"
class="org.apache.servicemix.nmr.core.StraightThroughFlow" />
- <bean id="serviceRegistry"
class="org.apache.servicemix.nmr.core.ServiceRegistryImpl"/>
</beans>
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/mtom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/mtom.xml?rev=643417&r1=643416&r2=643417&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/mtom.xml
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/mtom.xml
Tue Apr 1 07:27:33 2008
@@ -18,36 +18,27 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:cxf="http://activemq.apache.org/camel/schema/cxfEndpoint";
- xmlns:smx="http://servicemix.apache.org/camelEndpoint/";
xmlns:mtom="http://cxf.apache.org/mime";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://activemq.apache.org/camel/schema/cxfEndpoint
http://activemq.apache.org/camel/schema/cxf/cxfEndpoint.xsd
- http://servicemix.apache.org/camelEndpoint/
http://servicemix.apache.org/camelEndpoint/.xsd
">
- <cxf:cxfEndpoint id="routerEndpoint"
address="http://localhost:9036/mime-test";
- serviceClass="org.apache.cxf.mime.TestMtom" wsdlURL="/wsdl/mtom_xop.wsdl"
serviceName="mtom:TestMtomService"/>
+ <cxf:cxfEndpoint id="routerEndpoint"
+ address="http://localhost:9036/mime-test";
+ serviceClass="org.apache.cxf.mime.TestMtom"
+ wsdlURL="/wsdl/mtom_xop.wsdl"
+ serviceName="mtom:TestMtomService"/>
- <cxf:cxfEndpoint id="serviceEndpoint" address="local://smx/attachment"
- serviceClass="org.apache.cxf.mime.TestMtom" wsdlURL="/wsdl/mtom_xop.wsdl"
serviceName="mtom:TestMtomService"
- transportId="http://cxf.apache.org/transports/local"/>
+ <cxf:cxfEndpoint id="serviceEndpoint"
+ address="local://smx/attachment"
+ serviceClass="org.apache.cxf.mime.TestMtom"
+ wsdlURL="/wsdl/mtom_xop.wsdl"
+ serviceName="mtom:TestMtomService"
+ transportId="http://cxf.apache.org/transports/local"/>
+
+ <bean id="nmr" class="org.apache.servicemix.nmr.core.ServiceMix"
init-method="init" />
- <smx:smxEndpoint id="testEndpoint" nmr="#servicemix"
flow="#staightThroughFlow"/>
-
- <bean id="servicemix" class="org.apache.servicemix.nmr.core.ServiceMix">
- <property name="endpointRegistry" ref="endpointRegistry" />
- <property name="listenerRegistry" ref="listenerRegistry" />
- <property name="flowRegistry" ref="flowRegistry" />
- </bean>
- <bean id="endpointRegistry"
class="org.apache.servicemix.nmr.core.EndpointRegistryImpl">
- <property name="nmr" ref="servicemix" />
- <property name="registry" ref="serviceRegistry"/>
- </bean>
- <bean id="listenerRegistry"
class="org.apache.servicemix.nmr.core.ListenerRegistryImpl" />
- <bean id="flowRegistry"
class="org.apache.servicemix.nmr.core.FlowRegistryImpl" />
- <bean id="staightThroughFlow"
class="org.apache.servicemix.nmr.core.StraightThroughFlow" />
- <bean id="serviceRegistry"
class="org.apache.servicemix.nmr.core.ServiceRegistryImpl"/>
</beans>
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/server.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/server.xml?rev=643417&r1=643416&r2=643417&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/server.xml
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/server.xml
Tue Apr 1 07:27:33 2008
@@ -22,13 +22,10 @@
xmlns:jaxws="http://cxf.apache.org/jaxws";
xmlns:test="http://cxf.apache.org/greeter_control";
xmlns:cxf="http://activemq.apache.org/camel/schema/cxfEndpoint";
- xmlns:smx="http://servicemix.apache.org/camelEndpoint/";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd
http://activemq.apache.org/camel/schema/cxfEndpoint
http://activemq.apache.org/camel/schema/cxf/cxfEndpoint.xsd
- http://servicemix.apache.org/camelEndpoint/
http://servicemix.apache.org/camelEndpoint/.xsd
-
">
<bean id="mapAggregator"
class="org.apache.cxf.ws.addressing.MAPAggregator"/>
Modified: servicemix/smx4/features/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=643417&r1=643416&r2=643417&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Tue Apr 1 07:27:33 2008
@@ -182,6 +182,21 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${felix.compendium.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.foundation</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>javax.servlet</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${spring.version}</version>
