Author: rfeng
Date: Thu May 14 20:49:02 2009
New Revision: 774921
URL: http://svn.apache.org/viewvc?rev=774921&view=rev
Log:
Reorganize the pom so that bpel/spring modules are defined in features and
referenced by the distro pom
Added:
tuscany/java/sca/features/process/
tuscany/java/sca/features/process/pom.xml
Modified:
tuscany/java/sca/distribution/all/pom.xml
tuscany/java/sca/features/all/pom.xml
tuscany/java/sca/features/ejava/pom.xml
tuscany/java/sca/features/pom.xml
tuscany/java/sca/features/webapp/pom.xml
tuscany/java/sca/itest/implementation-spring/pom.xml
tuscany/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
tuscany/java/sca/modules/implementation-bpel-ode/pom.xml
tuscany/java/sca/modules/implementation-spring-sca/pom.xml
Modified: tuscany/java/sca/distribution/all/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/all/pom.xml?rev=774921&r1=774920&r2=774921&view=diff
==============================================================================
--- tuscany/java/sca/distribution/all/pom.xml (original)
+++ tuscany/java/sca/distribution/all/pom.xml Thu May 14 20:49:02 2009
@@ -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>
Modified: tuscany/java/sca/features/all/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/features/all/pom.xml?rev=774921&r1=774920&r2=774921&view=diff
==============================================================================
--- tuscany/java/sca/features/all/pom.xml (original)
+++ tuscany/java/sca/features/all/pom.xml Thu May 14 20:49:02 2009
@@ -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>
Modified: tuscany/java/sca/features/ejava/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/features/ejava/pom.xml?rev=774921&r1=774920&r2=774921&view=diff
==============================================================================
--- tuscany/java/sca/features/ejava/pom.xml (original)
+++ tuscany/java/sca/features/ejava/pom.xml Thu May 14 20:49:02 2009
@@ -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>
Modified: tuscany/java/sca/features/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/features/pom.xml?rev=774921&r1=774920&r2=774921&view=diff
==============================================================================
--- tuscany/java/sca/features/pom.xml (original)
+++ tuscany/java/sca/features/pom.xml Thu May 14 20:49:02 2009
@@ -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>
-->
Added: tuscany/java/sca/features/process/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/features/process/pom.xml?rev=774921&view=auto
==============================================================================
--- tuscany/java/sca/features/process/pom.xml (added)
+++ tuscany/java/sca/features/process/pom.xml Thu May 14 20:49:02 2009
@@ -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>
Modified: tuscany/java/sca/features/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/features/webapp/pom.xml?rev=774921&r1=774920&r2=774921&view=diff
==============================================================================
--- tuscany/java/sca/features/webapp/pom.xml (original)
+++ tuscany/java/sca/features/webapp/pom.xml Thu May 14 20:49:02 2009
@@ -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>
Modified: tuscany/java/sca/itest/implementation-spring/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/pom.xml?rev=774921&r1=774920&r2=774921&view=diff
==============================================================================
--- tuscany/java/sca/itest/implementation-spring/pom.xml (original)
+++ tuscany/java/sca/itest/implementation-spring/pom.xml Thu May 14 20:49:02
2009
@@ -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>
Modified: tuscany/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF?rev=774921&r1=774920&r2=774921&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
(original)
+++ tuscany/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF Thu
May 14 20:49:02 2009
@@ -14,7 +14,7 @@
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,
Modified: tuscany/java/sca/modules/implementation-bpel-ode/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/pom.xml?rev=774921&r1=774920&r2=774921&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel-ode/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-bpel-ode/pom.xml Thu May 14
20:49:02 2009
@@ -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>
Modified: tuscany/java/sca/modules/implementation-spring-sca/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-spring-sca/pom.xml?rev=774921&r1=774920&r2=774921&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-spring-sca/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-spring-sca/pom.xml Thu May 14
20:49:02 2009
@@ -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>
