You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ni...@apache.org on 2012/02/29 08:20:00 UTC
svn commit: r1294992 - in /servicemix/smx4/features/trunk/examples/cxf:
cxf-jaxrs-blueprint/pom.xml cxf-jaxrs/pom.xml cxf-jaxws-blueprint/pom.xml
cxf-osgi/pom.xml cxf-ws-addressing/pom.xml
cxf-ws-security-blueprint/pom.xml cxf-ws-security-osgi/pom.xml
Author: ningjiang
Date: Wed Feb 29 07:19:59 2012
New Revision: 1294992
URL: http://svn.apache.org/viewvc?rev=1294992&view=rev
Log:
clean up the code of servicemix examples
Modified:
servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs-blueprint/pom.xml
servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs/pom.xml
servicemix/smx4/features/trunk/examples/cxf/cxf-jaxws-blueprint/pom.xml
servicemix/smx4/features/trunk/examples/cxf/cxf-osgi/pom.xml
servicemix/smx4/features/trunk/examples/cxf/cxf-ws-addressing/pom.xml
servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/pom.xml
servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/pom.xml
Modified: servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs-blueprint/pom.xml?rev=1294992&r1=1294991&r2=1294992&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs-blueprint/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs-blueprint/pom.xml Wed Feb 29 07:19:59 2012
@@ -38,10 +38,6 @@
<artifactId>org.apache.servicemix.specs.jsr311-api-1.1.1</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
</dependency>
@@ -67,7 +63,7 @@
org.osgi.service.blueprint
</Import-Package>
<Export-Package>
- !org.apache.servicemix.examples.cxf.jaxrs*
+ org.apache.servicemix.examples.cxf.jaxrs
</Export-Package>
</instructions>
</configuration>
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=1294992&r1=1294991&r2=1294992&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf/cxf-jaxrs/pom.xml Wed Feb 29 07:19:59 2012
@@ -63,11 +63,11 @@
javax.ws.rs,
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>
- <Export-Package>org.apache.servicemix.examples.cxf.jaxrs
+ <Export-Package>
+ org.apache.servicemix.examples.cxf.jaxrs
</Export-Package>
</instructions>
</configuration>
Modified: servicemix/smx4/features/trunk/examples/cxf/cxf-jaxws-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-jaxws-blueprint/pom.xml?rev=1294992&r1=1294991&r2=1294992&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf/cxf-jaxws-blueprint/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf/cxf-jaxws-blueprint/pom.xml Wed Feb 29 07:19:59 2012
@@ -61,7 +61,7 @@
org.osgi.service.blueprint
</Import-Package>
<Export-Package>
- !org.apache.servicemix.examples.cxf*
+ org.apache.servicemix.examples.cxf
</Export-Package>
</instructions>
</configuration>
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=1294992&r1=1294991&r2=1294992&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf/cxf-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf/cxf-osgi/pom.xml Wed Feb 29 07:19:59 2012
@@ -59,7 +59,9 @@
org.apache.servicemix.util,
org.springframework.beans.factory.config
</Import-Package>
- <Private-Package>org.apache.servicemix.examples.cxf</Private-Package>
+ <Export-Package>
+ org.apache.servicemix.examples.cxf
+ </Export-Package>
</instructions>
</configuration>
</plugin>
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=1294992&r1=1294991&r2=1294992&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 Wed Feb 29 07:19:59 2012
@@ -1,42 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
- <!ELEMENT project (modelVersion|parent|artifactId|packaging|name|dependencies|build)*>
- <!ATTLIST project
- xmlns CDATA #REQUIRED
- xmlns:xsi CDATA #REQUIRED
- xsi:schemaLocation CDATA #REQUIRED>
- <!ELEMENT modelVersion (#PCDATA)>
- <!ELEMENT parent (groupId|artifactId|version)*>
- <!ELEMENT groupId (#PCDATA)>
- <!ELEMENT artifactId (#PCDATA)>
- <!ELEMENT version (#PCDATA)>
- <!ELEMENT packaging (#PCDATA)>
- <!ELEMENT name (#PCDATA)>
- <!ELEMENT dependencies (dependency)*>
- <!ELEMENT dependency (groupId|artifactId|scope)*>
- <!ELEMENT scope (#PCDATA)>
- <!ELEMENT build (plugins)*>
- <!ELEMENT plugins (plugin)*>
- <!ELEMENT plugin (groupId|artifactId|executions|configuration)*>
- <!ELEMENT executions (execution)*>
- <!ELEMENT execution (id|phase|configuration|goals)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT phase (#PCDATA)>
- <!ELEMENT configuration (sourceRoot|wsdlOptions|instructions|mainClass|includePluginDependencies)*>
- <!ELEMENT sourceRoot (#PCDATA)>
- <!ELEMENT wsdlOptions (wsdlOption)*>
- <!ELEMENT wsdlOption (wsdl)*>
- <!ELEMENT wsdl (#PCDATA)>
- <!ELEMENT goals (goal)*>
- <!ELEMENT goal (#PCDATA)>
- <!ELEMENT instructions (Bundle-SymbolicName|Import-Package|Require-Bundle|Export-Package)*>
- <!ELEMENT Bundle-SymbolicName (#PCDATA)>
- <!ELEMENT Import-Package (#PCDATA)>
- <!ELEMENT Require-Bundle (#PCDATA)>
- <!ELEMENT Export-Package (#PCDATA)>
- <!ELEMENT mainClass (#PCDATA)>
- <!ELEMENT includePluginDependencies (#PCDATA)>
- ]>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
@@ -144,7 +106,7 @@
<Export-Package>
org.apache.servicemix.examples.cxf.wsaddressing,
org.apache.hello_world_soap_http,
- org.apache.hello_world_soap_http.types,
+ org.apache.hello_world_soap_http.types
</Export-Package>
</instructions>
</configuration>
Modified: servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/pom.xml?rev=1294992&r1=1294991&r2=1294992&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/pom.xml Wed Feb 29 07:19:59 2012
@@ -78,8 +78,6 @@
org.apache.cxf.ws.security.wss4j,
javax.security.auth.callback,
org.apache.ws.security,
- org.apache.commons.logging,
- org.apache.servicemix.util,
org.apache.ws.security.processor,
org.apache.cxf.interceptor.security,
org.apache.cxf, org.apache.cxf.endpoint, org.apache.cxf.frontend, org.apache.cxf.interceptor, org.apache.cxf.jaxws, org.apache.cxf.message, org.apache.cxf.phase
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=1294992&r1=1294991&r2=1294992&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 Wed Feb 29 07:19:59 2012
@@ -78,8 +78,6 @@
org.springframework.beans.factory.config,
javax.security.auth.callback,
org.apache.ws.security,
- org.apache.commons.logging,
- org.apache.servicemix.util,
org.apache.ws.security.processor,
org.apache.cxf.interceptor.security,
org.apache.cxf, org.apache.cxf.endpoint, org.apache.cxf.frontend, org.apache.cxf.interceptor, org.apache.cxf.jaxws, org.apache.cxf.message, org.apache.cxf.phase