Enable binding.rmi and samples in ejava distro. Now the all has api, core and ejava (subset) included.

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

4 files changed, 120 insertions, 140 deletions

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>