Author: ffang
Date: Mon Dec 5 03:59:00 2011
New Revision: 1210323
URL: http://svn.apache.org/viewvc?rev=1210323&view=rev
Log:
[SMX4-998]cleanup cxf related examples to remove unnecessary package/resource
import and Required-Bundle
Modified:
servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs/pom.xml
servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs/src/main/resources/META-INF/spring/beans.xml
servicemix/smx4/features/trunk/examples/cxf/cxf-osgi/pom.xml
servicemix/smx4/features/trunk/examples/cxf/cxf-osgi/src/main/resources/META-INF/spring/beans.xml
servicemix/smx4/features/trunk/examples/cxf/cxf-ws-addressing/pom.xml
servicemix/smx4/features/trunk/examples/cxf/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml
servicemix/smx4/features/trunk/examples/cxf/cxf-ws-rm/pom.xml
servicemix/smx4/features/trunk/examples/cxf/cxf-ws-rm/src/main/resources/META-INF/spring/beans.xml
servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/pom.xml
servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/src/main/resources/META-INF/spring/beans.xml
Modified: servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs/pom.xml?rev=1210323&r1=1210322&r2=1210323&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs/pom.xml Mon Dec 5
03:59:00 2011
@@ -61,25 +61,14 @@
javax.xml.bind,
javax.xml.bind.annotation,
javax.ws.rs,
- META-INF.cxf,
- META-INF.cxf.osgi,
- org.apache.cxf.bus,
- org.apache.cxf.bus.spring,
- org.apache.cxf.bus.resource,
- org.apache.cxf.resource,
- org.apache.cxf.configuration.spring,
- org.apache.cxf.binding,
- org.apache.cxf.jaxrs.utils,
- org.apache.cxf.transport.http,
+ javax.ws.rs.core,
org.springframework.beans.factory.config,
org.apache.servicemix.examples.cxf.jaxrs,
org.apache.commons.httpclient,
org.apache.commons.httpclient.methods
</Import-Package>
- <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
<Export-Package>org.apache.servicemix.examples.cxf.jaxrs
</Export-Package>
-
<DynamicImport-Package>javax.ws.rs.*</DynamicImport-Package>
</instructions>
</configuration>
</plugin>
Modified:
servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs/src/main/resources/META-INF/spring/beans.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs/src/main/resources/META-INF/spring/beans.xml?rev=1210323&r1=1210322&r2=1210323&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs/src/main/resources/META-INF/spring/beans.xml
(original)
+++
servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs/src/main/resources/META-INF/spring/beans.xml
Mon Dec 5 03:59:00 2011
@@ -26,8 +26,6 @@ http://www.springframework.org/schema/be
http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd";>
- <import resource="classpath:META-INF/cxf/cxf.xml" />
- <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
<jaxrs:server id="customerService" address="/crm">
<jaxrs:serviceBeans>
Modified: servicemix/smx4/features/trunk/examples/cxf/cxf-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-osgi/pom.xml?rev=1210323&r1=1210322&r2=1210323&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf/cxf-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf/cxf-osgi/pom.xml Mon Dec 5
03:59:00 2011
@@ -56,20 +56,10 @@
javax.jws,
javax.wsdl,
javax.xml.namespace,
- META-INF.cxf,
- META-INF.cxf.osgi,
- org.apache.cxf.bus,
- org.apache.cxf.bus.spring,
- org.apache.cxf.bus.resource,
- org.apache.cxf.configuration.spring,
- org.apache.cxf.resource,
- org.apache.cxf.transport.http,
org.apache.servicemix.util,
org.springframework.beans.factory.config
</Import-Package>
<Private-Package>org.apache.servicemix.examples.cxf</Private-Package>
- <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
- <!-- <DynamicImport-Package>*</DynamicImport-Package>
-->
</instructions>
</configuration>
</plugin>
Modified:
servicemix/smx4/features/trunk/examples/cxf/cxf-osgi/src/main/resources/META-INF/spring/beans.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-osgi/src/main/resources/META-INF/spring/beans.xml?rev=1210323&r1=1210322&r2=1210323&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/examples/cxf/cxf-osgi/src/main/resources/META-INF/spring/beans.xml
(original)
+++
servicemix/smx4/features/trunk/examples/cxf/cxf-osgi/src/main/resources/META-INF/spring/beans.xml
Mon Dec 5 03:59:00 2011
@@ -25,8 +25,6 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd";>
- <import resource="classpath:META-INF/cxf/cxf.xml" />
- <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
<jaxws:endpoint id="helloWorld"
implementor="org.apache.servicemix.examples.cxf.HelloWorldImpl"
Modified: servicemix/smx4/features/trunk/examples/cxf/cxf-ws-addressing/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-ws-addressing/pom.xml?rev=1210323&r1=1210322&r2=1210323&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf/cxf-ws-addressing/pom.xml
(original)
+++ servicemix/smx4/features/trunk/examples/cxf/cxf-ws-addressing/pom.xml Mon
Dec 5 03:59:00 2011
@@ -128,7 +128,6 @@
javax.xml.ws.handler,
javax.xml.ws.handler.soap,
META-INF.cxf,
- META-INF.cxf.osgi,
org.apache.cxf.bus,
org.apache.cxf.bus.spring,
org.apache.cxf.bus.resource,
@@ -142,7 +141,6 @@
org.apache.servicemix.util,
org.springframework.beans.factory.config
</Import-Package>
- <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
<Export-Package>
org.apache.servicemix.examples.cxf.wsaddressing,
org.apache.hello_world_soap_http,
Modified:
servicemix/smx4/features/trunk/examples/cxf/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml?rev=1210323&r1=1210322&r2=1210323&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/examples/cxf/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml
(original)
+++
servicemix/smx4/features/trunk/examples/cxf/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml
Mon Dec 5 03:59:00 2011
@@ -31,8 +31,6 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd";>
<import resource="classpath:META-INF/cxf/cxf.xml" />
- <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
-
<jaxws:endpoint id="WsAddressingEndpoint"
implementor="org.apache.servicemix.examples.cxf.wsaddressing.GreeterImpl"
address="/SoapContext/SoapPort"
Modified: servicemix/smx4/features/trunk/examples/cxf/cxf-ws-rm/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-ws-rm/pom.xml?rev=1210323&r1=1210322&r2=1210323&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf/cxf-ws-rm/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf/cxf-ws-rm/pom.xml Mon Dec 5
03:59:00 2011
@@ -85,22 +85,18 @@
javax.wsdl,
javax.xml.ws,
javax.xml.namespace,
- META-INF.cxf,
- META-INF.cxf.osgi,
- org.apache.cxf,
- org.apache.cxf.bus,
- org.apache.cxf.bus.spring,
- org.apache.cxf.bus.resource,
- org.apache.cxf.configuration.spring,
- org.apache.cxf.resource,
- org.apache.cxf.interceptor, org.apache.cxf.io,
org.apache.cxf.message, org.apache.cxf.phase,
- org.apache.cxf.ws.addressing, org.apache.cxf.ws.rm,
- org.apache.cxf.transport.http,
- org.apache.servicemix.util,
+ org.apache.cxf,
+ org.apache.cxf.bus.spring,
+ org.apache.cxf.interceptor,
+ org.apache.cxf.io,
+ org.apache.cxf.message,
+ org.apache.cxf.phase,
+ org.apache.cxf.ws.addressing,
+ org.apache.cxf.ws.rm,
+ org.apache.cxf.ws.rm.v200702,
org.springframework.beans.factory.config
</Import-Package>
<Private-Package>org.apache.servicemix.examples.cxf</Private-Package>
- <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
</instructions>
</configuration>
</plugin>
Modified:
servicemix/smx4/features/trunk/examples/cxf/cxf-ws-rm/src/main/resources/META-INF/spring/beans.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-ws-rm/src/main/resources/META-INF/spring/beans.xml?rev=1210323&r1=1210322&r2=1210323&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/examples/cxf/cxf-ws-rm/src/main/resources/META-INF/spring/beans.xml
(original)
+++
servicemix/smx4/features/trunk/examples/cxf/cxf-ws-rm/src/main/resources/META-INF/spring/beans.xml
Mon Dec 5 03:59:00 2011
@@ -34,7 +34,6 @@
http://cxf.apache.org/ws/rm/manager
http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd";>
- <import resource="classpath:META-INF/cxf/cxf.xml" />
<jaxws:endpoint id="helloWorld"
implementor="org.apache.servicemix.examples.cxf.HelloWorldImpl"
Modified:
servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/pom.xml?rev=1210323&r1=1210322&r2=1210323&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/pom.xml
(original)
+++ servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/pom.xml
Mon Dec 5 03:59:00 2011
@@ -61,23 +61,14 @@
javax.xml.bind.annotation,
javax.xml.namespace,
javax.wsdl,
- META-INF.cxf,
- META-INF.cxf.osgi,
- org.apache.cxf.bus,
- org.apache.cxf.bus.spring,
- org.apache.cxf.bus.resource,
- org.apache.cxf.configuration.spring,
- org.apache.cxf.resource,
- org.apache.cxf.transport.http,
- org.apache.cxf.ws.security.wss4j,
org.springframework.beans.factory.config,
javax.security.auth.callback,
+ org.apache.cxf.ws.security.wss4j,
org.apache.ws.security,
org.apache.servicemix.util,
org.apache.ws.security.processor
</Import-Package>
<Export-Package>org.apache.servicemix.examples.cxf</Export-Package>
- <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
</instructions>
</configuration>
</plugin>
Modified:
servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/src/main/resources/META-INF/spring/beans.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/src/main/resources/META-INF/spring/beans.xml?rev=1210323&r1=1210322&r2=1210323&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/src/main/resources/META-INF/spring/beans.xml
(original)
+++
servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/src/main/resources/META-INF/spring/beans.xml
Mon Dec 5 03:59:00 2011
@@ -25,8 +25,6 @@ under the License.
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd";>
- <import resource="classpath:META-INF/cxf/cxf.xml" />
- <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
<bean id="myPasswordCallback"
class="org.apache.servicemix.examples.cxf.ServerPasswordCallback"/>
