Author: slaws
Date: Mon Jan 26 19:21:37 2009
New Revision: 737783
URL: http://svn.apache.org/viewvc?rev=737783&view=rev
Log:
Add the samples implementation-java-calculator, binding-ws-calculator,
host-webapp-calculator to the distribution.
Modified:
tuscany/java/sca/distribution/all/pom.xml
tuscany/java/sca/distribution/all/src/main/assembly/bin.xml
tuscany/java/sca/distribution/api/pom.xml
tuscany/java/sca/distribution/core/pom.xml
tuscany/java/sca/distribution/core/src/main/components/bin-samples.xml
tuscany/java/sca/distribution/pom.xml
tuscany/java/sca/distribution/webservice/pom.xml
tuscany/java/sca/distribution/webservice/src/main/components/bin-samples.xml
tuscany/java/sca/itest/pom.xml
Modified: tuscany/java/sca/distribution/all/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/all/pom.xml?rev=737783&r1=737782&r2=737783&view=diff
==============================================================================
--- tuscany/java/sca/distribution/all/pom.xml (original)
+++ tuscany/java/sca/distribution/all/pom.xml Mon Jan 26 19:21:37 2009
@@ -34,6 +34,13 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-api</artifactId>
+ <type>pom</type>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-distribution-core</artifactId>
<type>pom</type>
<version>2.0-SNAPSHOT</version>
@@ -41,36 +48,43 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-ejava</artifactId>
+ <artifactId>tuscany-distribution-webapp</artifactId>
<type>pom</type>
<version>2.0-SNAPSHOT</version>
</dependency>
-<!--
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-manager</artifactId>
+ <artifactId>tuscany-distribution-webservice</artifactId>
<type>pom</type>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-process</artifactId>
+ <artifactId>tuscany-distribution-ejava</artifactId>
<type>pom</type>
<version>2.0-SNAPSHOT</version>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-web20</artifactId>
+ <artifactId>tuscany-distribution-manager</artifactId>
<type>pom</type>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-webservice</artifactId>
+ <artifactId>tuscany-distribution-process</artifactId>
+ <type>pom</type>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-web20</artifactId>
<type>pom</type>
<version>2.0-SNAPSHOT</version>
</dependency>
@@ -98,7 +112,8 @@
<artifactId>tuscany-tracing-aspectj</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
--->
+ -->
+
</dependencies>
<profiles>
@@ -106,6 +121,9 @@
<!-- Build profile that can be used to build the distro packages -->
<profile>
<id>distribution</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<build>
<plugins>
<plugin>
@@ -120,6 +138,7 @@
</goals>
<configuration>
<targetDirectory>target/modules</targetDirectory>
+
<generateManifestJar>true</generateManifestJar>
</configuration>
</execution>
</executions>
Modified: tuscany/java/sca/distribution/all/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/all/src/main/assembly/bin.xml?rev=737783&r1=737782&r2=737783&view=diff
==============================================================================
--- tuscany/java/sca/distribution/all/src/main/assembly/bin.xml (original)
+++ tuscany/java/sca/distribution/all/src/main/assembly/bin.xml Mon Jan 26
19:21:37 2009
@@ -33,11 +33,12 @@
<componentDescriptor>../core/src/main/components/bin-modules.xml</componentDescriptor>
<componentDescriptor>../core/src/main/components/bin-samples.xml</componentDescriptor>
<componentDescriptor>../ejava/src/main/components/bin-samples.xml</componentDescriptor>
+
<componentDescriptor>../host-webapp/src/main/components/bin-samples.xml</componentDescriptor>
+
<componentDescriptor>../webservice/src/main/components/bin-samples.xml</componentDescriptor>
<!--
<componentDescriptor>../manager/src/main/components/bin-samples.xml</componentDescriptor>
<componentDescriptor>../process/src/main/components/bin-samples.xml</componentDescriptor>
<componentDescriptor>../web20/src/main/components/bin-samples.xml</componentDescriptor>
-
<componentDescriptor>../webservice/src/main/components/bin-samples.xml</componentDescriptor>
-->
</componentDescriptors>
</assembly>
Modified: tuscany/java/sca/distribution/api/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/api/pom.xml?rev=737783&r1=737782&r2=737783&view=diff
==============================================================================
--- tuscany/java/sca/distribution/api/pom.xml (original)
+++ tuscany/java/sca/distribution/api/pom.xml Mon Jan 26 19:21:37 2009
@@ -53,6 +53,9 @@
<!-- Build profile that can be used to build the distro packages -->
<profile>
<id>distribution</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<build>
<plugins>
<plugin>
@@ -68,6 +71,7 @@
</goals>
<configuration>
<targetDirectory>target/modules</targetDirectory>
+
<generateManifestJar>true</generateManifestJar>
</configuration>
</execution>
</executions>
Modified: tuscany/java/sca/distribution/core/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/core/pom.xml?rev=737783&r1=737782&r2=737783&view=diff
==============================================================================
--- tuscany/java/sca/distribution/core/pom.xml (original)
+++ tuscany/java/sca/distribution/core/pom.xml Mon Jan 26 19:21:37 2009
@@ -263,6 +263,9 @@
<!-- Build profile that can be used to build the distro packages -->
<profile>
<id>distribution</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<build>
<plugins>
<plugin>
@@ -305,6 +308,7 @@
</execution>
</executions>
</plugin>
+
</plugins>
</build>
</profile>
Modified: tuscany/java/sca/distribution/core/src/main/components/bin-samples.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/core/src/main/components/bin-samples.xml?rev=737783&r1=737782&r2=737783&view=diff
==============================================================================
--- tuscany/java/sca/distribution/core/src/main/components/bin-samples.xml
(original)
+++ tuscany/java/sca/distribution/core/src/main/components/bin-samples.xml Mon
Jan 26 19:21:37 2009
@@ -1,63 +1,49 @@
-<!--
- * 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.
--->
-<component>
- <fileSets>
-
- <!-- Add samples to the samples directory -->
- <fileSet>
- <directory>../../samples</directory>
- <outputDirectory>samples</outputDirectory>
- <includes>
- <include>README</include>
- <include>logging.properties</include>
- <include>calculator/**/*</include>
- <include>calculator-equinox/**/*</include>
- <include>calculator-osgi/**/*</include>
-<!--
- <include>calculator/**/*</include>
- <include>calculator-lean/**/*</include>
- <include>binding-echo/**/*</include>
- <include>binding-echo-extension/**/*</include>
- <include>databinding-echo/**/*</include>
- <include>implementation-composite/**/*</include>
- <include>implementation-crud/**/*</include>
- <include>implementation-crud-extension/**/*</include>
- <include>implementation-pojo-extension/**/*</include>
- <include>loanapplication/**/*</include>
- <include>simple-bigbank/**/*</include>
- <include>simple-callback/**/*</include>
- <include>supplychain/**/*</include>
--->
- </includes>
- <excludes>
- <!-- General file/folders to exclude -->
- <exclude>**/.*</exclude>
- <exclude>**/.*/**</exclude>
- <exclude>**/*.log</exclude>
- <exclude>**/*.svg</exclude>
- <exclude>**/maven-eclipse.xml</exclude>
-
- <!-- Sample specific files/folders to exclude -->
- <exclude>pom.xml</exclude>
- <exclude>**/target</exclude>
- <exclude>**/target/**/*</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</component>
+<!--
+ * 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.
+-->
+<component>
+ <fileSets>
+ <!-- Add top level samples files -->
+ <fileSet>
+ <directory>../../samples</directory>
+ <outputDirectory>samples</outputDirectory>
+ <includes>
+ <include>README</include>
+ <include>logging.properties</include>
+ <include>build-common.xml</include>
+ <include>implementation-java-calculator/**/*</include>
+ <include>calculator/**/*</include>
+ <include>calculator-equinox/**/*</include>
+ <include>calculator-osgi/**/*</include>
+ </includes>
+ <excludes>
+ <!-- General file/folders to exclude -->
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/**</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.svg</exclude>
+ <exclude>**/maven-eclipse.xml</exclude>
+
+ <!-- Sample specific files/folders to exclude -->
+ <exclude>pom.xml</exclude>
+ <exclude>**/target</exclude>
+ <exclude>**/target/**/*</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</component>
Modified: tuscany/java/sca/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/pom.xml?rev=737783&r1=737782&r2=737783&view=diff
==============================================================================
--- tuscany/java/sca/distribution/pom.xml (original)
+++ tuscany/java/sca/distribution/pom.xml Mon Jan 26 19:21:37 2009
@@ -36,12 +36,13 @@
<module>core</module>
<module>ejava</module>
<module>pdetarget</module>
+ <module>host-webapp</module>
+ <module>webservice</module>
<!--
<module>manager</module>
<module>process</module>
<module>repository</module>
<module>web20</module>
- <module>webservice</module>
-->
</modules>
Modified: tuscany/java/sca/distribution/webservice/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/webservice/pom.xml?rev=737783&r1=737782&r2=737783&view=diff
==============================================================================
--- tuscany/java/sca/distribution/webservice/pom.xml (original)
+++ tuscany/java/sca/distribution/webservice/pom.xml Mon Jan 26 19:21:37 2009
@@ -1,260 +1,262 @@
-<?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-webservice</artifactId>
- <name>Apache Tuscany SCA Web Service Distribution</name>
- <packaging>pom</packaging>
-
- <dependencies>
-
- <!-- Core distribution -->
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-core</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <!-- Bindings -->
- <!--dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-sca-axis2</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency-->
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws</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>
- <exclusions>
- <exclusion>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.axis2</groupId>
- <artifactId>addressing</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-xmlbeans</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-adb-codegen</artifactId>
- </exclusion>
- <exclusion>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- </exclusion>
- <exclusion>
- <groupId>opensaml</groupId>
- <artifactId>opensaml</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-xml</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <!-- Databindings -->
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-databinding-axiom</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <!--dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-databinding-sdo</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-databinding-sdo-axiom</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency-->
-
- <!-- Hosts -->
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jetty</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <!-- Policy models -->
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-policy-xml-ws</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
- <profiles>
-
- <!-- Build profile that can be used to build the distro packages -->
- <profile>
- <id>distribution</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-maven-bundle-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- <executions>
- <execution>
- <id>distribution-modules</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>generate-modules</goal>
- </goals>
- <configuration>
-
<targetDirectory>target/modules</targetDirectory>
- <excludeDirectories>
-
<excludeDirectory>../core/target/modules</excludeDirectory>
- </excludeDirectories>
-
<generateManifestJar>true</generateManifestJar>
- </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-webservice-2.0-SNAPSHOT</finalName>
- </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-corba</module>
- <module>../../../modules/binding-corba-runtime</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-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-jaxb</module>
- <module>../../../modules/databinding-jaxb-axiom</module>
- <module>../../../modules/databinding-sdo</module>
- <module>../../../modules/databinding-sdo-axiom</module>
- <module>../../../modules/definitions</module>
- <module>../../../modules/definitions-xml</module>
- <module>../../../modules/endpoint</module>
- <module>../../../modules/extensibility</module>
- <module>../../../modules/extensibility-equinox</module>
- <module>../../../modules/host-corba</module>
- <module>../../../modules/host-corba-jse</module>
- <module>../../../modules/host-http</module>
- <module>../../../modules/host-jetty</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/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/policy</module>
- <module>../../../modules/policy-security</module>
- <module>../../../modules/policy-security-jsr250</module>
- <module>../../../modules/policy-security-ws</module>
- <module>../../../modules/policy-xml</module>
- <module>../../../modules/policy-xml-ws</module>
- <module>../../../modules/sca-api</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-webservice</artifactId>
+ <name>Apache Tuscany SCA Web Service Distribution</name>
+ <packaging>pom</packaging>
+
+ <dependencies>
+
+ <!-- Core distribution -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-core</artifactId>
+ <type>pom</type>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Bindings -->
+ <!--dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-sca-axis2</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency-->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-ws</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>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>addressing</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-xmlbeans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb-codegen</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>opensaml</groupId>
+ <artifactId>opensaml</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-ws-xml</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Databindings -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-axiom</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <!--dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-sdo</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-sdo-axiom</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency-->
+
+ <!-- Hosts -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-jetty</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Policy models -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-policy-xml-ws</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+
+ <!-- Build profile that can be used to build the distro packages -->
+ <profile>
+ <id>distribution</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-bundle-plugin</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>distribution-modules</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>generate-modules</goal>
+ </goals>
+ <configuration>
+
<targetDirectory>target/modules</targetDirectory>
+ <excludeDirectories>
+
<excludeDirectory>../core/target/modules</excludeDirectory>
+ </excludeDirectories>
+
<generateManifestJar>true</generateManifestJar>
+ </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-webservice-2.0-SNAPSHOT</finalName>
+ </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-corba</module>
+ <module>../../../modules/binding-corba-runtime</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-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-jaxb</module>
+ <module>../../../modules/databinding-jaxb-axiom</module>
+ <module>../../../modules/databinding-sdo</module>
+ <module>../../../modules/databinding-sdo-axiom</module>
+ <module>../../../modules/definitions</module>
+ <module>../../../modules/definitions-xml</module>
+ <module>../../../modules/endpoint</module>
+ <module>../../../modules/extensibility</module>
+ <module>../../../modules/extensibility-equinox</module>
+ <module>../../../modules/host-corba</module>
+ <module>../../../modules/host-corba-jse</module>
+ <module>../../../modules/host-http</module>
+ <module>../../../modules/host-jetty</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/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/policy</module>
+ <module>../../../modules/policy-security</module>
+ <module>../../../modules/policy-security-jsr250</module>
+ <module>../../../modules/policy-security-ws</module>
+ <module>../../../modules/policy-xml</module>
+ <module>../../../modules/policy-xml-ws</module>
+ <module>../../../modules/sca-api</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/webservice/src/main/components/bin-samples.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/webservice/src/main/components/bin-samples.xml?rev=737783&r1=737782&r2=737783&view=diff
==============================================================================
---
tuscany/java/sca/distribution/webservice/src/main/components/bin-samples.xml
(original)
+++
tuscany/java/sca/distribution/webservice/src/main/components/bin-samples.xml
Mon Jan 26 19:21:37 2009
@@ -21,10 +21,11 @@
<!-- Add samples to the samples directory -->
<fileSet>
- <directory>../../../samples</directory>
+ <directory>../../samples</directory>
<outputDirectory>samples</outputDirectory>
<includes>
- <include>callback-ws-client/**/*</include>
+ <include>binding-ws-calculator/**/*</include>
+ <!--include>callback-ws-client/**/*</include>
<include>callback-ws-service/**/*</include>
<include>helloworld-ws-reference/**/*</include>
<include>helloworld-ws-service/**/*</include>
@@ -32,7 +33,7 @@
<include>helloworld-ws-service-secure/**/*</include>
<include>helloworld-ws-service-webapp/**/*</include>
<include>simple-callback-ws/**/*</include>
- <include>zipcode-jaxws/**/*</include>
+ <include>zipcode-jaxws/**/*</include-->
</includes>
<excludes>
<!-- General file/folders to exclude -->
Modified: tuscany/java/sca/itest/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/pom.xml?rev=737783&r1=737782&r2=737783&view=diff
==============================================================================
--- tuscany/java/sca/itest/pom.xml (original)
+++ tuscany/java/sca/itest/pom.xml Mon Jan 26 19:21:37 2009
@@ -60,7 +60,7 @@
<module>callback-set-conversation</module>
<module>component-type</module>
<module>conversations</module>
- <module>definitions-multiple</module>
+ <!--module>definitions-multiple</module-->
<module>exceptions</module>
<module>interfaces</module>
<module>operation-overloading</module>
