diff options
Diffstat (limited to '')
2 files changed, 56 insertions, 12 deletions
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>
|