diff options
Diffstat (limited to 'sca-java-1.x/trunk/tutorials/travelsample/distribution/src')
6 files changed, 106 insertions, 16 deletions
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-openejb.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-openejb.xml new file mode 100644 index 0000000000..8364ac11e5 --- /dev/null +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-openejb.xml @@ -0,0 +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-scatours-${version}</baseDirectory>
+ <formats>
+ <format>dir</format>
+<!--
+ <format>tar.gz</format>
+ <format>zip</format>
+-->
+ </formats>
+
+ <componentDescriptors>
+ <componentDescriptor>../src/main/components/bin-openejb.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin.xml index 52a2d5b691..2e71c1260a 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin.xml @@ -31,7 +31,7 @@ </formats> <componentDescriptors> - <componentDescriptor>src/main/components/bin-common.xml</componentDescriptor> - <componentDescriptor>src/main/components/bin-modules.xml</componentDescriptor> + <componentDescriptor>../src/main/components/bin-common.xml</componentDescriptor> + <componentDescriptor>../src/main/components/bin-modules.xml</componentDescriptor> </componentDescriptors> </assembly> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml index 29f95da110..0784bd0bc0 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml @@ -20,36 +20,28 @@ <fileSets> <fileSet> - <directory>target</directory> + <directory>bundle/target</directory> <outputDirectory>lib</outputDirectory> <includes> <include>tuscany-sca-manifest.jar</include> </includes> </fileSet> - <fileSet> - <directory>../util/openejb-runtime/target</directory> - <outputDirectory>util</outputDirectory> - <includes> - <include>scatours-util-openejb-runtime.jar</include> - </includes> - </fileSet> - </fileSets> <files> <file> - <source>src/main/resources/build-clients.xml</source> + <source>../src/main/resources/build-clients.xml</source> <outputDirectory>clients</outputDirectory> <destName>build.xml</destName> </file> <file> - <source>src/main/resources/build-launchers.xml</source> + <source>../src/main/resources/build-launchers.xml</source> <outputDirectory>launchers</outputDirectory> <destName>build.xml</destName> </file> <file> - <source>src/main/resources/build-services.xml</source> + <source>../src/main/resources/build-services.xml</source> <outputDirectory>services</outputDirectory> <destName>build.xml</destName> </file> @@ -71,6 +63,7 @@ </dependencySet> <dependencySet> + <useProjectArtifact>false</useProjectArtifact> <outputDirectory>util</outputDirectory> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <unpack>false</unpack> @@ -80,6 +73,7 @@ <scope>runtime</scope> </dependencySet> <dependencySet> + <useProjectArtifact>false</useProjectArtifact> <outputDirectory>contributions</outputDirectory> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <unpack>false</unpack> @@ -89,6 +83,7 @@ <scope>runtime</scope> </dependencySet> <dependencySet> + <useProjectArtifact>false</useProjectArtifact> <outputDirectory>launchers</outputDirectory> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <unpack>false</unpack> @@ -98,6 +93,7 @@ <scope>runtime</scope> </dependencySet> <dependencySet> + <useProjectArtifact>false</useProjectArtifact> <outputDirectory>services</outputDirectory> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <unpack>false</unpack> @@ -107,6 +103,7 @@ <scope>runtime</scope> </dependencySet> <dependencySet> + <useProjectArtifact>false</useProjectArtifact> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <outputDirectory>clients</outputDirectory> <unpack>false</unpack> @@ -116,6 +113,7 @@ <scope>runtime</scope> </dependencySet> <dependencySet> + <useProjectArtifact>false</useProjectArtifact> <outputDirectory>domainconfig</outputDirectory> <unpack>true</unpack> <includes> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-openejb.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-openejb.xml new file mode 100644 index 0000000000..596ee0b55a --- /dev/null +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-openejb.xml @@ -0,0 +1,46 @@ +<!--
+ * 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>
+
+ <dependencySets>
+ <!-- Add scatours-util-openejb-runtime.jar to the util directory -->
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>util</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ <includes>
+ <include>org.apache.tuscany.sca:scatours-util-openejb-runtime</include>
+ </includes>
+ <scope>runtime</scope>
+ </dependencySet>
+
+ <!-- Add the OpenEJB runtime dependencies to the openejb directory -->
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>openejb</outputDirectory>
+ <unpack>false</unpack>
+ <excludes>
+ <exclude>org.apache.tuscany.sca:scatours-util-openejb-runtime</exclude>
+ </excludes>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+
+</component>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml index 888cc37a7f..20c4b99048 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml @@ -214,7 +214,6 @@ <classpath>
<pathelement location="scatours-launcher-notification-ejb.jar"/>
<pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
- <fileset dir="${env.OPENEJB_HOME}/lib"/>
</classpath>
</java>
</target>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml index 7ebe7f3606..3ec8d6f8a2 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml @@ -30,7 +30,18 @@ <java classname="com.tuscanyscatours.smsgateway.SMSGatewayEJBServiceBootstrap" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-service-smsgateway-ejb.jar"/>
- <fileset dir="${env.OPENEJB_HOME}/lib"/>
+ <!-- The following is used to bring in additional dependencies of the OpenEJB runtime. -->
+ <fileset dir="${env.TUSCANY_HOME}/lib">
+ <!-- exclude some jars to prevent them being loaded by OpenEJB -->
+ <exclude name="tuscany-sca-manifest.jar"/>
+ <exclude name="ode-*.jar"/>
+ <exclude name="jaxb-xjc-*.jar"/>
+ <exclude name="jython-*.jar"/>
+ <exclude name="activemq-all-*.jar"/>
+ <exclude name="js-*.jar"/>
+ <exclude name="org.apache.felix.main-*.jar"/>
+ <exclude name="saxon-*.jar"/>
+ </fileset>
</classpath>
</java>
</target>
|