diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/sca/distribution/all/pom.xml | 108 | ||||
| -rw-r--r-- | java/sca/distribution/all/src/main/assembly/bin.xml | 86 | ||||
| -rw-r--r-- | java/sca/distribution/all/src/main/assembly/src.xml | 84 | ||||
| -rw-r--r-- | java/sca/distribution/all/src/main/components/src-modules.xml | 114 | ||||
| -rw-r--r-- | java/sca/distribution/ejava/pom.xml | 123 | ||||
| -rw-r--r-- | java/sca/distribution/ejava/src/main/assembly/bin.xml | 74 | ||||
| -rw-r--r-- | java/sca/distribution/ejava/src/main/assembly/src.xml | 72 | ||||
| -rw-r--r-- | java/sca/distribution/ejava/src/main/components/bin-samples.xml | 92 | ||||
| -rw-r--r-- | java/sca/distribution/ejava/src/main/components/src-modules.xml | 22 | ||||
| -rwxr-xr-x | java/sca/distribution/etc/generate-pom.sh | 52 | ||||
| -rwxr-xr-x | java/sca/distribution/etc/generate-src-modules.sh | 130 | ||||
| -rw-r--r-- | java/sca/distribution/pdetarget/pom.xml | 221 | ||||
| -rw-r--r-- | java/sca/distribution/pom.xml | 13 |
13 files changed, 414 insertions, 777 deletions
diff --git a/java/sca/distribution/all/pom.xml b/java/sca/distribution/all/pom.xml index 6b178c83b8..c8b7b95b12 100644 --- a/java/sca/distribution/all/pom.xml +++ b/java/sca/distribution/all/pom.xml @@ -46,6 +46,7 @@ <version>2.0-SNAPSHOT</version> </dependency> +<!-- <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-distribution-manager</artifactId> @@ -97,7 +98,7 @@ <artifactId>tuscany-tracing-aspectj</artifactId> <version>2.0-SNAPSHOT</version> </dependency> - +--> </dependencies> <profiles> @@ -153,111 +154,6 @@ <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-gsoc</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> diff --git a/java/sca/distribution/all/src/main/assembly/bin.xml b/java/sca/distribution/all/src/main/assembly/bin.xml index 41924c343b..50013c05ca 100644 --- a/java/sca/distribution/all/src/main/assembly/bin.xml +++ b/java/sca/distribution/all/src/main/assembly/bin.xml @@ -1,43 +1,43 @@ -<?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. ---> -<assembly> - <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> - <id></id> - <includeBaseDirectory>true</includeBaseDirectory> - <baseDirectory>tuscany-sca-2.0-SNAPSHOT</baseDirectory> - <formats> - <!-- - <format>dir</format> - <format>tar.gz</format> - --> - <format>zip</format> - </formats> - - <componentDescriptors> - <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor> - <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>../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> +<?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.
+-->
+<assembly>
+ <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
+ <id>bin</id>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>tuscany-sca-2.0-SNAPSHOT</baseDirectory>
+ <formats>
+ <format>dir</format>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+
+ <componentDescriptors>
+ <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
+ <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>../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>
diff --git a/java/sca/distribution/all/src/main/assembly/src.xml b/java/sca/distribution/all/src/main/assembly/src.xml index 9ce32d755d..0f7394fbda 100644 --- a/java/sca/distribution/all/src/main/assembly/src.xml +++ b/java/sca/distribution/all/src/main/assembly/src.xml @@ -1,42 +1,42 @@ -<?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. ---> -<assembly> - <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> - <id>src</id> - <includeBaseDirectory>true</includeBaseDirectory> - <baseDirectory>tuscany-sca-2.0-SNAPSHOT-src</baseDirectory> - <formats> - <!-- - <format>dir</format> - <format>tar.gz</format> - --> - <format>zip</format> - </formats> - - <componentDescriptors> - <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor> - <componentDescriptor>../core/src/main/components/src-modules.xml</componentDescriptor> - <componentDescriptor>../ejava/src/main/components/src-modules.xml</componentDescriptor> - <componentDescriptor>../manager/src/main/components/src-modules.xml</componentDescriptor> - <componentDescriptor>../process/src/main/components/src-modules.xml</componentDescriptor> - <componentDescriptor>../web20/src/main/components/src-modules.xml</componentDescriptor> - <componentDescriptor>../webservice/src/main/components/src-modules.xml</componentDescriptor> - </componentDescriptors> -</assembly> +<?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.
+-->
+<assembly>
+ <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
+ <id>src</id>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>tuscany-sca-2.0-SNAPSHOT-src</baseDirectory>
+ <formats>
+ <format>dir</format>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+
+ <componentDescriptors>
+ <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor>
+ <componentDescriptor>../core/src/main/components/src-modules.xml</componentDescriptor>
+ <componentDescriptor>../ejava/src/main/components/src-modules.xml</componentDescriptor>
+<!--
+ <componentDescriptor>../manager/src/main/components/src-modules.xml</componentDescriptor>
+ <componentDescriptor>../process/src/main/components/src-modules.xml</componentDescriptor>
+ <componentDescriptor>../web20/src/main/components/src-modules.xml</componentDescriptor>
+ <componentDescriptor>../webservice/src/main/components/src-modules.xml</componentDescriptor>
+-->
+ </componentDescriptors>
+</assembly>
diff --git a/java/sca/distribution/all/src/main/components/src-modules.xml b/java/sca/distribution/all/src/main/components/src-modules.xml index f3320c3456..0a85a03a7c 100644 --- a/java/sca/distribution/all/src/main/components/src-modules.xml +++ b/java/sca/distribution/all/src/main/components/src-modules.xml @@ -21,121 +21,9 @@ <!-- Add module sources to the modules directory --> <fileSet> - <directory>../../../modules</directory> + <directory>../../modules</directory> <outputDirectory>modules</outputDirectory> <includes> - <include>assembly/**/*</include> - <include>assembly-xml/**/*</include> - <include>assembly-xsd/**/*</include> - <include>binding-atom/**/*</include> - <include>binding-atom-abdera/**/*</include> - <include>binding-corba/**/*</include> - <include>binding-corba-runtime/**/*</include> - <include>binding-ejb/**/*</include> - <include>binding-ejb-runtime/**/*</include> - <include>binding-gdata/**/*</include> - <include>binding-gdata-gsoc/**/*</include> - <include>binding-gdata-runtime/**/*</include> - <include>binding-gdata-runtime-gsoc/**/*</include> - <include>binding-http/**/*</include> - <include>binding-http-runtime/**/*</include> - <include>binding-jms/**/*</include> - <include>binding-jms-runtime/**/*</include> - <include>binding-jsonrpc/**/*</include> - <include>binding-jsonrpc-runtime/**/*</include> - <include>binding-rmi/**/*</include> - <include>binding-rmi-runtime/**/*</include> - <include>binding-rss/**/*</include> - <include>binding-rss-rome/**/*</include> - <include>binding-sca/**/*</include> - <include>binding-sca-axis2/**/*</include> - <include>binding-sca-xml/**/*</include> - <include>binding-ws/**/*</include> - <include>binding-ws-axis2/**/*</include> - <include>binding-ws-axis2-policy/**/*</include> - <include>binding-ws-wsdlgen/**/*</include> - <include>binding-ws-xml/**/*</include> - <include>contribution/**/*</include> - <include>contribution-impl/**/*</include> - <include>contribution-java/**/*</include> - <include>contribution-namespace/**/*</include> - <include>contribution-resource/**/*</include> - <include>contribution-xml/**/*</include> - <include>core/**/*</include> - <include>core-databinding/**/*</include> - <include>core-spi/**/*</include> - <include>data-api/**/*</include> - <include>databinding/**/*</include> - <include>databinding-axiom/**/*</include> - <include>databinding-fastinfoset/**/*</include> - <include>databinding-jaxb/**/*</include> - <include>databinding-jaxb-axiom/**/*</include> - <include>databinding-json/**/*</include> - <include>databinding-saxon/**/*</include> - <include>databinding-sdo/**/*</include> - <include>databinding-sdo-axiom/**/*</include> - <include>databinding-xmlbeans/**/*</include> - <include>definitions/**/*</include> - <include>definitions-xml/**/*</include> - <include>distribution-core/**/*</include> - <include>distribution-ejava/**/*</include> - <include>distribution-manager/**/*</include> - <include>distribution-process/**/*</include> - <include>distribution-web20/**/*</include> - <include>distribution-webservice/**/*</include> - <include>domain-manager/**/*</include> - <include>endpoint/**/*</include> - <include>extensibility/**/*</include> - <include>extensibility-equinox/**/*</include> - <include>host-corba/**/*</include> - <include>host-corba-jee/**/*</include> - <include>host-corba-jse/**/*</include> - <include>host-http/**/*</include> - <include>host-jetty/**/*</include> - <include>host-rmi/**/*</include> - <include>implementation-bpel/**/*</include> - <include>implementation-bpel-ode/**/*</include> - <include>implementation-ejb/**/*</include> - <include>implementation-java/**/*</include> - <include>implementation-java-runtime/**/*</include> - <include>implementation-java-xml/**/*</include> - <include>implementation-node/**/*</include> - <include>implementation-node-runtime/**/*</include> - <include>implementation-resource/**/*</include> - <include>implementation-resource-runtime/**/*</include> - <include>implementation-script/**/*</include> - <include>implementation-script-runtime/**/*</include> - <include>implementation-spring/**/*</include> - <include>implementation-widget/**/*</include> - <include>implementation-widget-runtime/**/*</include> - <include>implementation-xquery/**/*</include> - <include>interface/**/*</include> - <include>interface-java/**/*</include> - <include>interface-java-jaxws/**/*</include> - <include>interface-java-xml/**/*</include> - <include>interface-wsdl/**/*</include> - <include>interface-wsdl-xml/**/*</include> - <include>monitor/**/*</include> - <include>node-api/**/*</include> - <include>node-impl/**/*</include> - <include>node-launcher/**/*</include> - <include>node-launcher-equinox/**/*</include> - <include>node-launcher-webapp/**/*</include> - <include>node-manager/**/*</include> - <include>policy/**/*</include> - <include>policy-security/**/*</include> - <include>policy-security-jsr250/**/*</include> - <include>policy-security-ws/**/*</include> - <include>policy-transaction/**/*</include> - <include>policy-xml/**/*</include> - <include>policy-xml-ws/**/*</include> - <include>sca-api/**/*</include> - <include>tracing-aspectj/**/*</include> - <include>workspace/**/*</include> - <include>workspace-impl/**/*</include> - <include>workspace-xml/**/*</include> - <include>xsd/**/*</include> - <include>xsd-xml/**/*</include> </includes> <excludes> <!-- General file/folders to exclude --> diff --git a/java/sca/distribution/ejava/pom.xml b/java/sca/distribution/ejava/pom.xml index 5ce5d95048..2f23c82039 100644 --- a/java/sca/distribution/ejava/pom.xml +++ b/java/sca/distribution/ejava/pom.xml @@ -46,6 +46,7 @@ <artifactId>tuscany-binding-rmi-runtime</artifactId> <version>2.0-SNAPSHOT</version> </dependency> +<!-- <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-ejb-runtime</artifactId> @@ -56,6 +57,7 @@ <artifactId>tuscany-binding-jms-runtime</artifactId> <version>2.0-SNAPSHOT</version> </dependency> +--> <!-- Hosts --> <dependency> @@ -63,13 +65,16 @@ <artifactId>tuscany-host-rmi</artifactId> <version>2.0-SNAPSHOT</version> </dependency> +<!-- <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-corba-jee</artifactId> <version>2.0-SNAPSHOT</version> </dependency> +--> <!-- Implementations --> +<!-- <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-ejb</artifactId> @@ -80,13 +85,16 @@ <artifactId>tuscany-implementation-spring</artifactId> <version>2.0-SNAPSHOT</version> </dependency> +--> <!-- Policies --> +<!-- <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-policy-transaction</artifactId> <version>2.0-SNAPSHOT</version> </dependency> +--> </dependencies> <profiles> @@ -145,73 +153,54 @@ <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-ejb</module> - <module>../../../modules/binding-ejb-runtime</module> - <module>../../../modules/binding-jms</module> - <module>../../../modules/binding-jms-runtime</module> - <module>../../../modules/binding-rmi</module> - <module>../../../modules/binding-rmi-runtime</module> - <module>../../../modules/binding-sca</module> - <module>../../../modules/binding-sca-xml</module> - <module>../../../modules/binding-ws</module> - <module>../../../modules/binding-ws-wsdlgen</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/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-jee</module> - <module>../../../modules/host-corba-jse</module> - <module>../../../modules/host-http</module> - <module>../../../modules/host-rmi</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-spring</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-transaction</module> - <module>../../../modules/policy-xml</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> + <module>../../modules/assembly</module> + <module>../../modules/assembly-xml</module> + <module>../../modules/assembly-xsd</module> + <module>../../modules/binding-rmi</module> + <module>../../modules/binding-rmi-runtime</module> + <module>../../modules/binding-sca</module> + <module>../../modules/binding-sca-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/databinding</module> + <module>../../modules/databinding-jaxb</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-http</module> + <module>../../modules/host-rmi</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/policy</module> + <module>../../modules/policy-security</module> + <module>../../modules/policy-xml</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> diff --git a/java/sca/distribution/ejava/src/main/assembly/bin.xml b/java/sca/distribution/ejava/src/main/assembly/bin.xml index fdcc421f2f..3a85bc09a3 100644 --- a/java/sca/distribution/ejava/src/main/assembly/bin.xml +++ b/java/sca/distribution/ejava/src/main/assembly/bin.xml @@ -1,38 +1,36 @@ -<?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. ---> -<assembly> - <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> - <id></id> - <includeBaseDirectory>true</includeBaseDirectory> - <baseDirectory>tuscany-sca-2.0-SNAPSHOT</baseDirectory> - <formats> - <!-- - <format>dir</format> - <format>tar.gz</format> - --> - <format>zip</format> - </formats> - - <componentDescriptors> - <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor> - <componentDescriptor>../core/src/main/components/bin-modules.xml</componentDescriptor> - <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor> - </componentDescriptors> -</assembly> +<?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.
+-->
+<assembly>
+ <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
+ <id>bin</id>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>tuscany-sca-2.0-SNAPSHOT</baseDirectory>
+ <formats>
+ <format>dir</format>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+
+ <componentDescriptors>
+ <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
+ <componentDescriptor>../core/src/main/components/bin-modules.xml</componentDescriptor>
+ <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
diff --git a/java/sca/distribution/ejava/src/main/assembly/src.xml b/java/sca/distribution/ejava/src/main/assembly/src.xml index af3cb8e6fc..ce301181e0 100644 --- a/java/sca/distribution/ejava/src/main/assembly/src.xml +++ b/java/sca/distribution/ejava/src/main/assembly/src.xml @@ -1,37 +1,35 @@ -<?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. ---> -<assembly> - <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> - <id>src</id> - <includeBaseDirectory>true</includeBaseDirectory> - <baseDirectory>tuscany-sca-2.0-SNAPSHOT-src</baseDirectory> - <formats> - <!-- - <format>dir</format> - <format>tar.gz</format> - --> - <format>zip</format> - </formats> - - <componentDescriptors> - <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor> - <componentDescriptor>src/main/components/src-modules.xml</componentDescriptor> - </componentDescriptors> -</assembly> +<?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.
+-->
+<assembly>
+ <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
+ <id>src</id>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>tuscany-sca-2.0-SNAPSHOT-src</baseDirectory>
+ <formats>
+ <format>dir</format>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+
+ <componentDescriptors>
+ <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor>
+ <componentDescriptor>src/main/components/src-modules.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
diff --git a/java/sca/distribution/ejava/src/main/components/bin-samples.xml b/java/sca/distribution/ejava/src/main/components/bin-samples.xml index f1c691965b..b791807d6e 100644 --- a/java/sca/distribution/ejava/src/main/components/bin-samples.xml +++ b/java/sca/distribution/ejava/src/main/components/bin-samples.xml @@ -1,44 +1,48 @@ -<!-- - * 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>helloworld-reference-jms/**/*</include> - <include>helloworld-service-jms/**/*</include> - <include>simple-bigbank-spring/**/*</include> - </includes> - <excludes> - <!-- General file/folders to exclude --> - <exclude>**/.*</exclude> - <exclude>**/.*/**</exclude> - <exclude>**/*.log</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 samples to the samples directory -->
+ <fileSet>
+ <directory>../../samples</directory>
+ <outputDirectory>samples</outputDirectory>
+ <includes>
+ <include>calculator-rmi-reference/**/*</include>
+ <include>calculator-rmi-service/**/*</include>
+<!--
+ <include>helloworld-reference-jms/**/*</include>
+ <include>helloworld-service-jms/**/*</include>
+ <include>simple-bigbank-spring/**/*</include>
+-->
+ </includes>
+ <excludes>
+ <!-- General file/folders to exclude -->
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/**</exclude>
+ <exclude>**/*.log</exclude>
+
+ <!-- Sample specific files/folders to exclude -->
+ <exclude>pom.xml</exclude>
+ <exclude>**/target</exclude>
+ <exclude>**/target/**/*</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</component>
diff --git a/java/sca/distribution/ejava/src/main/components/src-modules.xml b/java/sca/distribution/ejava/src/main/components/src-modules.xml index 89a432e2cc..4da310abab 100644 --- a/java/sca/distribution/ejava/src/main/components/src-modules.xml +++ b/java/sca/distribution/ejava/src/main/components/src-modules.xml @@ -21,35 +21,24 @@ <!-- Add module sources to the modules directory --> <fileSet> - <directory>../../../modules</directory> + <directory>../../modules</directory> <outputDirectory>modules</outputDirectory> <includes> <include>assembly/**/*</include> <include>assembly-xml/**/*</include> <include>assembly-xsd/**/*</include> - <include>binding-corba/**/*</include> - <include>binding-corba-runtime/**/*</include> - <include>binding-ejb/**/*</include> - <include>binding-ejb-runtime/**/*</include> - <include>binding-jms/**/*</include> - <include>binding-jms-runtime/**/*</include> <include>binding-rmi/**/*</include> <include>binding-rmi-runtime/**/*</include> <include>binding-sca/**/*</include> <include>binding-sca-xml/**/*</include> - <include>binding-ws/**/*</include> - <include>binding-ws-wsdlgen/**/*</include> <include>contribution/**/*</include> - <include>contribution-impl/**/*</include> <include>contribution-java/**/*</include> <include>contribution-namespace/**/*</include> <include>contribution-xml/**/*</include> <include>core/**/*</include> <include>core-databinding/**/*</include> <include>core-spi/**/*</include> - <include>data-api/**/*</include> <include>databinding/**/*</include> - <include>databinding-axiom/**/*</include> <include>databinding-jaxb/**/*</include> <include>definitions/**/*</include> <include>definitions-xml/**/*</include> @@ -57,18 +46,13 @@ <include>endpoint/**/*</include> <include>extensibility/**/*</include> <include>extensibility-equinox/**/*</include> - <include>host-corba/**/*</include> - <include>host-corba-jee/**/*</include> - <include>host-corba-jse/**/*</include> <include>host-http/**/*</include> <include>host-rmi/**/*</include> - <include>implementation-ejb/**/*</include> <include>implementation-java/**/*</include> <include>implementation-java-runtime/**/*</include> <include>implementation-java-xml/**/*</include> <include>implementation-node/**/*</include> <include>implementation-node-runtime/**/*</include> - <include>implementation-spring/**/*</include> <include>interface/**/*</include> <include>interface-java/**/*</include> <include>interface-java-jaxws/**/*</include> @@ -80,12 +64,8 @@ <include>node-impl/**/*</include> <include>node-launcher/**/*</include> <include>node-launcher-equinox/**/*</include> - <include>node-launcher-webapp/**/*</include> <include>policy/**/*</include> <include>policy-security/**/*</include> - <include>policy-security-jsr250/**/*</include> - <include>policy-security-ws/**/*</include> - <include>policy-transaction/**/*</include> <include>policy-xml/**/*</include> <include>sca-api/**/*</include> <include>workspace/**/*</include> diff --git a/java/sca/distribution/etc/generate-pom.sh b/java/sca/distribution/etc/generate-pom.sh index b14d96f4a0..b8446a51d3 100755 --- a/java/sca/distribution/etc/generate-pom.sh +++ b/java/sca/distribution/etc/generate-pom.sh @@ -1,26 +1,26 @@ -# 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.
-
-# This script can be used to generate a Maven build profile that includes all
-# the modules included directly or transitively in a distribution
-
-cat pom.xml | awk 'BEGIN { i=0 } /<modules>/ { i=1; print } /.*/ { if (i==0) print } '
-
-mvn -o dependency:list | awk '/.INFO. (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO. )(.*)(:)(tuscany-)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\5", "g") }' | grep -v "distribution-" | grep -v "maven-" | grep -v "wsdl2java" | grep -v "java2wsdl" | sort | awk '{ printf " <module>../../modules/%s</module>\n", $1 }'
-
-cat pom.xml | awk 'BEGIN { i=0 } /<\/modules>/ { i=1 } /.*/ { if (i==1) print } '
-
+# 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. + +# This script can be used to generate a Maven build profile that includes all +# the modules included directly or transitively in a distribution + +cat pom.xml | awk 'BEGIN { i=0 } /<modules>/ { i=1; print } /.*/ { if (i==0) print } ' + +mvn -o dependency:list | awk '/.INFO. (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO. )(.*)(:)(tuscany-)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\5", "g") }' | grep -v "distribution-" | grep -v "maven-" | grep -v "wsdl2java" | grep -v "java2wsdl" | sort | awk '{ printf " <module>../../modules/%s</module>\n", $1 }' + +cat pom.xml | awk 'BEGIN { i=0 } /<\/modules>/ { i=1 } /.*/ { if (i==1) print } ' + diff --git a/java/sca/distribution/etc/generate-src-modules.sh b/java/sca/distribution/etc/generate-src-modules.sh index 7c44f74a0e..9a1272258c 100755 --- a/java/sca/distribution/etc/generate-src-modules.sh +++ b/java/sca/distribution/etc/generate-src-modules.sh @@ -1,65 +1,65 @@ -# 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.
-
-# This generates a Maven assembly component that can be included in a Maven
-# assembly to include the source of the modules in a source distribution.
-
-echo "<!--"
-echo " * Licensed to the Apache Software Foundation (ASF) under one"
-echo " * or more contributor license agreements. See the NOTICE file"
-echo " * distributed with this work for additional information"
-echo " * regarding copyright ownership. The ASF licenses this file"
-echo " * to you under the Apache License, Version 2.0 (the"
-echo " * "License"); you may not use this file except in compliance"
-echo " * with the License. You may obtain a copy of the License at"
-echo " *"
-echo " * http://www.apache.org/licenses/LICENSE-2.0"
-echo " *"
-echo " * Unless required by applicable law or agreed to in writing,"
-echo " * software distributed under the License is distributed on an"
-echo " * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY"
-echo " * KIND, either express or implied. See the License for the"
-echo " * specific language governing permissions and limitations"
-echo " * under the License."
-echo "-->"
-echo "<component>"
-echo " <fileSets>"
-echo ""
-echo " <!-- Add module sources to the modules directory -->"
-echo " <fileSet>"
-echo " <directory>../../modules</directory>"
-echo " <outputDirectory>modules</outputDirectory>"
-echo " <includes>"
-
-mvn -o dependency:list | awk '/.INFO. (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO. )(.*)(:)(tuscany-)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\5", "g") }' | sort | awk '{ printf " <include>%s/**/*</include>\n", $1 }'
-
-echo " </includes>"
-echo " <excludes>"
-echo " <!-- General file/folders to exclude -->"
-echo " <exclude>**/.*</exclude>"
-echo " <exclude>**/.*/**</exclude>"
-echo " <exclude>**/*.log</exclude>"
-echo ""
-echo " <!-- Specific files/folders to exclude -->"
-echo " <exclude>pom.xml</exclude>"
-echo " <exclude>**/target</exclude>"
-echo " <exclude>**/target/**/*</exclude>"
-echo " </excludes>"
-echo " </fileSet>"
-echo " </fileSets>"
-echo "</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. + +# This generates a Maven assembly component that can be included in a Maven +# assembly to include the source of the modules in a source distribution. + +echo "<!--" +echo " * Licensed to the Apache Software Foundation (ASF) under one" +echo " * or more contributor license agreements. See the NOTICE file" +echo " * distributed with this work for additional information" +echo " * regarding copyright ownership. The ASF licenses this file" +echo " * to you under the Apache License, Version 2.0 (the" +echo " * "License"); you may not use this file except in compliance" +echo " * with the License. You may obtain a copy of the License at" +echo " *" +echo " * http://www.apache.org/licenses/LICENSE-2.0" +echo " *" +echo " * Unless required by applicable law or agreed to in writing," +echo " * software distributed under the License is distributed on an" +echo " * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY" +echo " * KIND, either express or implied. See the License for the" +echo " * specific language governing permissions and limitations" +echo " * under the License." +echo "-->" +echo "<component>" +echo " <fileSets>" +echo "" +echo " <!-- Add module sources to the modules directory -->" +echo " <fileSet>" +echo " <directory>../../modules</directory>" +echo " <outputDirectory>modules</outputDirectory>" +echo " <includes>" + +mvn -o dependency:list | awk '/.INFO. (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO. )(.*)(:)(tuscany-)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\5", "g") }' | sort | awk '{ printf " <include>%s/**/*</include>\n", $1 }' + +echo " </includes>" +echo " <excludes>" +echo " <!-- General file/folders to exclude -->" +echo " <exclude>**/.*</exclude>" +echo " <exclude>**/.*/**</exclude>" +echo " <exclude>**/*.log</exclude>" +echo "" +echo " <!-- Specific files/folders to exclude -->" +echo " <exclude>pom.xml</exclude>" +echo " <exclude>**/target</exclude>" +echo " <exclude>**/target/**/*</exclude>" +echo " </excludes>" +echo " </fileSet>" +echo " </fileSets>" +echo "</component>" + diff --git a/java/sca/distribution/pdetarget/pom.xml b/java/sca/distribution/pdetarget/pom.xml index cbf5017576..4cf42ec38c 100644 --- a/java/sca/distribution/pdetarget/pom.xml +++ b/java/sca/distribution/pdetarget/pom.xml @@ -33,23 +33,12 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-core</artifactId>
+ <artifactId>tuscany-distribution-all</artifactId>
<type>pom</type>
<version>2.0-SNAPSHOT</version>
</dependency>
<!-- Extra dependencies not in the core distro -->
-
- <!--
- <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-jetty</artifactId>
- <type>jar</type> <version>2.0-SNAPSHOT</version> </dependency> <dependency>
- <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-policy-xml-ws</artifactId> <type>jar</type>
- <version>2.0-SNAPSHOT</version> </dependency> <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>
@@ -69,47 +58,6 @@ <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>
- </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>
-
- <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-policy-xml-ws</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency-->
</dependencies>
</profile>
@@ -147,11 +95,6 @@ <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>
@@ -166,119 +109,57 @@ <!-- Profile that can be used to build the modules included in the distro -->
<profile>
<id>modules</id>
+ <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>
+ <module>../../modules/assembly</module>
+ <module>../../modules/assembly-xml</module>
+ <module>../../modules/assembly-xsd</module>
+ <module>../../modules/binding-rmi</module>
+ <module>../../modules/binding-rmi-runtime</module>
+ <module>../../modules/binding-sca</module>
+ <module>../../modules/binding-sca-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/databinding</module>
+ <module>../../modules/databinding-jaxb</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-http</module>
+ <module>../../modules/host-rmi</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/policy</module>
+ <module>../../modules/policy-security</module>
+ <module>../../modules/policy-xml</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>
</profile>
</profiles>
diff --git a/java/sca/distribution/pom.xml b/java/sca/distribution/pom.xml index ba46ca190c..f200fff281 100644 --- a/java/sca/distribution/pom.xml +++ b/java/sca/distribution/pom.xml @@ -31,16 +31,19 @@ <name>Apache Tuscany SCA Distributions</name> <modules> - <!--module>all</module--> + <module>all</module> + <module>api</module> <module>api</module> <module>core</module> - <!--module>ejava</module> - <module>manager</module--> + <module>ejava</module> <module>pdetarget</module> - <!--module>process</module> +<!-- + <module>manager</module> + <module>process</module> <module>repository</module> <module>web20</module> - <module>webservice</module--> + <module>webservice</module> +--> </modules> </project> |