You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by dk...@apache.org on 2006/05/12 20:57:38 UTC

svn commit: r405834 [1/2] - in /incubator/tuscany/java: ./ distribution/ distribution/axis2-overlay/ distribution/axis2-overlay/src/ distribution/axis2-overlay/src/main/ distribution/axis2-overlay/src/main/assembly/ distribution/celtix-overlay/ distrib...

Author: dkulp
Date: Fri May 12 11:57:34 2006
New Revision: 405834

URL: http://svn.apache.org/viewcvs?rev=405834&view=rev
Log:
Start of TUSCANY-282


Added:
    incubator/tuscany/java/buildDistribution.xml   (with props)
    incubator/tuscany/java/distribution/
    incubator/tuscany/java/distribution/axis2-overlay/
    incubator/tuscany/java/distribution/axis2-overlay/pom.xml   (with props)
    incubator/tuscany/java/distribution/axis2-overlay/src/
    incubator/tuscany/java/distribution/axis2-overlay/src/main/
    incubator/tuscany/java/distribution/axis2-overlay/src/main/assembly/
    incubator/tuscany/java/distribution/axis2-overlay/src/main/assembly/bin.xml   (with props)
    incubator/tuscany/java/distribution/build-dist.bat   (with props)
    incubator/tuscany/java/distribution/build-dist.sh   (with props)
    incubator/tuscany/java/distribution/celtix-overlay/
    incubator/tuscany/java/distribution/celtix-overlay/pom.xml   (with props)
    incubator/tuscany/java/distribution/celtix-overlay/src/
    incubator/tuscany/java/distribution/celtix-overlay/src/main/
    incubator/tuscany/java/distribution/celtix-overlay/src/main/assembly/
    incubator/tuscany/java/distribution/celtix-overlay/src/main/assembly/bin.xml   (with props)
    incubator/tuscany/java/distribution/pom.xml   (with props)
    incubator/tuscany/java/distribution/readme.txt   (with props)
    incubator/tuscany/java/distribution/tomcat-overlay/
    incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml   (with props)
    incubator/tuscany/java/distribution/tomcat-overlay/context.xsl   (with props)
    incubator/tuscany/java/distribution/tomcat-overlay/pom.xml   (with props)
    incubator/tuscany/java/distribution/tomcat-overlay/server.xsl   (with props)
    incubator/tuscany/java/distribution/tuscany-core-overlay/
    incubator/tuscany/java/distribution/tuscany-core-overlay/pom.xml   (with props)
    incubator/tuscany/java/distribution/tuscany-core-overlay/src/
    incubator/tuscany/java/distribution/tuscany-core-overlay/src/main/
    incubator/tuscany/java/distribution/tuscany-core-overlay/src/main/assembly/
    incubator/tuscany/java/distribution/tuscany-core-overlay/src/main/assembly/bin.xml   (with props)
    incubator/tuscany/java/distribution/tuscany-polish/
    incubator/tuscany/java/distribution/tuscany-polish/fixupJars.xml   (with props)
    incubator/tuscany/java/distribution/tuscany-polish/pom.xml   (with props)
    incubator/tuscany/java/distribution/tuscany-samples/
    incubator/tuscany/java/distribution/tuscany-samples/pom.xml   (with props)
    incubator/tuscany/java/distribution/tuscany-samples/src/
    incubator/tuscany/java/distribution/tuscany-samples/src/main/
    incubator/tuscany/java/distribution/tuscany-samples/src/main/assembly/
    incubator/tuscany/java/distribution/tuscany-samples/src/main/assembly/bin.xml   (with props)
    incubator/tuscany/java/distribution/tuscany-tools-overlay/
    incubator/tuscany/java/distribution/tuscany-tools-overlay/pom.xml   (with props)
    incubator/tuscany/java/distribution/tuscany-tools-overlay/src/
    incubator/tuscany/java/distribution/tuscany-tools-overlay/src/main/
    incubator/tuscany/java/distribution/tuscany-tools-overlay/src/main/assembly/
    incubator/tuscany/java/distribution/tuscany-tools-overlay/src/main/assembly/bin.xml   (with props)
Modified:
    incubator/tuscany/java/pom.xml
    incubator/tuscany/java/spec/pom.xml

Added: incubator/tuscany/java/buildDistribution.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/buildDistribution.xml?rev=405834&view=auto
==============================================================================
--- incubator/tuscany/java/buildDistribution.xml (added)
+++ incubator/tuscany/java/buildDistribution.xml Fri May 12 11:57:34 2006
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<project name="project" default="createDistribution">
+
+	<condition property="isSample">
+		<and>
+			<contains string="${project.groupId}" substring=".samples" />
+			<or>
+				<equals arg1="${project.packaging}" arg2="jar" />
+				<equals arg1="${project.packaging}" arg2="war" />
+			</or>
+		</and>
+	</condition>
+
+	<condition property="isJar">
+		<and>
+			<not>
+				<contains string="${project.groupId}" substring=".samples" />
+			</not>
+			<equals arg1="${project.packaging}" arg2="jar" />
+		</and>
+	</condition>
+
+	<target name="createDistribution" depends="copySample, copyJar"/>
+
+	<target name="copySample" if="isSample" description="Copy the sample code to the Tuscany distribution folder">
+		<property name="target.folder" value="${dist.folder}/samples/${project.artifactId}" />
+		<delete dir="${target.folder}" />
+		<copy todir="${target.folder}">
+			<fileset dir="${project.basedir}" includes="readme.htm, pom.xml">
+				<include name="src/main/**" />
+				<include name="target/${project.artifactId}-${project.version}.${project.packaging}" />
+			</fileset>
+		</copy>
+	</target>
+
+	<target name="copyJar" if="isJar" description="Copy the jar to the Tuscany distribution folder">
+		<!--
+		<copy todir="${dist.folder}/lib">
+			<fileset dir="${project.basedir}/target">
+				<include name="${project.artifactId}-${project.version}.${project.packaging}" />
+			</fileset>
+		</copy>
+		-->
+		<copy todir="${dist.folder}/javadoc">
+			<fileset dir="${project.basedir}/target">
+				<include name="${project.artifactId}-${project.version}-javadoc.${project.packaging}" />
+			</fileset>
+		</copy>
+		<copy todir="${dist.folder}/javadoc/${project.artifactId}">
+			<fileset dir="${project.basedir}/target/javadoc">
+				<include name="**/*" />
+			</fileset>
+		</copy>
+	</target>
+	
+	<target name="cleanDistribution" depends="cleanJar, cleanSample"/>
+	
+	<target name="cleanJar" if="isJar">
+		<delete file="${dist.folder}/lib/${project.artifactId}-${project.version}.${project.packaging}" quiet="true"/>
+		<delete file="${dist.folder}/javadoc/${project.artifactId}-${project.version}-javadoc.${project.packaging}" quiet="true"/>
+		<delete dir="${dist.folder}/javadoc/${project.artifactId}" quiet="true"/>
+	</target>
+	
+	<target name="cleanSample" if="isSample">
+		<delete dir="${dist.folder}/samples/${project.artifactId}" quiet="true"/>
+	</target>
+
+
+</project>
+

Propchange: incubator/tuscany/java/buildDistribution.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/buildDistribution.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/tuscany/java/distribution/axis2-overlay/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/axis2-overlay/pom.xml?rev=405834&view=auto
==============================================================================
--- incubator/tuscany/java/distribution/axis2-overlay/pom.xml (added)
+++ incubator/tuscany/java/distribution/axis2-overlay/pom.xml Fri May 12 11:57:34 2006
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ -->
+<project>
+    <parent>
+        <groupId>org.apache.tuscany</groupId>
+        <artifactId>tuscany-distribution</artifactId>
+        <version>SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tuscany-distribution-axis2-overlay</artifactId>
+    <packaging>jar</packaging>
+    <name>Tuscany Distribution Project - Axis2 Overlay</name>
+    <version>SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca.bindings</groupId>
+            <artifactId>tuscany-binding-axis2</artifactId>
+            <version>${pom.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.tuscany</groupId>
+                    <artifactId>tuscany-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <finalName>tuscany-axis2</finalName>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                        </manifest>
+                    </archive>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>manifest-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.0.1</version>
+                <executions>
+                    <execution>
+                        <id>overlay</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>directory</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                    </descriptors>
+                    <finalName>tuscany</finalName>
+                    <outputDirectory>${basedir}/../target</outputDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: incubator/tuscany/java/distribution/axis2-overlay/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/distribution/axis2-overlay/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/tuscany/java/distribution/axis2-overlay/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/axis2-overlay/src/main/assembly/bin.xml?rev=405834&view=auto
==============================================================================
--- incubator/tuscany/java/distribution/axis2-overlay/src/main/assembly/bin.xml (added)
+++ incubator/tuscany/java/distribution/axis2-overlay/src/main/assembly/bin.xml Fri May 12 11:57:34 2006
@@ -0,0 +1,22 @@
+<assembly>
+    <id>dist</id>
+    <formats>
+        <format>dir</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>axis2-overlay/target</directory>
+            <outputDirectory>lib/axis2</outputDirectory>
+            <includes>
+                <include>tuscany-axis2.jar</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>lib/axis2</outputDirectory>
+        </dependencySet>
+    </dependencySets>
+</assembly>
+

Propchange: incubator/tuscany/java/distribution/axis2-overlay/src/main/assembly/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/distribution/axis2-overlay/src/main/assembly/bin.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/tuscany/java/distribution/build-dist.bat
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/build-dist.bat?rev=405834&view=auto
==============================================================================
--- incubator/tuscany/java/distribution/build-dist.bat (added)
+++ incubator/tuscany/java/distribution/build-dist.bat Fri May 12 11:57:34 2006
@@ -0,0 +1,62 @@
+@REM ----------------------------------------------------------------------------
+@REM Copyright 2006 The Apache Software Foundation.
+@REM 
+@REM Licensed under the Apache License, Version 2.0 (the "License");
+@REM you may not use this file except in compliance with the License.
+@REM You may obtain a copy of the License at
+@REM 
+@REM      http://www.apache.org/licenses/LICENSE-2.0
+@REM 
+@REM Unless required by applicable law or agreed to in writing, software
+@REM distributed under the License is distributed on an "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM See the License for the specific language governing permissions and
+@REM limitations under the License.
+@REM ----------------------------------------------------------------------------
+@REM 
+@setlocal
+@echo off
+
+SET CUR_DIR=%cd%
+cd /d "%~dp0.."
+SET TUSCANY_HOME=%cd%
+cd /d "%CUR_DIR%"
+echo Building Tuscany ...
+cd /d "%TUSCANY_HOME%"
+call mvn -Dtuscany.home=%TUSCANY_HOME% clean install -Dmaven.test.skip=true
+cd /d "%TUSCANY_HOME%/distribution"
+echo Creating Tuscany distribution ...
+call mvn clean install
+cd /d "%CUR_DIR%"
+@endlocal
+@REM ----------------------------------------------------------------------------
+@REM Copyright 2006 The Apache Software Foundation.
+@REM 
+@REM Licensed under the Apache License, Version 2.0 (the "License");
+@REM you may not use this file except in compliance with the License.
+@REM You may obtain a copy of the License at
+@REM 
+@REM      http://www.apache.org/licenses/LICENSE-2.0
+@REM 
+@REM Unless required by applicable law or agreed to in writing, software
+@REM distributed under the License is distributed on an "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM See the License for the specific language governing permissions and
+@REM limitations under the License.
+@REM ----------------------------------------------------------------------------
+@REM 
+@setlocal
+@echo off
+
+SET CUR_DIR=%cd%
+cd /d "%~dp0.."
+SET TUSCANY_HOME=%cd%
+cd /d "%CUR_DIR%"
+echo Building Tuscany ...
+cd /d "%TUSCANY_HOME%"
+call mvn -Dtuscany.home=%TUSCANY_HOME% clean install -Dmaven.test.skip=true
+cd /d "%TUSCANY_HOME%/distribution"
+echo Creating Tuscany distribution ...
+call mvn clean install
+cd /d "%CUR_DIR%"
+@endlocal

Propchange: incubator/tuscany/java/distribution/build-dist.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/tuscany/java/distribution/build-dist.sh
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/build-dist.sh?rev=405834&view=auto
==============================================================================
--- incubator/tuscany/java/distribution/build-dist.sh (added)
+++ incubator/tuscany/java/distribution/build-dist.sh Fri May 12 11:57:34 2006
@@ -0,0 +1,58 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+#  Copyright 2006 The Apache Software Foundation.
+#  
+#  Licensed 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.
+# ----------------------------------------------------------------------------
+
+#   Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
+#   reserved.
+#
+CUR_DIR=`pwd`
+cd ..
+TUSCANY_HOME=`pwd`
+echo Building Tuscany ...
+mvn -Dtuscany.home=$TUSCANY_HOME install -Dmaven.test.skip=true
+cd $CUR_DIR
+echo Creating Tuscany distribution ...
+mvn clean install
+
+#!/bin/sh
+# ----------------------------------------------------------------------------
+#  Copyright 2006 The Apache Software Foundation.
+#  
+#  Licensed 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.
+# ----------------------------------------------------------------------------
+
+#   Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
+#   reserved.
+#
+CUR_DIR=`pwd`
+cd ..
+TUSCANY_HOME=`pwd`
+echo Building Tuscany ...
+mvn -Dtuscany.home=$TUSCANY_HOME install -Dmaven.test.skip=true
+cd $CUR_DIR
+echo Creating Tuscany distribution ...
+mvn clean install
+

Propchange: incubator/tuscany/java/distribution/build-dist.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/distribution/build-dist.sh
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/tuscany/java/distribution/celtix-overlay/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/celtix-overlay/pom.xml?rev=405834&view=auto
==============================================================================
--- incubator/tuscany/java/distribution/celtix-overlay/pom.xml (added)
+++ incubator/tuscany/java/distribution/celtix-overlay/pom.xml Fri May 12 11:57:34 2006
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ -->
+<project>
+    <parent>
+        <groupId>org.apache.tuscany</groupId>
+        <artifactId>tuscany-distribution</artifactId>
+        <version>SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tuscany-distribution-celtix-overlay</artifactId>
+    <packaging>jar</packaging>
+    <name>Tuscany Distribution Project - Celtix Overlay</name>
+    <version>SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+             <groupId>org.apache.tuscany.sca.bindings</groupId>
+             <artifactId>tuscany-binding-celtix</artifactId>
+             <version>${pom.version}</version>
+             <exclusions>
+                 <exclusion>
+                     <groupId>org.apache.tuscany</groupId>
+                     <artifactId>tuscany-core</artifactId>
+                 </exclusion>
+             </exclusions>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <finalName>tuscany-celtix</finalName>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                        </manifest>
+                    </archive>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>manifest-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.0.1</version>
+                <executions>
+                    <execution>
+                        <id>overlay</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>directory</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                    </descriptors>
+                    <finalName>tuscany</finalName>
+                    <outputDirectory>${basedir}/../target</outputDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: incubator/tuscany/java/distribution/celtix-overlay/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/distribution/celtix-overlay/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/tuscany/java/distribution/celtix-overlay/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/celtix-overlay/src/main/assembly/bin.xml?rev=405834&view=auto
==============================================================================
--- incubator/tuscany/java/distribution/celtix-overlay/src/main/assembly/bin.xml (added)
+++ incubator/tuscany/java/distribution/celtix-overlay/src/main/assembly/bin.xml Fri May 12 11:57:34 2006
@@ -0,0 +1,23 @@
+<assembly>
+    <id>dist</id>
+    <formats>
+        <format>dir</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>celtix-overlay/target</directory>
+            <outputDirectory>lib/celtix</outputDirectory>
+            <includes>
+                <include>tuscany-celtix.jar</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>lib/celtix</outputDirectory>
+        </dependencySet>
+    </dependencySets>
+</assembly>
+
+     
\ No newline at end of file

Propchange: incubator/tuscany/java/distribution/celtix-overlay/src/main/assembly/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/distribution/celtix-overlay/src/main/assembly/bin.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/tuscany/java/distribution/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/pom.xml?rev=405834&view=auto
==============================================================================
--- incubator/tuscany/java/distribution/pom.xml (added)
+++ incubator/tuscany/java/distribution/pom.xml Fri May 12 11:57:34 2006
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ -->
+<project>
+    <parent>
+        <groupId>org.apache.tuscany</groupId>
+        <artifactId>tuscany-project</artifactId>
+        <version>SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tuscany-distribution</artifactId>
+    <packaging>pom</packaging>
+    <name>Tuscany Distribution Project</name>
+    <version>SNAPSHOT</version>
+
+    <modules>
+        <module>axis2-overlay</module>
+        <module>celtix-overlay</module>
+        <module>tuscany-core-overlay</module>
+        <module>tuscany-tools-overlay</module>
+        <module>tuscany-samples</module>
+        <module>tomcat-overlay</module>
+        <module>tuscany-polish</module>
+    </modules>
+
+</project>

Propchange: incubator/tuscany/java/distribution/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/distribution/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/tuscany/java/distribution/readme.txt
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/readme.txt?rev=405834&view=auto
==============================================================================
--- incubator/tuscany/java/distribution/readme.txt (added)
+++ incubator/tuscany/java/distribution/readme.txt Fri May 12 11:57:34 2006
@@ -0,0 +1,14 @@
+To create the Tuscany distribution, you just simply run:
+
+build-dist.bat
+or
+build-dist.sh
+
+
+To create the Tuscany distribution, you just simply run:
+
+build-dist.bat
+or
+build-dist.sh
+
+

Propchange: incubator/tuscany/java/distribution/readme.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/distribution/readme.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml?rev=405834&view=auto
==============================================================================
--- incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml (added)
+++ incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml Fri May 12 11:57:34 2006
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ -->
+<project name="setup tomcat" default="prepareTomcat" basedir='.'>
+        <property environment="env" />
+        <property file="${user.home}/tuscany/build.properties" />
+        <property file="${user.home}/build.properties" />
+        <property name="wsbinding" value="axis2"/>
+
+        <property name="tuscany.acceptance.tomcat.version" value='5.5.17' />
+        <condition property="tuscany.acceptance.tomcat.zipped" value='apache-tomcat-${tuscany.acceptance.tomcat.version}.zip'>
+            <os family="windows"/>
+        </condition>
+        <condition property="tuscany.acceptance.tomcat.zipped" value='apache-tomcat-${tuscany.acceptance.tomcat.version}.tar.gz'>
+            <or>
+                <os family="unix"/>
+                <os family="mac"/>
+            </or>
+        </condition>
+        <condition property="ant.home" value="${env.ANT_HOME}">
+            <os family="unix"/>
+        </condition>
+        <property name="tuscany.acceptance.tc.dir" value='${target.dir}/apache-tomcat-${tuscany.acceptance.tomcat.version}' />
+        <property name="tuscany.acceptance.target.dir" value='${target.dir}' />
+
+        <property name="tuscany.acceptance.groupId" value='org/apache/tuscany' />
+        <property name="tuscany.acceptance.version" value='SNAPSHOT' />
+
+        <property name="tuscany.sca.acceptance.groupId" value='org/osoa' />
+        <property name="tuscany.sca.acceptance.version" value='SNAPSHOT' />
+
+        <property name="tuscany.commonj.acceptance.groupId" value='commonj' />
+        <property name="tuscany.commonj.acceptance.version" value='SNAPSHOT' />
+
+        <property name="tuscany.sdo.acceptance.groupId" value='org/apache/tuscany' />
+        <property name="tuscany.sdo.acceptance.version" value='SNAPSHOT' />
+
+        <property name="tuscany.acceptance.axis2.version" value='1.0' />
+
+        <property name="tuscany.acceptance.bindings" value='org/apache/tuscany/sca/bindings' />
+        <property name="tuscany.acceptance.containers" value='org/apache/tuscany/sca/containers' />
+        <property name="tuscany.acceptance.databindings" value='org/apache/tuscany/databinding' />
+        <property name="tuscany.acceptance.sca.samples.dir" value='../../sca/samples' />
+        <property name="tuscany.acceptance.samples.dir" value='../../samples' />
+        <property name="tuscany.acceptance.interop.dir" value='../interop' />
+        <!-- property name="tuscany.maven.repos.dir" value='${user.home}\.maven\repository' / -->
+        <!-- change for maven 2.0 -->
+        <property name="tuscany.maven.repos.dir" value='${user.home}\.m2\repository' />
+        <condition property="isWindows">
+            <os family="windows"/>
+        </condition>
+        <condition property="isUnix">
+            <os family="unix"/>
+        </condition>
+        <condition property="isMac">
+            <os family="mac"/>
+        </condition>
+
+        <patternset id="tuscany.acceptance.common.dependencies">
+                <include name="**/woodstox/wstx-asl/2.9.3/wstx-asl-2.9.3.jar" />
+        </patternset>
+
+        <patternset id="tuscany.acceptance.emf.dependencies">
+                <include name="**/org/eclipse/emf/common/2.2.0-SNAPSHOT/common-2.2.0-SNAPSHOT.jar" />
+                <include name="**/org/eclipse/emf/ecore/2.2.0-SNAPSHOT/ecore-2.2.0-SNAPSHOT.jar" />
+                <include name="**/org/eclipse/emf/ecore-change/2.2.0-SNAPSHOT/ecore-change-2.2.0-SNAPSHOT.jar" />
+                <include name="**/org/eclipse/emf/ecore-xmi/2.2.0-SNAPSHOT/ecore-xmi-2.2.0-SNAPSHOT.jar" />
+                <include name="**/org/eclipse/xsd/xsd/2.2.0-SNAPSHOT/xsd-2.2.0-SNAPSHOT.jar" />
+        </patternset>
+
+        <patternset id="tuscany.acceptance.tc.specsdoimpl">  <!--jars which need to go into tomcat common/lib  -->
+                <include name="**/${tuscany.sca.acceptance.groupId}/sca-api/${tuscany.sca.acceptance.version}/sca-api-${tuscany.sca.acceptance.version}.jar" />
+                <include name="**/${tuscany.commonj.acceptance.groupId}/sdo-api/${tuscany.commonj.acceptance.version}/sdo-api-${tuscany.commonj.acceptance.version}.jar" />
+                <include name="**/${tuscany.acceptance.groupId}/tuscany-sdo-impl/${tuscany.acceptance.version}/tuscany-sdo-impl-${tuscany.acceptance.version}.jar" />
+        </patternset>
+
+        <patternset id="tuscany.acceptance.sca.core"> <!--jars which need to go into tomcat server/lib  -->
+                <include name="**/${tuscany.acceptance.groupId}/tuscany-common/${tuscany.acceptance.version}/tuscany-common-${tuscany.acceptance.version}.jar" />
+                <include name="**/${tuscany.acceptance.containers}/tuscany-container-java/${tuscany.acceptance.version}/tuscany-container-java-${tuscany.acceptance.version}.jar" />
+                <include name="**/${tuscany.acceptance.databindings}/tuscany-databinding-sdo/${tuscany.acceptance.version}/tuscany-databinding-sdo-${tuscany.acceptance.version}.jar" />
+                <include name="**/${tuscany.acceptance.groupId}/tuscany-core/${tuscany.acceptance.version}/tuscany-core-${tuscany.acceptance.version}.jar" />
+                <include name="**/${tuscany.acceptance.groupId}/tuscany-model/${tuscany.acceptance.version}/tuscany-model-${tuscany.acceptance.version}.jar" />
+
+                <include name="**/wsdl4j/wsdl4j/1.5.2/wsdl4j-1.5.2.jar"/>
+                <include name="**/stax/stax-api/1.0/stax-api-1.0.jar" />
+                <include name="**/org/apache/geronimo/geronimo-connector/1.0/geronimo-connector-1.0.jar" />
+                <include name="**/org/apache/geronimo/specs/geronimo-j2ee-connector_1.5_spec/1.0/geronimo-j2ee-connector_1.5_spec-1.0.jar" />
+                <include name="**/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0/geronimo-jta_1.0.1B_spec-1.0.jar" />
+                <include name="**/org/apache/geronimo/geronimo-transaction/1.0/geronimo-transaction-1.0.jar" />
+                <include name="**/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar" />
+                <include name="**/asm/asm/2.2/asm-2.2.jar" />
+                <include name="**/stax/stax-api/1.0/stax-api-1.0.jar" />
+                <include name="**/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" />
+        </patternset>
+
+        <patternset id="tuscany.acceptance.binding.axis2">
+                <include name="**/${tuscany.acceptance.bindings}/tuscany-binding-axis2/${tuscany.acceptance.version}/tuscany-binding-axis2-${tuscany.acceptance.version}.jar" />
+                <include name="**/axis2/axis2-kernel/${tuscany.acceptance.axis2.version}/axis2-kernel-${tuscany.acceptance.axis2.version}.jar" />
+                <include name="**/ws-commons/axiom-api/1.0/axiom-api-1.0.jar" />
+                <include name="**/ws-commons/axiom-impl/1.0/axiom-impl-1.0.jar" />
+                <include name="**/ws-commons/neethi/1.0.1/neethi-1.0.1.jar" />
+                <include name="**/org/apache/ws/commons//XmlSchema/1.0.2/XmlSchema-1.0.2.jar" />
+                <include name="**/commons-httpclient/commons-httpclient/3.0/commons-httpclient-3.0.jar" />
+                <include name="**/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" />
+        </patternset>
+
+        <property name="celtix.version" value="1.0"/>
+        <patternset id="tuscany.acceptance.binding.celtix">
+            <include name="**/${tuscany.acceptance.bindings}/tuscany-binding-celtix/${tuscany.acceptance.version}/tuscany-binding-celtix-${tuscany.acceptance.version}.jar" />
+            <include name="**/org/objectweb/celtix/celtix-rt/${celtix.version}/celtix-rt-${celtix.version}.jar"/>
+            <include name="**/org/objectweb/celtix/celtix-api/${celtix.version}/celtix-api-${celtix.version}.jar"/>
+            <include name="**/org/objectweb/celtix/celtix-common/${celtix.version}/celtix-common-${celtix.version}.jar"/>
+            <include name="**/org/objectweb/celtix/celtix-tools/${celtix.version}/celtix-tools-${celtix.version}.jar"/>
+
+            <include name="**/com/sun/xml/jaxb-impl/2.0EA3/jaxb-impl-2.0EA3.jar"/>
+            <include name="**/com/sun/xml/jaxb-xjc/2.0EA3/jaxb-xjc-2.0EA3.jar"/>
+            <include name="**/com/sun/xml/saaj-impl/1.3/saaj-impl-1.3.jar"/>
+            <include name="**/javax/annotation/jsr250-api/2.0-JAXWS-2.0-EA3/jsr250-api-2.0-JAXWS-2.0-EA3.jar"/>
+            <include name="**/javax/jws/jsr181-api/2.0-JAXWS-2.0-EA3/jsr181-api-2.0-JAXWS-2.0-EA3.jar"/>
+            <include name="**/javax/xml/jaxb-api/2.0EA3/jaxb-api-2.0EA3.jar"/>
+            <include name="**/javax/xml/jaxws-api/2.0-JAXWS-2.0-EA3/jaxws-api-2.0-JAXWS-2.0-EA3.jar"/>
+            <include name="**/javax/xml/saaj-api/1.3/saaj-api-1.3.jar"/>
+            <include name="**/jetty/org.mortbay.jetty/5.1.9/org.mortbay.jetty-5.1.9.jar"/>
+            <include name="**/org/springframework/spring-beans/1.2.5/spring-beans-1.2.5.jar"/>
+            <include name="**/org/springframework/spring-core/1.2.5/spring-core-1.2.5.jar"/>
+            <include name="**/regexp/regexp/1.3/regexp-1.3.jar"/>
+            <include name="**/stax/stax-api/1.0/stax-api-1.0.jar"/>
+            <include name="**/velocity/velocity-dep/1.4/velocity-dep-1.4.jar"/>
+            <include name="**/velocity/velocity/1.4/velocity-1.4.jar"/>
+            <include name="**/woodstox/wstx-asl/2.9.3/wstx-asl-2.9.3.jar"/>
+            <include name="**/wsdl4j/wsdl4j/1.5.2/wsdl4j-1.5.2.jar"/>
+
+            <include name="**/org/apache/geronimo/specs/geronimo-activation_1.0.2_spec/1.0/geronimo-activation_1.0.2_spec-1.0.jar"/>
+            <include name="**/asm/asm/2.2/asm-2.2.jar" />
+        </patternset>
+
+        <target name="init">
+                <available property='tomcat.is.available' file='${tuscany.acceptance.tc.dir}/server/lib/catalina.jar' type='file' />
+                <available property='tuscany.acceptance.tomcat.zipped.available' file='${tuscany.acceptance.tomcat.zipped}' type='file' />
+                <available property='tuscany.acceptance.tomcat.serverxmlorg.available' file='${tuscany.acceptance.tc.dir}/conf/server.xml.original' />
+                <available property='tuscany.acceptance.tomcat.contextxmlorg.available' file='${tuscany.acceptance.tc.dir}/conf/context.xml.original' />
+        </target>
+
+        <target name="check.for.zip" depends="init" unless='tuscany.acceptance.tomcat.zipped.available'>
+                <property name='tuscany.acceptance.tomcat.zipped.full' location="${tuscany.acceptance.tomcat.zipped}" />
+                <echo level="error" message="${tuscany.acceptance.tomcat.zipped} file not found here:'${tuscany.acceptance.tomcat.zipped.full}'" />
+                <echo level="error" message="Either place zip file there or change ${user.home}/build.properties in home dir to include 'tuscany.acceptance.tomcat.zipped' property to where zip is located. " />
+                <fail />
+        </target>
+
+
+        <target name="tuscany.tomcat.unzipWindows" if="isWindows" depends='init,check.for.zip' description='Just unzip tomcat' unless='tomcat.is.available'>
+                <unzip src="${tuscany.acceptance.tomcat.zipped}" dest="${tuscany.acceptance.target.dir}" />
+        </target>
+        <target name="tuscany.tomcat.unzipUnix" if="isUnix" depends='init,check.for.zip' description='Just unzip tomcat' unless='tomcat.is.available'>
+            <mkdir dir="${tuscany.acceptance.target.dir}" />
+            <gunzip src="${tuscany.acceptance.tomcat.zipped}" dest="${tuscany.acceptance.target.dir}/temp.tar"/>
+            <!-- Exec tar because ant builtin tar does not preserve execute permissions. -->
+            <exec executable="tar" dir="${tuscany.acceptance.target.dir}">
+                <arg value="xf"/>
+                <arg value="temp.tar"/>
+            </exec>
+			<delete file="${tuscany.acceptance.target.dir}/temp.tar"/>
+        </target>
+        <target name="tuscany.tomcat.unzipMac" if="isMac" depends='init,check.for.zip' description='Just unzip tomcat' unless='tomcat.is.available'>
+                <antcall target="tuscany.tomcat.unzipUnix" /> <!-- just use unix for now -->
+        </target>
+
+        <target name="prepareTomcat" depends='tuscany.tomcat.unzipWindows,tuscany.tomcat.unzipUnix,tuscany.tomcat.unzipMac,tuscany.tomcat.fixup,tuscany.deploy.samples' description='Unzip tomcat, fix it up, and deploy samples'>
+                <dirname property='tuscany.acceptance.tc.dir.full' file="${tuscany.acceptance.tc.dir}/bin" />
+                <echo level="info" message="Tomcat fixed up here:  ${tuscany.acceptance.tc.dir.full}" />
+                <echo level="info" message="http://localhost:8080/helloworldweb-SNAPSHOT/" />
+                
+        </target>
+        <target name="startTestServer" depends='prepareTomcat' description='start server prepared to run tests'>
+                <waitfor maxwait="1" maxwaitunit="second" checkevery="200" timeoutproperty="tuscany.tomcat.notstarted" >
+                        <http url="http://localhost:8080"/>
+                </waitfor>
+                <condition property="tuscany.tomcat.alreadystarted">
+                    <not>
+                     <istrue value="${tuscany.tomcat.notstarted}"/>
+                    </not>
+                </condition>
+                <antcall target="startTomcat" />
+        </target>
+
+        <target name="tuscany.tomcat.fixup" depends='tuscany.tomcat.fixserverconfig' description='Fix up tomcat for tuscany.'>
+                <mkdir dir="${tuscany.acceptance.target.dir}" />
+
+                <copy todir="${tuscany.acceptance.tc.dir}/common/lib" flatten='true'>
+                        <fileset dir="${tuscany.maven.repos.dir}">
+                                <patternset refid="tuscany.acceptance.emf.dependencies" />
+                        </fileset>
+                        <fileset dir="${tuscany.maven.repos.dir}">
+                                <patternset refid="tuscany.acceptance.tc.specsdoimpl" />
+                        </fileset>
+                        <fileset dir="${tuscany.maven.repos.dir}">
+                                <patternset>  <!-- for db2 and das support -->
+                                  <include name="**/${tuscany.acceptance.groupId}/das/tuscany-das-rdb/${tuscany.acceptance.version}/tuscany-das-rdb-${tuscany.acceptance.version}.jar" />
+                                  <include name="**/org/apache/derby/derby/10.1.2.1/derby-10.1.2.1.jar" />
+                                </patternset>
+                                <patternset>  <!-- for JSON-RPC support -->
+                                  <include name="**/metaparadigm/jsonrpc/1.0/jsonrpc-1.0.jar" />
+                                </patternset>
+                        </fileset>
+                </copy>
+                <copy todir="${tuscany.acceptance.tc.dir}/server/lib" flatten='true'>
+                        <fileset dir="${tuscany.maven.repos.dir}">
+                                <patternset refid="tuscany.acceptance.common.dependencies" />
+                        </fileset>
+                        <fileset dir="${tuscany.maven.repos.dir}">
+                                <patternset refid="tuscany.acceptance.sca.core" />
+                                <patternset>
+                                    <include name="**/${tuscany.acceptance.groupId}/tuscany-tomcat/${tuscany.acceptance.version}/tuscany-tomcat-${tuscany.acceptance.version}.jar" />
+                                </patternset>
+                        </fileset>
+                        <fileset dir="${tuscany.maven.repos.dir}">
+                                <patternset refid="tuscany.acceptance.binding.${wsbinding}" />
+                        </fileset>
+                        <fileset dir="${tuscany.maven.repos.dir}">
+                                <patternset>
+                                  <include name="**/${tuscany.acceptance.bindings}/tuscany-binding-jsonrpc/${tuscany.acceptance.version}/tuscany-binding-jsonrpc-${tuscany.acceptance.version}.jar" />
+                                </patternset>
+                        </fileset>
+
+                </copy>
+        </target>
+
+        <target name="tuscany.deploy.samples" description='Deploy tuscany sample wars to tomcat webapps.'>
+                <copy todir="${tuscany.acceptance.tc.dir}/webapps" flatten='true'>
+                        <fileset dir="${tuscany.acceptance.sca.samples.dir}">
+                                <include name="**/*.war" />
+                        </fileset>
+                        <fileset dir="${tuscany.acceptance.samples.dir}">
+                                <include name="**/*.war" />
+                        </fileset>
+                </copy>
+        </target>
+
+
+        <target name="tuscany.deploy.interop" description='Deploy tuscany interop test wars to tomcat webapps.'>
+                <copy todir="${tuscany.acceptance.tc.dir}/webapps" flatten='true'>
+                        <fileset dir="${tuscany.acceptance.interop.dir}">
+                                <include name="**/*.war" />
+                        </fileset>
+                </copy>
+        </target>
+
+        <!-- provide a convenient -Djava.ext.dirs=  to run j2se samples -->
+        <target name="j2se" description='create a java extensions directory to run J2SE tuscany applications.'>
+                <property name="tuscany.acceptance.j2se.dir" value='${tuscany.acceptance.target.dir}/j2se' />
+                <mkdir dir="${tuscany.acceptance.j2se.dir}" />
+                <copy todir="${tuscany.acceptance.j2se.dir}" flatten='true'>
+                        <fileset dir="${tuscany.maven.repos.dir}">
+                                <patternset refid="tuscany.acceptance.common.dependencies" />
+                        </fileset>
+                        <fileset dir="${tuscany.maven.repos.dir}">
+                                <patternset refid="tuscany.acceptance.emf.dependencies" />
+                                <patternset refid="tuscany.acceptance.tc.specsdoimpl" />
+                                <patternset refid="tuscany.acceptance.sca.core" />
+                        </fileset>
+                </copy>
+        </target>
+
+        <!-- provide a convenient -Djava.ext.dirs=  to run j2se and webservice client samples -->
+        <target name="j2sews" description='create a java extensions directory to run J2SE tuscany applications.'>
+                <property name="tuscany.acceptance.j2sews.dir" value='${tuscany.acceptance.target.dir}/j2sews' />
+
+             <antcall target="j2se"  inheritAll='true' inheritRefs='true' >
+               <param name="tuscany.acceptance.j2se.dir" value="${tuscany.acceptance.j2sews.dir}" />
+              </antcall>
+                <copy todir="${tuscany.acceptance.j2sews.dir}" flatten='true'>
+                        <fileset dir="${tuscany.maven.repos.dir}">
+                                <patternset refid="tuscany.acceptance.common.dependencies" />
+                        </fileset>
+                        <fileset dir="${tuscany.maven.repos.dir}">
+                                <patternset refid="tuscany.acceptance.binding.${wsbinding}" />
+                        </fileset>
+                </copy>
+        </target>
+
+
+        <target name="backup.server.xml" depends="init" unless='tuscany.acceptance.tomcat.serverxmlorg.available'>
+                <copy file='${tuscany.acceptance.tc.dir}/conf/server.xml' tofile='${tuscany.acceptance.tc.dir}/conf/server.xml.original' />
+        </target>
+        <target name="backup.context.xml" depends="init" unless='tuscany.acceptance.tomcat.contextxmlorg.available'>
+                <copy file='${tuscany.acceptance.tc.dir}/conf/context.xml' tofile='${tuscany.acceptance.tc.dir}/conf/context.xml.original' />
+        </target>
+        <target name="tuscany.tomcat.fixserverconfig" depends='tuscany.tomcat.fixserverxml,tuscany.tomcat.fixcontextxml' description='Add listeners' />
+        <target name="tuscany.tomcat.fixserverxml" depends='init,backup.server.xml'  unless='tuscany.acceptance.tomcat.serverxmlorg.available'>
+                <property name="tuscany.acceptance.tomcat.serverxmlorg.available" value='true' />
+                
+                <xslt processor="trax"
+                  in="${tuscany.acceptance.tc.dir}/conf/server.xml.original"
+                      style="server.xsl" out="${tuscany.acceptance.tc.dir}/conf/server.xml"
+                      >
+
+                 </xslt>
+                <!-- echo message='${user.home}/.axis2/axis2.xml '/ -->
+                <!-- copy file='axis2.xml' tofile='${user.home}/.axis2/axis2.xml' / -->
+        </target>
+        <target name="tuscany.tomcat.fixcontextxml" depends='init,backup.context.xml'  unless='tuscany.acceptance.tomcat.contextxmlorg.available'>
+                <property name="tuscany.acceptance.tomcat.contextxmlorg.available" value='true' />
+                <!-- DO NOTHING AT THIS TIME                
+                <xslt
+                  in="${tuscany.acceptance.tc.dir}/conf/context.xml.original"
+                      style="context.xsl" out="${tuscany.acceptance.tc.dir}/conf/context.xml"
+                      >
+
+                 </xslt>
+                 -->
+        </target>
+        
+        <target name="startTomcatWindows" if="isWindows" unless='tuscany.tomcat.alreadystarted' >
+                <exec spawn='true' vmlauncher="false" failonerror='false' dir="${tuscany.acceptance.tc.dir}\bin" executable="cmd.exe" >
+                        <arg line="/C start &quot; Tomcat running ${tuscany.acceptance.tc.dir}&quot;  catalina run &amp;&amp;   exit" />
+                </exec>
+        </target>
+        <target name="startTomcatUnix" if="isUnix" unless='tuscany.tomcat.alreadystarted'>
+            <exec spawn='true' vmlauncher="false" failonerror='false' dir="${tuscany.acceptance.tc.dir}/bin" executable="xterm" >
+                <env key='CATALINA_HOME' value='${env.PWD}/${tuscany.acceptance.tc.dir}'/>
+                <arg line="-e ./catalina.sh run"/>
+            </exec>
+        </target>
+        <target name="startTomcatMac" if="isMac" unless='tuscany.tomcat.alreadystarted' >
+                <antcall target="startTomcatUnix" /> <!--just use unix for now -->
+        </target>
+
+        <target name="tuscany.tomcat.alreadystartedmsg" if="tuscany.tomcat.alreadystarted">
+             <echo level="info" message="Tomcat has been already started! ${tuscany.tomcat.alreadystarted}" />
+        </target>
+        <target name="startTomcat" description="Start up tomcat." depends="tuscany.tomcat.alreadystartedmsg,startTomcatWindows,startTomcatUnix,startTomcatMac" unless='tuscany.tomcat.alreadystarted'>
+                <!-- env key="CATALINA_OPTS" value="-Dhttp.proxyHost=localhost  -Dhttp.proxyPort=8090 -DproxySet=true"/-->
+                <sleep seconds="10"/> <!-- it's going to at least require this -->
+                <waitfor maxwait="15" maxwaitunit="second" checkevery="200">
+                        <http url="http://localhost:8080"/>
+                </waitfor>
+                
+        </target>
+
+        <target name="clean" description='Clean out all built artifacts'>
+                <delete dir="${tuscany.acceptance.tc.dir}" />
+        </target>
+
+        <target name='setup.TC.antscripts' depends='tuscany.tomcat.unzipWindows,tuscany.tomcat.unzipUnix,tuscany.tomcat.unzipMac'>
+                <!-- Configure the custom Ant tasks for the Manager application -->
+                <taskdef resource="org/apache/catalina/ant/catalina.tasks">
+                        <classpath>
+                                <fileset dir="${tuscany.acceptance.tc.dir}/server/lib">
+                                        <include name="*.jar" />
+                                </fileset>
+                                <fileset dir="${tuscany.acceptance.tc.dir}/common/lib">
+                                        <include name="*.jar" />
+                                </fileset>
+                                <fileset dir="${tuscany.acceptance.tc.dir}/bin">
+                                        <include name="*.jar" />
+                                </fileset>
+                        </classpath>
+                </taskdef>
+
+        </target>
+
+</project>
+
+

Propchange: incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/tuscany/java/distribution/tomcat-overlay/context.xsl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/tomcat-overlay/context.xsl?rev=405834&view=auto
==============================================================================
--- incubator/tuscany/java/distribution/tomcat-overlay/context.xsl (added)
+++ incubator/tuscany/java/distribution/tomcat-overlay/context.xsl Fri May 12 11:57:34 2006
@@ -0,0 +1,96 @@
+<!--
+  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+  Licensed 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.
+ -->
+<xsl:stylesheet version="1.0" 
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output indent="yes" />
+ 
+  <xsl:param name="classname"/> 
+  <!-- xsl:template match="node() | @*">
+    <xsl:copy>
+      <xsl:apply-templates select="node() | @*"/>
+    </xsl:copy>
+  </xsl:template -->
+  <xsl:template
+  match="@* | * | comment() | processing-instruction() | text()">
+    <xsl:copy>
+      <xsl:apply-templates
+      select="@* | * | comment() | processing-instruction() | text()" />
+    </xsl:copy>
+  </xsl:template>
+  
+<!--
+  <xsl:template match="Context">
+    <Context>
+    <xsl:apply-templates select="@*" />
+    <Listener className="org.apache.tuscany.tomcat.lifecycle.listener.TomcatWebAppLifecycleListener" /> 
+   <xsl:apply-templates
+      select="@* | * | comment() | processing-instruction() | text()" />
+    </Context>
+  </xsl:template>
+-->
+  
+  <!-- xsl:template match="/">
+    <xsl:apply-templates select="node() | @*" />
+  </xsl:template -->
+</xsl:stylesheet>
+<!--
+  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+  Licensed 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.
+ -->
+<xsl:stylesheet version="1.0" 
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output indent="yes" />
+ 
+  <xsl:param name="classname"/> 
+  <!-- xsl:template match="node() | @*">
+    <xsl:copy>
+      <xsl:apply-templates select="node() | @*"/>
+    </xsl:copy>
+  </xsl:template -->
+  <xsl:template
+  match="@* | * | comment() | processing-instruction() | text()">
+    <xsl:copy>
+      <xsl:apply-templates
+      select="@* | * | comment() | processing-instruction() | text()" />
+    </xsl:copy>
+  </xsl:template>
+  
+<!--
+  <xsl:template match="Context">
+    <Context>
+    <xsl:apply-templates select="@*" />
+    <Listener className="org.apache.tuscany.tomcat.lifecycle.listener.TomcatWebAppLifecycleListener" /> 
+   <xsl:apply-templates
+      select="@* | * | comment() | processing-instruction() | text()" />
+    </Context>
+  </xsl:template>
+-->
+  
+  <!-- xsl:template match="/">
+    <xsl:apply-templates select="node() | @*" />
+  </xsl:template -->
+</xsl:stylesheet>

Propchange: incubator/tuscany/java/distribution/tomcat-overlay/context.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/distribution/tomcat-overlay/context.xsl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/tuscany/java/distribution/tomcat-overlay/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/tomcat-overlay/pom.xml?rev=405834&view=auto
==============================================================================
--- incubator/tuscany/java/distribution/tomcat-overlay/pom.xml (added)
+++ incubator/tuscany/java/distribution/tomcat-overlay/pom.xml Fri May 12 11:57:34 2006
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	*  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+	*
+	*  Licensed under the Apache License, Version 2.0 (the "License");
+	*  you may not use this file except in compliance with the License.
+	*  You may obtain a copy of the License at
+	*
+	*     http://www.apache.org/licenses/LICENSE-2.0
+	*
+	*  Unless required by applicable law or agreed to in writing, software
+	*  distributed under the License is distributed on an "AS IS" BASIS,
+	*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	*  See the License for the specific language governing permissions and
+	*  limitations under the License.
+-->
+<project>
+	<parent>
+		<groupId>org.apache.tuscany</groupId>
+		<artifactId>tuscany-distribution</artifactId>
+		<version>SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>tuscany-distribution-tomcat-overlay</artifactId>
+	<packaging>pom</packaging>
+	<name>Tuscany Distribution Project - Tomcat Overlay</name>
+	<version>SNAPSHOT</version>
+
+    <!--
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany</groupId>
+            <artifactId>tuscany-distribution-tuscany-samples</artifactId>
+            <version>${pom.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany</groupId>
+            <artifactId>tuscany-distribution-tuscany-core-overlay</artifactId>
+            <version>${pom.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany</groupId>
+            <artifactId>tuscany-distribution-tuscany-tools-overlay</artifactId>
+            <version>${pom.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany</groupId>
+            <artifactId>tuscany-distribution-axis2-overlay</artifactId>
+            <version>${pom.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany</groupId>
+            <artifactId>tuscany-distribution-celtix-overlay</artifactId>
+            <version>${pom.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    -->
+    
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<dependencies>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-trax</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                 </dependencies>
+				
+				<executions>
+					<execution>
+						<id>create-tomcat</id>
+						<phase>install</phase>
+						<configuration>
+							<tasks>
+								<ant inheritRefs="true"
+									antfile="configureTomcat.xml" dir="${basedir}"
+									target="prepareTomcat">
+									<property name="target.dir"
+										value="${basedir}/../target/tuscany-dist" />
+									<property name="user.home" value="${user.home}" /> 
+								</ant>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>clean-tomcat</id>
+						<phase>clean</phase>
+						<configuration>
+							<tasks>
+								<ant inheritRefs="true"
+									antfile="configureTomcat.xml" dir="${basedir}"
+									target="clean">
+									<property name="target.dir"
+										value="${basedir}/../target/tuscany-dist" />
+								</ant>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

Propchange: incubator/tuscany/java/distribution/tomcat-overlay/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/distribution/tomcat-overlay/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/tuscany/java/distribution/tomcat-overlay/server.xsl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/tomcat-overlay/server.xsl?rev=405834&view=auto
==============================================================================
--- incubator/tuscany/java/distribution/tomcat-overlay/server.xsl (added)
+++ incubator/tuscany/java/distribution/tomcat-overlay/server.xsl Fri May 12 11:57:34 2006
@@ -0,0 +1,96 @@
+<!--
+  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+  Licensed 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.
+ -->
+<xsl:stylesheet version="1.0" 
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output indent="yes" />
+ 
+  <xsl:param name="classname"/> 
+  <!-- xsl:template match="node() | @*">
+    <xsl:copy>
+      <xsl:apply-templates select="node() | @*"/>
+    </xsl:copy>
+  </xsl:template -->
+  <xsl:template
+  match="@* | * | comment() | processing-instruction() | text()">
+    <xsl:copy>
+      <xsl:apply-templates
+      select="@* | * | comment() | processing-instruction() | text()" />
+    </xsl:copy>
+  </xsl:template>
+  
+  <xsl:template match="Host">
+    <Host>
+  <xsl:attribute name="className">
+    <xsl:text>org.apache.tuscany.tomcat.TuscanyHost</xsl:text>
+  </xsl:attribute> 
+    <xsl:apply-templates select="@*" />
+   <xsl:apply-templates
+      select="@* | * | comment() | processing-instruction() | text()" />
+    </Host>
+  </xsl:template>
+  
+  <!-- xsl:template match="/">
+    <xsl:apply-templates select="node() | @*" />
+  </xsl:template -->
+</xsl:stylesheet>
+<!--
+  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+  Licensed 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.
+ -->
+<xsl:stylesheet version="1.0" 
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output indent="yes" />
+ 
+  <xsl:param name="classname"/> 
+  <!-- xsl:template match="node() | @*">
+    <xsl:copy>
+      <xsl:apply-templates select="node() | @*"/>
+    </xsl:copy>
+  </xsl:template -->
+  <xsl:template
+  match="@* | * | comment() | processing-instruction() | text()">
+    <xsl:copy>
+      <xsl:apply-templates
+      select="@* | * | comment() | processing-instruction() | text()" />
+    </xsl:copy>
+  </xsl:template>
+  
+  <xsl:template match="Host">
+    <Host>
+  <xsl:attribute name="className">
+    <xsl:text>org.apache.tuscany.tomcat.TuscanyHost</xsl:text>
+  </xsl:attribute> 
+    <xsl:apply-templates select="@*" />
+   <xsl:apply-templates
+      select="@* | * | comment() | processing-instruction() | text()" />
+    </Host>
+  </xsl:template>
+  
+  <!-- xsl:template match="/">
+    <xsl:apply-templates select="node() | @*" />
+  </xsl:template -->
+</xsl:stylesheet>

Propchange: incubator/tuscany/java/distribution/tomcat-overlay/server.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/distribution/tomcat-overlay/server.xsl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/tuscany/java/distribution/tuscany-core-overlay/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/tuscany-core-overlay/pom.xml?rev=405834&view=auto
==============================================================================
--- incubator/tuscany/java/distribution/tuscany-core-overlay/pom.xml (added)
+++ incubator/tuscany/java/distribution/tuscany-core-overlay/pom.xml Fri May 12 11:57:34 2006
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    *  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+    *
+    *  Licensed under the Apache License, Version 2.0 (the "License");
+    *  you may not use this file except in compliance with the License.
+    *  You may obtain a copy of the License at
+    *
+    *     http://www.apache.org/licenses/LICENSE-2.0
+    *
+    *  Unless required by applicable law or agreed to in writing, software
+    *  distributed under the License is distributed on an "AS IS" BASIS,
+    *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    *  See the License for the specific language governing permissions and
+    *  limitations under the License.
+-->
+<project>
+    <parent>
+        <groupId>org.apache.tuscany</groupId>
+        <artifactId>tuscany-distribution</artifactId>
+        <version>SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tuscany-distribution-tuscany-core-overlay</artifactId>
+    <packaging>pom</packaging>
+    <name>Tuscany Distribution Project - Tuscany Core Overlay</name>
+    <version>SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany</groupId>
+            <artifactId>tuscany-core</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.databinding</groupId>
+            <artifactId>tuscany-databinding-sdo</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca.bindings</groupId>
+            <artifactId>tuscany-binding-jsonrpc</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca.containers</groupId>
+            <artifactId>tuscany-container-rhino</artifactId>
+            <version>${pom.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.tuscany.sca.bindings</groupId>
+                    <artifactId>tuscany-binding-axis2</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca.containers</groupId>
+            <artifactId>tuscany-container-java</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany</groupId>
+            <artifactId>tuscany-tomcat</artifactId>
+            <version>${pom.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.tuscany.sca.bindings</groupId>
+                    <artifactId>tuscany-binding-axis2</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>dependency-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-javadoc</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.osoa</groupId>
+                                    <artifactId>sca-api</artifactId>
+                                    <version>${project.version}</version>
+                                    <classifier>javadoc</classifier>
+                                    <outputDirectory>${basedir}/../target/tuscany-dist/javadoc/sca</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>commonj</groupId>
+                                    <artifactId>sdo-api</artifactId>
+                                    <version>${project.version}</version>
+                                    <classifier>javadoc</classifier>
+                                    <outputDirectory>${basedir}/../target/tuscany-dist/javadoc/sdo</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <finalName>tuscany-runtime</finalName>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                        </manifest>
+                    </archive>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>manifest-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.0.1</version>
+                <executions>
+                    <execution>
+                        <id>overlay</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>directory</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                    </descriptors>
+                    <finalName>tuscany</finalName>
+                    <outputDirectory>${basedir}/../target</outputDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: incubator/tuscany/java/distribution/tuscany-core-overlay/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/distribution/tuscany-core-overlay/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/tuscany/java/distribution/tuscany-core-overlay/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/tuscany-core-overlay/src/main/assembly/bin.xml?rev=405834&view=auto
==============================================================================
--- incubator/tuscany/java/distribution/tuscany-core-overlay/src/main/assembly/bin.xml (added)
+++ incubator/tuscany/java/distribution/tuscany-core-overlay/src/main/assembly/bin.xml Fri May 12 11:57:34 2006
@@ -0,0 +1,22 @@
+<assembly>
+    <id>dist</id>
+    <formats>
+        <format>dir</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>tuscany-core-overlay/target</directory>
+            <outputDirectory>lib</outputDirectory>
+            <includes>
+                <include>tuscany-runtime.jar</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+        </dependencySet>
+    </dependencySets>
+</assembly>
+

Propchange: incubator/tuscany/java/distribution/tuscany-core-overlay/src/main/assembly/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/distribution/tuscany-core-overlay/src/main/assembly/bin.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/tuscany/java/distribution/tuscany-polish/fixupJars.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/tuscany-polish/fixupJars.xml?rev=405834&view=auto
==============================================================================
--- incubator/tuscany/java/distribution/tuscany-polish/fixupJars.xml (added)
+++ incubator/tuscany/java/distribution/tuscany-polish/fixupJars.xml Fri May 12 11:57:34 2006
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<project name="project" default="fixupJars">
+
+    <target name="fixupJars">
+        <delete>
+            <fileset dir="${target.dir}/lib/axis2" includes="*.jar">
+                <present present="both" targetdir="${target.dir}/lib" />
+            </fileset>
+            <fileset dir="${target.dir}/lib/celtix" includes="*.jar">
+                <present present="both" targetdir="${target.dir}/lib" />
+            </fileset>
+            <fileset dir="${target.dir}/lib/tools" includes="*.jar">
+                <present present="both" targetdir="${target.dir}/lib" />
+            </fileset>
+        </delete>
+    	<copy todir="${target.dir}/javadoc">
+    		<fileset dir="${target.dir}/../../build/javadoc">
+    			<include name="**/*"/>
+    		</fileset>
+    	</copy>
+    </target>
+
+</project>
+
+<?xml version="1.0"?>
+<project name="project" default="fixupJars">
+
+    <target name="fixupJars">
+        <delete>
+            <fileset dir="${target.dir}/lib/axis2" includes="*.jar">
+                <present present="both" targetdir="${target.dir}/lib" />
+            </fileset>
+            <fileset dir="${target.dir}/lib/celtix" includes="*.jar">
+                <present present="both" targetdir="${target.dir}/lib" />
+            </fileset>
+            <fileset dir="${target.dir}/lib/tools" includes="*.jar">
+                <present present="both" targetdir="${target.dir}/lib" />
+            </fileset>
+        </delete>
+    	<copy todir="${target.dir}/javadoc">
+    		<fileset dir="${target.dir}/../../build/javadoc">
+    			<include name="**/*"/>
+    		</fileset>
+    	</copy>
+    </target>
+
+</project>
+

Propchange: incubator/tuscany/java/distribution/tuscany-polish/fixupJars.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/distribution/tuscany-polish/fixupJars.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/tuscany/java/distribution/tuscany-polish/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/tuscany-polish/pom.xml?rev=405834&view=auto
==============================================================================
--- incubator/tuscany/java/distribution/tuscany-polish/pom.xml (added)
+++ incubator/tuscany/java/distribution/tuscany-polish/pom.xml Fri May 12 11:57:34 2006
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	*  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+	*
+	*  Licensed under the Apache License, Version 2.0 (the "License");
+	*  you may not use this file except in compliance with the License.
+	*  You may obtain a copy of the License at
+	*
+	*     http://www.apache.org/licenses/LICENSE-2.0
+	*
+	*  Unless required by applicable law or agreed to in writing, software
+	*  distributed under the License is distributed on an "AS IS" BASIS,
+	*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	*  See the License for the specific language governing permissions and
+	*  limitations under the License.
+-->
+<project>
+	<parent>
+		<groupId>org.apache.tuscany</groupId>
+		<artifactId>tuscany-distribution</artifactId>
+		<version>SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>tuscany-distribution-tuscany-polish</artifactId>
+	<packaging>pom</packaging>
+	<name>Tuscany Distribution Project - Tuscany Polish</name>
+	<version>SNAPSHOT</version>
+
+    <!--
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany</groupId>
+            <artifactId>tuscany-distribution-tuscany-samples</artifactId>
+            <version>${pom.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany</groupId>
+            <artifactId>tuscany-distribution-tuscany-core-overlay</artifactId>
+            <version>${pom.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany</groupId>
+            <artifactId>tuscany-distribution-tuscany-tools-overlay</artifactId>
+            <version>${pom.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany</groupId>
+            <artifactId>tuscany-distribution-axis2-overlay</artifactId>
+            <version>${pom.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany</groupId>
+            <artifactId>tuscany-distribution-celtix-overlay</artifactId>
+            <version>${pom.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany</groupId>
+            <artifactId>tuscany-distribution-tomcat-overlay</artifactId>
+            <version>${pom.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>        
+    </dependencies>
+    -->
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<dependencies>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-trax</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                 </dependencies>
+				
+				<executions>
+					<execution>
+						<id>fixup-jars</id>
+						<phase>install</phase>
+						<configuration>
+							<tasks>
+								<ant inheritRefs="true"
+									antfile="fixupJars.xml" dir="${basedir}"
+									target="fixupJars">
+									<property name="target.dir"
+										value="${basedir}/../target/tuscany-dist" />
+								</ant>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

Propchange: incubator/tuscany/java/distribution/tuscany-polish/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/distribution/tuscany-polish/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/tuscany/java/distribution/tuscany-samples/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/tuscany-samples/pom.xml?rev=405834&view=auto
==============================================================================
--- incubator/tuscany/java/distribution/tuscany-samples/pom.xml (added)
+++ incubator/tuscany/java/distribution/tuscany-samples/pom.xml Fri May 12 11:57:34 2006
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ -->
+<project>
+    <parent>
+        <groupId>org.apache.tuscany</groupId>
+        <artifactId>tuscany-distribution</artifactId>
+        <version>SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tuscany-distribution-tuscany-samples</artifactId>
+    <packaging>pom</packaging>
+    <name>Tuscany Distribution Project - Tuscany Samples Overlay</name>
+    <version>SNAPSHOT</version>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.0.1</version>
+                <executions>
+                    <execution>
+                        <id>overlay</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>directory</goal>
+                        </goals>
+                    </execution>
+                </executions>
+
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                    </descriptors>
+                    <finalName>tuscany</finalName>
+                    <outputDirectory>${basedir}/../target</outputDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
+

Propchange: incubator/tuscany/java/distribution/tuscany-samples/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/distribution/tuscany-samples/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/tuscany/java/distribution/tuscany-samples/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/tuscany-samples/src/main/assembly/bin.xml?rev=405834&view=auto
==============================================================================
--- incubator/tuscany/java/distribution/tuscany-samples/src/main/assembly/bin.xml (added)
+++ incubator/tuscany/java/distribution/tuscany-samples/src/main/assembly/bin.xml Fri May 12 11:57:34 2006
@@ -0,0 +1,74 @@
+<assembly>
+    <id>dist</id>
+    <formats>
+        <format>dir</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>../sampleapps</directory>
+            <outputDirectory>sampleapps</outputDirectory>
+            <includes>
+                <include>bigbank/**/*</include>
+            </includes>
+            <excludes>
+                <exclude>**/target</exclude>
+                <exclude>**/target/**/*</exclude>
+                <exclude>**/build</exclude>
+                <exclude>**/build/**/*</exclude>
+                <exclude>**/.settings/**/*</exclude>
+                <exclude>**/.classpath</exclude>
+                <exclude>**/.project</exclude>
+                <exclude>**/.wtpmodules</exclude>
+                <exclude>**/surefire*</exclude>
+                <exclude>**/cobertura.ser</exclude>
+                <exclude>**/bin/*</exclude>
+                <exclude>**/var/journal</exclude>
+                <exclude>**/build.out*</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>../sampleapps</directory>
+            <outputDirectory>sampleapps</outputDirectory>
+            <includes>
+                <include>**/target/*.jar</include>
+                <include>**/target/*.war</include>
+            </includes>
+        </fileSet>
+        
+        <fileSet>
+            <directory>../samples</directory>
+            <outputDirectory>samples</outputDirectory>
+            <excludes>
+                <exclude>pom.xml</exclude>
+                <!-- 
+                <exclude>**/src/test/**/*</exclude>
+                <exclude>**/src/test</exclude>
+                 -->
+                <exclude>**/target/**/*</exclude>
+                <exclude>**/target</exclude>
+                <exclude>**/build</exclude>
+                <exclude>**/build/**/*</exclude>
+                <exclude>**/.settings</exclude>
+                <exclude>**/.settings/**/*</exclude>
+                <exclude>**/.classpath</exclude>
+                <exclude>**/.project</exclude>
+                <exclude>**/.wtpmodules</exclude>
+                <exclude>**/surefire*</exclude>
+                <exclude>**/cobertura.ser</exclude>
+                <exclude>**/bin/*</exclude>
+                <exclude>**/var/journal</exclude>
+                <exclude>**/build.out*</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>../samples</directory>
+            <outputDirectory>samples</outputDirectory>
+            <includes>
+                <include>**/target/*.jar</include>
+                <include>**/target/*.war</include>
+            </includes>
+        </fileSet>
+ 
+    </fileSets>
+</assembly>

Propchange: incubator/tuscany/java/distribution/tuscany-samples/src/main/assembly/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/distribution/tuscany-samples/src/main/assembly/bin.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml