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/04/04 08:26:04 UTC
svn commit: r644622 - in /servicemix/smx4/features/trunk: ./ assembly/
assembly/src/main/descriptors/ assembly/src/main/filtered-resources/
assembly/src/main/filtered-resources/etc/ camel/servicemix-camel/
ejb3/bundles/cxf/ ejb3/cxf-binding-nmr/ ejb3/c...
Author: gnodet
Date: Thu Apr 3 23:26:01 2008
New Revision: 644622
URL: http://svn.apache.org/viewvc?rev=644622&view=rev
Log:
Add CXF examples
Added:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/examples/ (with props)
servicemix/smx4/features/trunk/examples/cxf-nmr/ (with props)
servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml
servicemix/smx4/features/trunk/examples/cxf-nmr/src/
servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/
servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/java/
servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/java/org/
servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/java/org/apache/
servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/java/org/apache/servicemix/
servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/java/org/apache/servicemix/examples/
servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/java/org/apache/servicemix/examples/cxf/
servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java
servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java
servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/resources/
servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/resources/META-INF/
servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/resources/META-INF/spring/
servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/resources/META-INF/spring/beans.xml
servicemix/smx4/features/trunk/examples/cxf-osgi/ (with props)
servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml
servicemix/smx4/features/trunk/examples/cxf-osgi/src/
servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/
servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/java/
servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/java/org/
servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/java/org/apache/
servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/java/org/apache/servicemix/
servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/
servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/
servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java
servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java
servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/resources/
servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/resources/META-INF/
servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/resources/META-INF/spring/
servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/resources/META-INF/spring/beans.xml
servicemix/smx4/features/trunk/examples/pom.xml
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
servicemix/smx4/features/trunk/ejb3/bundles/cxf/pom.xml
servicemix/smx4/features/trunk/ejb3/cxf-binding-nmr/pom.xml
servicemix/smx4/features/trunk/ejb3/cxf-transport-nmr/pom.xml
servicemix/smx4/features/trunk/ejb3/cxf-transport-osgi/pom.xml
servicemix/smx4/features/trunk/ejb3/deployer/pom.xml
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=644622&r1=644621&r2=644622&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Thu Apr 3 23:26:01 2008
@@ -164,7 +164,7 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cxf-2.0.4</artifactId>
+ <artifactId>org.apache.servicemix.bundles.cxf-2.0.5</artifactId>
<version>${version}</version>
</dependency>
<dependency>
@@ -430,6 +430,28 @@
<outputDirectory>target/dependencies/win</outputDirectory>
</artifactItem>
</artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/classes/features.xml</file>
+ <type>xml </type>
+ <classifier>features</classifier>
+ </artifact>
+ </artifacts>
</configuration>
</execution>
</executions>
Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=644622&r1=644621&r2=644622&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml Thu Apr 3 23:26:01 2008
@@ -51,8 +51,8 @@
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
+ <directory>target/classes/etc</directory>
+ <outputDirectory>/etc/</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -177,7 +177,7 @@
<include>org.apache.openejb:openejb-webservices</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.asm-2.2.3</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-cli-1.1</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cxf-2.0.4</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cxf-2.0.5</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-api-2.0</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl-2.0.3</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxws-api-2.0</include>
Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=644622&r1=644621&r2=644622&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml Thu Apr 3 23:26:01 2008
@@ -51,8 +51,8 @@
<lineEnding>dos</lineEnding>
</fileSet>
<fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
+ <directory>target/classes/etc</directory>
+ <outputDirectory>/etc/</outputDirectory>
<lineEnding>dos</lineEnding>
</fileSet>
@@ -168,7 +168,7 @@
<include>org.apache.openejb:openejb-webservices</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.asm-2.2.3</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-cli-1.1</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cxf-2.0.4</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cxf-2.0.5</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-api-2.0</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl-2.0.3</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxws-api-2.0</include>
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=644622&r1=644621&r2=644622&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties Thu Apr 3 23:26:01 2008
@@ -119,7 +119,7 @@
openejb-server-${openejb.version}.jar=50
openejb-webservices-${openejb.version}.jar=50
-org.apache.servicemix.bundles.cxf-2.0.4-${version}.jar=50
+org.apache.servicemix.bundles.cxf-2.0.5-${version}.jar=50
org.apache.servicemix.bundles.commons-cli-1.1-${version}.jar=50
org.apache.servicemix.bundles.jaxb-api-2.0-${version}.jar=50
org.apache.servicemix.bundles.jaxb-impl-2.0.3-${version}.jar=50
Added: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=644622&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (added)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Thu Apr 3 23:26:01 2008
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http///www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<features>
+ <feature name="web-core">
+ <bundle>mvn:org.mortbay.jetty/jetty-util/${jetty.version}</bundle>
+ <bundle>mvn:org.mortbay.jetty/jetty/${jetty.version}</bundle>
+ <bundle>mvn:org.ops4j.pax.web/pax-web-bundle/${pax.web.version}</bundle>
+ </feature>
+ <feature name="web">
+ <feature>web-core</feature>
+ <bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
+ <bundle>mvn:org.ops4j.pax.web-extender/pax-web-ex-war/${pax.web.extender.version}</bundle>
+ <bundle>mvn:org.ops4j.pax.web-extender/pax-web-ex-whiteboard/${pax.web.extender.version}</bundle>
+ <bundle>mvn:org.ops4j.pax.url/pax-url-war/${pax.url.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.war/org.apache.servicemix.war.deployer/${version}</bundle>
+ </feature>
+ <feature name="activemq">
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta.version}</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms.version}</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec</bundle>
+ <bundle>mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
+ <bundle>mvn:org.apache.activemq/activemq-core/${activemq.version}</bundle>
+ </feature>
+ <feature name="cxf">
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/${geronimo.activation.version}</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo.annotation.version}</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-javamail_1.4_spec/${geronimo.javamail.version}</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-saaj_1.3_spec/${geronimo.saaj.version}</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo.wsmetadata.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm-2.2.3/${servicemix.kernel.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-api-2.0/${version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl-2.0.3/${version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxws-api-2.0/${version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi-2.0.2/${version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.woodstox-3.2.3/${servicemix.nmr.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j-1.6.1/${version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlschema-1.3.2/${version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver-1.2/${version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cxf-2.0.5/${version}</bundle>
+ </feature>
+ <feature name="cxf-osgi">
+ <feature>cxf</feature>
+ <feature>web-core</feature>
+ <bundle>mvn:org.ops4j.pax.web-extender/pax-web-ex-whiteboard/${pax.web.extender.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.ejb3/org.apache.servicemix.cxf.transport.osgi/${version}</bundle>
+ </feature>
+ <feature name="cxf-nmr">
+ <feature>nmr</feature>
+ <bundle>mvn:org.apache.servicemix.ejb3/org.apache.servicemix.cxf.transport.nmr/${version}</bundle>
+ <bundle>mvn:org.apache.servicemix.ejb3/org.apache.servicemix.cxf.binding.nmr/${version}</bundle>
+ </feature>
+ <feature name="examples-cxf-osgi">
+ <feature>cxf-ogi</feature>
+ <bundle>mvn:org.apache.servicemix.examples/cxf-osgi/${version}</bundle>
+ </feature>
+ <feature name="examples-cxf-nmr">
+ <feature>cxf-nmr</feature>
+ <bundle>mvn:org.apache.servicemix.examples/cxf-nmr/${version}</bundle>
+ </feature>
+</features>
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml?rev=644622&r1=644621&r2=644622&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml Thu Apr 3 23:26:01 2008
@@ -51,7 +51,6 @@
<artifactId>org.osgi.core</artifactId>
<version>${felix.osgi.version}</version>
<scope>provided</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -101,22 +100,7 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-policy</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-addr</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-rm</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-security</artifactId>
+ <artifactId>cxf-bundle</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
Modified: servicemix/smx4/features/trunk/ejb3/bundles/cxf/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/ejb3/bundles/cxf/pom.xml?rev=644622&r1=644621&r2=644622&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/bundles/cxf/pom.xml (original)
+++ servicemix/smx4/features/trunk/ejb3/bundles/cxf/pom.xml Thu Apr 3 23:26:01 2008
@@ -29,7 +29,7 @@
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cxf-2.0.4</artifactId>
+ <artifactId>org.apache.servicemix.bundles.cxf-2.0.5</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ServiceMix OSGI Common Bundles: cxf</name>
@@ -38,7 +38,7 @@
</description>
<properties>
- <pkgVersion>2.0.4</pkgVersion>
+ <pkgVersion>2.0.5.incubator</pkgVersion>
<servicemix.osgi.export>
org.apache.cxf*;version=${pkgVersion};-split-package:=merge-first,
org.xmlsoap.schemas*;version=${pkgVersion};-split-package:=merge-first,
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle</artifactId>
- <version>2.0.4-incubator</version>
+ <version>2.0.5-incubator</version>
<optional>true</optional>
</dependency>
Modified: servicemix/smx4/features/trunk/ejb3/cxf-binding-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/ejb3/cxf-binding-nmr/pom.xml?rev=644622&r1=644621&r2=644622&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/cxf-binding-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/ejb3/cxf-binding-nmr/pom.xml Thu Apr 3 23:26:01 2008
@@ -36,11 +36,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cxf-2.0.4</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.nmr</groupId>
<artifactId>org.apache.servicemix.nmr.api</artifactId>
<version>${servicemix.nmr.version}</version>
@@ -49,7 +44,6 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle</artifactId>
<version>${cxf.version}</version>
- <optional>true</optional>
</dependency>
</dependencies>
Modified: servicemix/smx4/features/trunk/ejb3/cxf-transport-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/ejb3/cxf-transport-nmr/pom.xml?rev=644622&r1=644621&r2=644622&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/cxf-transport-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/ejb3/cxf-transport-nmr/pom.xml Thu Apr 3 23:26:01 2008
@@ -36,11 +36,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cxf-2.0.4</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.nmr</groupId>
<artifactId>org.apache.servicemix.nmr.api</artifactId>
<version>${servicemix.nmr.version}</version>
@@ -49,7 +44,6 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle</artifactId>
<version>${cxf.version}</version>
- <optional>true</optional>
</dependency>
</dependencies>
Modified: servicemix/smx4/features/trunk/ejb3/cxf-transport-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/ejb3/cxf-transport-osgi/pom.xml?rev=644622&r1=644621&r2=644622&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/cxf-transport-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/ejb3/cxf-transport-osgi/pom.xml Thu Apr 3 23:26:01 2008
@@ -36,11 +36,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cxf-2.0.4</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>${felix.compendium.version}</version>
@@ -50,7 +45,6 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle</artifactId>
<version>${cxf.version}</version>
- <optional>true</optional>
</dependency>
</dependencies>
Modified: servicemix/smx4/features/trunk/ejb3/deployer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/ejb3/deployer/pom.xml?rev=644622&r1=644621&r2=644622&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/deployer/pom.xml (original)
+++ servicemix/smx4/features/trunk/ejb3/deployer/pom.xml Thu Apr 3 23:26:01 2008
@@ -36,11 +36,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cxf-2.0.4</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.ejb3</groupId>
<artifactId>org.apache.servicemix.cxf.transport.nmr</artifactId>
<version>${pom.version}</version>
@@ -320,7 +315,6 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle</artifactId>
<version>${cxf.version}</version>
- <optional>true</optional>
</dependency>
</dependencies>
Propchange: servicemix/smx4/features/trunk/examples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Apr 3 23:26:01 2008
@@ -0,0 +1,9 @@
+target
+*.iml
+*.ipr
+*.iws
+.classpath
+.project
+.settings
+
+
Propchange: servicemix/smx4/features/trunk/examples/cxf-nmr/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Apr 3 23:26:01 2008
@@ -0,0 +1,9 @@
+target
+*.iml
+*.ipr
+*.iws
+.classpath
+.project
+.settings
+
+
Added: servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml?rev=644622&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml (added)
+++ servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml Thu Apr 3 23:26:01 2008
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix.examples</groupId>
+ <artifactId>examples</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.examples</groupId>
+ <artifactId>cxf-nmr</artifactId>
+ <packaging>bundle</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>ServiceMix Example :: CXF NMR</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ <version>${geronimo.wsmetadata.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Import-Package>javax.jws,META-INF.cxf,META-INF.cxf.transport.nmr</Import-Package>
+ <Private-Package>org.apache.servicemix.examples.cxf</Private-Package>
+ <Require-Bundle>org.apache.servicemix.bundles.woodstox-3.2.3</Require-Bundle>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java?rev=644622&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java (added)
+++ servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java Thu Apr 3 23:26:01 2008
@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+// START SNIPPET: service
+package org.apache.servicemix.examples.cxf;
+
+import javax.jws.WebService;
+
+@WebService
+public interface HelloWorld {
+ String sayHi(String text);
+}
+// END SNIPPET: service
Added: servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java?rev=644622&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java (added)
+++ servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java Thu Apr 3 23:26:01 2008
@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+// START SNIPPET: service
+package org.apache.servicemix.examples.cxf;
+
+import javax.jws.WebService;
+
+@WebService(endpointInterface = "org.apache.servicemix.examples.cxf.HelloWorld")
+public class HelloWorldImpl implements HelloWorld {
+
+ public String sayHi(String text) {
+ return "Hello " + text;
+ }
+}
+// END SNIPPET: service
Added: servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/resources/META-INF/spring/beans.xml?rev=644622&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/resources/META-INF/spring/beans.xml (added)
+++ servicemix/smx4/features/trunk/examples/cxf-nmr/src/main/resources/META-INF/spring/beans.xml Thu Apr 3 23:26:01 2008
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!-- START SNIPPET: beans -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="
+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/cxf-extension-soap.xml" />
+ <import resource="classpath:META-INF/cxf/transport/nmr/cxf-transport-nmr.xml" />
+
+ <jaxws:endpoint id="helloWorld"
+ implementor="org.apache.servicemix.examples.cxf.HelloWorldImpl"
+ address="nmr:HelloWorld" />
+
+</beans>
+<!-- END SNIPPET: beans -->
Propchange: servicemix/smx4/features/trunk/examples/cxf-osgi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Apr 3 23:26:01 2008
@@ -0,0 +1,9 @@
+target
+*.iml
+*.ipr
+*.iws
+.classpath
+.project
+.settings
+
+
Added: servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml?rev=644622&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml (added)
+++ servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml Thu Apr 3 23:26:01 2008
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix.examples</groupId>
+ <artifactId>examples</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.examples</groupId>
+ <artifactId>cxf-osgi</artifactId>
+ <packaging>bundle</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>ServiceMix Example :: CXF OSGi</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ <version>${geronimo.wsmetadata.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Import-Package>javax.jws,META-INF.cxf,META-INF.cxf.osgi</Import-Package>
+ <Private-Package>org.apache.servicemix.examples.cxf</Private-Package>
+ <Require-Bundle>org.apache.servicemix.bundles.woodstox-3.2.3</Require-Bundle>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java?rev=644622&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java (added)
+++ servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java Thu Apr 3 23:26:01 2008
@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+// START SNIPPET: service
+package org.apache.servicemix.examples.cxf;
+
+import javax.jws.WebService;
+
+@WebService
+public interface HelloWorld {
+ String sayHi(String text);
+}
+// END SNIPPET: service
Added: servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java?rev=644622&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java (added)
+++ servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java Thu Apr 3 23:26:01 2008
@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+// START SNIPPET: service
+package org.apache.servicemix.examples.cxf;
+
+import javax.jws.WebService;
+
+@WebService(endpointInterface = "org.apache.servicemix.examples.cxf.HelloWorld")
+public class HelloWorldImpl implements HelloWorld {
+
+ public String sayHi(String text) {
+ return "Hello " + text;
+ }
+}
+// END SNIPPET: service
Added: servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/resources/META-INF/spring/beans.xml?rev=644622&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/resources/META-INF/spring/beans.xml (added)
+++ servicemix/smx4/features/trunk/examples/cxf-osgi/src/main/resources/META-INF/spring/beans.xml Thu Apr 3 23:26:01 2008
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!-- START SNIPPET: beans -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="
+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/cxf-extension-soap.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
+ <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
+
+ <jaxws:endpoint id="helloWorld"
+ implementor="org.apache.servicemix.examples.cxf.HelloWorldImpl"
+ address="/HelloWorld"/>
+
+</beans>
+<!-- END SNIPPET: beans -->
Added: servicemix/smx4/features/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/pom.xml?rev=644622&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/examples/pom.xml (added)
+++ servicemix/smx4/features/trunk/examples/pom.xml Thu Apr 3 23:26:01 2008
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix.features</groupId>
+ <artifactId>features</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.examples</groupId>
+ <artifactId>examples</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>ServiceMix Examples</name>
+
+ <modules>
+ <module>cxf-nmr</module>
+ <module>cxf-osgi</module>
+ </modules>
+
+</project>
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=644622&r1=644621&r2=644622&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Thu Apr 3 23:26:01 2008
@@ -40,6 +40,7 @@
<module>camel</module>
<module>war</module>
<module>ejb3</module>
+ <module>examples</module>
<module>assembly</module>
</modules>
@@ -69,7 +70,7 @@
<camel.version>1.3-SNAPSHOT</camel.version>
<commons.io.version>1.3.1</commons.io.version>
<commons.logging.version>1.1</commons.logging.version>
- <cxf.version>2.0.4-incubator</cxf.version>
+ <cxf.version>2.0.5-incubator</cxf.version>
<felix.bundlerepository.version>1.0.2</felix.bundlerepository.version>
<felix.compendium.version>1.0.0</felix.compendium.version>
<felix.configadmin.version>1.0.0</felix.configadmin.version>
@@ -101,7 +102,7 @@
<jaxb.impl.version>2.0.3</jaxb.impl.version>
<jaxws.api.version>2.0</jaxws.api.version>
<jencks.version>2.1</jencks.version>
- <jetty.version>6.1.8</jetty.version>
+ <jetty.version>6.1.9</jetty.version>
<jline.version>0.9.93</jline.version>
<junit.version>4.4</junit.version>
<log4j.version>1.2.14</log4j.version>