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/14 10:26:38 UTC
svn commit: r647693 - in /servicemix/smx4/features: branches/ejb3/
branches/ejb3/bundles/ branches/ejb3/bundles/cxf/
branches/ejb3/bundles/jaxws-api/ branches/ejb3/bundles/neethi/
branches/ejb3/bundles/saaj-impl/ branches/ejb3/bundles/wsdl4j/ branches/...
Author: gnodet
Date: Mon Apr 14 01:25:59 2008
New Revision: 647693
URL: http://svn.apache.org/viewvc?rev=647693&view=rev
Log:
Move EJB support to a branch and rename CXF support
Added:
servicemix/smx4/features/branches/ejb3/
- copied from r646413, servicemix/smx4/features/trunk/ejb3/
servicemix/smx4/features/branches/ejb3/bundles/
- copied from r647690, servicemix/smx4/features/trunk/ejb3/bundles/
servicemix/smx4/features/branches/ejb3/deployer/
- copied from r647690, servicemix/smx4/features/trunk/ejb3/deployer/
servicemix/smx4/features/branches/ejb3/pom.xml
- copied, changed from r647690, servicemix/smx4/features/trunk/ejb3/pom.xml
servicemix/smx4/features/trunk/BUILDING.txt
- copied, changed from r646413, servicemix/smx4/kernel/trunk/BUILDING.txt
servicemix/smx4/features/trunk/LICENSE.txt
- copied unchanged from r646413, servicemix/smx4/kernel/trunk/LICENSE.txt
servicemix/smx4/features/trunk/NOTICE.txt
- copied unchanged from r646413, servicemix/smx4/kernel/trunk/NOTICE.txt
servicemix/smx4/features/trunk/README.txt
- copied, changed from r646413, servicemix/smx4/kernel/trunk/README.txt
servicemix/smx4/features/trunk/RELEASE-NOTES.txt
- copied, changed from r646413, servicemix/smx4/kernel/trunk/RELEASE-NOTES.txt
servicemix/smx4/features/trunk/cxf/
servicemix/smx4/features/trunk/cxf/bundles/
servicemix/smx4/features/trunk/cxf/bundles/cxf/
- copied from r646413, servicemix/smx4/features/trunk/ejb3/bundles/cxf/
servicemix/smx4/features/trunk/cxf/bundles/cxf/pom.xml
- copied, changed from r647690, servicemix/smx4/features/trunk/ejb3/bundles/cxf/pom.xml
servicemix/smx4/features/trunk/cxf/bundles/jaxws-api/
- copied from r646413, servicemix/smx4/features/trunk/ejb3/bundles/jaxws-api/
servicemix/smx4/features/trunk/cxf/bundles/jaxws-api/pom.xml
- copied, changed from r647690, servicemix/smx4/features/trunk/ejb3/bundles/jaxws-api/pom.xml
servicemix/smx4/features/trunk/cxf/bundles/neethi/
- copied from r646413, servicemix/smx4/features/trunk/ejb3/bundles/neethi/
servicemix/smx4/features/trunk/cxf/bundles/neethi/pom.xml
- copied, changed from r647690, servicemix/smx4/features/trunk/ejb3/bundles/neethi/pom.xml
servicemix/smx4/features/trunk/cxf/bundles/pom.xml
servicemix/smx4/features/trunk/cxf/bundles/saaj-impl/
- copied from r646413, servicemix/smx4/features/trunk/ejb3/bundles/saaj-impl/
servicemix/smx4/features/trunk/cxf/bundles/saaj-impl/pom.xml
- copied, changed from r647690, servicemix/smx4/features/trunk/ejb3/bundles/saaj-impl/pom.xml
servicemix/smx4/features/trunk/cxf/bundles/wsdl4j/
- copied from r646413, servicemix/smx4/features/trunk/ejb3/bundles/wsdl4j/
servicemix/smx4/features/trunk/cxf/bundles/wsdl4j/pom.xml
- copied, changed from r647690, servicemix/smx4/features/trunk/ejb3/bundles/wsdl4j/pom.xml
servicemix/smx4/features/trunk/cxf/bundles/xmlresolver/
- copied from r646413, servicemix/smx4/features/trunk/ejb3/bundles/xmlresolver/
servicemix/smx4/features/trunk/cxf/bundles/xmlresolver/pom.xml
- copied, changed from r647690, servicemix/smx4/features/trunk/ejb3/bundles/xmlresolver/pom.xml
servicemix/smx4/features/trunk/cxf/bundles/xmlschema/
- copied from r646413, servicemix/smx4/features/trunk/ejb3/bundles/xmlschema/
servicemix/smx4/features/trunk/cxf/bundles/xmlschema/pom.xml
- copied, changed from r647690, servicemix/smx4/features/trunk/ejb3/bundles/xmlschema/pom.xml
servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/
- copied from r646413, servicemix/smx4/features/trunk/ejb3/cxf-binding-nmr/
servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml
- copied, changed from r647690, servicemix/smx4/features/trunk/ejb3/cxf-binding-nmr/pom.xml
servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/src/
- copied from r647690, servicemix/smx4/features/trunk/ejb3/cxf-binding-nmr/src/
servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/
- copied from r646413, servicemix/smx4/features/trunk/ejb3/cxf-transport-nmr/
servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml
- copied, changed from r647690, servicemix/smx4/features/trunk/ejb3/cxf-transport-nmr/pom.xml
servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/
- copied from r647690, servicemix/smx4/features/trunk/ejb3/cxf-transport-nmr/src/
servicemix/smx4/features/trunk/cxf/cxf-transport-osgi/
- copied from r646413, servicemix/smx4/features/trunk/ejb3/cxf-transport-osgi/
servicemix/smx4/features/trunk/cxf/cxf-transport-osgi/pom.xml
- copied, changed from r647690, servicemix/smx4/features/trunk/ejb3/cxf-transport-osgi/pom.xml
servicemix/smx4/features/trunk/cxf/cxf-transport-osgi/src/
- copied from r647690, servicemix/smx4/features/trunk/ejb3/cxf-transport-osgi/src/
servicemix/smx4/features/trunk/cxf/pom.xml
Removed:
servicemix/smx4/features/branches/ejb3/bundles/cxf/
servicemix/smx4/features/branches/ejb3/bundles/jaxws-api/
servicemix/smx4/features/branches/ejb3/bundles/neethi/
servicemix/smx4/features/branches/ejb3/bundles/saaj-impl/
servicemix/smx4/features/branches/ejb3/bundles/wsdl4j/
servicemix/smx4/features/branches/ejb3/bundles/xmlresolver/
servicemix/smx4/features/branches/ejb3/bundles/xmlschema/
servicemix/smx4/features/branches/ejb3/cxf-binding-nmr/
servicemix/smx4/features/branches/ejb3/cxf-transport-nmr/
servicemix/smx4/features/branches/ejb3/cxf-transport-osgi/
servicemix/smx4/features/trunk/ejb3/
Modified:
servicemix/smx4/features/branches/ejb3/bundles/pom.xml
servicemix/smx4/features/trunk/activemq/activemq-osgi/pom.xml
servicemix/smx4/features/trunk/activemq/pom.xml
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/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/camel/bundles/jaxb-api/pom.xml
servicemix/smx4/features/trunk/camel/bundles/jaxb-impl/pom.xml
servicemix/smx4/features/trunk/camel/bundles/pom.xml
servicemix/smx4/features/trunk/camel/pom.xml
servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml
servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml
servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml
servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml
servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml
servicemix/smx4/features/trunk/examples/pom.xml
servicemix/smx4/features/trunk/management/acegi/pom.xml
servicemix/smx4/features/trunk/management/core/pom.xml
servicemix/smx4/features/trunk/management/pom.xml
servicemix/smx4/features/trunk/pom.xml
servicemix/smx4/features/trunk/transaction/bundles/howl/pom.xml
servicemix/smx4/features/trunk/transaction/bundles/jencks/pom.xml
servicemix/smx4/features/trunk/transaction/bundles/pom.xml
servicemix/smx4/features/trunk/transaction/pom.xml
servicemix/smx4/features/trunk/transaction/transaction/pom.xml
servicemix/smx4/features/trunk/war/bundles/jasper/pom.xml
servicemix/smx4/features/trunk/war/bundles/pom.xml
servicemix/smx4/features/trunk/war/deployer/pom.xml
servicemix/smx4/features/trunk/war/pom.xml
Modified: servicemix/smx4/features/branches/ejb3/bundles/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/branches/ejb3/bundles/pom.xml?rev=647693&r1=647690&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/branches/ejb3/bundles/pom.xml (original)
+++ servicemix/smx4/features/branches/ejb3/bundles/pom.xml Mon Apr 14 01:25:59 2008
@@ -34,15 +34,8 @@
<modules>
<module>commons-cli</module>
- <module>cxf</module>
- <module>jaxws-api</module>
- <module>neethi</module>
<module>openjpa</module>
- <module>saaj-impl</module>
<module>swizzle</module>
- <module>wsdl4j</module>
- <module>xmlresolver</module>
- <module>xmlschema</module>
</modules>
<properties>
Copied: servicemix/smx4/features/branches/ejb3/pom.xml (from r647690, servicemix/smx4/features/trunk/ejb3/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/branches/ejb3/pom.xml?p2=servicemix/smx4/features/branches/ejb3/pom.xml&p1=servicemix/smx4/features/trunk/ejb3/pom.xml&r1=647690&r2=647693&rev=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/pom.xml (original)
+++ servicemix/smx4/features/branches/ejb3/pom.xml Mon Apr 14 01:25:59 2008
@@ -36,9 +36,6 @@
<modules>
<module>bundles</module>
- <module>cxf-transport-nmr</module>
- <module>cxf-transport-osgi</module>
- <module>cxf-binding-nmr</module>
<module>deployer</module>
</modules>
Copied: servicemix/smx4/features/trunk/BUILDING.txt (from r646413, servicemix/smx4/kernel/trunk/BUILDING.txt)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/BUILDING.txt?p2=servicemix/smx4/features/trunk/BUILDING.txt&p1=servicemix/smx4/kernel/trunk/BUILDING.txt&r1=646413&r2=647693&rev=647693&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/BUILDING.txt (original)
+++ servicemix/smx4/features/trunk/BUILDING.txt Mon Apr 14 01:25:59 2008
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-Building Apache ServiceMix Kernel
-===================================
+Building Apache ServiceMix 4
+============================
Initial Setup
-------------
@@ -28,7 +28,7 @@
JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or
$JAVA_HOME$/bin (unix).
-3) Install Maven 2.0.7, which can be downloaded from
+3) Install Maven 2.0.8, which can be downloaded from
http://maven.apache.org/download.html. Make sure that your PATH includes
the MVN_HOME/bin directory.
@@ -36,13 +36,13 @@
Building
--------
-1) Change to the top level directory of Apache ServiceMix Kernel source distribution.
+1) Change to the top level directory of Apache ServiceMix 4 source distribution.
2) Run
$> mvn
- This will compile Apache ServiceMix Kernel and run all of the tests in the
+ This will compile Apache ServiceMix 4 and run all of the tests in the
Apache ServiceMix Kernel source distribution. Alternatively, you can run
$> mvn -Pfastinstall
- This will compile Apache ServiceMix Kernel without running the tests and takes less
+ This will compile Apache ServiceMix 4 without running the tests and takes less
time to build.
Depending on the load of remote Maven 2.0 repositories, you may have
to run "mvn" several times until the required dependencies are
Copied: servicemix/smx4/features/trunk/README.txt (from r646413, servicemix/smx4/kernel/trunk/README.txt)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/README.txt?p2=servicemix/smx4/features/trunk/README.txt&p1=servicemix/smx4/kernel/trunk/README.txt&r1=646413&r2=647693&rev=647693&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/README.txt (original)
+++ servicemix/smx4/features/trunk/README.txt Mon Apr 14 01:25:59 2008
@@ -15,38 +15,28 @@
* limitations under the License.
*/
-Welcome to Apache ServiceMix Kernel
-====================================
-Apache ServiceMix Kernel is a small OSGi based kernel which provides a
-lightweight container onto which various bundles can be deployed.
-
-The following features are included:
- * Hot deployment of OSGi bundles
- * Dynamic reloadable configuration
- * Provisioning
- * Native OS integration
- * Extensible Shell console
- * Remote access
- * Managing multiple instances
+Welcome to Apache ServiceMix 4
+==============================
+Apache ServiceMix 4 is an integration platform.
Getting Started
===============
-For an Apache ServiceMix Kernel source distribution, please read
-BUILDING.txt for instructions on building Apache ServiceMix Kernel.
+For an Apache ServiceMix 4 source distribution, please read
+BUILDING.txt for instructions on building Apache ServiceMix 4.
-For an Apache ServiceMix Kernel binary distribution, please read
+For an Apache ServiceMix 4 binary distribution, please read
RELEASE-NOTES.txt for installation instructions and list of supported
and unsupported features.
Alternatively, you can also find out how to get started here:
- http://servicemix.apache.org/kernel/
+ http://servicemix.apache.org/smx4/
If you need more help try talking to us on our mailing lists
http://servicemix.apache.org/mailing-lists.html
-If you find any issues with ServiceMix Kernel, please submit reports
+If you find any issues with ServiceMix 4, please submit reports
with JIRA here:
- http://issues.apache.org/activemq/browse/SMX4KNL
+ http://issues.apache.org/activemq/browse/SMX4
We welcome contributions, and encourage you to get involved in the
ServiceMix community. If you'd like to learn more about how you can
Copied: servicemix/smx4/features/trunk/RELEASE-NOTES.txt (from r646413, servicemix/smx4/kernel/trunk/RELEASE-NOTES.txt)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/RELEASE-NOTES.txt?p2=servicemix/smx4/features/trunk/RELEASE-NOTES.txt&p1=servicemix/smx4/kernel/trunk/RELEASE-NOTES.txt&r1=646413&r2=647693&rev=647693&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/RELEASE-NOTES.txt (original)
+++ servicemix/smx4/features/trunk/RELEASE-NOTES.txt Mon Apr 14 01:25:59 2008
@@ -15,35 +15,13 @@
* limitations under the License.
*/
- Apache ServiceMix Kernel 1.0-m2
+ Apache ServiceMix 4.0-m1
================================
-This is the second milestone of ServiceMix Kernel, but mostly a bug fix release
-compared to the first milestone.
+See the README.txt file for more general informations about ServiceMix 4.
-** Bug
- * [SMX4KNL-13] - startup issue in recognizing new files in deploy folder
- * [SMX4KNL-15] - Display of memory size using the info command on Windows is ugly
- * [SMX4KNL-16] - Bad error message when startup.properties lists a unknown file (the file name is not displayed, but 'null' instead)
- * [SMX4KNL-18] - No need for DynamicImport-Package=* in filemonitor
- * [SMX4KNL-19] - Performance problems when using the OSGi classloaders in a certain way
-
-** Improvement
- * [SMX4KNL-4] - Add a start option on the 'osgi install' command so that the bundle is automatically started
-
-** Task
- * [SMX4KNL-17] - Remove all the warnings when building the distribution tar.gz
-
-See the README.txt file for more general informations about ServiceMix Kernel.
-
-
- Apache ServiceMix Kernel 1.0-m1
- ================================
-
-See the README.txt file for more general informations about ServiceMix Kernel.
-
-This is the first milestone of ServiceMix Kernel. All the features are not
-fully implemented yet and things may be changed until the final 1.0 release.
+This is the first milestone of ServiceMix 4. All the features are not
+fully implemented yet and things may be changed until the final 4.0 release.
Please refer to the web site for more informations and feel free to ask any
questions on the ServiceMix mailing lists or simply to provide feedback
(we appreciate it very much).
Modified: servicemix/smx4/features/trunk/activemq/activemq-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-osgi/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-osgi/pom.xml Mon Apr 14 01:25:59 2008
@@ -25,13 +25,13 @@
<parent>
<groupId>org.apache.servicemix.activemq</groupId>
<artifactId>activemq</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.activemq</groupId>
<artifactId>org.apache.servicemix.activemq</artifactId>
<packaging>bundle</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix Features :: ActiveMQ</name>
<properties>
Modified: servicemix/smx4/features/trunk/activemq/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/pom.xml (original)
+++ servicemix/smx4/features/trunk/activemq/pom.xml Mon Apr 14 01:25:59 2008
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.servicemix.features</groupId>
<artifactId>features</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.activemq</groupId>
<artifactId>activemq</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix Features :: ActiveMQ</name>
<modules>
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Mon Apr 14 01:25:59 2008
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.servicemix.features</groupId>
<artifactId>features</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.features</groupId>
<artifactId>apache-servicemix</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix Features :: Assembly</name>
<dependencies>
@@ -139,42 +139,57 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-cli-1.1</artifactId>
+ <artifactId>org.apache.servicemix.bundles.jencks-2.1</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jencks-2.1</artifactId>
+ <artifactId>org.apache.servicemix.bundles.saaj-impl-1.3</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.saaj-impl-1.3</artifactId>
+ <artifactId>org.apache.servicemix.bundles.woodstox-3.2.3</artifactId>
+ <version>${servicemix.nmr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.cxf-2.0.5</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.swizzle-stream-1.0.1</artifactId>
+ <artifactId>org.apache.servicemix.bundles.neethi-2.0.2</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.woodstox-3.2.3</artifactId>
- <version>${servicemix.nmr.version}</version>
+ <artifactId>org.apache.servicemix.bundles.xmlschema-1.3.2</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cxf-2.0.5</artifactId>
+ <artifactId>org.apache.servicemix.bundles.xmlresolver-1.2</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.neethi-2.0.2</artifactId>
+ <artifactId>org.apache.servicemix.bundles.jaxb-impl-2.0.3</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xmlresolver-1.2</artifactId>
+ <artifactId>org.apache.servicemix.bundles.jaxb-api-2.0</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jaxws-api-2.0</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.wsdl4j-1.6.1</artifactId>
<version>${version}</version>
</dependency>
<dependency>
@@ -215,38 +230,34 @@
<dependency>
<groupId>org.apache.servicemix.activemq</groupId>
<artifactId>org.apache.servicemix.activemq</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.transaction</groupId>
<artifactId>org.apache.servicemix.transaction</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.management</groupId>
<artifactId>org.apache.servicemix.management.core</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.ejb3</groupId>
+ <groupId>org.apache.servicemix.cxf</groupId>
<artifactId>org.apache.servicemix.cxf.binding.nmr</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.ejb3</groupId>
+ <groupId>org.apache.servicemix.cxf</groupId>
<artifactId>org.apache.servicemix.cxf.transport.nmr</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.ejb3</groupId>
+ <groupId>org.apache.servicemix.cxf</groupId>
<artifactId>org.apache.servicemix.cxf.transport.osgi</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.ejb3</groupId>
- <artifactId>org.apache.servicemix.ejb3.deployer</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${version}</version>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
@@ -292,6 +303,7 @@
<artifactId>openejb-webservices</artifactId>
<version>${openejb.version}</version>
</dependency>
+ -->
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
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=647693&r1=647692&r2=647693&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 Mon Apr 14 01:25:59 2008
@@ -153,46 +153,50 @@
<include>org.ops4j.pax.url:pax-url-war</include>
<include>org.apache.servicemix.war:org.apache.servicemix.war.deployer</include>
- <!-- EJB3 / CXF -->
- <include>org.apache.xbean:xbean-finder</include>
- <include>org.apache.xbean:xbean-naming</include>
- <include>org.apache.xbean:xbean-reflect</include>
+ <!-- CXF -->
<include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-ejb_3.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-interceptor_3.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-jacc_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
- <include>org.apache.geronimo.specs:geronimo-jaxrpc_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-jpa_3.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-saaj_1.3_spec</include>
<include>org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec</include>
- <include>org.apache.openejb:openejb-core</include>
- <include>org.apache.openejb:openejb-cxf</include>
- <include>org.apache.openejb:openejb-ejbd</include>
- <include>org.apache.openejb:openejb-http</include>
- <include>org.apache.openejb:openejb-javaagent</include>
- <include>org.apache.openejb:openejb-jee</include>
- <include>org.apache.openejb:openejb-loader</include>
- <include>org.apache.openejb:openejb-server</include>
- <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.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>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.neethi-2.0.2</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.openjpa-1.0.1</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.saaj-impl-1.3</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.swizzle-stream-1.0.1</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.wsdl4j-1.6.1</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xmlschema-1.3.2</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xmlresolver-1.2</include>
- <include>org.apache.servicemix.ejb3:org.apache.servicemix.cxf.transport.nmr</include>
- <include>org.apache.servicemix.ejb3:org.apache.servicemix.cxf.transport.osgi</include>
- <include>org.apache.servicemix.ejb3:org.apache.servicemix.cxf.binding.nmr</include>
+ <include>org.apache.servicemix.cxf:org.apache.servicemix.cxf.transport.nmr</include>
+ <include>org.apache.servicemix.cxf:org.apache.servicemix.cxf.transport.osgi</include>
+ <include>org.apache.servicemix.cxf:org.apache.servicemix.cxf.binding.nmr</include>
+
+ <!-- OpenEJB -->
+ <!--
+ <include>org.apache.xbean:xbean-finder</include>
+ <include>org.apache.xbean:xbean-naming</include>
+ <include>org.apache.xbean:xbean-reflect</include>
+ <include>org.apache.geronimo.specs:geronimo-ejb_3.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-interceptor_3.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jacc_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jaxrpc_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jpa_3.0_spec</include>
+ <include>org.apache.openejb:openejb-core</include>
+ <include>org.apache.openejb:openejb-cxf</include>
+ <include>org.apache.openejb:openejb-ejbd</include>
+ <include>org.apache.openejb:openejb-http</include>
+ <include>org.apache.openejb:openejb-javaagent</include>
+ <include>org.apache.openejb:openejb-jee</include>
+ <include>org.apache.openejb:openejb-loader</include>
+ <include>org.apache.openejb:openejb-server</include>
+ <include>org.apache.openejb:openejb-webservices</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-cli-1.1</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.openjpa-1.0.1</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.swizzle-stream-1.0.1</include>
<include>org.apache.servicemix.ejb3:org.apache.servicemix.ejb3.deployer</include>
+ -->
</includes>
</dependencySet>
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=647693&r1=647692&r2=647693&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 Mon Apr 14 01:25:59 2008
@@ -144,46 +144,50 @@
<include>org.ops4j.pax.url:pax-url-war</include>
<include>org.apache.servicemix.war:org.apache.servicemix.war.deployer</include>
- <!-- EJB3 / CXF -->
- <include>org.apache.xbean:xbean-finder</include>
- <include>org.apache.xbean:xbean-naming</include>
- <include>org.apache.xbean:xbean-reflect</include>
+ <!-- CXF -->
<include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-ejb_3.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-interceptor_3.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-jacc_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
- <include>org.apache.geronimo.specs:geronimo-jaxrpc_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-jpa_3.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-saaj_1.3_spec</include>
<include>org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec</include>
- <include>org.apache.openejb:openejb-core</include>
- <include>org.apache.openejb:openejb-cxf</include>
- <include>org.apache.openejb:openejb-ejbd</include>
- <include>org.apache.openejb:openejb-http</include>
- <include>org.apache.openejb:openejb-javaagent</include>
- <include>org.apache.openejb:openejb-jee</include>
- <include>org.apache.openejb:openejb-loader</include>
- <include>org.apache.openejb:openejb-server</include>
- <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.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>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.neethi-2.0.2</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.openjpa-1.0.1</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.saaj-impl-1.3</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.swizzle-stream-1.0.1</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.wsdl4j-1.6.1</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xmlschema-1.3.2</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xmlresolver-1.2</include>
- <include>org.apache.servicemix.ejb3:org.apache.servicemix.cxf.transport.nmr</include>
- <include>org.apache.servicemix.ejb3:org.apache.servicemix.cxf.transport.osgi</include>
- <include>org.apache.servicemix.ejb3:org.apache.servicemix.cxf.binding.nmr</include>
+ <include>org.apache.servicemix.cxf:org.apache.servicemix.cxf.transport.nmr</include>
+ <include>org.apache.servicemix.cxf:org.apache.servicemix.cxf.transport.osgi</include>
+ <include>org.apache.servicemix.cxf:org.apache.servicemix.cxf.binding.nmr</include>
+
+ <!-- OpenEJB -->
+ <!--
+ <include>org.apache.xbean:xbean-finder</include>
+ <include>org.apache.xbean:xbean-naming</include>
+ <include>org.apache.xbean:xbean-reflect</include>
+ <include>org.apache.geronimo.specs:geronimo-ejb_3.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-interceptor_3.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jacc_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jaxrpc_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jpa_3.0_spec</include>
+ <include>org.apache.openejb:openejb-core</include>
+ <include>org.apache.openejb:openejb-cxf</include>
+ <include>org.apache.openejb:openejb-ejbd</include>
+ <include>org.apache.openejb:openejb-http</include>
+ <include>org.apache.openejb:openejb-javaagent</include>
+ <include>org.apache.openejb:openejb-jee</include>
+ <include>org.apache.openejb:openejb-loader</include>
+ <include>org.apache.openejb:openejb-server</include>
+ <include>org.apache.openejb:openejb-webservices</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-cli-1.1</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.openjpa-1.0.1</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.swizzle-stream-1.0.1</include>
<include>org.apache.servicemix.ejb3:org.apache.servicemix.ejb3.deployer</include>
+ -->
</includes>
</dependencySet>
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=647693&r1=647692&r2=647693&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 Mon Apr 14 01:25:59 2008
@@ -95,39 +95,18 @@
pax-web-ex-whiteboard-${pax.web.extender.version}.jar=50
pax-url-war-${pax.url.version}.jar=50
-org.apache.servicemix.bundles.asm-2.2.3-${servicemix.kernel.version}.jar=50
-xbean-finder-${xbean.version}.jar=50
-xbean-naming-${xbean.version}.jar=50
-xbean-reflect-${xbean.version}.jar=50
geronimo-annotation_1.0_spec-${geronimo.annotation.version}.jar=50
-geronimo-ejb_3.0_spec-${geronimo.ejb3.version}.jar=50
-geronimo-interceptor_3.0_spec-${geronimo.interceptor.version}.jar=50
-geronimo-jacc_1.1_spec-${geronimo.jacc.version}.jar=50
geronimo-javamail_1.4_spec-${geronimo.javamail.version}.jar=50
-geronimo-jaxrpc_1.1_spec-${geronimo.jaxrpc.version}.jar=50
-geronimo-jpa_3.0_spec-${geronimo.jpa.version}.jar=50
geronimo-saaj_1.3_spec-${geronimo.saaj.version}.jar=50
geronimo-ws-metadata_2.0_spec-${geronimo.wsmetadata.version}.jar=50
-openejb-core-${openejb.version}.jar=50
-openejb-cxf-${openejb.version}.jar=50
-openejb-ejbd-${openejb.version}.jar=50
-openejb-http-${openejb.version}.jar=50
-openejb-javaagent-${openejb.version}.jar=50
-openejb-jee-${openejb.version}.jar=50
-openejb-loader-${openejb.version}.jar=50
-openejb-server-${openejb.version}.jar=50
-openejb-webservices-${openejb.version}.jar=50
-
+org.apache.servicemix.bundles.asm-2.2.3-${servicemix.kernel.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
org.apache.servicemix.bundles.jaxws-api-2.0-${version}.jar=50
org.apache.servicemix.bundles.neethi-2.0.2-${version}.jar=50
-org.apache.servicemix.bundles.openjpa-1.0.1-${version}.jar=50
org.apache.servicemix.bundles.saaj-impl-1.3-${version}.jar=50
-org.apache.servicemix.bundles.swizzle-stream-1.0.1-${version}.jar=50
org.apache.servicemix.bundles.woodstox-3.2.3-${servicemix.nmr.version}.jar=50
org.apache.servicemix.bundles.wsdl4j-1.6.1-${version}.jar=50
org.apache.servicemix.bundles.xmlschema-1.3.2-${version}.jar=50
@@ -135,7 +114,6 @@
org.apache.servicemix.cxf.transport.nmr-${version}.jar=50
org.apache.servicemix.cxf.transport.osgi-${version}.jar=50
org.apache.servicemix.cxf.binding.nmr-${version}.jar=50
-org.apache.servicemix.ejb3.deployer-${version}.jar=50
#
# Start console last
Modified: 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=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Mon Apr 14 01:25:59 2008
@@ -18,6 +18,7 @@
-->
<features>
<feature name="web-core">
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
<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>
@@ -42,6 +43,7 @@
<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-stax-api_1.0_spec/${geronimo.stax.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>
Modified: servicemix/smx4/features/trunk/camel/bundles/jaxb-api/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/bundles/jaxb-api/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/bundles/jaxb-api/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/bundles/jaxb-api/pom.xml Mon Apr 14 01:25:59 2008
@@ -25,12 +25,12 @@
<parent>
<groupId>org.apache.servicemix.camel.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
<description>
Modified: servicemix/smx4/features/trunk/camel/bundles/jaxb-impl/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/bundles/jaxb-impl/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/bundles/jaxb-impl/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/bundles/jaxb-impl/pom.xml Mon Apr 14 01:25:59 2008
@@ -25,12 +25,12 @@
<parent>
<groupId>org.apache.servicemix.camel.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
<description>
Modified: servicemix/smx4/features/trunk/camel/bundles/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/bundles/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/bundles/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/bundles/pom.xml Mon Apr 14 01:25:59 2008
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.servicemix.camel</groupId>
<artifactId>camel</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.camel.bundles</groupId>
<artifactId>bundles</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix OSGI Common Bundles</name>
<modules>
Modified: servicemix/smx4/features/trunk/camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/pom.xml Mon Apr 14 01:25:59 2008
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.servicemix.features</groupId>
<artifactId>features</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.camel</groupId>
<artifactId>camel</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix Features :: Camel</name>
<modules>
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=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml Mon Apr 14 01:25:59 2008
@@ -25,13 +25,13 @@
<parent>
<groupId>org.apache.servicemix.camel</groupId>
<artifactId>camel</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.camel</groupId>
<artifactId>org.apache.servicemix.camel.component</artifactId>
<packaging>bundle</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix Camel Component</name>
<dependencies>
Copied: servicemix/smx4/features/trunk/cxf/bundles/cxf/pom.xml (from r647690, servicemix/smx4/features/trunk/ejb3/bundles/cxf/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/bundles/cxf/pom.xml?p2=servicemix/smx4/features/trunk/cxf/bundles/cxf/pom.xml&p1=servicemix/smx4/features/trunk/ejb3/bundles/cxf/pom.xml&r1=647690&r2=647693&rev=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/bundles/cxf/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/bundles/cxf/pom.xml Mon Apr 14 01:25:59 2008
@@ -23,14 +23,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.ejb3.bundles</groupId>
+ <groupId>org.apache.servicemix.cxf.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.cxf-2.0.5</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ServiceMix OSGI Common Bundles: cxf</name>
<description>
Copied: servicemix/smx4/features/trunk/cxf/bundles/jaxws-api/pom.xml (from r647690, servicemix/smx4/features/trunk/ejb3/bundles/jaxws-api/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/bundles/jaxws-api/pom.xml?p2=servicemix/smx4/features/trunk/cxf/bundles/jaxws-api/pom.xml&p1=servicemix/smx4/features/trunk/ejb3/bundles/jaxws-api/pom.xml&r1=647690&r2=647693&rev=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/bundles/jaxws-api/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/bundles/jaxws-api/pom.xml Mon Apr 14 01:25:59 2008
@@ -23,14 +23,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.ejb3.bundles</groupId>
+ <groupId>org.apache.servicemix.cxf.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jaxws-api-2.0</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
<description>
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jaxb-api-2.0</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Copied: servicemix/smx4/features/trunk/cxf/bundles/neethi/pom.xml (from r647690, servicemix/smx4/features/trunk/ejb3/bundles/neethi/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/bundles/neethi/pom.xml?p2=servicemix/smx4/features/trunk/cxf/bundles/neethi/pom.xml&p1=servicemix/smx4/features/trunk/ejb3/bundles/neethi/pom.xml&r1=647690&r2=647693&rev=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/bundles/neethi/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/bundles/neethi/pom.xml Mon Apr 14 01:25:59 2008
@@ -23,14 +23,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.ejb3.bundles</groupId>
+ <groupId>org.apache.servicemix.cxf.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.neethi-2.0.2</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
<description>
Added: servicemix/smx4/features/trunk/cxf/bundles/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/bundles/pom.xml?rev=647693&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/cxf/bundles/pom.xml (added)
+++ servicemix/smx4/features/trunk/cxf/bundles/pom.xml Mon Apr 14 01:25:59 2008
@@ -0,0 +1,77 @@
+<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.cxf</groupId>
+ <artifactId>cxf</artifactId>
+ <version>4.0-m1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.cxf.bundles</groupId>
+ <artifactId>bundles</artifactId>
+ <packaging>pom</packaging>
+ <version>4.0-m1-SNAPSHOT</version>
+ <name>ServiceMix OSGI Common Bundles</name>
+
+ <modules>
+ <module>cxf</module>
+ <module>jaxws-api</module>
+ <module>neethi</module>
+ <module>saaj-impl</module>
+ <module>wsdl4j</module>
+ <module>xmlresolver</module>
+ <module>xmlschema</module>
+ </modules>
+
+ <properties>
+ <servicemix.osgi.export>${servicemix.osgi.export.pkg}*;version=${pkgVersion}</servicemix.osgi.export>
+ <servicemix.osgi.export.pkg />
+ <servicemix.osgi.import.pkg />
+ <servicemix.osgi.private.pkg />
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Export-Package>${servicemix.osgi.export}</Export-Package>
+ <Import-Package>${servicemix.osgi.import.pkg}*</Import-Package>
+ <Private-Package>${servicemix.osgi.private.pkg}</Private-Package>
+ </instructions>
+ <unpackBundle>true</unpackBundle>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Copied: servicemix/smx4/features/trunk/cxf/bundles/saaj-impl/pom.xml (from r647690, servicemix/smx4/features/trunk/ejb3/bundles/saaj-impl/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/bundles/saaj-impl/pom.xml?p2=servicemix/smx4/features/trunk/cxf/bundles/saaj-impl/pom.xml&p1=servicemix/smx4/features/trunk/ejb3/bundles/saaj-impl/pom.xml&r1=647690&r2=647693&rev=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/bundles/saaj-impl/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/bundles/saaj-impl/pom.xml Mon Apr 14 01:25:59 2008
@@ -23,14 +23,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.ejb3.bundles</groupId>
+ <groupId>org.apache.servicemix.cxf.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.saaj-impl-1.3</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
<description>
Copied: servicemix/smx4/features/trunk/cxf/bundles/wsdl4j/pom.xml (from r647690, servicemix/smx4/features/trunk/ejb3/bundles/wsdl4j/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/bundles/wsdl4j/pom.xml?p2=servicemix/smx4/features/trunk/cxf/bundles/wsdl4j/pom.xml&p1=servicemix/smx4/features/trunk/ejb3/bundles/wsdl4j/pom.xml&r1=647690&r2=647693&rev=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/bundles/wsdl4j/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/bundles/wsdl4j/pom.xml Mon Apr 14 01:25:59 2008
@@ -23,14 +23,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.ejb3.bundles</groupId>
+ <groupId>org.apache.servicemix.cxf.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.wsdl4j-1.6.1</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
<description>
Copied: servicemix/smx4/features/trunk/cxf/bundles/xmlresolver/pom.xml (from r647690, servicemix/smx4/features/trunk/ejb3/bundles/xmlresolver/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/bundles/xmlresolver/pom.xml?p2=servicemix/smx4/features/trunk/cxf/bundles/xmlresolver/pom.xml&p1=servicemix/smx4/features/trunk/ejb3/bundles/xmlresolver/pom.xml&r1=647690&r2=647693&rev=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/bundles/xmlresolver/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/bundles/xmlresolver/pom.xml Mon Apr 14 01:25:59 2008
@@ -23,14 +23,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.ejb3.bundles</groupId>
+ <groupId>org.apache.servicemix.cxf.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xmlresolver-1.2</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
<description>
Copied: servicemix/smx4/features/trunk/cxf/bundles/xmlschema/pom.xml (from r647690, servicemix/smx4/features/trunk/ejb3/bundles/xmlschema/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/bundles/xmlschema/pom.xml?p2=servicemix/smx4/features/trunk/cxf/bundles/xmlschema/pom.xml&p1=servicemix/smx4/features/trunk/ejb3/bundles/xmlschema/pom.xml&r1=647690&r2=647693&rev=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/bundles/xmlschema/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/bundles/xmlschema/pom.xml Mon Apr 14 01:25:59 2008
@@ -23,14 +23,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.ejb3.bundles</groupId>
+ <groupId>org.apache.servicemix.cxf.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xmlschema-1.3.2</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
<description>
Copied: servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml (from r647690, servicemix/smx4/features/trunk/ejb3/cxf-binding-nmr/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml?p2=servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml&p1=servicemix/smx4/features/trunk/ejb3/cxf-binding-nmr/pom.xml&r1=647690&r2=647693&rev=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/cxf-binding-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml Mon Apr 14 01:25:59 2008
@@ -23,15 +23,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.ejb3</groupId>
- <artifactId>ejb3</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.apache.servicemix.cxf</groupId>
+ <artifactId>cxf</artifactId>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.ejb3</groupId>
+ <groupId>org.apache.servicemix.cxf</groupId>
<artifactId>org.apache.servicemix.cxf.binding.nmr</artifactId>
<packaging>bundle</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix CXF Binding for NMR</name>
<dependencies>
Copied: servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml (from r647690, servicemix/smx4/features/trunk/ejb3/cxf-transport-nmr/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml?p2=servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml&p1=servicemix/smx4/features/trunk/ejb3/cxf-transport-nmr/pom.xml&r1=647690&r2=647693&rev=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/cxf-transport-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml Mon Apr 14 01:25:59 2008
@@ -23,15 +23,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.ejb3</groupId>
- <artifactId>ejb3</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.apache.servicemix.cxf</groupId>
+ <artifactId>cxf</artifactId>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.ejb3</groupId>
+ <groupId>org.apache.servicemix.cxf</groupId>
<artifactId>org.apache.servicemix.cxf.transport.nmr</artifactId>
<packaging>bundle</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix CXF Transport for NMR</name>
<dependencies>
Copied: servicemix/smx4/features/trunk/cxf/cxf-transport-osgi/pom.xml (from r647690, servicemix/smx4/features/trunk/ejb3/cxf-transport-osgi/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-transport-osgi/pom.xml?p2=servicemix/smx4/features/trunk/cxf/cxf-transport-osgi/pom.xml&p1=servicemix/smx4/features/trunk/ejb3/cxf-transport-osgi/pom.xml&r1=647690&r2=647693&rev=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/cxf-transport-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-transport-osgi/pom.xml Mon Apr 14 01:25:59 2008
@@ -23,15 +23,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.ejb3</groupId>
- <artifactId>ejb3</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.apache.servicemix.cxf</groupId>
+ <artifactId>cxf</artifactId>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.ejb3</groupId>
+ <groupId>org.apache.servicemix.cxf</groupId>
<artifactId>org.apache.servicemix.cxf.transport.osgi</artifactId>
<packaging>bundle</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix CXF Transport for OSGi</name>
<dependencies>
Added: servicemix/smx4/features/trunk/cxf/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/pom.xml?rev=647693&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/cxf/pom.xml (added)
+++ servicemix/smx4/features/trunk/cxf/pom.xml Mon Apr 14 01:25:59 2008
@@ -0,0 +1,44 @@
+<?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>4.0-m1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.cxf</groupId>
+ <artifactId>cxf</artifactId>
+ <packaging>pom</packaging>
+ <version>4.0-m1-SNAPSHOT</version>
+ <name>ServiceMix CXF Support</name>
+
+ <modules>
+ <module>bundles</module>
+ <module>cxf-transport-nmr</module>
+ <module>cxf-transport-osgi</module>
+ <module>cxf-binding-nmr</module>
+ </modules>
+
+</project>
Modified: servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml Mon Apr 14 01:25:59 2008
@@ -25,13 +25,13 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>examples</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>camel-nmr</artifactId>
<packaging>bundle</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix Example :: Camel NMR</name>
<dependencies>
Modified: servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml Mon Apr 14 01:25:59 2008
@@ -25,13 +25,13 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>examples</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>camel-osgi</artifactId>
<packaging>bundle</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix Example :: Camel OSGi</name>
<dependencies>
Modified: servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml Mon Apr 14 01:25:59 2008
@@ -25,13 +25,13 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>examples</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf-camel-nmr</artifactId>
<packaging>bundle</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix Example :: CXF-Camel NMR</name>
<dependencies>
Modified: 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=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml Mon Apr 14 01:25:59 2008
@@ -25,13 +25,13 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>examples</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf-nmr</artifactId>
<packaging>bundle</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix Example :: CXF NMR</name>
<dependencies>
Modified: 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=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml Mon Apr 14 01:25:59 2008
@@ -25,13 +25,13 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>examples</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf-osgi</artifactId>
<packaging>bundle</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix Example :: CXF OSGi</name>
<dependencies>
Modified: servicemix/smx4/features/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/pom.xml Mon Apr 14 01:25:59 2008
@@ -25,13 +25,13 @@
<parent>
<groupId>org.apache.servicemix.features</groupId>
<artifactId>features</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>examples</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix Examples</name>
<modules>
Modified: servicemix/smx4/features/trunk/management/acegi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/management/acegi/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/management/acegi/pom.xml (original)
+++ servicemix/smx4/features/trunk/management/acegi/pom.xml Mon Apr 14 01:25:59 2008
@@ -25,13 +25,13 @@
<parent>
<groupId>org.apache.servicemix.management</groupId>
<artifactId>management</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.management</groupId>
<artifactId>org.apache.servicemix.management.acegi</artifactId>
<packaging>bundle</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix Management Acegi</name>
<dependencies>
Modified: servicemix/smx4/features/trunk/management/core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/management/core/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/management/core/pom.xml (original)
+++ servicemix/smx4/features/trunk/management/core/pom.xml Mon Apr 14 01:25:59 2008
@@ -25,13 +25,13 @@
<parent>
<groupId>org.apache.servicemix.management</groupId>
<artifactId>management</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.management</groupId>
<artifactId>org.apache.servicemix.management.core</artifactId>
<packaging>bundle</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix Management Core</name>
<dependencies>
Modified: servicemix/smx4/features/trunk/management/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/management/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/management/pom.xml (original)
+++ servicemix/smx4/features/trunk/management/pom.xml Mon Apr 14 01:25:59 2008
@@ -25,13 +25,13 @@
<parent>
<groupId>org.apache.servicemix.features</groupId>
<artifactId>features</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.management</groupId>
<artifactId>management</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix Features :: Management</name>
<modules>
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Mon Apr 14 01:25:59 2008
@@ -30,7 +30,7 @@
<groupId>org.apache.servicemix.features</groupId>
<artifactId>features</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>Apache ServiceMix Features</name>
<modules>
@@ -39,7 +39,10 @@
<module>activemq</module>
<module>camel</module>
<module>war</module>
+ <module>cxf</module>
+ <!--
<module>ejb3</module>
+ -->
<module>examples</module>
<module>assembly</module>
</modules>
Modified: servicemix/smx4/features/trunk/transaction/bundles/howl/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/transaction/bundles/howl/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/transaction/bundles/howl/pom.xml (original)
+++ servicemix/smx4/features/trunk/transaction/bundles/howl/pom.xml Mon Apr 14 01:25:59 2008
@@ -25,12 +25,12 @@
<parent>
<groupId>org.apache.servicemix.transaction.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.howl-1.0.1-1</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
<description>
Modified: servicemix/smx4/features/trunk/transaction/bundles/jencks/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/transaction/bundles/jencks/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/transaction/bundles/jencks/pom.xml (original)
+++ servicemix/smx4/features/trunk/transaction/bundles/jencks/pom.xml Mon Apr 14 01:25:59 2008
@@ -25,12 +25,12 @@
<parent>
<groupId>org.apache.servicemix.transaction.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jencks-2.1</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
<description>
Modified: servicemix/smx4/features/trunk/transaction/bundles/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/transaction/bundles/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/transaction/bundles/pom.xml (original)
+++ servicemix/smx4/features/trunk/transaction/bundles/pom.xml Mon Apr 14 01:25:59 2008
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.servicemix.transaction</groupId>
<artifactId>transaction</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.transaction.bundles</groupId>
<artifactId>bundles</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix OSGI Common Bundles</name>
<modules>
Modified: servicemix/smx4/features/trunk/transaction/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/transaction/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/transaction/pom.xml (original)
+++ servicemix/smx4/features/trunk/transaction/pom.xml Mon Apr 14 01:25:59 2008
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.servicemix.features</groupId>
<artifactId>features</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.transaction</groupId>
<artifactId>transaction</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix Features :: Transaction</name>
<modules>
Modified: servicemix/smx4/features/trunk/transaction/transaction/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/transaction/transaction/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/transaction/transaction/pom.xml (original)
+++ servicemix/smx4/features/trunk/transaction/transaction/pom.xml Mon Apr 14 01:25:59 2008
@@ -25,13 +25,13 @@
<parent>
<groupId>org.apache.servicemix.transaction</groupId>
<artifactId>transaction</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.transaction</groupId>
<artifactId>org.apache.servicemix.transaction</artifactId>
<packaging>bundle</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix Features :: Transaction</name>
<dependencies>
Modified: servicemix/smx4/features/trunk/war/bundles/jasper/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/war/bundles/jasper/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/war/bundles/jasper/pom.xml (original)
+++ servicemix/smx4/features/trunk/war/bundles/jasper/pom.xml Mon Apr 14 01:25:59 2008
@@ -25,12 +25,12 @@
<parent>
<groupId>org.apache.servicemix.war.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
<description>
Modified: servicemix/smx4/features/trunk/war/bundles/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/war/bundles/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/war/bundles/pom.xml (original)
+++ servicemix/smx4/features/trunk/war/bundles/pom.xml Mon Apr 14 01:25:59 2008
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.servicemix.war</groupId>
<artifactId>war</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.war.bundles</groupId>
<artifactId>bundles</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix OSGI Common Bundles</name>
<modules>
Modified: servicemix/smx4/features/trunk/war/deployer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/war/deployer/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/war/deployer/pom.xml (original)
+++ servicemix/smx4/features/trunk/war/deployer/pom.xml Mon Apr 14 01:25:59 2008
@@ -25,13 +25,13 @@
<parent>
<groupId>org.apache.servicemix.war</groupId>
<artifactId>war</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.war</groupId>
<artifactId>org.apache.servicemix.war.deployer</artifactId>
<packaging>bundle</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix WAR Deployer</name>
<dependencies>
Modified: servicemix/smx4/features/trunk/war/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/war/pom.xml?rev=647693&r1=647692&r2=647693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/war/pom.xml (original)
+++ servicemix/smx4/features/trunk/war/pom.xml Mon Apr 14 01:25:59 2008
@@ -25,13 +25,13 @@
<parent>
<groupId>org.apache.servicemix.features</groupId>
<artifactId>features</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.war</groupId>
<artifactId>war</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>4.0-m1-SNAPSHOT</version>
<name>ServiceMix WAR Support</name>
<modules>