servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r616297 [1/2] - in /servicemix/smx4: features/trunk/ features/trunk/assembly/ features/trunk/assembly/src/main/descriptors/ features/trunk/assembly/src/main/filtered-resources/etc/ features/trunk/ejb3/ features/trunk/ejb3/bundles/ features/...
Date Tue, 29 Jan 2008 13:10:51 GMT
Author: gnodet
Date: Tue Jan 29 05:10:47 2008
New Revision: 616297

URL: http://svn.apache.org/viewvc?rev=616297&view=rev
Log:
Add transactions / ejb3 layers

Added:
    servicemix/smx4/features/trunk/ejb3/   (with props)
    servicemix/smx4/features/trunk/ejb3/bundles/   (with props)
    servicemix/smx4/features/trunk/ejb3/bundles/cxf/   (props changed)
      - copied from r615143, servicemix/smx4/old-branch/bundles/cxf/
    servicemix/smx4/features/trunk/ejb3/bundles/jaxws-api/   (props changed)
      - copied from r615143, servicemix/smx4/old-branch/bundles/jaxws-api/
    servicemix/smx4/features/trunk/ejb3/bundles/openejb/   (props changed)
      - copied from r615143, servicemix/smx4/old-branch/bundles/openejb/
    servicemix/smx4/features/trunk/ejb3/bundles/openjpa/   (props changed)
      - copied from r615143, servicemix/smx4/old-branch/bundles/openjpa/
    servicemix/smx4/features/trunk/ejb3/bundles/pom.xml
    servicemix/smx4/features/trunk/ejb3/bundles/saaj-impl/   (with props)
    servicemix/smx4/features/trunk/ejb3/bundles/saaj-impl/pom.xml
    servicemix/smx4/features/trunk/ejb3/bundles/wsdl4j/   (props changed)
      - copied from r615143, servicemix/smx4/old-branch/bundles/wsdl4j/
    servicemix/smx4/features/trunk/ejb3/bundles/xmlschema/   (with props)
    servicemix/smx4/features/trunk/ejb3/bundles/xmlschema/pom.xml
    servicemix/smx4/features/trunk/ejb3/deployer/   (props changed)
      - copied from r615143, servicemix/smx4/old-branch/openejb/
    servicemix/smx4/features/trunk/ejb3/deployer/src/main/java/org/apache/servicemix/ejb3/
    servicemix/smx4/features/trunk/ejb3/deployer/src/main/java/org/apache/servicemix/ejb3/deployer/
    servicemix/smx4/features/trunk/ejb3/deployer/src/main/java/org/apache/servicemix/ejb3/deployer/AbstractBundleWatcher.java
    servicemix/smx4/features/trunk/ejb3/deployer/src/main/java/org/apache/servicemix/ejb3/deployer/CxfService.java
    servicemix/smx4/features/trunk/ejb3/deployer/src/main/java/org/apache/servicemix/ejb3/deployer/Deployer.java
    servicemix/smx4/features/trunk/ejb3/deployer/src/main/java/org/apache/servicemix/ejb3/deployer/Log4jLogStreamFactory.java
    servicemix/smx4/features/trunk/ejb3/deployer/src/main/java/org/apache/servicemix/ejb3/deployer/MyEjbWsContainer.java
    servicemix/smx4/features/trunk/ejb3/deployer/src/main/java/org/apache/servicemix/ejb3/deployer/OpenEjbFactory.java
    servicemix/smx4/features/trunk/ejb3/deployer/src/main/java/org/apache/servicemix/ejb3/deployer/OsgiDeployer.java
    servicemix/smx4/features/trunk/ejb3/deployer/src/main/java/org/apache/servicemix/ejb3/deployer/OsgiWsRegistry.java
    servicemix/smx4/features/trunk/ejb3/deployer/src/test/java/org/apache/servicemix/ejb3/
    servicemix/smx4/features/trunk/ejb3/deployer/src/test/java/org/apache/servicemix/ejb3/deployer/
    servicemix/smx4/features/trunk/ejb3/deployer/src/test/java/org/apache/servicemix/ejb3/deployer/MyService.java
    servicemix/smx4/features/trunk/ejb3/deployer/src/test/java/org/apache/servicemix/ejb3/deployer/MyServiceItf.java
    servicemix/smx4/features/trunk/ejb3/deployer/src/test/java/org/apache/servicemix/ejb3/deployer/Test.java
    servicemix/smx4/features/trunk/ejb3/deployer/src/test/resources/META-INF/MANIFEST.MF
    servicemix/smx4/features/trunk/ejb3/pom.xml
    servicemix/smx4/features/trunk/transaction/bundles/   (with props)
    servicemix/smx4/features/trunk/transaction/bundles/howl/   (with props)
    servicemix/smx4/features/trunk/transaction/bundles/howl/pom.xml
    servicemix/smx4/features/trunk/transaction/bundles/jencks/   (with props)
    servicemix/smx4/features/trunk/transaction/bundles/jencks/pom.xml
    servicemix/smx4/features/trunk/transaction/bundles/pom.xml
Removed:
    servicemix/smx4/features/trunk/ejb3/deployer/src/main/java/org/apache/servicemix/openejb/
    servicemix/smx4/features/trunk/ejb3/deployer/src/test/java/org/apache/servicemix/openejb/
    servicemix/smx4/old-branch/bundles/cxf/
    servicemix/smx4/old-branch/bundles/jaxws-api/
    servicemix/smx4/old-branch/bundles/openejb/
    servicemix/smx4/old-branch/bundles/openjpa/
    servicemix/smx4/old-branch/bundles/wsdl4j/
    servicemix/smx4/old-branch/openejb/
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/filtered-resources/etc/startup.properties
    servicemix/smx4/features/trunk/ejb3/bundles/cxf/pom.xml
    servicemix/smx4/features/trunk/ejb3/bundles/jaxws-api/pom.xml
    servicemix/smx4/features/trunk/ejb3/bundles/openejb/pom.xml
    servicemix/smx4/features/trunk/ejb3/bundles/openjpa/pom.xml
    servicemix/smx4/features/trunk/ejb3/bundles/wsdl4j/pom.xml
    servicemix/smx4/features/trunk/ejb3/deployer/pom.xml
    servicemix/smx4/features/trunk/ejb3/deployer/src/main/resources/META-INF/spring/openejb-spring.xml
    servicemix/smx4/features/trunk/pom.xml
    servicemix/smx4/features/trunk/transaction/pom.xml
    servicemix/smx4/features/trunk/transaction/transaction/pom.xml
    servicemix/smx4/features/trunk/transaction/transaction/src/main/resources/META-INF/spring/servicemix-tx.xml

Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=616297&r1=616296&r2=616297&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Tue Jan 29 05:10:47 2008
@@ -46,14 +46,17 @@
             <version>${servicemix.kernel.version}</version>
             <type>tar.gz</type>
         </dependency>
-
-       
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.1_spec</artifactId>
             <version>${geronimo.activation.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.4_spec</artifactId>
+            <version>${geronimo.javamail.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.servicemix.nmr</groupId>
             <artifactId>org.apache.servicemix.preferences</artifactId>
             <version>${servicemix.nmr.version}</version>
@@ -109,7 +112,31 @@
             <artifactId>org.apache.servicemix.jbi.runtime</artifactId>
             <version>${servicemix.nmr.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.howl-1.0.1-1</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.asm-2.2.3</artifactId>
+            <version>${servicemix.kernel.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <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.saaj-impl-1.3</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.woodstox-3.2.3</artifactId>
+            <version>${version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.osgi</groupId>
             <artifactId>spring-osgi-extender</artifactId>
@@ -125,13 +152,11 @@
             <artifactId>spring-osgi-io</artifactId>
             <version>${spring.osgi.version}</version>
         </dependency>
-
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>${log4j.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jms_1.1_spec</artifactId>
@@ -148,19 +173,54 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
+            <groupId>org.apache.servicemix.transaction</groupId>
+            <artifactId>org.apache.servicemix.transaction</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>
+        </dependency>
+        <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-core</artifactId>
             <version>${activemq.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-finder</artifactId>
+            <version>${xbean.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-naming</artifactId>
+            <version>${xbean.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-reflect</artifactId>
+            <version>${xbean.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-spring</artifactId>
             <version>${xbean.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
             <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-service</artifactId>
+            <version>${pax.web.version}</version>
         </dependency>
     </dependencies>
     <build>

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=616297&r1=616296&r2=616297&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 Tue Jan 29 05:10:47 2008
@@ -104,8 +104,9 @@
             <unpack>false</unpack>
             <scope>runtime</scope>
             <includes>
+                <!-- NMR / JBI -->
                 <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-${woodstox.version}</include>
+                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>
                 <include>org.apache.servicemix.nmr:org.apache.servicemix.preferences</include>
                 <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
                 <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
@@ -118,13 +119,52 @@
                 <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.deployer</include>
                 <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.commands</include>
 
+                <!-- Transaction -->
                 <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
+                <include>org.springframework:spring-tx</include>
+                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.howl-1.0.1-1</include>
+                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jencks-2.1</include>
+                <include>org.apache.geronimo.components:geronimo-connector</include>
+                <include>org.apache.geronimo.components:geronimo-transaction</include>
+                <include>org.apache.servicemix.transaction:org.apache.servicemix.transaction</include>
+
+                <!-- ActiveMQ -->
                 <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
                 <include>org.springframework:spring-web</include>
                 <include>org.apache.activemq:activemq-core</include>
                 <include>org.apache.xbean:xbean-spring</include>
                 <include>org.apache.servicemix.activemq:org.apache.servicemix.activemq</include>
+
+                <!-- WEB -->
+                <include>org.ops4j.pax.web:pax-web-service</include>
+
+                <!-- EJB3 / CXF -->
+                <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-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.servicemix.bundles:org.apache.servicemix.bundles.asm-2.2.3</include>
+                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cxf-2.0.3</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.openejb-3.0.0-SNAPSHOT</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.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.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=616297&r1=616296&r2=616297&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 Tue Jan 29 05:10:47 2008
@@ -65,14 +65,49 @@
 org.apache.servicemix.jbi.osgi-${servicemix.nmr.version}.jar=50
 org.apache.servicemix.jbi.runtime-${servicemix.nmr.version}.jar=50
 
+geronimo-jta_1.1_spec-${geronimo.jta.version}.jar=50
+geronimo-j2ee-connector_1.5_spec-${geronimo.j2ee.connector.version}.jar=50
+spring-tx-${spring.version}.jar=50
+org.apache.servicemix.bundles.howl-1.0.1-1-${version}.jar=50
+org.apache.servicemix.bundles.jencks-2.1-${version}.jar=50
+geronimo-connector-${geronimo.connector.version}.jar=50
+geronimo-transaction-${geronimo.transaction.version}.jar=50
+org.apache.servicemix.transaction-${version}.jar=50
+
 geronimo-j2ee-management_1.1_spec-${geronimo.j2ee.management.version}.jar=50
 geronimo-jms_1.1_spec-${geronimo.jms.version}.jar=50
-geronimo-jta_1.1_spec-${geronimo.jta.version}.jar=50
 xbean-spring-${xbean.version}.jar=50
 activemq-core-${activemq.version}.jar=50
 spring-web-${spring.version}.jar=50
 org.apache.servicemix.activemq-${version}.jar=50
 
+pax-web-service-${pax.web.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
+org.apache.servicemix.bundles.asm-2.2.3-${servicemix.kernel.version}.jar=50
+org.apache.servicemix.bundles.cxf-2.0.3-${version}.jar=50
+org.apache.servicemix.bundles.jaxb-api-2.0-${servicemix.nmr.version}.jar=50
+org.apache.servicemix.bundles.jaxb-impl-2.0.3-${servicemix.nmr.version}.jar=50
+org.apache.servicemix.bundles.jaxws-api-2.0-${version}.jar=50
+org.apache.servicemix.bundles.openejb-3.0.0-SNAPSHOT-${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.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
+org.apache.servicemix.ejb3.deployer-${version}.jar=50
 
 #
 # Start console last

Propchange: servicemix/smx4/features/trunk/ejb3/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jan 29 05:10:47 2008
@@ -0,0 +1,9 @@
+target
+*.iml
+*.ipr
+*.iws
+.classpath
+.project
+.settings
+
+

Propchange: servicemix/smx4/features/trunk/ejb3/bundles/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jan 29 05:10:47 2008
@@ -0,0 +1,9 @@
+target
+*.iml
+*.ipr
+*.iws
+.classpath
+.project
+.settings
+
+

Propchange: servicemix/smx4/features/trunk/ejb3/bundles/cxf/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jan 29 05:10:47 2008
@@ -0,0 +1,9 @@
+target
+*.iml
+*.ipr
+*.iws
+.classpath
+.project
+.settings
+
+

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=616297&r1=615143&r2=616297&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/bundles/cxf/pom.xml (original)
+++ servicemix/smx4/features/trunk/ejb3/bundles/cxf/pom.xml Tue Jan 29 05:10:47 2008
@@ -23,32 +23,32 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix</groupId>
+        <groupId>org.apache.servicemix.ejb3.bundles</groupId>
         <artifactId>bundles</artifactId>
-        <version>4.0-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
-    <version>${pkgVersion}-${pomVersion}</version>
+    <artifactId>org.apache.servicemix.bundles.cxf-2.0.3</artifactId>
+    <version>1.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <name>ServiceMix OSGI Common Bundles: cxf</name>
     <description>
-        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+        This bundle simply wraps cxf ${pkgVersion}.
     </description>
 
     <properties>
-        <pkgArtifactId>cxf</pkgArtifactId>
-        <pkgVersion>${cxf.version}</pkgVersion>
-        <pomVersion>4.0-SNAPSHOT</pomVersion>
-		<servicemix.osgi.export.pkg>
-            org.apache.cxf
-        </servicemix.osgi.export.pkg>
+        <pkgVersion>2.0.3</pkgVersion>
+		<servicemix.osgi.export>
+            org.apache.cxf*;version=${pkgVersion},
+            org.xmlsoap.schemas*;version=${pkgVersion}
+        </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
             com.ibm*;resolution:=optional,
             com.sun*;resolution:=optional,
             javanet.staxutils*;resolution:=optional,
             javax.jms*;resolution:=optional,
+            javax.xml.soap,
             junit.framework*;resolution:=optional,
             org.apache.axiom*;resolution:=optional,
             org.apache.commons.lang*;resolution:=optional,
@@ -70,7 +70,6 @@
             META-INF*,
             org.apache.xml.resolver*,
             org.apache.neethi*,
-            org.xmlsoap.schemas.wsdl.http,
         </servicemix.osgi.private.pkg>
     </properties>
 
@@ -78,7 +77,7 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-bundle</artifactId>
-            <version>${pkgVersion}</version>
+            <version>2.0.3-incubator</version>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -92,12 +91,53 @@
             <artifactId>neethi</artifactId>
             <version>2.0.2</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.ws.commons.axiom</groupId>
+                    <artifactId>axiom-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.ws.commons.axiom</groupId>
+                    <artifactId>axiom-impl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>wsdl4j</groupId>
+                    <artifactId>wsdl4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.woodstox</groupId>
+                    <artifactId>wstx-asl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- Dependency on other bundles -->
         <dependency>
             <groupId>org.apache.ws.commons.schema</groupId>
             <artifactId>XmlSchema</artifactId>
+            <version>1.3.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xmlunit</groupId>
+                    <artifactId>xmlunit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.ws.commons</groupId>
+                    <artifactId>ws-commons-java5</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

Propchange: servicemix/smx4/features/trunk/ejb3/bundles/jaxws-api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jan 29 05:10:47 2008
@@ -0,0 +1,9 @@
+target
+*.iml
+*.ipr
+*.iws
+.classpath
+.project
+.settings
+
+

Modified: servicemix/smx4/features/trunk/ejb3/bundles/jaxws-api/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/ejb3/bundles/jaxws-api/pom.xml?rev=616297&r1=615143&r2=616297&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/bundles/jaxws-api/pom.xml (original)
+++ servicemix/smx4/features/trunk/ejb3/bundles/jaxws-api/pom.xml Tue Jan 29 05:10:47 2008
@@ -23,14 +23,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix</groupId>
+        <groupId>org.apache.servicemix.ejb3.bundles</groupId>
         <artifactId>bundles</artifactId>
-        <version>4.0-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
-    <version>${pkgVersion}-${pomVersion}</version>
+    <artifactId>org.apache.servicemix.bundles.jaxws-api-2.0</artifactId>
+    <version>1.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
     <description>
@@ -40,7 +40,6 @@
     <properties>
         <pkgArtifactId>jaxws-api</pkgArtifactId>
         <pkgVersion>${jaxws.api.version}</pkgVersion>
-        <pomVersion>4.0-SNAPSHOT</pomVersion>
         <servicemix.osgi.export.pkg>javax.xml.ws*</servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             javax.xml.soap*;resolution:=optional,
@@ -61,11 +60,13 @@
         </dependency>
         <dependency>
 		    <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.jaxb-api</artifactId>
+            <artifactId>org.apache.servicemix.bundles.jaxb-api-2.0</artifactId>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
 		    <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-saaj_1.1_spec</artifactId>
+            <artifactId>geronimo-saaj_1.3_spec</artifactId>
+            <version>${geronimo.saaj.version}</version>
         </dependency>
     </dependencies>
 </project>

Propchange: servicemix/smx4/features/trunk/ejb3/bundles/openejb/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jan 29 05:10:47 2008
@@ -0,0 +1,9 @@
+target
+*.iml
+*.ipr
+*.iws
+.classpath
+.project
+.settings
+
+

Modified: servicemix/smx4/features/trunk/ejb3/bundles/openejb/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/ejb3/bundles/openejb/pom.xml?rev=616297&r1=615143&r2=616297&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/bundles/openejb/pom.xml (original)
+++ servicemix/smx4/features/trunk/ejb3/bundles/openejb/pom.xml Tue Jan 29 05:10:47 2008
@@ -23,44 +23,44 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix</groupId>
+        <groupId>org.apache.servicemix.ejb3.bundles</groupId>
         <artifactId>bundles</artifactId>
-        <version>4.0-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
-    <version>${pkgVersion}-${pomVersion}</version>
+    <artifactId>org.apache.servicemix.bundles.openejb-3.0.0-SNAPSHOT</artifactId>
+    <version>1.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <name>ServiceMix OSGI Common Bundles: openejb</name>
     <description>
-        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+        This bundle simply wraps openejb-${pkgVersion}.jar.
     </description>
 
     <properties>
-        <pkgArtifactId>openejb</pkgArtifactId>
         <pkgVersion>${openejb.version}</pkgVersion>
-        <pomVersion>4.0-SNAPSHOT</pomVersion>
-		<servicemix.osgi.export.pkg>org.apache.openejb</servicemix.osgi.export.pkg>
+		<servicemix.osgi.export.pkg>
+			org.apache.openejb
+		</servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             javax.enterprise.deploy*;resolution:=optional,
             javax.jms*;resolution:=optional,
             javax.xml.registry*;resolution:=optional,
             javax.xml.rpc*;resolution:=optional,
-            javax.xml.soap*;resolution:=optional,
+            javax.xml.soap,
             org.apache.activemq*;resolution:=optional,
             org.apache.catalina*;resolution:=optional,
-            org.apache.commons.cli*;resolution:=optional,
             org.apache.commons.dbcp*;resolution:=optional,
-            org.apache.geronimo.connector*;resolution:=optional,
-            org.apache.geronimo.transaction*;resolution:=optional,
+            org.apache.xerces*;resolution:=optional,
             org.apache.xml.resolver*;resolution:=optional,
             org.codehaus.swizzle*;resolution:=optional,
+            org.mortbay*;resolution:=optional,
             org.xmlsoap.schemas.wsdl.http*;resolution:=optional,
             sun.misc*;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private.pkg>
+            org.apache.commons.cli*
         </servicemix.osgi.private.pkg>
     </properties>
 
@@ -68,62 +68,549 @@
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-core</artifactId>
-            <version>${pkgVersion}</version>
+            <version>${openejb.version}</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jpa_3.0_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>log4j</groupId>
+                  <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-loader</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-javaagent</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-jee</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-itests-app</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-itests-beans</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-itests-interceptor-beans</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-itests-interceptor-beans</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-itests-client</artifactId>
+                </exclusion>
+                <!--
+                <exclusion>
+                  <groupId>commons-cli</groupId>
+                  <artifactId>commons-cli</artifactId>
+                </exclusion>
+                -->
+                <exclusion>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-ra</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-core</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.openjpa</groupId>
+                  <artifactId>openjpa-persistence-jdbc</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.components</groupId>
+                  <artifactId>geronimo-connector</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.components</groupId>
+                  <artifactId>geronimo-transaction</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-annotation_1.0_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-interceptor_3.0_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jacc_1.1_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_1.1_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jta_1.1_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.javamail</groupId>
+                  <artifactId>geronimo-javamail_1.4_mail</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-activation_1.1_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>javax.xml.bind</groupId>
+                  <artifactId>jaxb-api</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.xbean</groupId>
+                  <artifactId>xbean-reflect</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.xbean</groupId>
+                  <artifactId>xbean-finder</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.xbean</groupId>
+                  <artifactId>xbean-naming</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>asm</groupId>
+                  <artifactId>asm</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>asm</groupId>
+                  <artifactId>asm-commons</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>junit</groupId>
+                  <artifactId>junit</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>hsqldb</groupId>
+                  <artifactId>hsqldb</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>idb</groupId>
+                  <artifactId>idb</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>commons-dbcp</groupId>
+                  <artifactId>commons-dbcp</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.codehaus.swizzle</groupId>
+                  <artifactId>swizzle-stream</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.axis2</groupId>
+                  <artifactId>axis2-jaxws-api</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>wsdl4j</groupId>
+                  <artifactId>wsdl4j</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>xmlunit</groupId>
+                  <artifactId>xmlunit</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-client</artifactId>
-            <version>${pkgVersion}</version>
+            <version>${openejb.version}</version>
             <optional>true</optional>
+            <exclusions>
+            <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            </exclusion>
+            <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+            </exclusion>
+            <exclusion>
+                  <groupId>org.apache.geronimo.javamail</groupId>
+                  <artifactId>geronimo-javamail_1.4_mail</artifactId>
+            </exclusion>
+            <exclusion>
+                  <groupId>org.apache.axis2</groupId>
+                  <artifactId>axis2-jaxws-api</artifactId>
+            </exclusion>
+            <exclusion>
+                  <groupId>javax.xml.bind</groupId>
+                  <artifactId>jaxb-api</artifactId>
+            </exclusion>
+            <exclusion>
+                  <groupId>commons-logging</groupId>
+                  <artifactId>commons-logging-api</artifactId>
+            </exclusion>
+            <exclusion>
+                  <groupId>junit</groupId>
+                  <artifactId>junit</artifactId>
+            </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-javaagent</artifactId>
-            <version>${pkgVersion}</version>
+            <version>${openejb.version}</version>
             <optional>true</optional>
+        <exclusions>
+        <exclusion>
+              <groupId>junit</groupId>
+              <artifactId>junit</artifactId>
+        </exclusion>
+        </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-jee</artifactId>
-            <version>${pkgVersion}</version>
+            <version>${openejb.version}</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-activation_1.1_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>com.sun.xml.bind</groupId>
+                  <artifactId>jaxb-impl</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>javax.xml.bind</groupId>
+                  <artifactId>jaxb-api</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>junit</groupId>
+                  <artifactId>junit</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>xmlunit</groupId>
+                  <artifactId>xmlunit</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-loader</artifactId>
-            <version>${pkgVersion}</version>
+            <version>${openejb.version}</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.tomcat</groupId>
+                  <artifactId>catalina</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>junit</groupId>
+                  <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-cxf</artifactId>
-            <version>${pkgVersion}</version>
+            <version>${openejb.version}</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-core</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-http</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-webservices</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-interceptor_3.0_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.axis2</groupId>
+                  <artifactId>axis2-saaj-api</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.axis2</groupId>
+                  <artifactId>axis2-jaxws-api</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>wsdl4j</groupId>
+                  <artifactId>wsdl4j</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.cxf</groupId>
+                  <artifactId>cxf-rt-frontend-jaxws</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.cxf</groupId>
+                  <artifactId>cxf-rt-transports-http</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.cxf</groupId>
+                  <artifactId>cxf-rt-transports-http-jetty</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>xml-resolver</groupId>
+                  <artifactId>xml-resolver</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-http</artifactId>
-            <version>${pkgVersion}</version>
+            <version>${openejb.version}</version>
             <optional>true</optional>
+            <exclusions>
+
+
+              <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-core</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-loader</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-server</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-ejbd</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>org.mortbay.jetty</groupId>
+                  <artifactId>jetty-embedded</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-servlet_2.5_spec</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-itests-client</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>idb</groupId>
+                  <artifactId>idb</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>junit</groupId>
+                  <artifactId>junit</artifactId>
+              </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-server</artifactId>
-            <version>${pkgVersion}</version>
+            <version>${openejb.version}</version>
             <optional>true</optional>
+            <exclusions>
+
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-loader</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-core</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-client</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.xbean</groupId>
+                  <artifactId>xbean-finder</artifactId>
+                </exclusion>
+                <!--
+                <exclusion>
+                  <groupId>commons-cli</groupId>
+                  <artifactId>commons-cli</artifactId>
+                </exclusion>
+                -->
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>log4j</groupId>
+                  <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>junit</groupId>
+                  <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-ejbd</artifactId>
-            <version>${pkgVersion}</version>
+            <version>${openejb.version}</version>
             <optional>true</optional>
+            <exclusions>
+
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_1.1_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>idb</groupId>
+                  <artifactId>idb</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-core</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-server</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-loader</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-client</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-itests-client</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>junit</groupId>
+                  <artifactId>junit</artifactId>
+                </exclusion>
+                
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-webservices</artifactId>
-            <version>${pkgVersion}</version>
+            <version>${openejb.version}</version>
             <optional>true</optional>
+            <exclusions>
+
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-loader</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-core</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-server</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-http</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.codehaus.swizzle</groupId>
+                  <artifactId>swizzle-stream</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.axis2</groupId>
+                  <artifactId>axis2-jaxws-api</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>wsdl4j</groupId>
+                  <artifactId>wsdl4j</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.axis2</groupId>
+                  <artifactId>axis2-saaj-api</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>axis</groupId>
+                  <artifactId>axis</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.xml.messaging.saaj</groupId>
+                    <artifactId>saaj-impl</artifactId>
+                </exclusion>
+                
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.codehaus.swizzle</groupId>
@@ -138,15 +625,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>${felix.version}</version>
-                <extensions>true</extensions>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>bundle</goal>
-                        </goals>
-                    </execution>
-                </executions>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>

Propchange: servicemix/smx4/features/trunk/ejb3/bundles/openjpa/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jan 29 05:10:47 2008
@@ -0,0 +1,9 @@
+target
+*.iml
+*.ipr
+*.iws
+.classpath
+.project
+.settings
+
+

Modified: servicemix/smx4/features/trunk/ejb3/bundles/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/ejb3/bundles/openjpa/pom.xml?rev=616297&r1=615143&r2=616297&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/bundles/openjpa/pom.xml (original)
+++ servicemix/smx4/features/trunk/ejb3/bundles/openjpa/pom.xml Tue Jan 29 05:10:47 2008
@@ -23,34 +23,37 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix</groupId>
+        <groupId>org.apache.servicemix.ejb3.bundles</groupId>
         <artifactId>bundles</artifactId>
-        <version>4.0-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
-    <version>${pkgVersion}-${pomVersion}</version>
+    <artifactId>org.apache.servicemix.bundles.openjpa-1.0.1</artifactId>
+    <version>1.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <name>ServiceMix OSGI Common Bundles: openjpa</name>
     <description>
-        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+        This bundle simply wraps openjpa-1.0.1.jar.
     </description>
 
     <properties>
-        <pkgArtifactId>openjpa</pkgArtifactId>
         <pkgVersion>${openjpa.version}</pkgVersion>
-        <pomVersion>4.0-SNAPSHOT</pomVersion>
-		<servicemix.osgi.export.pkg>org.apache.openjpa</servicemix.osgi.export.pkg>
+		<servicemix.osgi.export.pkg>
+			org.apache.openjpa
+		</servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             com.ibm*;resolution:=optional,
             org.apache.commons.collections*;resolution:=optional,
             org.apache.commons.lang*;resolution:=optional,
             org.apache.commons.pool*;resolution:=optional,
             org.apache.tools.ant*;resolution:=optional,
+            org.apache.xerces*;resolution:=optional,
             javax.jms*;resolution:=optional,
+            oracle*;resolution:=optional,
             serp*;resolution:=optional,
             sun.misc*;resolution:=optional,
+            weblogic*;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private.pkg>
@@ -61,57 +64,60 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-jdbc</artifactId>
-            <version>${pkgVersion}</version>
+            <version>${openjpa.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-jdbc-5</artifactId>
-            <version>${pkgVersion}</version>
+            <version>${openjpa.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel</artifactId>
-            <version>${pkgVersion}</version>
+            <version>${openjpa.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel-5</artifactId>
-            <version>${pkgVersion}</version>
+            <version>${openjpa.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-lib</artifactId>
-            <version>${pkgVersion}</version>
+            <version>${openjpa.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence</artifactId>
-            <version>${pkgVersion}</version>
+            <version>${openjpa.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
-            <version>${pkgVersion}</version>
+            <version>${openjpa.version}</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jms_1.1_spec</artifactId>
+            <version>${geronimo.jms.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <version>${geronimo.jta.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <version>${geronimo.jpa.version}</version>
         </dependency>
     </dependencies>
 

Added: servicemix/smx4/features/trunk/ejb3/bundles/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/ejb3/bundles/pom.xml?rev=616297&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/bundles/pom.xml (added)
+++ servicemix/smx4/features/trunk/ejb3/bundles/pom.xml Tue Jan 29 05:10:47 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.ejb3</groupId>
+        <artifactId>ejb3</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.ejb3.bundles</groupId>
+    <artifactId>bundles</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>ServiceMix OSGI Common Bundles</name>
+
+    <modules>
+        <module>cxf</module>
+        <module>jaxws-api</module>
+        <module>openejb</module>
+        <module>openjpa</module>
+        <module>saaj-impl</module>
+        <module>wsdl4j</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

Propchange: servicemix/smx4/features/trunk/ejb3/bundles/saaj-impl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jan 29 05:10:47 2008
@@ -0,0 +1,9 @@
+target
+*.iml
+*.ipr
+*.iws
+.classpath
+.project
+.settings
+
+

Added: servicemix/smx4/features/trunk/ejb3/bundles/saaj-impl/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/ejb3/bundles/saaj-impl/pom.xml?rev=616297&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/bundles/saaj-impl/pom.xml (added)
+++ servicemix/smx4/features/trunk/ejb3/bundles/saaj-impl/pom.xml Tue Jan 29 05:10:47 2008
@@ -0,0 +1,73 @@
+<?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.ejb3.bundles</groupId>
+        <artifactId>bundles</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.bundles</groupId>
+    <artifactId>org.apache.servicemix.bundles.saaj-impl-1.3</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <description>
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+    </description>
+
+    <properties>
+        <pkgArtifactId>saaj-impl</pkgArtifactId>
+        <pkgVersion>1.3</pkgVersion>
+        <servicemix.osgi.export.pkg>com.sun.xml.messaging.saaj</servicemix.osgi.export.pkg>
+        <servicemix.osgi.import.pkg>
+            com.sun.image.codec.jpeg*;resolution:=optional,
+            com.sun.xml.fastinfoset*;resolution:=optional,
+            javax.xml.soap,
+            org.jvnet.fastinfoset*;resolution:=optional,
+            *
+        </servicemix.osgi.import.pkg>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.sun.xml.messaging.saaj</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.soap</groupId>
+                    <artifactId>saaj-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+		    <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-saaj_1.3_spec</artifactId>
+            <version>${geronimo.saaj.version}</version>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+</project>

Propchange: servicemix/smx4/features/trunk/ejb3/bundles/wsdl4j/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jan 29 05:10:47 2008
@@ -0,0 +1,9 @@
+target
+*.iml
+*.ipr
+*.iws
+.classpath
+.project
+.settings
+
+

Modified: servicemix/smx4/features/trunk/ejb3/bundles/wsdl4j/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/ejb3/bundles/wsdl4j/pom.xml?rev=616297&r1=615143&r2=616297&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/bundles/wsdl4j/pom.xml (original)
+++ servicemix/smx4/features/trunk/ejb3/bundles/wsdl4j/pom.xml Tue Jan 29 05:10:47 2008
@@ -23,14 +23,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix</groupId>
+        <groupId>org.apache.servicemix.ejb3.bundles</groupId>
         <artifactId>bundles</artifactId>
-        <version>4.0-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
-    <version>${pkgVersion}-${pomVersion}</version>
+    <artifactId>org.apache.servicemix.bundles.wsdl4j-1.6.1</artifactId>
+    <version>1.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
     <description>
@@ -40,9 +40,10 @@
     <properties>
         <pkgArtifactId>wsdl4j</pkgArtifactId>
         <pkgVersion>1.6.1</pkgVersion>
-        <pomVersion>4.0-SNAPSHOT</pomVersion>
-        <servicemix.osgi.export.pkg>javax.wsdl*</servicemix.osgi.export.pkg>
-        <servicemix.osgi.private.pkg>com.ibm*</servicemix.osgi.private.pkg>
+        <servicemix.osgi.export>
+            javax.wsdl*;version=1.2,
+            com.ibm.wsdl*;version=${pkgVersion}
+        </servicemix.osgi.export>
     </properties>
 
     <dependencies>

Propchange: servicemix/smx4/features/trunk/ejb3/bundles/xmlschema/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jan 29 05:10:47 2008
@@ -0,0 +1,9 @@
+target
+*.iml
+*.ipr
+*.iws
+.classpath
+.project
+.settings
+
+

Added: servicemix/smx4/features/trunk/ejb3/bundles/xmlschema/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/ejb3/bundles/xmlschema/pom.xml?rev=616297&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/bundles/xmlschema/pom.xml (added)
+++ servicemix/smx4/features/trunk/ejb3/bundles/xmlschema/pom.xml Tue Jan 29 05:10:47 2008
@@ -0,0 +1,56 @@
+<?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.ejb3.bundles</groupId>
+        <artifactId>bundles</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.bundles</groupId>
+    <artifactId>org.apache.servicemix.bundles.xmlschema-1.3.2</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <description>
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+    </description>
+
+    <properties>
+        <pkgArtifactId>xmlschema</pkgArtifactId>
+        <pkgVersion>1.3.2</pkgVersion>
+        <servicemix.osgi.export.pkg>org.apache.ws.commons.schema</servicemix.osgi.export.pkg>
+        <servicemix.osgi.private.pkg></servicemix.osgi.private.pkg>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.ws.commons.schema</groupId>
+            <artifactId>XmlSchema</artifactId>
+            <version>${pkgVersion}</version>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+</project>

Propchange: servicemix/smx4/features/trunk/ejb3/deployer/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jan 29 05:10:47 2008
@@ -0,0 +1,9 @@
+target
+*.iml
+*.ipr
+*.iws
+.classpath
+.project
+.settings
+
+

Modified: servicemix/smx4/features/trunk/ejb3/deployer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/ejb3/deployer/pom.xml?rev=616297&r1=615143&r2=616297&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/deployer/pom.xml (original)
+++ servicemix/smx4/features/trunk/ejb3/deployer/pom.xml Tue Jan 29 05:10:47 2008
@@ -23,180 +23,209 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>servicemix</artifactId>
-        <version>4.0-SNAPSHOT</version>
+	    <groupId>org.apache.servicemix.ejb3</groupId>
+	    <artifactId>ejb3</artifactId>
+        <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.servicemix.openejb</groupId>
-    <artifactId>org.apache.servicemix.openejb</artifactId>
+    <groupId>org.apache.servicemix.ejb3</groupId>
+    <artifactId>org.apache.servicemix.ejb3.deployer</artifactId>
     <packaging>bundle</packaging>
-    <version>4.0-SNAPSHOT</version>
-    <name>ServiceMix OpenEJB</name>
+    <version>1.0-SNAPSHOT</version>
+    <name>ServiceMix EJB3 Deployer</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.cxf</artifactId>
+            <artifactId>org.apache.servicemix.bundles.cxf-2.0.3</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.jaxb-api</artifactId>
+            <artifactId>org.apache.servicemix.bundles.jaxb-api-2.0</artifactId>
+            <version>${servicemix.nmr.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
+            <artifactId>org.apache.servicemix.bundles.jaxb-impl-2.0.3</artifactId>
+            <version>${servicemix.nmr.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.jaxws-api</artifactId>
+            <artifactId>org.apache.servicemix.bundles.jaxws-api-2.0</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.openejb</artifactId>
+            <artifactId>org.apache.servicemix.bundles.openejb-3.0.0-SNAPSHOT</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.openjpa</artifactId>
+            <artifactId>org.apache.servicemix.bundles.openjpa-1.0.1</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
+            <artifactId>org.apache.servicemix.bundles.wsdl4j-1.6.1</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-finder</artifactId>
+            <version>${xbean.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+            <version>${geronimo.jaxrpc.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <version>${geronimo.ejb3.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+            <version>${geronimo.wsmetadata.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <version>${geronimo.servlet.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
+            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.osgi</groupId>
             <artifactId>spring-osgi-core</artifactId>
+            <version>${spring.osgi.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.ops4j.pax.web</groupId>
             <artifactId>pax-web-service</artifactId>
+            <version>${pax.web.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
+            <version>${pax.logging.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-service</artifactId>
+            <version>${pax.logging.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+            <version>${geronimo.j2ee.connector.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+            <version>${geronimo.stax.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <version>${geronimo.annotation.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-interceptor_3.0_spec</artifactId>
+            <version>${geronimo.interceptor.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jacc_1.1_spec</artifactId>
+            <version>${geronimo.jacc.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.components</groupId>
             <artifactId>geronimo-transaction</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.components</groupId>
-            <artifactId>geronimo-transaction</artifactId>
+            <version>${geronimo.transaction.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-naming</artifactId>
+            <version>${xbean.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-reflect</artifactId>
+            <version>${xbean.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-core</artifactId>
+            <version>${activemq.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.ws.commons.schema</groupId>
-            <artifactId>XmlSchema</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.xmlschema-1.3.2</artifactId>
+            <version>${pom.version}</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.osgi.core</artifactId>
+            <version>${felix.osgi.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.osgi.compendium</artifactId>
+            <version>${felix.compendium.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
+            <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
+            <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
+            <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.osgi</groupId>
             <artifactId>spring-osgi-io</artifactId>
+            <version>${spring.osgi.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -207,26 +236,59 @@
         <dependency>
             <groupId>org.springframework.osgi</groupId>
             <artifactId>spring-osgi-test</artifactId>
+            <version>${spring.osgi.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+		            <groupId>org.springframework.osgi</groupId>
+		            <artifactId>asm.osgi</artifactId>
+                </exclusion>
+                <exclusion>
+		            <groupId>org.springframework.osgi</groupId>
+		            <artifactId>junit.osgi</artifactId>
+                </exclusion>
+	        </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.osgi</groupId>
             <artifactId>spring-osgi-annotation</artifactId>
+            <version>${spring.osgi.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+            <artifactId>org.apache.servicemix.bundles.asm-2.2.3</artifactId>
+            <version>${servicemix.kernel.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.junit</artifactId>
+            <artifactId>org.apache.servicemix.bundles.junit-4.4</artifactId>
+            <version>${servicemix.kernel.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.components</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+            <version>${geronimo.transaction.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.components</groupId>
+            <artifactId>geronimo-connector</artifactId>
+            <version>${geronimo.connector.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.1_spec</artifactId>
+            <version>${geronimo.activation.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -242,6 +304,13 @@
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
                             javax.xml.rpc*;resolution:=optional,
+                            javax.xml.soap,
+                            com.ctc.wstx.stax;resolution:=optional,
+                            org.apache.axis.soap;resolution:=optional,
+                            org.apache.axis2.saaj;resolution:=optional,
+                            com.sun.xml.messaging.saaj.soap.ver1_1;resolution:=optional,
+                            com.sun.xml.messaging.saaj.client.p2p;resolution:=optional,
+                            com.sun.xml.messaging.saaj.soap;resolution:=optional,
                             *
                         </Import-Package>
                         <!-- Needed for jaxb annotations classes -->
@@ -254,9 +323,9 @@
             </plugin>
             <!-- generate dependencies versions -->
             <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>depends-maven-plugin</artifactId>
-                <version>4.0-SNAPSHOT</version>
+		        <groupId>org.apache.servicemix.kernel.testing</groupId>
+		        <artifactId>depends-maven-plugin</artifactId>
+                <version>${servicemix.kernel.version}</version>
                 <executions>
                     <execution>
                         <id>generate-depends-file</id>



Mime
View raw message