You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@wookie.apache.org by ps...@apache.org on 2011/10/21 12:59:37 UTC
svn commit: r1187296 - in /incubator/wookie/branches/0.9.1:
ant/ivy-release-common.xml etc/release/runsignatures.bat ivy.xml
Author: psharples
Date: Fri Oct 21 10:59:37 2011
New Revision: 1187296
URL: http://svn.apache.org/viewvc?rev=1187296&view=rev
Log:
Modified build and version properties so everything is the same in each file
Modified:
incubator/wookie/branches/0.9.1/ant/ivy-release-common.xml
incubator/wookie/branches/0.9.1/etc/release/runsignatures.bat
incubator/wookie/branches/0.9.1/ivy.xml
Modified: incubator/wookie/branches/0.9.1/ant/ivy-release-common.xml
URL: http://svn.apache.org/viewvc/incubator/wookie/branches/0.9.1/ant/ivy-release-common.xml?rev=1187296&r1=1187295&r2=1187296&view=diff
==============================================================================
--- incubator/wookie/branches/0.9.1/ant/ivy-release-common.xml (original)
+++ incubator/wookie/branches/0.9.1/ant/ivy-release-common.xml Fri Oct 21 10:59:37 2011
@@ -24,17 +24,17 @@
<import file="ivy-webapp-common.xml" />
<tstamp />
- <property name="project.general.name" value="apache-wookie-${version}-incubating" />
+ <property name="project.general.name" value="apache-wookie-${version}" />
<property name="wookie.source.folder.name" value="wookie-source" />
<property name="wookie.war.folder.name" value="wookie-war" />
<property name="wookie.standalone.folder.name" value="Apache-Wookie" />
<property name="wookie.source.zip.name"
- value="apache-wookie-${version}-incubating-src" />
+ value="apache-wookie-${version}-src" />
<property name="wookie.standalone.zip.name"
- value="apache-wookie-${version}-incubating-standalone" />
+ value="apache-wookie-${version}-standalone" />
<property name="wookie.war.name"
- value="apache-wookie-${version}-incubating-war" />
+ value="apache-wookie-${version}-war" />
<property name="rat.install.version" value="0.7" />
<property name="rat.home" value="${user.home}/.ant" />
@@ -68,33 +68,33 @@
<target name="build-release-src" depends="init-rat">
<echo>Building source release</echo>
- <mkdir dir="${wookie.release.dir}/${version}-incubating/source" />
+ <mkdir dir="${wookie.release.dir}/${version}/source" />
<!-- run RAT report -->
- <rat:report reportFile="${wookie.release.dir}/${version}-incubating/source/rat-report.txt">
+ <rat:report reportFile="${wookie.release.dir}/${version}/source/rat-report.txt">
<fileset dir=".">
<includesFile name="./etc/release/src-build-include.txt" />
<excludesfile name="./licenses/rat-ignore.txt"/>
</fileset>
</rat:report>
- <zip destfile="${wookie.release.dir}/${version}-incubating/source/${wookie.source.zip.name}.zip"
+ <zip destfile="${wookie.release.dir}/${version}/source/${wookie.source.zip.name}.zip"
basedir="."
includesFile="./etc/release/src-build-include.txt"
/>
<!-- tar -->
- <tar destfile="${wookie.release.dir}/${version}-incubating/source/${wookie.source.zip.name}.tar.gz"
+ <tar destfile="${wookie.release.dir}/${version}/source/${wookie.source.zip.name}.tar.gz"
compression="gzip">
- <zipfileset src="${wookie.release.dir}/${version}-incubating/source/${wookie.source.zip.name}.zip" />
+ <zipfileset src="${wookie.release.dir}/${version}/source/${wookie.source.zip.name}.zip" />
</tar>
</target>
<target name="build-release-war" depends="init-rat,clean-build, compile-core, deploy-webapp, post-deploy-webapp">
<echo>Building war release</echo>
- <delete dir="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}" />
- <mkdir dir="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/scripts/" />
+ <delete dir="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}" />
+ <mkdir dir="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/scripts/" />
<!-- back the widgetserver.properties file up -->
<copy file="${build.dir}/webapp/wookie/WEB-INF/classes/widgetserver.properties"
@@ -124,7 +124,7 @@
<!-- build war file -->
<war
- destfile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/wookie.war"
+ destfile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/wookie.war"
webxml="${build.dir}/webapp/wookie/WEB-INF/web.xml">
<lib dir="${build.dir}/webapp/wookie/WEB-INF/lib">
<exclude name="derby-10.2.1.6.jar"/>
@@ -156,26 +156,26 @@
-->
<!-- copy sql scripts across -->
- <copy todir="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/scripts/">
+ <copy todir="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/scripts/">
<fileset dir="${build.dir}/classes/org/apache/wookie/beans/jpa/">
<include name="*.sql" />
</fileset>
</copy>
<!-- copy over project readme files-->
- <copy file="DISCLAIMER" tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/DISCLAIMER" overwrite="yes" />
- <copy file="etc/release/war/LICENSE" tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/LICENSE" overwrite="yes" />
- <copy file="README" tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/README" overwrite="yes" />
- <copy file="RELEASE_NOTES" tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/RELEASE_NOTES" overwrite="yes" />
- <copy file="NEW_AND_NOTEWORTHY" tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/NEW_AND_NOTEWORTHY" overwrite="yes" />
- <copy file="UPGRADING" tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/UPGRADING" overwrite="yes" />
+ <copy file="DISCLAIMER" tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/DISCLAIMER" overwrite="yes" />
+ <copy file="etc/release/war/LICENSE" tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/LICENSE" overwrite="yes" />
+ <copy file="README" tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/README" overwrite="yes" />
+ <copy file="RELEASE_NOTES" tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/RELEASE_NOTES" overwrite="yes" />
+ <copy file="NEW_AND_NOTEWORTHY" tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/NEW_AND_NOTEWORTHY" overwrite="yes" />
+ <copy file="UPGRADING" tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/UPGRADING" overwrite="yes" />
<!-- copy WAR readme-->
<copy file="etc/release/war/WAR_BUILD_NOTES"
- tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/WAR_BUILD_NOTES"
+ tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/WAR_BUILD_NOTES"
overwrite="yes" />
<!-- update context for mysql -->
- <copy file="${etc.dir}/tomcat/conf/jpa-context.xml" tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/${ant.project.name}.xml" overwrite="true">
+ <copy file="${etc.dir}/tomcat/conf/jpa-context.xml" tofile="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/${ant.project.name}.xml" overwrite="true">
<filterset>
<filter token="DATABASE_USER" value="java" />
<filter token="DATABASE_PASSWORD" value="java" />
@@ -185,35 +185,35 @@
</copy>
<!-- zip -->
- <zip destfile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.name}.zip" basedir="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/" update="true" />
+ <zip destfile="${wookie.release.dir}/${version}/binary/war/${wookie.war.name}.zip" basedir="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/" update="true" />
<!-- tar -->
- <tar destfile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.name}.tar.gz"
+ <tar destfile="${wookie.release.dir}/${version}/binary/war/${wookie.war.name}.tar.gz"
compression="gzip">
- <zipfileset src="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.name}.zip" />
+ <zipfileset src="${wookie.release.dir}/${version}/binary/war/${wookie.war.name}.zip" />
</tar>
<!-- run RAT report -->
- <rat:report reportFile="${wookie.release.dir}/${version}-incubating/binary/war/rat-report.txt">
- <fileset dir="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/">
+ <rat:report reportFile="${wookie.release.dir}/${version}/binary/war/rat-report.txt">
+ <fileset dir="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}/build/">
<excludesfile name="./licenses/rat-ignore.txt"/>
</fileset>
</rat:report>
<!-- clean up -->
- <delete dir="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}" />
+ <delete dir="${wookie.release.dir}/${version}/binary/war/${wookie.war.folder.name}" />
</target>
<target name="build-release-standalone" depends="init-rat, clean-build, compile-core, deploy-webapp, post-deploy-webapp">
<echo>Building standalone release</echo>
- <delete dir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}" />
- <mkdir dir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/build/" />
- <mkdir dir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/lib/" />
- <mkdir dir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/etc/" />
+ <delete dir="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}" />
+ <mkdir dir="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/build/" />
+ <mkdir dir="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/lib/" />
+ <mkdir dir="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/etc/" />
- <copy todir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/build/">
+ <copy todir="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/build/">
<fileset dir="${build.dir}/">
<exclude name="classes/" />
<exclude name="widgets/" />
@@ -221,42 +221,42 @@
</fileset>
</copy>
- <copy todir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/">
+ <copy todir="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/">
<fileset dir="etc/release/standalone/" />
</copy>
- <copy file="./etc/jetty-realm.properties" tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/etc/jetty-realm.properties" />
- <copy file="DISCLAIMER" tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/DISCLAIMER" overwrite="yes" />
- <!--<copy file="KEYS" tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/KEYS" overwrite="yes" />-->
- <copy file="README" tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/README" overwrite="yes" />
- <copy file="RELEASE_NOTES" tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/RELEASE_NOTES" overwrite="yes" />
- <copy file="NEW_AND_NOTEWORTHY" tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/NEW_AND_NOTEWORTHY" overwrite="yes" />
- <copy file="UPGRADING" tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/UPGRADING" overwrite="yes" />
- <copy file="etc/release/standalone/LICENSE" tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/LICENSE" overwrite="yes" />
+ <copy file="./etc/jetty-realm.properties" tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/etc/jetty-realm.properties" />
+ <copy file="DISCLAIMER" tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/DISCLAIMER" overwrite="yes" />
+ <!--<copy file="KEYS" tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/KEYS" overwrite="yes" />-->
+ <copy file="README" tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/README" overwrite="yes" />
+ <copy file="RELEASE_NOTES" tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/RELEASE_NOTES" overwrite="yes" />
+ <copy file="NEW_AND_NOTEWORTHY" tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/NEW_AND_NOTEWORTHY" overwrite="yes" />
+ <copy file="UPGRADING" tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/UPGRADING" overwrite="yes" />
+ <copy file="etc/release/standalone/LICENSE" tofile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/LICENSE" overwrite="yes" />
<ivy:retrieve conf="runtime"
- pattern="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/lib/[artifact]-[revision].[ext]" />
+ pattern="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/lib/[artifact]-[revision].[ext]" />
<!-- duplicate -->
- <delete file="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/lib/servlet-api-2.5.jar" />
+ <delete file="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}/lib/servlet-api-2.5.jar" />
<!-- run RAT report -->
- <rat:report reportFile="${wookie.release.dir}/${version}-incubating/binary/standalone/rat-report.txt">
- <fileset dir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}">
+ <rat:report reportFile="${wookie.release.dir}/${version}/binary/standalone/rat-report.txt">
+ <fileset dir="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}">
<excludesfile name="./licenses/rat-ignore.txt"/>
</fileset>
</rat:report>
- <zip destfile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.zip.name}.zip"
- basedir="${wookie.release.dir}/${version}-incubating/binary/standalone/" includes="${wookie.standalone.folder.name}/"
+ <zip destfile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.zip.name}.zip"
+ basedir="${wookie.release.dir}/${version}/binary/standalone/" includes="${wookie.standalone.folder.name}/"
update="true" />
- <tar destfile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.zip.name}.tar.gz"
+ <tar destfile="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.zip.name}.tar.gz"
compression="gzip">
- <zipfileset src="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.zip.name}.zip" />
+ <zipfileset src="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.zip.name}.zip" />
</tar>
- <delete dir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}" />
+ <delete dir="${wookie.release.dir}/${version}/binary/standalone/${wookie.standalone.folder.name}" />
</target>
<target name="add-extra-files" depends="">
Modified: incubator/wookie/branches/0.9.1/etc/release/runsignatures.bat
URL: http://svn.apache.org/viewvc/incubator/wookie/branches/0.9.1/etc/release/runsignatures.bat?rev=1187296&r1=1187295&r2=1187296&view=diff
==============================================================================
--- incubator/wookie/branches/0.9.1/etc/release/runsignatures.bat (original)
+++ incubator/wookie/branches/0.9.1/etc/release/runsignatures.bat Fri Oct 21 10:59:37 2011
@@ -11,17 +11,17 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF
rem See the License for the specific language governing permissions and
rem limitations under the License.
-set WOOKIE-VERSION=0.9.1
-set ROOT-FOLDER=%WOOKIE-VERSION%-incubating
+set WOOKIE-VERSION=0.9.1-incubating
+set ROOT-FOLDER=%WOOKIE-VERSION%
set SOURCE-FOLDER=source
-set SRC-BUILD-TAR=apache-wookie-%WOOKIE-VERSION%-incubating-src.tar.gz
-set SRC-BUILD-ZIP=apache-wookie-%WOOKIE-VERSION%-incubating-src.zip
+set SRC-BUILD-TAR=apache-wookie-%WOOKIE-VERSION%-src.tar.gz
+set SRC-BUILD-ZIP=apache-wookie-%WOOKIE-VERSION%-src.zip
set BINARY-FOLDER-STANDALONE=binary/standalone
-set BINARY-STANDALONE-TAR=apache-wookie-%WOOKIE-VERSION%-incubating-standalone.tar.gz
-set BINARY-STANDALONE-ZIP=apache-wookie-%WOOKIE-VERSION%-incubating-standalone.zip
+set BINARY-STANDALONE-TAR=apache-wookie-%WOOKIE-VERSION%-standalone.tar.gz
+set BINARY-STANDALONE-ZIP=apache-wookie-%WOOKIE-VERSION%-standalone.zip
set BINARY-FOLDER-WAR=binary/war
-set BINARY-WAR-TAR=apache-wookie-%WOOKIE-VERSION%-incubating-war.tar.gz
-set BINARY-WAR-ZIP=apache-wookie-%WOOKIE-VERSION%-incubating-war.zip
+set BINARY-WAR-TAR=apache-wookie-%WOOKIE-VERSION%-war.tar.gz
+set BINARY-WAR-ZIP=apache-wookie-%WOOKIE-VERSION%-war.zip
cd %ROOT-FOLDER%/%SOURCE-FOLDER%
gpg2 --armor --output %SRC-BUILD-TAR%.asc --detach-sig %SRC-BUILD-TAR%
Modified: incubator/wookie/branches/0.9.1/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/wookie/branches/0.9.1/ivy.xml?rev=1187296&r1=1187295&r2=1187296&view=diff
==============================================================================
--- incubator/wookie/branches/0.9.1/ivy.xml (original)
+++ incubator/wookie/branches/0.9.1/ivy.xml Fri Oct 21 10:59:37 2011
@@ -39,9 +39,9 @@
</publications>
<dependencies>
- <dependency org="org.apache.wookie" name="wookie-java-connector" rev="latest.integration" conf="deploy->default">
+ <dependency org="org.apache.wookie" name="wookie-java-connector" rev="0.9.1-incubating" conf="deploy->default">
</dependency>
- <dependency org="org.apache.wookie" name="wookie-parser" rev="latest.integration" conf="deploy->default">
+ <dependency org="org.apache.wookie" name="wookie-parser" rev="0.9.1-incubating" conf="deploy->default">
</dependency>
<!-- Uncomment to include JCR persistence manager -->