Author: jsdelfino
Date: Sun May 14 12:33:21 2006
New Revision: 406408
URL: http://svn.apache.org/viewcvs?rev=406408&view=rev
Log:
Moved buildDistribution.xml to distribution and renamed tuscany-dist.zip to
tuscany-incubating-M1.zip
Added:
incubator/tuscany/java/distribution/buildDistribution.xml (with props)
Removed:
incubator/tuscany/java/buildDistribution.xml
Modified:
incubator/tuscany/java/distribution/build-dist.sh
incubator/tuscany/java/distribution/tuscany-polish/fixupJars.xml
incubator/tuscany/java/pom.xml
incubator/tuscany/java/spec/pom.xml
Modified: incubator/tuscany/java/distribution/build-dist.sh
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/build-dist.sh?rev=406408&r1=406407&r2=406408&view=diff
==============================================================================
--- incubator/tuscany/java/distribution/build-dist.sh (original)
+++ incubator/tuscany/java/distribution/build-dist.sh Sun May 14 12:33:21 2006
@@ -22,8 +22,8 @@
cd ..
TUSCANY_HOME=`pwd`
echo Building Tuscany ...
-mvn -Dtuscany.home=$TUSCANY_HOME install -Dmaven.test.skip=true
+mvn -Dtuscany.home=$TUSCANY_HOME -o clean install -Dmaven.test.skip=true
cd $CUR_DIR
echo Creating Tuscany distribution ...
-mvn clean install
+mvn -o clean install
Added: incubator/tuscany/java/distribution/buildDistribution.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/buildDistribution.xml?rev=406408&view=auto
==============================================================================
--- incubator/tuscany/java/distribution/buildDistribution.xml (added)
+++ incubator/tuscany/java/distribution/buildDistribution.xml Sun May 14
12:33:21 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/distribution/buildDistribution.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/distribution/buildDistribution.xml
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Modified: incubator/tuscany/java/distribution/tuscany-polish/fixupJars.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/tuscany-polish/fixupJars.xml?rev=406408&r1=406407&r2=406408&view=diff
==============================================================================
--- incubator/tuscany/java/distribution/tuscany-polish/fixupJars.xml (original)
+++ incubator/tuscany/java/distribution/tuscany-polish/fixupJars.xml Sun May 14
12:33:21 2006
@@ -18,10 +18,9 @@
<include name="**/*"/>
</fileset>
</copy>
- <zip destfile="${target.dir}/tuscany.zip">
- <fileset dir="${target.dir}">
- <exclude name="tuscany.zip"/>
- </fileset>
+ <zip destfile="${target.dir}/../tuscany-incubating-M1.zip">
+ <zipfileset dir="${target.dir}"
prefix="tuscany-incubating-M1">
+ </zipfileset>
</zip>
</target>
Modified: incubator/tuscany/java/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/pom.xml?rev=406408&r1=406407&r2=406408&view=diff
==============================================================================
--- incubator/tuscany/java/pom.xml (original)
+++ incubator/tuscany/java/pom.xml Sun May 14 12:33:21 2006
@@ -190,7 +190,7 @@
<configuration>
<tasks>
<ant inheritRefs="true"
- antfile="buildDistribution.xml"
dir="${tuscany.home}"
+
antfile="${tuscany.home}/distribution/buildDistribution.xml"
dir="${tuscany.home}"
target="createDistribution">
<property name="dist.folder"
value="${tuscany.home}/distribution/build" />
@@ -217,7 +217,7 @@
<configuration>
<tasks>
<ant inheritRefs="true"
- antfile="buildDistribution.xml"
dir="${tuscany.home}"
+
antfile="${tuscany,home}/distribution/buildDistribution.xml"
dir="${tuscany.home}"
target="cleanDistribution">
<property name="dist.folder"
value="${tuscany.home}/distribution/build" />
Modified: incubator/tuscany/java/spec/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/spec/pom.xml?rev=406408&r1=406407&r2=406408&view=diff
==============================================================================
--- incubator/tuscany/java/spec/pom.xml (original)
+++ incubator/tuscany/java/spec/pom.xml Sun May 14 12:33:21 2006
@@ -170,7 +170,7 @@
<configuration>
<tasks>
<ant inheritRefs="true"
-
antfile="buildDistribution.xml" dir="${tuscany.home}"
+
antfile="${tuscany.home}/distribution/buildDistribution.xml"
dir="${tuscany.home}"
target="createDistribution">
<property name="dist.folder"
value="${tuscany.home}/distribution/build" />
@@ -197,7 +197,7 @@
<configuration>
<tasks>
<ant inheritRefs="true"
-
antfile="buildDistribution.xml" dir="${tuscany.home}"
+
antfile="${tuscany.home}/distribution/buildDistribution.xml"
dir="${tuscany.home}"
target="cleanDistribution">
<property name="dist.folder"
value="${tuscany.home}/distribution/build" />
