[Yanel-commits] rev 44536 - in public/yanel/trunk/src: build
build/resource-types build/targets build/targets/webapp test
guillaume at wyona.com
guillaume at wyona.com
Tue Sep 1 14:01:53 CEST 2009
Author: guillaume
Date: 2009-09-01 14:01:52 +0200 (Tue, 01 Sep 2009)
New Revision: 44536
Modified:
public/yanel/trunk/src/build/build.xml
public/yanel/trunk/src/build/resource-types/resource-type.build.xml
public/yanel/trunk/src/build/targets/build-artifacts.build.xml
public/yanel/trunk/src/build/targets/build-binary-snapshot.xml
public/yanel/trunk/src/build/targets/build-update-war.xml
public/yanel/trunk/src/build/targets/realms.xml
public/yanel/trunk/src/build/targets/resources.xml
public/yanel/trunk/src/build/targets/webapp/webapp.xml
public/yanel/trunk/src/test/build.xml
Log:
Small refactoring: in Yanel build system replaced "${yanel.version}-r${yanel.revision}" by "${yanel.source.version}" everywhere:
that should ease refactorings to compute the revision number from the working copy at some later point!
Issue: 5341
Modified: public/yanel/trunk/src/build/build.xml
===================================================================
--- public/yanel/trunk/src/build/build.xml 2009-09-01 10:21:28 UTC (rev 44535)
+++ public/yanel/trunk/src/build/build.xml 2009-09-01 12:01:52 UTC (rev 44536)
@@ -177,7 +177,7 @@
<equals arg1="${yanel.revision}" arg2="REVISION"/>
</condition>
</fail>
- <property name="snapshot.dir" value="${build.dir}/source-snapshots/wyona-yanel-${yanel.version}-r${yanel.revision}-src"/>
+ <property name="snapshot.dir" value="${build.dir}/source-snapshots/wyona-yanel-${yanel.source.version}-src"/>
<fail message="Directory already exists: '${snapshot.dir}'. Either delete this directory or use a different version/revision!">
<condition>
<available file="${snapshot.dir}" type="dir"/>
@@ -233,7 +233,7 @@
</replace>
<zip destfile="${snapshot.dir}.zip">
- <zipfileset dir="${snapshot.dir}" prefix="wyona-yanel-${yanel.version}-r${yanel.revision}-src" filemode="755"/>
+ <zipfileset dir="${snapshot.dir}" prefix="wyona-yanel-${yanel.source.version}-src" filemode="755"/>
</zip>
</target>
Modified: public/yanel/trunk/src/build/resource-types/resource-type.build.xml
===================================================================
--- public/yanel/trunk/src/build/resource-types/resource-type.build.xml 2009-09-01 10:21:28 UTC (rev 44535)
+++ public/yanel/trunk/src/build/resource-types/resource-type.build.xml 2009-09-01 12:01:52 UTC (rev 44536)
@@ -81,7 +81,7 @@
<copy file="${yanel.home}/src/build/resource-types/Eclipse-3.template.project" tofile="${resource.home.dir}/.project">
<filterset>
<filter token="RESOURCE_TYPE_NAME" value="${ant.project.name}"/>
- <filter token="YANEL_VERSION" value="${yanel.version}-r${yanel.revision}"/>
+ <filter token="YANEL_VERSION" value="${yanel.source.version}"/>
<filter token="GENERATION_COMMAND" value="build -f ${ant.file} eclipse"/>
<filter token="YANEL_BUILD_CLASSES_DIR_LINK" value="${eclipse.yanel.build.classes.dir.link}"/>
<filter token="YANEL_BUILD_CLASSES_DIR" value="${yanel.build.webapp.classes.dir}"/>
Modified: public/yanel/trunk/src/build/targets/build-artifacts.build.xml
===================================================================
--- public/yanel/trunk/src/build/targets/build-artifacts.build.xml 2009-09-01 10:21:28 UTC (rev 44535)
+++ public/yanel/trunk/src/build/targets/build-artifacts.build.xml 2009-09-01 12:01:52 UTC (rev 44536)
@@ -12,7 +12,7 @@
<sequential>
<mkdir dir="${yanel.source.home}/build/lib"/>
- <jar destfile="${yanel.source.home}/build/lib/yanel-@{id}-${yanel.version}-r${yanel.revision}.jar"
+ <jar destfile="${yanel.source.home}/build/lib/yanel-@{id}-${yanel.source.version}.jar"
basedir="@{classes-dir}"
includes="org/wyona/yanel/@{package-dir}/**"
>
@@ -20,12 +20,12 @@
</jar>
<copy file="${yanel.source.home}/src/build/pom-@{id}.xml" todir="${yanel.source.home}/build/lib"/>
- <replace file="${yanel.source.home}/build/lib/pom-@{id}.xml" value="${yanel.version}-r${yanel.revision}">
+ <replace file="${yanel.source.home}/build/lib/pom-@{id}.xml" value="${yanel.source.version}">
<replacetoken>@VERSION@</replacetoken>
</replace>
<mkdir dir="${yanel.source.home}/build/lib"/>
- <jar destfile="${yanel.source.home}/build/lib/yanel-@{id}-${yanel.version}-r${yanel.revision}-sources.jar"
+ <jar destfile="${yanel.source.home}/build/lib/yanel-@{id}-${yanel.source.version}-sources.jar"
basedir="@{sources-dir}"
includes="org/wyona/yanel/@{package-dir}/**"
>
@@ -34,9 +34,9 @@
<artifact:pom id="@{id}.project" file="${yanel.source.home}/build/lib/pom-@{id}.xml"/>
- <artifact:install file="${yanel.source.home}/build/lib/yanel-@{id}-${yanel.version}-r${yanel.revision}.jar">
+ <artifact:install file="${yanel.source.home}/build/lib/yanel-@{id}-${yanel.source.version}.jar">
<pom refid="@{id}.project"/>
- <attach file="${yanel.source.home}/build/lib/yanel-@{id}-${yanel.version}-r${yanel.revision}-sources.jar" classifier="sources"/>
+ <attach file="${yanel.source.home}/build/lib/yanel-@{id}-${yanel.source.version}-sources.jar" classifier="sources"/>
</artifact:install>
</sequential>
@@ -52,7 +52,7 @@
<sequential>
<mkdir dir="${yanel.source.home}/build/lib"/>
- <jar destfile="${yanel.source.home}/build/lib/wyona-@{id}-${yanel.version}-r${yanel.revision}.jar"
+ <jar destfile="${yanel.source.home}/build/lib/wyona-@{id}-${yanel.source.version}.jar"
basedir="@{classes-dir}"
includes="org/wyona/@{package-dir}/**"
>
@@ -60,12 +60,12 @@
</jar>
<copy file="${yanel.source.home}/src/build/pom-@{id}.xml" todir="${yanel.source.home}/build/lib"/>
- <replace file="${yanel.source.home}/build/lib/pom-@{id}.xml" value="${yanel.version}-r${yanel.revision}">
+ <replace file="${yanel.source.home}/build/lib/pom-@{id}.xml" value="${yanel.source.version}">
<replacetoken>@VERSION@</replacetoken>
</replace>
<mkdir dir="${yanel.source.home}/build/lib"/>
- <jar destfile="${yanel.source.home}/build/lib/wyona-@{id}-${yanel.version}-r${yanel.revision}-sources.jar"
+ <jar destfile="${yanel.source.home}/build/lib/wyona-@{id}-${yanel.source.version}-sources.jar"
basedir="@{sources-dir}"
includes="org/wyona/@{package-dir}/**"
>
@@ -74,9 +74,9 @@
<artifact:pom id="@{id}.project" file="${yanel.source.home}/build/lib/pom-@{id}.xml"/>
- <artifact:install file="${yanel.source.home}/build/lib/wyona-@{id}-${yanel.version}-r${yanel.revision}.jar">
+ <artifact:install file="${yanel.source.home}/build/lib/wyona-@{id}-${yanel.source.version}.jar">
<pom refid="@{id}.project"/>
- <attach file="${yanel.source.home}/build/lib/wyona-@{id}-${yanel.version}-r${yanel.revision}-sources.jar" classifier="sources"/>
+ <attach file="${yanel.source.home}/build/lib/wyona-@{id}-${yanel.source.version}-sources.jar" classifier="sources"/>
</artifact:install>
</sequential>
Modified: public/yanel/trunk/src/build/targets/build-binary-snapshot.xml
===================================================================
--- public/yanel/trunk/src/build/targets/build-binary-snapshot.xml 2009-09-01 10:21:28 UTC (rev 44535)
+++ public/yanel/trunk/src/build/targets/build-binary-snapshot.xml 2009-09-01 12:01:52 UTC (rev 44536)
@@ -12,7 +12,7 @@
</condition>
</fail>
- <property name="snapshot.dir.unix" value="${build.dir}/bin-snapshots/wyona-yanel-${yanel.version}-r${yanel.revision}-bin"/>
+ <property name="snapshot.dir.unix" value="${build.dir}/bin-snapshots/wyona-yanel-${yanel.source.version}-bin"/>
<fail message="Directory already exists: '${snapshot.dir.unix}'. Either delete this directory or use a different version/revision!">
<condition>
<available file="${snapshot.dir.unix}" type="dir"/>
@@ -20,7 +20,7 @@
</fail>
<mkdir dir="${snapshot.dir.unix}"/>
- <property name="snapshot.dir.win" value="${build.dir}/bin-snapshots/wyona-yanel-${yanel.version}-r${yanel.revision}-bin-win"/>
+ <property name="snapshot.dir.win" value="${build.dir}/bin-snapshots/wyona-yanel-${yanel.source.version}-bin-win"/>
<fail message="Directory already exists: '${snapshot.dir.win}'. Either delete this directory or use a different version/revision!">
<condition>
<available file="${snapshot.dir.win}" type="dir"/>
@@ -83,12 +83,12 @@
<delete dir="${snapshot.dir.unix}/apache-tomcat-${tomcat.version}/webapps/webdav"/>
<!-- Add context file -->
- <copy file="${yanel.source.home}/src/binary-dist/tomcat-context.xml" tofile="${snapshot.dir.unix}/apache-tomcat-${tomcat.version}/conf/Catalina/localhost/Wyona-Yanel-webapp-${yanel.version}-r${yanel.revision}.xml"/>
- <replace file="${snapshot.dir.unix}/apache-tomcat-${tomcat.version}/conf/Catalina/localhost/Wyona-Yanel-webapp-${yanel.version}-r${yanel.revision}.xml" value="yanel-webapp-${yanel.version}-r${yanel.revision}">
+ <copy file="${yanel.source.home}/src/binary-dist/tomcat-context.xml" tofile="${snapshot.dir.unix}/apache-tomcat-${tomcat.version}/conf/Catalina/localhost/Wyona-Yanel-webapp-${yanel.source.version}.xml"/>
+ <replace file="${snapshot.dir.unix}/apache-tomcat-${tomcat.version}/conf/Catalina/localhost/Wyona-Yanel-webapp-${yanel.source.version}.xml" value="yanel-webapp-${yanel.source.version}">
<replacetoken>@SERVLET_CONTEXT@</replacetoken>
</replace>
<copy file="${yanel.source.home}/src/binary-dist/tomcat-context.xml" tofile="${snapshot.dir.unix}/apache-tomcat-${tomcat.version}/conf/Catalina/localhost/ROOT.xml"/>
- <replace file="${snapshot.dir.unix}/apache-tomcat-${tomcat.version}/conf/Catalina/localhost/ROOT.xml" value="yanel-webapp-${yanel.version}-r${yanel.revision}">
+ <replace file="${snapshot.dir.unix}/apache-tomcat-${tomcat.version}/conf/Catalina/localhost/ROOT.xml" value="yanel-webapp-${yanel.source.version}">
<replacetoken>@SERVLET_CONTEXT@</replacetoken>
</replace>
</target>
@@ -151,7 +151,7 @@
</replace>
<copy file="${yanel.source.home}/src/binary-dist/log4j.properties" todir="${tmp.dir}/WEB-INF/classes" overwrite="true"/>
- <replace file="${tmp.dir}/WEB-INF/classes/log4j.properties" value="yanel-webapp-${yanel.version}-r${yanel.revision}">
+ <replace file="${tmp.dir}/WEB-INF/classes/log4j.properties" value="yanel-webapp-${yanel.source.version}">
<replacetoken>@SERVLET_CONTEXT@</replacetoken>
</replace>
<mkdir dir="${tmp.dir}/WEB-INF/logs"/>
@@ -174,7 +174,7 @@
<copy todir="${snapshot.dir.win}/apache-tomcat-${tomcat.version}">
<fileset dir="${snapshot.dir.unix}/apache-tomcat-${tomcat.version}" />
</copy>
- <copy todir="${snapshot.dir.win}/apache-tomcat-${tomcat.version}/webapps/yanel-webapp-${yanel.version}-r${yanel.revision}">
+ <copy todir="${snapshot.dir.win}/apache-tomcat-${tomcat.version}/webapps/yanel-webapp-${yanel.source.version}">
<fileset dir="${tmp.dir}"/>
</copy>
<!-- <move file="${snapshot.dir.unix}/${servlet.context.prefix}.war" todir="${snapshot.dir.win}/apache-tomcat-${tomcat.version}/webapps"/> -->
@@ -192,19 +192,19 @@
<copy file="${yanel.source.home}/src/binary-dist/windows/install.ico" todir="${snapshot.dir.win}"/>
<copy file="${yanel.source.home}/src/binary-dist/windows/uninstall.ico" todir="${snapshot.dir.win}"/>
<copy file="${yanel.source.home}/src/binary-dist/windows/install-yanel.nsi" todir="${snapshot.dir.win}"/>
- <replace file="${snapshot.dir.win}/install-yanel.nsi" value="${yanel.version}-r${yanel.revision}">
+ <replace file="${snapshot.dir.win}/install-yanel.nsi" value="${yanel.source.version}">
<replacetoken>@YANEL_VERSION@</replacetoken>
</replace>
<!-- Create ZIP file
<zip destfile="${snapshot.dir.unix}.zip">
- <zipfileset dir="${snapshot.dir.unix}" prefix="wyona-yanel-${yanel.version}-r${yanel.revision}-bin" filemode="755"/>
+ <zipfileset dir="${snapshot.dir.unix}" prefix="wyona-yanel-${yanel.source.version}-bin" filemode="755"/>
</zip>
-->
</target>
<target name="bin-snapshot-unix">
- <copy todir="${snapshot.dir.unix}/apache-tomcat-${tomcat.version}/webapps/yanel-webapp-${yanel.version}-r${yanel.revision}">
+ <copy todir="${snapshot.dir.unix}/apache-tomcat-${tomcat.version}/webapps/yanel-webapp-${yanel.source.version}">
<fileset dir="${tmp.dir}"/>
</copy>
@@ -219,7 +219,7 @@
<!-- Create TGZ file -->
<tar destfile="${snapshot.dir.unix}.tar.gz" compression="gzip" longfile="gnu"><!-- we need GNU tar, our filenames are too long and cannot reasonably be reduced to less than 100 characters -->
- <tarfileset dir="${snapshot.dir.unix}" prefix="wyona-yanel-${yanel.version}-r${yanel.revision}-bin" mode="775"/>
+ <tarfileset dir="${snapshot.dir.unix}" prefix="wyona-yanel-${yanel.source.version}-bin" mode="775"/>
</tar>
<!--gzip src="${snapshot.dir.unix}.tar" destfile="${snapshot.dir.unix}.tar.gz"/>
<delete file="${snapshot.dir.unix}.tar"/-->
Modified: public/yanel/trunk/src/build/targets/build-update-war.xml
===================================================================
--- public/yanel/trunk/src/build/targets/build-update-war.xml 2009-09-01 10:21:28 UTC (rev 44535)
+++ public/yanel/trunk/src/build/targets/build-update-war.xml 2009-09-01 12:01:52 UTC (rev 44536)
@@ -4,7 +4,7 @@
<target name="update-war" description="Create a war to update" depends="init, webapp">
<delete dir="${build.dir}/update-war"/>
- <property name="update.dir" value="${build.dir}/update-war/wyona-yanel-webapp-${yanel.version}-r${yanel.revision}"/>
+ <property name="update.dir" value="${build.dir}/update-war/wyona-yanel-webapp-${yanel.source.version}"/>
<mkdir dir="${update.dir}"/>
<copy todir="${update.dir}/${servlet.context.prefix}">
@@ -48,7 +48,7 @@
<replacetoken>../src/realms/welcome-admin/yanel/resources</replacetoken>
</replace>
<copy file="${yanel.source.home}/src/binary-dist/log4j.properties" todir="${update.dir}/${servlet.context.prefix}/WEB-INF/classes" overwrite="true"/>
- <replace file="${update.dir}/${servlet.context.prefix}/WEB-INF/classes/log4j.properties" value="wyona-yanel-webapp-${yanel.version}-r${yanel.revision}">
+ <replace file="${update.dir}/${servlet.context.prefix}/WEB-INF/classes/log4j.properties" value="wyona-yanel-webapp-${yanel.source.version}">
<replacetoken>@SERVLET_CONTEXT@</replacetoken>
</replace>
<mkdir dir="${update.dir}/${servlet.context.prefix}/WEB-INF/logs"/>
@@ -64,7 +64,7 @@
<replacetoken>@INSTALLTYPE@</replacetoken>
</replace>
- <jar jarfile="${build.dir}/update-war/wyona-yanel-webapp-${yanel.version}-r${yanel.revision}.war" basedir="${update.dir}/${servlet.context.prefix}"/>
+ <jar jarfile="${build.dir}/update-war/wyona-yanel-webapp-${yanel.source.version}.war" basedir="${update.dir}/${servlet.context.prefix}"/>
<delete dir="${update.dir}"/>
</target>
Modified: public/yanel/trunk/src/build/targets/realms.xml
===================================================================
--- public/yanel/trunk/src/build/targets/realms.xml 2009-09-01 10:21:28 UTC (rev 44535)
+++ public/yanel/trunk/src/build/targets/realms.xml 2009-09-01 12:01:52 UTC (rev 44536)
@@ -40,7 +40,7 @@
-->
<xslt in="${yanel.source.home}/conf/realms.xml" out="../../build/build-realms.xml" style="yanel2realms.xsl" force="false">
<param name="servlet.context.prefix" expression="${servlet.context.prefix}"/>
- <param name="yanel.source.version" expression="${yanel.version}-r${yanel.revision}"/>
+ <param name="yanel.source.version" expression="${yanel.source.version}"/>
<param name="yanel.source.home" expression="${yanel.source.home}"/>
<param name="maven.url" expression="${maven.url}"/>
</xslt>
@@ -57,7 +57,7 @@
-->
<xslt in="${local.config.home}/local.realms.xml" out="../../build/build-realms.xml" style="yanel2realms.xsl" force="true">
<param name="servlet.context.prefix" expression="${servlet.context.prefix}"/>
- <param name="yanel.source.version" expression="${yanel.version}-r${yanel.revision}"/>
+ <param name="yanel.source.version" expression="${yanel.source.version}"/>
<param name="yanel.source.home" expression="${yanel.source.home}"/>
<param name="maven.url" expression="${maven.url}"/>
</xslt>
Modified: public/yanel/trunk/src/build/targets/resources.xml
===================================================================
--- public/yanel/trunk/src/build/targets/resources.xml 2009-09-01 10:21:28 UTC (rev 44535)
+++ public/yanel/trunk/src/build/targets/resources.xml 2009-09-01 12:01:52 UTC (rev 44536)
@@ -79,7 +79,7 @@
<target name="generate-resources-build-file" description="Generate resources build file" depends="init">
<xslt in="${classes.dir}/resource-types.xml" out="../../build/build-resource-types.xml" style="yanel2resources.xsl" force="true">
<param name="servlet.context.prefix" expression="${servlet.context.prefix}"/>
- <param name="yanel.source.version" expression="${yanel.version}-r${yanel.revision}"/>
+ <param name="yanel.source.version" expression="${yanel.source.version}"/>
<param name="maven.url" expression="${maven.url}"/>
<param name="yanel.source.home" expression="${yanel.source.home.forward.slashes}"/>
<param name="copy.resource-type-configs.to.webapp" expression="${copy.resource-type-configs.to.webapp}"/>
Modified: public/yanel/trunk/src/build/targets/webapp/webapp.xml
===================================================================
--- public/yanel/trunk/src/build/targets/webapp/webapp.xml 2009-09-01 10:21:28 UTC (rev 44535)
+++ public/yanel/trunk/src/build/targets/webapp/webapp.xml 2009-09-01 12:01:52 UTC (rev 44536)
@@ -170,7 +170,7 @@
<copy file="${yanel.source.home}/src/build/resource-types/Eclipse-3.template.project" tofile="${yanel.source.home}/.project">
<filterset>
<filter token="RESOURCE_TYPE_NAME" value="yanel"/>
- <filter token="YANEL_VERSION" value="${yanel.version}-r${yanel.revision}"/>
+ <filter token="YANEL_VERSION" value="${yanel.source.version}"/>
<filter token="GENERATION_COMMAND" value="build eclipse"/>
</filterset>
</copy>
Modified: public/yanel/trunk/src/test/build.xml
===================================================================
--- public/yanel/trunk/src/test/build.xml 2009-09-01 10:21:28 UTC (rev 44535)
+++ public/yanel/trunk/src/test/build.xml 2009-09-01 12:01:52 UTC (rev 44536)
@@ -24,9 +24,7 @@
<property name="webapp.classes.dir" value="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes"/>
<property name="webapp.lib.dir" value="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib"/>
- <property name="yanel.source.version" value="${yanel.version}-r${yanel.revision}"/>
-
<import file="../build/targets/build-artifacts.build.xml"/>
<target name="init" depends="dependencies">
More information about the Yanel-commits
mailing list