You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/11/20 00:08:20 UTC
svn commit: r719120 [2/2] - in /tuscany/java/sca: contrib/distribution/
distribution/ distribution/all/ distribution/all/src/
distribution/all/src/main/ distribution/all/src/main/assembly/
distribution/all/src/main/components/ distribution/all/src/main...
Copied: tuscany/java/sca/distribution/pdetarget/pom.xml (from r714142, tuscany/branches/sca-equinox/distribution/pdetarget/pom.xml)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/pdetarget/pom.xml?p2=tuscany/java/sca/distribution/pdetarget/pom.xml&p1=tuscany/branches/sca-equinox/distribution/pdetarget/pom.xml&r1=714142&r2=719120&rev=719120&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/pdetarget/pom.xml (original)
+++ tuscany/java/sca/distribution/pdetarget/pom.xml Wed Nov 19 15:08:15 2008
@@ -1,247 +1,247 @@
-<?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-distribution</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>tuscany-distribution-pdetarget</artifactId>
- <name>Apache Tuscany SCA PDE Target Platform Distribution</name>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-all</artifactId>
- <type>pom</type>
- <version>1.4-EQUINOX-SNAPSHOT</version>
- </dependency>
-
- <!-- host-tomcat is not in the all-in-one distro -->
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
- <type>jar</type>
- <version>1.4-EQUINOX-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>annotations-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-webapp</artifactId>
- <type>jar</type>
- <version>1.4-EQUINOX-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
- <!--
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <version>1.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>httpunit</groupId>
- <artifactId>httpunit</artifactId>
- <version>1.6.1</version>
- <scope>test</scope>
- </dependency>
- -->
- </dependencies>
-
- <profiles>
-
- <!-- Build profile that can be used to configure your Eclipse environment -->
- <profile>
- <id>eclipse</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-maven-bundle-plugin</artifactId>
- <executions>
- <execution>
- <id>distribution-modules</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>generate-modules</goal>
- </goals>
- <configuration>
- <targetDirectory>target/modules</targetDirectory>
- <generateTargetPlatform>true</generateTargetPlatform>
- <excludeGroupIds>
- <excludeGroupId>org.apache.tuscany.sca</excludeGroupId>
- </excludeGroupIds>
- <artifactAggregations>
- <artifactAggregation>
- <symbolicName>com.google.gdata</symbolicName>
- <version>1.0</version>
- <artifactMembers>
- <artifactMember>
- <groupId>com.google.gdata</groupId>
- <artifactId>*</artifactId>
- <version>1.0</version>
- </artifactMember>
- <!--
- <artifactMember>
- <groupId>com.google.gdata</groupId>
- <artifactId>gdata-media</artifactId>
- <version>1.0</version>
- </artifactMember>
- -->
- </artifactMembers>
- </artifactAggregation>
- </artifactAggregations>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- Profile that can be used to build the modules included in the distro -->
- <profile>
- <id>modules</id>
- <modules>
- <module>../../../modules/assembly</module>
- <module>../../../modules/assembly-xml</module>
- <module>../../../modules/assembly-xsd</module>
- <module>../../../modules/binding-atom</module>
- <module>../../../modules/binding-atom-abdera</module>
- <module>../../../modules/binding-corba</module>
- <module>../../../modules/binding-corba-runtime</module>
- <module>../../../modules/binding-ejb</module>
- <module>../../../modules/binding-ejb-runtime</module>
- <module>../../../modules/binding-gdata</module>
- <module>../../../modules/binding-gdata-runtime</module>
- <module>../../../modules/binding-gdata-runtime-gsoc</module>
- <module>../../../modules/binding-http</module>
- <module>../../../modules/binding-http-runtime</module>
- <module>../../../modules/binding-jms</module>
- <module>../../../modules/binding-jms-runtime</module>
- <module>../../../modules/binding-jsonrpc</module>
- <module>../../../modules/binding-jsonrpc-runtime</module>
- <module>../../../modules/binding-rmi</module>
- <module>../../../modules/binding-rmi-runtime</module>
- <module>../../../modules/binding-rss</module>
- <module>../../../modules/binding-rss-rome</module>
- <module>../../../modules/binding-sca</module>
- <module>../../../modules/binding-sca-axis2</module>
- <module>../../../modules/binding-sca-xml</module>
- <module>../../../modules/binding-ws</module>
- <module>../../../modules/binding-ws-axis2</module>
- <module>../../../modules/binding-ws-axis2-policy</module>
- <module>../../../modules/binding-ws-wsdlgen</module>
- <module>../../../modules/binding-ws-xml</module>
- <module>../../../modules/contribution</module>
- <module>../../../modules/contribution-java</module>
- <module>../../../modules/contribution-namespace</module>
- <module>../../../modules/contribution-resource</module>
- <module>../../../modules/contribution-xml</module>
- <module>../../../modules/core</module>
- <module>../../../modules/core-databinding</module>
- <module>../../../modules/core-spi</module>
- <module>../../../modules/data-api</module>
- <module>../../../modules/databinding</module>
- <module>../../../modules/databinding-axiom</module>
- <module>../../../modules/databinding-fastinfoset</module>
- <module>../../../modules/databinding-jaxb</module>
- <module>../../../modules/databinding-jaxb-axiom</module>
- <module>../../../modules/databinding-json</module>
- <module>../../../modules/databinding-saxon</module>
- <module>../../../modules/databinding-sdo</module>
- <module>../../../modules/databinding-sdo-axiom</module>
- <module>../../../modules/databinding-xmlbeans</module>
- <module>../../../modules/definitions</module>
- <module>../../../modules/definitions-xml</module>
- <module>../../../modules/domain-manager</module>
- <module>../../../modules/endpoint</module>
- <module>../../../modules/extensibility</module>
- <module>../../../modules/extensibility-equinox</module>
- <module>../../../modules/host-corba</module>
- <module>../../../modules/host-corba-jee</module>
- <module>../../../modules/host-corba-jse</module>
- <module>../../../modules/host-http</module>
- <module>../../../modules/host-jetty</module>
- <module>../../../modules/host-rmi</module>
- <module>../../../modules/implementation-bpel</module>
- <module>../../../modules/implementation-bpel-ode</module>
- <module>../../../modules/implementation-ejb</module>
- <module>../../../modules/implementation-java</module>
- <module>../../../modules/implementation-java-runtime</module>
- <module>../../../modules/implementation-java-xml</module>
- <module>../../../modules/implementation-node</module>
- <module>../../../modules/implementation-node-runtime</module>
- <module>../../../modules/implementation-resource</module>
- <module>../../../modules/implementation-resource-runtime</module>
- <module>../../../modules/implementation-script</module>
- <module>../../../modules/implementation-script-runtime</module>
- <module>../../../modules/implementation-spring</module>
- <module>../../../modules/implementation-widget</module>
- <module>../../../modules/implementation-widget-runtime</module>
- <module>../../../modules/implementation-xquery</module>
- <module>../../../modules/interface</module>
- <module>../../../modules/interface-java</module>
- <module>../../../modules/interface-java-jaxws</module>
- <module>../../../modules/interface-java-xml</module>
- <module>../../../modules/interface-wsdl</module>
- <module>../../../modules/interface-wsdl-xml</module>
- <module>../../../modules/monitor</module>
- <module>../../../modules/node-api</module>
- <module>../../../modules/node-impl</module>
- <module>../../../modules/node-launcher</module>
- <module>../../../modules/node-launcher-equinox</module>
- <!--
- <module>../../../modules/node-launcher-webapp</module>
- -->
- <module>../../../modules/node-manager</module>
- <module>../../../modules/policy</module>
- <module>../../../modules/policy-security</module>
- <module>../../../modules/policy-security-jsr250</module>
- <module>../../../modules/policy-security-ws</module>
- <module>../../../modules/policy-transaction</module>
- <module>../../../modules/policy-xml</module>
- <module>../../../modules/policy-xml-ws</module>
- <module>../../../modules/sca-api</module>
- <module>../../../modules/tracing-aspectj</module>
- <module>../../../modules/workspace</module>
- <module>../../../modules/workspace-impl</module>
- <module>../../../modules/workspace-xml</module>
- <module>../../../modules/xsd</module>
- <module>../../../modules/xsd-xml</module>
- </modules>
- </profile>
- </profiles>
-
-</project>
+<?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-distribution</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>tuscany-distribution-pdetarget</artifactId>
+ <name>Apache Tuscany SCA PDE Target Platform Distribution</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-all</artifactId>
+ <type>pom</type>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <!-- host-tomcat is not in the all-in-one distro -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-tomcat</artifactId>
+ <type>jar</type>
+ <version>2.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>annotations-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-webapp</artifactId>
+ <type>jar</type>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>1.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.6.1</version>
+ <scope>test</scope>
+ </dependency>
+ -->
+ </dependencies>
+
+ <profiles>
+
+ <!-- Build profile that can be used to configure your Eclipse environment -->
+ <profile>
+ <id>eclipse</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>distribution-modules</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>generate-modules</goal>
+ </goals>
+ <configuration>
+ <targetDirectory>target/modules</targetDirectory>
+ <generateTargetPlatform>true</generateTargetPlatform>
+ <excludeGroupIds>
+ <excludeGroupId>org.apache.tuscany.sca</excludeGroupId>
+ </excludeGroupIds>
+ <artifactAggregations>
+ <artifactAggregation>
+ <symbolicName>com.google.gdata</symbolicName>
+ <version>1.0</version>
+ <artifactMembers>
+ <artifactMember>
+ <groupId>com.google.gdata</groupId>
+ <artifactId>*</artifactId>
+ <version>1.0</version>
+ </artifactMember>
+ <!--
+ <artifactMember>
+ <groupId>com.google.gdata</groupId>
+ <artifactId>gdata-media</artifactId>
+ <version>1.0</version>
+ </artifactMember>
+ -->
+ </artifactMembers>
+ </artifactAggregation>
+ </artifactAggregations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- Profile that can be used to build the modules included in the distro -->
+ <profile>
+ <id>modules</id>
+ <modules>
+ <module>../../../modules/assembly</module>
+ <module>../../../modules/assembly-xml</module>
+ <module>../../../modules/assembly-xsd</module>
+ <module>../../../modules/binding-atom</module>
+ <module>../../../modules/binding-atom-abdera</module>
+ <module>../../../modules/binding-corba</module>
+ <module>../../../modules/binding-corba-runtime</module>
+ <module>../../../modules/binding-ejb</module>
+ <module>../../../modules/binding-ejb-runtime</module>
+ <module>../../../modules/binding-gdata</module>
+ <module>../../../modules/binding-gdata-runtime</module>
+ <module>../../../modules/binding-gdata-runtime-gsoc</module>
+ <module>../../../modules/binding-http</module>
+ <module>../../../modules/binding-http-runtime</module>
+ <module>../../../modules/binding-jms</module>
+ <module>../../../modules/binding-jms-runtime</module>
+ <module>../../../modules/binding-jsonrpc</module>
+ <module>../../../modules/binding-jsonrpc-runtime</module>
+ <module>../../../modules/binding-rmi</module>
+ <module>../../../modules/binding-rmi-runtime</module>
+ <module>../../../modules/binding-rss</module>
+ <module>../../../modules/binding-rss-rome</module>
+ <module>../../../modules/binding-sca</module>
+ <module>../../../modules/binding-sca-axis2</module>
+ <module>../../../modules/binding-sca-xml</module>
+ <module>../../../modules/binding-ws</module>
+ <module>../../../modules/binding-ws-axis2</module>
+ <module>../../../modules/binding-ws-axis2-policy</module>
+ <module>../../../modules/binding-ws-wsdlgen</module>
+ <module>../../../modules/binding-ws-xml</module>
+ <module>../../../modules/contribution</module>
+ <module>../../../modules/contribution-java</module>
+ <module>../../../modules/contribution-namespace</module>
+ <module>../../../modules/contribution-resource</module>
+ <module>../../../modules/contribution-xml</module>
+ <module>../../../modules/core</module>
+ <module>../../../modules/core-databinding</module>
+ <module>../../../modules/core-spi</module>
+ <module>../../../modules/data-api</module>
+ <module>../../../modules/databinding</module>
+ <module>../../../modules/databinding-axiom</module>
+ <module>../../../modules/databinding-fastinfoset</module>
+ <module>../../../modules/databinding-jaxb</module>
+ <module>../../../modules/databinding-jaxb-axiom</module>
+ <module>../../../modules/databinding-json</module>
+ <module>../../../modules/databinding-saxon</module>
+ <module>../../../modules/databinding-sdo</module>
+ <module>../../../modules/databinding-sdo-axiom</module>
+ <module>../../../modules/databinding-xmlbeans</module>
+ <module>../../../modules/definitions</module>
+ <module>../../../modules/definitions-xml</module>
+ <module>../../../modules/domain-manager</module>
+ <module>../../../modules/endpoint</module>
+ <module>../../../modules/extensibility</module>
+ <module>../../../modules/extensibility-equinox</module>
+ <module>../../../modules/host-corba</module>
+ <module>../../../modules/host-corba-jee</module>
+ <module>../../../modules/host-corba-jse</module>
+ <module>../../../modules/host-http</module>
+ <module>../../../modules/host-jetty</module>
+ <module>../../../modules/host-rmi</module>
+ <module>../../../modules/implementation-bpel</module>
+ <module>../../../modules/implementation-bpel-ode</module>
+ <module>../../../modules/implementation-ejb</module>
+ <module>../../../modules/implementation-java</module>
+ <module>../../../modules/implementation-java-runtime</module>
+ <module>../../../modules/implementation-java-xml</module>
+ <module>../../../modules/implementation-node</module>
+ <module>../../../modules/implementation-node-runtime</module>
+ <module>../../../modules/implementation-resource</module>
+ <module>../../../modules/implementation-resource-runtime</module>
+ <module>../../../modules/implementation-script</module>
+ <module>../../../modules/implementation-script-runtime</module>
+ <module>../../../modules/implementation-spring</module>
+ <module>../../../modules/implementation-widget</module>
+ <module>../../../modules/implementation-widget-runtime</module>
+ <module>../../../modules/implementation-xquery</module>
+ <module>../../../modules/interface</module>
+ <module>../../../modules/interface-java</module>
+ <module>../../../modules/interface-java-jaxws</module>
+ <module>../../../modules/interface-java-xml</module>
+ <module>../../../modules/interface-wsdl</module>
+ <module>../../../modules/interface-wsdl-xml</module>
+ <module>../../../modules/monitor</module>
+ <module>../../../modules/node-api</module>
+ <module>../../../modules/node-impl</module>
+ <module>../../../modules/node-launcher</module>
+ <module>../../../modules/node-launcher-equinox</module>
+ <!--
+ <module>../../../modules/node-launcher-webapp</module>
+ -->
+ <module>../../../modules/node-manager</module>
+ <module>../../../modules/policy</module>
+ <module>../../../modules/policy-security</module>
+ <module>../../../modules/policy-security-jsr250</module>
+ <module>../../../modules/policy-security-ws</module>
+ <module>../../../modules/policy-transaction</module>
+ <module>../../../modules/policy-xml</module>
+ <module>../../../modules/policy-xml-ws</module>
+ <module>../../../modules/sca-api</module>
+ <module>../../../modules/tracing-aspectj</module>
+ <module>../../../modules/workspace</module>
+ <module>../../../modules/workspace-impl</module>
+ <module>../../../modules/workspace-xml</module>
+ <module>../../../modules/xsd</module>
+ <module>../../../modules/xsd-xml</module>
+ </modules>
+ </profile>
+ </profiles>
+
+</project>
Modified: tuscany/java/sca/distribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/pom.xml?rev=719120&r1=719119&r2=719120&view=diff
==============================================================================
--- tuscany/java/sca/distribution/pom.xml (original)
+++ tuscany/java/sca/distribution/pom.xml Wed Nov 19 15:08:15 2008
@@ -22,309 +22,24 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
+ <version>2.0-SNAPSHOT</version>
</parent>
-
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-distribution</artifactId>
- <name>Apache Tuscany SCA Distribution</name>
<packaging>pom</packaging>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- <tuscany.version>${pom.version}</tuscany.version>
- </properties>
+ <name>Apache Tuscany SCA Distributions</name>
<modules>
- <module>bundle</module>
- <module>manifest</module>
- <!--module>webapp</module-->
+ <module>all</module>
+ <module>core</module>
+ <module>ejava</module>
+ <module>manager</module>
+ <module>pdetarget</module>
+ <module>process</module>
+ <module>repository</module>
+ <module>web20</module>
+ <module>webservice</module>
</modules>
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-bundle</artifactId>
- <version>${pom.version}</version>
- <exclusions>
- <!-- exclude things that get dragged in from other dependencies that we don't need to distribute -->
- <!-- TODO: this should probably be done in the Tuscany module where the dependency is defined -->
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-launcher</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- </exclusion>
- <exclusion>
- <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <!--
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</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-activation_1.0.2_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-webapp</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <!--don't put two servlet hosts in the classpath TUSCANY-1954 -->
- <!--include tomcat here so it is shipped in modules/ but not -->
- <!--in the all jar -->
- <!-- dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency -->
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-impl</artifactId>
- <version>1.1-incubating</version>
- <exclusions>
- <exclusion>
- <!-- sdo 1.0 uses 3.2.0 but sca uses 3.2.1 -->
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </exclusion>
- <exclusion>
- <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <!-- exclude felix since we are using a later version -->
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.main</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>apache-activemq</artifactId>
- <version>4.1.1</version>
- <exclusions>
- <!-- TUSCANY-2168 -->
- <exclusion>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-console</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-optional</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-web</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-web-demo</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-jaas</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-j2ee-jacc_1.0_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-jsp_2.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>servlet-api-2.5</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </exclusion>
- <exclusion>
- <groupId>activesoap</groupId>
- <artifactId>jaxp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>activemq</groupId>
- <artifactId>jmdns</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jrms</groupId>
- <artifactId>jrms</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xmlpull</groupId>
- <artifactId>xmlpull</artifactId>
- </exclusion>
- <exclusion>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-remote</artifactId>
- </exclusion>
- <exclusion>
- <!-- exclude backport-util-concurrent-2.2.jar since we are using version 3.0 -->
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-
- <build>
-
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
-
- <plugins>
- <!-- Temporarily Remove Javadoc -->
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-javadoc</id>
- <phase>package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <classifier>javadoc</classifier>
- <version>${pom.version}</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-core-spi</artifactId>
- <classifier>javadoc</classifier>
- <version>${pom.version}</version>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- -->
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- <finalName>apache-tuscany-sca-${pom.version}</finalName>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- </build>
-
</project>
Propchange: tuscany/java/sca/distribution/process/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov 19 15:08:15 2008
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Copied: tuscany/java/sca/distribution/process/pom.xml (from r714142, tuscany/branches/sca-equinox/distribution/process/pom.xml)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/process/pom.xml?p2=tuscany/java/sca/distribution/process/pom.xml&p1=tuscany/branches/sca-equinox/distribution/process/pom.xml&r1=714142&r2=719120&rev=719120&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/process/pom.xml (original)
+++ tuscany/java/sca/distribution/process/pom.xml Wed Nov 19 15:08:15 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-distribution</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -37,19 +37,19 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-distribution-core</artifactId>
<type>pom</type>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<!-- Implementations -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-bpel-ode</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-xquery</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -96,7 +96,7 @@
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
- <finalName>apache-tuscany-sca-process-1.4-EQUINOX-SNAPSHOT</finalName>
+ <finalName>apache-tuscany-sca-process-2.0-SNAPSHOT</finalName>
</configuration>
</execution>
</executions>
Copied: tuscany/java/sca/distribution/process/src/main/assembly/bin.xml (from r714142, tuscany/branches/sca-equinox/distribution/process/src/main/assembly/bin.xml)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/process/src/main/assembly/bin.xml?p2=tuscany/java/sca/distribution/process/src/main/assembly/bin.xml&p1=tuscany/branches/sca-equinox/distribution/process/src/main/assembly/bin.xml&r1=714142&r2=719120&rev=719120&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/process/src/main/assembly/bin.xml (original)
+++ tuscany/java/sca/distribution/process/src/main/assembly/bin.xml Wed Nov 19 15:08:15 2008
@@ -21,7 +21,7 @@
<!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
<id></id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>tuscany-sca-1.4-EQUINOX-SNAPSHOT</baseDirectory>
+ <baseDirectory>tuscany-sca-2.0-SNAPSHOT</baseDirectory>
<formats>
<!--
<format>dir</format>
Copied: tuscany/java/sca/distribution/process/src/main/assembly/src.xml (from r714142, tuscany/branches/sca-equinox/distribution/process/src/main/assembly/src.xml)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/process/src/main/assembly/src.xml?p2=tuscany/java/sca/distribution/process/src/main/assembly/src.xml&p1=tuscany/branches/sca-equinox/distribution/process/src/main/assembly/src.xml&r1=714142&r2=719120&rev=719120&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/process/src/main/assembly/src.xml (original)
+++ tuscany/java/sca/distribution/process/src/main/assembly/src.xml Wed Nov 19 15:08:15 2008
@@ -21,7 +21,7 @@
<!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
<id>src</id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>tuscany-sca-1.4-EQUINOX-SNAPSHOT-src</baseDirectory>
+ <baseDirectory>tuscany-sca-2.0-SNAPSHOT-src</baseDirectory>
<formats>
<!--
<format>dir</format>
Propchange: tuscany/java/sca/distribution/repository/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov 19 15:08:15 2008
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Copied: tuscany/java/sca/distribution/repository/pom.xml (from r714142, tuscany/branches/sca-equinox/distribution/repository/pom.xml)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/repository/pom.xml?p2=tuscany/java/sca/distribution/repository/pom.xml&p1=tuscany/branches/sca-equinox/distribution/repository/pom.xml&r1=714142&r2=719120&rev=719120&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/repository/pom.xml (original)
+++ tuscany/java/sca/distribution/repository/pom.xml Wed Nov 19 15:08:15 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-distribution</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -37,46 +37,46 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-distribution-all</artifactId>
<type>pom</type>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<!-- Eclipse update site -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>org.apache.tuscany.sca.updatesite</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<!-- Maven plugins -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-maven-ant-generator</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-maven-bundle-plugin</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-maven-eclipse-compiler</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-maven-incremental-build</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-maven-wsdl2java</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-maven-java2wsdl</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -103,7 +103,7 @@
<descriptor>src/main/assembly/repository.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
- <finalName>apache-tuscany-sca-repository-1.4-EQUINOX-SNAPSHOT</finalName>
+ <finalName>apache-tuscany-sca-repository-2.0-SNAPSHOT</finalName>
</configuration>
</execution>
</executions>
Copied: tuscany/java/sca/distribution/repository/src/main/assembly/repository.xml (from r714142, tuscany/branches/sca-equinox/distribution/repository/src/main/assembly/repository.xml)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/repository/src/main/assembly/repository.xml?p2=tuscany/java/sca/distribution/repository/src/main/assembly/repository.xml&p1=tuscany/branches/sca-equinox/distribution/repository/src/main/assembly/repository.xml&r1=714142&r2=719120&rev=719120&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/repository/src/main/assembly/repository.xml (original)
+++ tuscany/java/sca/distribution/repository/src/main/assembly/repository.xml Wed Nov 19 15:08:15 2008
@@ -21,7 +21,7 @@
<!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
<id></id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>tuscany-sca-1.4-EQUINOX-SNAPSHOT</baseDirectory>
+ <baseDirectory>tuscany-sca-2.0-SNAPSHOT</baseDirectory>
<formats>
<!--
<format>dir</format>
Propchange: tuscany/java/sca/distribution/web20/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov 19 15:08:15 2008
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Copied: tuscany/java/sca/distribution/web20/pom.xml (from r714142, tuscany/branches/sca-equinox/distribution/web20/pom.xml)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/web20/pom.xml?p2=tuscany/java/sca/distribution/web20/pom.xml&p1=tuscany/branches/sca-equinox/distribution/web20/pom.xml&r1=714142&r2=719120&rev=719120&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/web20/pom.xml (original)
+++ tuscany/java/sca/distribution/web20/pom.xml Wed Nov 19 15:08:15 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-distribution</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -37,67 +37,67 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-distribution-core</artifactId>
<type>pom</type>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<!-- Bindings -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-atom-abdera</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-http-runtime</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-rss-rome</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<!-- Contribution model -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution-resource</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<!-- Databindings -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-databinding-json</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<!-- Hosts -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-jetty</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<!-- Implementation types -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-resource-runtime</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-script-runtime</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-widget-runtime</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -144,7 +144,7 @@
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
- <finalName>apache-tuscany-sca-web20-1.4-EQUINOX-SNAPSHOT</finalName>
+ <finalName>apache-tuscany-sca-web20-2.0-SNAPSHOT</finalName>
</configuration>
</execution>
</executions>
Copied: tuscany/java/sca/distribution/web20/src/main/assembly/bin.xml (from r714142, tuscany/branches/sca-equinox/distribution/web20/src/main/assembly/bin.xml)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/web20/src/main/assembly/bin.xml?p2=tuscany/java/sca/distribution/web20/src/main/assembly/bin.xml&p1=tuscany/branches/sca-equinox/distribution/web20/src/main/assembly/bin.xml&r1=714142&r2=719120&rev=719120&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/web20/src/main/assembly/bin.xml (original)
+++ tuscany/java/sca/distribution/web20/src/main/assembly/bin.xml Wed Nov 19 15:08:15 2008
@@ -21,7 +21,7 @@
<!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
<id></id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>tuscany-sca-1.4-EQUINOX-SNAPSHOT</baseDirectory>
+ <baseDirectory>tuscany-sca-2.0-SNAPSHOT</baseDirectory>
<formats>
<!--
<format>dir</format>
Copied: tuscany/java/sca/distribution/web20/src/main/assembly/src.xml (from r714142, tuscany/branches/sca-equinox/distribution/web20/src/main/assembly/src.xml)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/web20/src/main/assembly/src.xml?p2=tuscany/java/sca/distribution/web20/src/main/assembly/src.xml&p1=tuscany/branches/sca-equinox/distribution/web20/src/main/assembly/src.xml&r1=714142&r2=719120&rev=719120&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/web20/src/main/assembly/src.xml (original)
+++ tuscany/java/sca/distribution/web20/src/main/assembly/src.xml Wed Nov 19 15:08:15 2008
@@ -21,7 +21,7 @@
<!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
<id>src</id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>tuscany-sca-1.4-EQUINOX-SNAPSHOT-src</baseDirectory>
+ <baseDirectory>tuscany-sca-2.0-SNAPSHOT-src</baseDirectory>
<formats>
<!--
<format>dir</format>
Propchange: tuscany/java/sca/distribution/webservice/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov 19 15:08:15 2008
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Copied: tuscany/java/sca/distribution/webservice/pom.xml (from r714142, tuscany/branches/sca-equinox/distribution/webservice/pom.xml)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/webservice/pom.xml?p2=tuscany/java/sca/distribution/webservice/pom.xml&p1=tuscany/branches/sca-equinox/distribution/webservice/pom.xml&r1=714142&r2=719120&rev=719120&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/webservice/pom.xml (original)
+++ tuscany/java/sca/distribution/webservice/pom.xml Wed Nov 19 15:08:15 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-distribution</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -37,19 +37,19 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-distribution-core</artifactId>
<type>pom</type>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<!-- Bindings -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-sca-axis2</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.apache.ant</groupId>
@@ -82,36 +82,36 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-databinding-axiom</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-databinding-jaxb-axiom</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-databinding-sdo</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-databinding-sdo-axiom</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<!-- Hosts -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-jetty</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<!-- Policy models -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-policy-xml-ws</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -158,7 +158,7 @@
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
- <finalName>apache-tuscany-sca-webservice-1.4-EQUINOX-SNAPSHOT</finalName>
+ <finalName>apache-tuscany-sca-webservice-2.0-SNAPSHOT</finalName>
</configuration>
</execution>
</executions>
Copied: tuscany/java/sca/distribution/webservice/src/main/assembly/bin.xml (from r714142, tuscany/branches/sca-equinox/distribution/webservice/src/main/assembly/bin.xml)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/webservice/src/main/assembly/bin.xml?p2=tuscany/java/sca/distribution/webservice/src/main/assembly/bin.xml&p1=tuscany/branches/sca-equinox/distribution/webservice/src/main/assembly/bin.xml&r1=714142&r2=719120&rev=719120&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/webservice/src/main/assembly/bin.xml (original)
+++ tuscany/java/sca/distribution/webservice/src/main/assembly/bin.xml Wed Nov 19 15:08:15 2008
@@ -21,7 +21,7 @@
<!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
<id></id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>tuscany-sca-1.4-EQUINOX-SNAPSHOT</baseDirectory>
+ <baseDirectory>tuscany-sca-2.0-SNAPSHOT</baseDirectory>
<formats>
<!--
<format>dir</format>
Copied: tuscany/java/sca/distribution/webservice/src/main/assembly/src.xml (from r714142, tuscany/branches/sca-equinox/distribution/webservice/src/main/assembly/src.xml)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/webservice/src/main/assembly/src.xml?p2=tuscany/java/sca/distribution/webservice/src/main/assembly/src.xml&p1=tuscany/branches/sca-equinox/distribution/webservice/src/main/assembly/src.xml&r1=714142&r2=719120&rev=719120&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/webservice/src/main/assembly/src.xml (original)
+++ tuscany/java/sca/distribution/webservice/src/main/assembly/src.xml Wed Nov 19 15:08:15 2008
@@ -21,7 +21,7 @@
<!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
<id>src</id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>tuscany-sca-1.4-EQUINOX-SNAPSHOT-src</baseDirectory>
+ <baseDirectory>tuscany-sca-2.0-SNAPSHOT-src</baseDirectory>
<formats>
<!--
<format>dir</format>