Author: jsdelfino
Date: Mon May 15 15:02:06 2006
New Revision: 406752
URL: http://svn.apache.org/viewcvs?rev=406752&view=rev
Log:
Fix for TUSCANY-376, applied patch
Modified:
incubator/tuscany/java/distribution/buildDistribution.xml
incubator/tuscany/java/distribution/tuscany-polish/fixupJars.xml
Modified: incubator/tuscany/java/distribution/buildDistribution.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/buildDistribution.xml?rev=406752&r1=406751&r2=406752&view=diff
==============================================================================
--- incubator/tuscany/java/distribution/buildDistribution.xml (original)
+++ incubator/tuscany/java/distribution/buildDistribution.xml Mon May 15
15:02:06 2006
@@ -20,7 +20,14 @@
</and>
</condition>
- <target name="createDistribution" depends="copySample, copyJar"/>
+ <condition property="isFirstTime">
+ <and>
+ <equals arg1="${project.groupId}" arg2="org.osoa" />
+ <equals arg1="${project.artifactId}" arg2="spec" />
+ </and>
+ </condition>
+
+ <target name="createDistribution" depends="copyJavadoc" />
<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}" />
@@ -33,38 +40,29 @@
</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>
+ <target name="copyJavadoc" if="isJar" description="Copy the javadoc to
the Tuscany distribution folder">
<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 name="cleanDistribution" depends="cleanJavadoc, cleanBuild" />
+
+ <target name="cleanJavadoc" 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"/>
+ <delete dir="${dist.folder}/samples/${project.artifactId}"
quiet="true" />
</target>
+ <target name="cleanBuild" if="isFirstTime">
+ <delete dir="${dist.folder}" quiet="true" />
+ </target>
</project>
Modified: incubator/tuscany/java/distribution/tuscany-polish/fixupJars.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/tuscany-polish/fixupJars.xml?rev=406752&r1=406751&r2=406752&view=diff
==============================================================================
--- incubator/tuscany/java/distribution/tuscany-polish/fixupJars.xml (original)
+++ incubator/tuscany/java/distribution/tuscany-polish/fixupJars.xml Mon May 15
15:02:06 2006
@@ -1,37 +1,76 @@
<?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>
- <copy todir="${target.dir}/docs">
- <fileset dir="../../docs">
- <include name="**/*"/>
- </fileset>
- </copy>
- <zip destfile="${target.dir}/../tuscany-incubating-M1.zip">
- <zipfileset dir="${target.dir}"
prefix="tuscany-incubating-M1">
- </zipfileset>
- </zip>
- <tar destfile="${target.dir}/../tuscany-incubating-M1.tar">
- <tarfileset dir="${target.dir}"
prefix="tuscany-incubating-M1">
- </tarfileset>
- </tar>
- <gzip zipfile="${target.dir}/../tuscany-incubating-M1.tar.gz"
src="${target.dir}/../tuscany-incubating-M1.tar"/>
- </target>
-
-</project>
+
+ <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="sca-api/**/*" />
+ <include name="sdo-api/**/*" />
+ <include name="tuscany-common/**/*" />
+ <include name="tuscany-core/**/*" />
+ <include name="tuscany-model/**/*" />
+ <include name="tuscany-das-rdb/**/*" />
+ <include name="tuscany-databinding-sdo/**/*" />
+ </fileset>
+ </copy>
+ <copy todir="${target.dir}/docs">
+ <fileset dir="../../docs">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+ <zip destfile="${target.dir}/../tuscany-incubating-M1.zip">
+ <zipfileset dir="${target.dir}"
prefix="tuscany-incubating-M1">
+ </zipfileset>
+ </zip>
+ <tar destfile="${target.dir}/../tuscany-incubating-M1.tar"
longfile="gnu">
+ <tarfileset dir="${target.dir}"
prefix="tuscany-incubating-M1">
+ </tarfileset>
+ </tar>
+ <gzip zipfile="${target.dir}/../tuscany-incubating-M1.tar.gz"
src="${target.dir}/../tuscany-incubating-M1.tar" />
+
+ <patternset id="exclusionList">
+ <exclude name="**/target"/>
+ <exclude name="**/target/**/*"/>
+ <exclude name="**/.svn"/>
+ <exclude name="**/.svn/**/*"/>
+ <exclude name="**/build"/>
+ <exclude name="**/build/**/*"/>
+ <exclude name="**/.settings/**/*"/>
+ <exclude name="**/.classpath"/>
+ <exclude name="**/.project"/>
+ <exclude name="**/.wtpmodules"/>
+ <exclude name="**/surefire*"/>
+ <exclude name="**/cobertura.ser"/>
+ <exclude name="**/bin/*"/>
+ <exclude name="**/var/journal"/>
+ <exclude name="**/build.out*"/>
+ <exclude name="**/apache-tomcat-*.zip"/>
+ <exclude name="**/apache-tomcat-*.tar.gz"/>
+ </patternset>
+
+ <zip destfile="${target.dir}/../tuscany-incubating-M1-src.zip">
+ <zipfileset dir="${target.dir}/../../.."
prefix="tuscany-incubating-M1">
+ <patternset refid="exclusionList"/>
+ </zipfileset>
+ </zip>
+ <tar destfile="${target.dir}/../tuscany-incubating-M1-src.tar"
longfile="gnu">
+ <tarfileset dir="${target.dir}/../../.."
prefix="tuscany-incubating-M1">
+ <patternset refid="exclusionList"/>
+ </tarfileset>
+ </tar>
+ <gzip
zipfile="${target.dir}/../tuscany-incubating-M1-src-tar.gz"
src="${target.dir}/../tuscany-incubating-M1-src.tar" />
+
+ </target>
+
+</project>
