Author: ningjiang
Date: Wed Nov 3 03:22:09 2010
New Revision: 1030322
URL: http://svn.apache.org/viewvc?rev=1030322&view=rev
Log:
CAMEL-3303 Exporting the package META-INF.cxf.camel instead of META-INF.cxf in
camel-cxf bundle
Added:
camel/trunk/components/camel-cxf/src/main/resources/META-INF/cxf/camel/
camel/trunk/components/camel-cxf/src/main/resources/META-INF/cxf/camel/cxf-extension-camel.xml
(props changed)
- copied unchanged from r1030015,
camel/trunk/components/camel-cxf/src/main/resources/META-INF/cxf/cxf-extension-camel.xml
Modified:
camel/trunk/components/camel-cxf/pom.xml
camel/trunk/components/camel-cxf/src/main/resources/META-INF/cxf/cxf-extension-camel.xml
camel/trunk/components/camel-cxf/src/main/resources/META-INF/cxf/cxf.extension
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CamelJBIClientProxy.xml
Modified: camel/trunk/components/camel-cxf/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/pom.xml?rev=1030322&r1=1030321&r2=1030322&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/pom.xml (original)
+++ camel/trunk/components/camel-cxf/pom.xml Wed Nov 3 03:22:09 2010
@@ -33,7 +33,7 @@
<properties>
<camel.osgi.import>
!org.apache.camel.component.cxf.*,
- !META-INF.cxf,
+ !META-INF.cxf.camel,
javax.activation*;version="[0.0,2)",
javax.annotation*;version="[0.0,2)",
javax.jws*;version="[0.0,3)",
@@ -46,7 +46,7 @@
</camel.osgi.import>
<camel.osgi.export>
org.apache.camel.component.cxf.*;${camel.osgi.version};-split-package:=merge-first,
- '=META-INF.cxf'
+ '=META-INF.cxf.camel'
</camel.osgi.export>
<camel.osgi.failok>true</camel.osgi.failok>
</properties>
Propchange:
camel/trunk/components/camel-cxf/src/main/resources/META-INF/cxf/camel/cxf-extension-camel.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-cxf/src/main/resources/META-INF/cxf/camel/cxf-extension-camel.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/trunk/components/camel-cxf/src/main/resources/META-INF/cxf/camel/cxf-extension-camel.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
camel/trunk/components/camel-cxf/src/main/resources/META-INF/cxf/camel/cxf-extension-camel.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
camel/trunk/components/camel-cxf/src/main/resources/META-INF/cxf/cxf-extension-camel.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/resources/META-INF/cxf/cxf-extension-camel.xml?rev=1030322&r1=1030321&r2=1030322&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/resources/META-INF/cxf/cxf-extension-camel.xml
(original)
+++
camel/trunk/components/camel-cxf/src/main/resources/META-INF/cxf/cxf-extension-camel.xml
Wed Nov 3 03:22:09 2010
@@ -22,13 +22,6 @@
xmlns:foo="http://cxf.apache.org/configuration/foo";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
-
- <bean
class="org.apache.camel.component.cxf.transport.CamelTransportFactory"
lazy-init="true">
- <property name="bus" ref="cxf"/>
- <property name="transportIds">
- <list>
- <value>http://cxf.apache.org/transports/camel</value>
- </list>
- </property>
- </bean>
+ <!-- This file will be removed in Camel 3.0, please use the file
META-INF/cxf/camel/cxf-extension-camel.xml -->
+ <import resource="classpath:META-INF/cxf/camel/cxf-extension-camel.xml"/>
</beans>
Modified:
camel/trunk/components/camel-cxf/src/main/resources/META-INF/cxf/cxf.extension
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/resources/META-INF/cxf/cxf.extension?rev=1030322&r1=1030321&r2=1030322&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/resources/META-INF/cxf/cxf.extension
(original)
+++
camel/trunk/components/camel-cxf/src/main/resources/META-INF/cxf/cxf.extension
Wed Nov 3 03:22:09 2010
@@ -1 +1 @@
-META-INF/cxf/cxf-extension-camel.xml
\ No newline at end of file
+META-INF/cxf/camel/cxf-extension-camel.xml
\ No newline at end of file
Modified:
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml?rev=1030322&r1=1030321&r2=1030322&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml
(original)
+++
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml
Wed Nov 3 03:22:09 2010
@@ -25,7 +25,7 @@
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util-2.0.xsd
http://cxf.apache.org/transports/camel
http://cxf.apache.org/transports/camel.xsd
">
- <import resource="classpath:META-INF/cxf/cxf-extension-camel.xml" />
+ <import resource="classpath:META-INF/cxf/camel/cxf-extension-camel.xml" />
<!-- START SNIPPET: beanDefinition -->
<util:list id="customerServiceBean">
Modified:
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CamelJBIClientProxy.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CamelJBIClientProxy.xml?rev=1030322&r1=1030321&r2=1030322&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CamelJBIClientProxy.xml
(original)
+++
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CamelJBIClientProxy.xml
Wed Nov 3 03:22:09 2010
@@ -30,7 +30,7 @@
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-extension-jbi-binding.xml"/>
- <import resource="classpath:META-INF/cxf/cxf-extension-camel.xml"/>
+ <import resource="classpath:META-INF/cxf/camel/cxf-extension-camel.xml"/>
<camelContext id="conduit_context"
xmlns="http://camel.apache.org/schema/spring";>
