Reorganize the pom so that bpel/spring modules are defined in features and referenced by the distro pom

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@774921 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 112 insertions, 60 deletions

diff --git a/java/sca/distribution/all/pom.xml b/java/sca/distribution/all/pom.xml
index 3363a7a5f5..3591f67173 100644
--- a/java/sca/distribution/all/pom.xml
+++ b/java/sca/distribution/all/pom.xml
@@ -37,36 +37,6 @@
             <type>pom</type>

             <version>2.0-SNAPSHOT</version>

         </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-bpel</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-bpel-ode</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-stripes</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-spring</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-spring-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-myfaces</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

     </dependencies>

 

     <build>

diff --git a/java/sca/features/all/pom.xml b/java/sca/features/all/pom.xml
index 605de8e261..d3b38106ab 100644
--- a/java/sca/features/all/pom.xml
+++ b/java/sca/features/all/pom.xml
@@ -67,6 +67,12 @@
             <version>2.0-SNAPSHOT</version>

         </dependency>

 

+       <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-feature-process</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

diff --git a/java/sca/features/ejava/pom.xml b/java/sca/features/ejava/pom.xml
index c11c1cc503..5d3bfa4e27 100644
--- a/java/sca/features/ejava/pom.xml
+++ b/java/sca/features/ejava/pom.xml
@@ -80,12 +80,18 @@
             <artifactId>tuscany-implementation-ejb</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>

+-->

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-implementation-spring</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>

--->

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-implementation-spring-sca</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

 

         <!-- OSGi RFC 119 -->

         <dependency>

diff --git a/java/sca/features/pom.xml b/java/sca/features/pom.xml
index 93e4bfb9d9..deef2b7111 100644
--- a/java/sca/features/pom.xml
+++ b/java/sca/features/pom.xml
@@ -37,9 +37,9 @@
         <module>ejava</module>
         <module>webservice</module>
         <module>webapp</module>
+        <module>process</module>
 <!--
         <module>manager</module>
-        <module>process</module>
         <module>repository</module>
         <module>web20</module>
 -->
diff --git a/java/sca/features/process/pom.xml b/java/sca/features/process/pom.xml
new file mode 100644
index 0000000000..037beaecc6
--- /dev/null
+++ b/java/sca/features/process/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+<project>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

+        <groupId>org.apache.tuscany.sca</groupId>

+        <artifactId>tuscany-feature</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../pom.xml</relativePath>

+    </parent>

+

+    <artifactId>tuscany-feature-process</artifactId>

+    <name>Apache Tuscany SCA Process Feature</name>

+    <packaging>pom</packaging>

+

+    <dependencies>

+

+        <!-- Core distribution -->

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-feature-core</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <!-- ODE BPEL -->

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-implementation-bpel</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-implementation-bpel-ode</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+    </dependencies>

+

+</project>

diff --git a/java/sca/features/webapp/pom.xml b/java/sca/features/webapp/pom.xml
index 8c21ae6fd3..e7d75322d5 100644
--- a/java/sca/features/webapp/pom.xml
+++ b/java/sca/features/webapp/pom.xml
@@ -64,6 +64,18 @@
             <version>1.0.1</version>

         </dependency>

 

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-stripes</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-myfaces</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

     </dependencies>

 

 </project>

diff --git a/java/sca/itest/implementation-spring/pom.xml b/java/sca/itest/implementation-spring/pom.xml
index f332890b5c..94bf716141 100644
--- a/java/sca/itest/implementation-spring/pom.xml
+++ b/java/sca/itest/implementation-spring/pom.xml
@@ -7,15 +7,15 @@
     * 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.    

+    * under the License.

 -->

 <project>

     <modelVersion>4.0.0</modelVersion>

@@ -48,23 +48,23 @@
         </dependency>

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-spring-runtime</artifactId>

+            <artifactId>tuscany-implementation-spring-sca</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>

-        

+

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-binding-ws-axis2</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>

-        

+

         <!-- Spring dependencies... -->

         <dependency>

             <groupId>org.springframework</groupId>

             <artifactId>spring-core</artifactId>

             <version>2.5.5</version>

         </dependency>

-        

+

         <dependency>

             <groupId>org.springframework</groupId>

             <artifactId>spring-beans</artifactId>

diff --git a/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF b/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
index eb2db6e5cb..5e8ef59631 100644
--- a/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Bundle-Description: Apache Tuscany SCA BPEL ODE Implementation Extensi
  on

 Import-Package: javax.resource.spi,

  javax.sql,

- javax.transaction;version="1.0.1",

+ javax.transaction;version="1.1.0",

  javax.wsdl,

  javax.xml.namespace,

  org.apache.commons.logging,

diff --git a/java/sca/modules/implementation-bpel-ode/pom.xml b/java/sca/modules/implementation-bpel-ode/pom.xml
index e0e3c5f36d..5e6e263f94 100644
--- a/java/sca/modules/implementation-bpel-ode/pom.xml
+++ b/java/sca/modules/implementation-bpel-ode/pom.xml
@@ -259,6 +259,10 @@
             <version>1.1</version>

             <exclusions>

                 <exclusion>

+                    <groupId>geronimo-spec</groupId>

+                    <artifactId>geronimo-spec-jta</artifactId>

+                </exclusion>

+                <exclusion>

                     <groupId>junit</groupId>

                     <artifactId>junit</artifactId>

                 </exclusion>

@@ -326,7 +330,7 @@
                 <exclusion>

                     <groupId>xml-apis</groupId>

                     <artifactId>xml-apis</artifactId>

-                </exclusion>                

+                </exclusion>

             </exclusions>

         </dependency>

         <dependency>

@@ -349,7 +353,7 @@
                     <groupId>xml-apis</groupId>

                     <artifactId>xml-apis</artifactId>

                 </exclusion>

-            </exclusions>                        

+            </exclusions>

         </dependency>

         <dependency>

             <groupId>org.apache.xmlbeans</groupId>

diff --git a/java/sca/modules/implementation-spring-sca/pom.xml b/java/sca/modules/implementation-spring-sca/pom.xml
index 98aadb1dea..746b8cc2ac 100644
--- a/java/sca/modules/implementation-spring-sca/pom.xml
+++ b/java/sca/modules/implementation-spring-sca/pom.xml
@@ -7,15 +7,15 @@
  * 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.    

+ * under the License.

 -->

 <project>

     <modelVersion>4.0.0</modelVersion>

@@ -25,21 +25,21 @@
         <version>2.0-SNAPSHOT</version>

         <relativePath>../pom.xml</relativePath>

     </parent>

-    <artifactId>tuscany-implementation-spring-runtime</artifactId>

+    <artifactId>tuscany-implementation-spring-sca</artifactId>

     <name>Apache Tuscany SCA Spring Implementation Runtime Model</name>

 

     <dependencies>

 

-        <!-- **************************************** -->    

-        <!-- *                                      * -->    

-        <!-- * DONT ADD ANY TUSCANY DEPENDENCIES!!! * -->    

-        <!-- *                                      * -->    

-        <!-- * See the README for details why not   * -->    

-        <!-- *                                      * -->    

-        <!-- *                                      * -->    

-        <!-- **************************************** -->    

+        <!-- **************************************** -->

+        <!-- *                                      * -->

+        <!-- * DONT ADD ANY TUSCANY DEPENDENCIES!!! * -->

+        <!-- *                                      * -->

+        <!-- * See the README for details why not   * -->

+        <!-- *                                      * -->

+        <!-- *                                      * -->

+        <!-- **************************************** -->

 

-        <!-- SCA API dependency -->    

+        <!-- SCA API dependency -->

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-sca-api</artifactId>

@@ -47,27 +47,24 @@
             <scope>provided</scope>

         </dependency>

 

-        <!-- Spring dependencies... -->    

+        <!-- Spring dependencies... -->

         <dependency>

             <groupId>org.springframework</groupId>

             <artifactId>spring-core</artifactId>

             <version>2.5.5</version>

-            <scope>provided</scope>

         </dependency>

 

         <dependency>

             <groupId>org.springframework</groupId>

             <artifactId>spring-beans</artifactId>

             <version>2.5.5</version>

-            <scope>provided</scope>

         </dependency>

 

         <dependency>

             <groupId>org.springframework</groupId>

             <artifactId>spring-context</artifactId>

             <version>2.5.5</version>

-            <scope>provided</scope>

         </dependency>

-          

+

     </dependencies>

 </project>