You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2011/11/15 08:01:42 UTC
svn commit: r1202070 - in /commons/proper/daemon/trunk: build.xml
src/main/assembly/native-src.xml src/samples/Tomcat5.sh
src/samples/Tomcat7.sh
Author: mturk
Date: Tue Nov 15 07:01:42 2011
New Revision: 1202070
URL: http://svn.apache.org/viewvc?rev=1202070&view=rev
Log:
Axe tomcat sample scripts since they are now moved to tomcat repository and are part of tomcat distribution
Removed:
commons/proper/daemon/trunk/src/samples/Tomcat5.sh
commons/proper/daemon/trunk/src/samples/Tomcat7.sh
Modified:
commons/proper/daemon/trunk/build.xml
commons/proper/daemon/trunk/src/main/assembly/native-src.xml
Modified: commons/proper/daemon/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/build.xml?rev=1202070&r1=1202069&r2=1202070&view=diff
==============================================================================
--- commons/proper/daemon/trunk/build.xml (original)
+++ commons/proper/daemon/trunk/build.xml Tue Nov 15 07:01:42 2011
@@ -59,7 +59,7 @@
<property name="component.title" value="Java Daemons"/>
<!-- The current version number of this component -->
- <property name="component.version" value="1.0.7"/>
+ <property name="component.version" value="1.0.8"/>
<!-- The base directory for compilation targets -->
<property name="build.home" value="target"/>
@@ -239,10 +239,6 @@
-->
<fileset dir="src/native/unix" />
</copy>
- <copy file="src/samples/Tomcat5.sh"
- todir="${native.path}/unix/samples"/>
- <copy file="src/samples/Tomcat7.sh"
- todir="${native.path}/unix/samples"/>
<copy todir="${native.path}/windows">
<fileset dir="src/native/windows" />
</copy>
@@ -258,12 +254,10 @@
<include name="${native.name}/**" />
<exclude name="${native.name}/unix/configure" />
<exclude name="${native.name}/unix/support/*.sh" />
- <exclude name="${native.name}/unix/samples/*.sh" />
</tarfileset>
<tarfileset dir="${dist.home}/bin/native" mode="755">
<include name="${native.name}/unix/configure" />
<include name="${native.name}/unix/support/*.sh" />
- <include name="${native.name}/unix/samples/*.sh" />
</tarfileset>
</tar>
<zip zipfile="${dist.home}/bin/${native.name}.zip">
@@ -271,12 +265,10 @@
<include name="${native.name}/**" />
<exclude name="${native.name}/unix/configure" />
<exclude name="${native.name}/unix/support/*.sh" />
- <exclude name="${native.name}/unix/samples/*.sh" />
</zipfileset>
<zipfileset dir="${dist.home}/bin/native" filemode="755">
<include name="${native.name}/unix/configure" />
<include name="${native.name}/unix/support/*.sh" />
- <include name="${native.name}/unix/samples/*.sh" />
</zipfileset>
</zip>
Modified: commons/proper/daemon/trunk/src/main/assembly/native-src.xml
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/main/assembly/native-src.xml?rev=1202070&r1=1202069&r2=1202070&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/main/assembly/native-src.xml (original)
+++ commons/proper/daemon/trunk/src/main/assembly/native-src.xml Tue Nov 15 07:01:42 2011
@@ -54,16 +54,6 @@
</includes>
</fileSet>
<fileSet>
- <directory>src/samples</directory>
- <outputDirectory>unix/samples</outputDirectory>
- <lineEnding>lf</lineEnding>
- <fileMode>775</fileMode>
- <includes>
- <include>Tomcat5.sh</include>
- <include>Tomcat7.sh</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>src/native/windows</directory>
<outputDirectory>windows</outputDirectory>
<lineEnding>crlf</lineEnding>