[Yanel-commits] rev 38123 - in public/yanel/trunk/src/build: .
targets
michi at wyona.com
michi at wyona.com
Tue Aug 19 16:28:51 CEST 2008
Author: michi
Date: 2008-08-19 16:28:50 +0200 (Tue, 19 Aug 2008)
New Revision: 38123
Removed:
public/yanel/trunk/src/build/continuous-integration.properties
public/yanel/trunk/src/build/continuous-integration.xml
Modified:
public/yanel/trunk/src/build/build.xml
public/yanel/trunk/src/build/targets/add-third-party-realm.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/check-conf-version.xml
public/yanel/trunk/src/build/targets/create-new-resource-type.xml
public/yanel/trunk/src/build/targets/execute-jmeter.xml
public/yanel/trunk/src/build/targets/install-tomcat.xml
Log:
import dedicated target files and cleanup of yanel source home property
Modified: public/yanel/trunk/src/build/build.xml
===================================================================
--- public/yanel/trunk/src/build/build.xml 2008-08-19 14:28:12 UTC (rev 38122)
+++ public/yanel/trunk/src/build/build.xml 2008-08-19 14:28:50 UTC (rev 38123)
@@ -18,7 +18,7 @@
<property file="local.build.properties"/>
<property file="build.properties"/>
-
+ <property name="yanel.source.home" value="${basedir}/../../"/>
<!--
<echo>Yanel Revision: ${yanel.revision}</echo>
-->
@@ -32,7 +32,7 @@
</condition>
<import file="dependencies.xml"/>
- <import file="continuous-integration.xml"/>
+ <import file="targets/continuous-integration/continuous-integration.xml"/>
<import file="targets/install-tomcat.xml"/>
<import file="targets/add-third-party-realm.xml"/>
<import file="targets/create-new-resource-type.xml"/>
@@ -40,207 +40,29 @@
<import file="targets/build-update-war.xml"/>
<import file="targets/execute-jmeter.xml"/>
<import file="targets/check-conf-version.xml"/>
+ <import file="targets/clean.xml"/>
+ <import file="targets/webapp/webapp.xml"/>
+ <import file="targets/webapp/cluster.xml"/>
+ <import file="targets/javadoc.xml"/>
+ <import file="targets/resources.xml"/>
+ <import file="targets/realms.xml"/>
+ <import file="targets/cmdl.xml"/>
+ <import file="targets/test.xml"/>
+ <import file="targets/config.xml"/>
- <target name="ask-to-reconfigure-tomcat-cluster-node1" description="reconfigure Tomcat cluster node 1" if="isTomcat1PortsSet">
- <input message="Do you want to reconfigure tomcat cluster node 1 in order to support SSL? (YES/no):" defaultvalue="NO" addproperty="answerReconfigureTomcat1"/>
- <condition property="doNotReconfigureTomcat1">
- <equals arg1="no" arg2="${answerReconfigureTomcat1}"/>
- </condition>
- <antcall target="reconfigure-tomcat-cluster-node1"/>
- <antcall target="comment-local-tomcat1-ports"/>
- </target>
-
- <target name="comment-local-tomcat1-ports" if="doNotReconfigureTomcat1" description="Comment ports of Tomcat Cluster Node 1 within local.build.properties">
- <replace file="${yanel.home.dir}/src/build/local.build.properties" value="#tomcat1.ssl.port=${tomcat1.ssl.port}">
- <replacetoken>tomcat1.ssl.port=8443</replacetoken>
-<!--
- <replacetoken>tomcat1.ssl.port=${tomcat1.ssl.port}</replacetoken>
--->
- </replace>
- <replace file="${yanel.home.dir}/src/build/local.build.properties" value="#tomcat1.http.port=${tomcat1.http.port}">
- <replacetoken>tomcat1.http.port=8080</replacetoken>
-<!--
- <replacetoken>tomcat1.http.port=${tomcat1.http.port}</replacetoken>
--->
- </replace>
- </target>
- <target name="reconfigure-tomcat-cluster-node1" unless="doNotReconfigureTomcat1" description="reconfigures tomcat regarding ssl">
- <!-- TODO: Ask the port numbers -->
-
-<!--
- <replace file="${yanel.home.dir}/src/build/local.build.properties" value="tomcat1.http.port=8080">
- <replacetoken>#tomcat1.http.port=9190</replacetoken>
- </replace>
- <replace file="${yanel.home.dir}/src/build/local.build.properties" value="tomcat1.ssl.port=8443">
- <replacetoken>#tomcat1.ssl.port=9143</replacetoken>
- </replace>
--->
-
- <antcall target="createCK"/>
- <copy file="${build.dir}/${certificate.keystore}" todir="${tomcat1.home.dir}"/>
- <xslt in="${tomcat1.home.dir}/conf/server.xml"
- out="${tomcat1.home.dir}/conf/server.xml.ssl"
- style="connector.xsl">
- <param name="ssl-port" expression="${tomcat1.ssl.port}"/>
- <param name="keystoreFile" expression="${certificate.keystore}"/>
- <param name="keystorePass" expression="${certificate.keypass}"/>
- <param name="http-port" expression="${tomcat1.http.port}"/>
- </xslt>
- <tstamp>
- <format property="timestamp" pattern="yyyyMMdd'T'HHmmss"/>
- </tstamp>
- <copy file="${tomcat1.home.dir}/conf/server.xml" tofile="${tomcat1.home.dir}/conf/server.xml.BAK_${timestamp}"/>
- <move file="${tomcat1.home.dir}/conf/server.xml.ssl" tofile="${tomcat1.home.dir}/conf/server.xml"/>
- </target>
-
- <target name="ask-to-reconfigure-tomcat-cluster-node2" description="reconfigure Tomcat cluster node 2" if="isTomcat2HomeSet">
- <input message="Do you want to reconfigure tomcat cluster node 2 in order to support SSL? (yes/NO):" defaultvalue="NO" addproperty="answerReconfigureTomcat2"/>
- <condition property="reconfigureTomcat2">
- <equals arg1="yes" arg2="${answerReconfigureTomcat2}"/>
- </condition>
- <antcall target="reconfigure-tomcat-cluster-node2"/>
- </target>
-
- <target name="reconfigure-tomcat-cluster-node2" if="reconfigureTomcat2" description="reconfigures tomcat regarding ssl">
- <antcall target="createCK"/>
- <copy file="${build.dir}/${certificate.keystore}" todir="${tomcat2.home.dir}"/>
- <xslt in="${tomcat2.home.dir}/conf/server.xml"
- out="${tomcat2.home.dir}/conf/server.xml.ssl"
- style="connector.xsl">
- <param name="ssl-port" expression="${tomcat2.ssl.port}"/>
- <param name="keystoreFile" expression="${certificate.keystore}"/>
- <param name="keystorePass" expression="${certificate.keypass}"/>
- <param name="http-port" expression="${tomcat2.http.port}"/>
- </xslt>
- <tstamp>
- <format property="timestamp" pattern="yyyyMMdd'T'HHmmss"/>
- </tstamp>
- <copy file="${tomcat2.home.dir}/conf/server.xml" tofile="${tomcat2.home.dir}/conf/server.xml.BAK_${timestamp}"/>
- <move file="${tomcat2.home.dir}/conf/server.xml.ssl" tofile="${tomcat2.home.dir}/conf/server.xml"/>
- </target>
-
- <target name="createCK" description="Add ssl configuration to your webserver">
- <!-- delete already created file -->
- <delete file="${build.dir}/${certificate.keystore}"/>
- <!-- create new keystore file -->
- <!-- IMPORT NOTE: In order to find keytool set: export PATH=/usr/local/jdk1.5.0_06/bin:$PATH (resp. depending on operating system use some other way to reset the PATH environment variable) -->
- <exec executable="keytool">
- <arg line="-genkey"/>
- <arg line="-alias"/>
- <arg value="${servlet.container}"/>
- <arg line="-keyalg"/>
- <arg value="RSA"/>
- <arg line="-storepass"/>
- <arg value="${certificate.keypass}"/>
- <arg line="-keypass"/>
- <arg value="${certificate.keypass}"/>
- <arg line="-keystore"/>
- <arg value="${build.dir}/${certificate.keystore}"/>
- <arg line="-dname"/>
- <arg value="CN=${certificate.common.name}, OU=${certificate.organisation.unit}, O=${certificate.organisation}, L=${certificate.locality.name}, S=${certificate.state.name}, C=${certificate.country.code}"/>
- </exec>
- </target>
-
- <target name="config" description="Initialize all local properties files" depends="init">
- <condition property="local.build.properties.does.not.exist.yet">
- <not>
- <available file="local.build.properties" type="file"/>
- </not>
- </condition>
- <antcall target="create-local-build-properties"/>
-
- <!-- Reload local.build.properties -->
- <property file="local.build.properties"/>
-
- <fail message="No such directory: ${tomcat1.home.dir}! You might have to delete src/build/local.build.properties and re-run configure.">
- <condition>
- <and>
- <isset property="tomcat1.home.dir"/>
- <not><available file="${tomcat1.home.dir}" type="dir"/></not>
- </and>
- </condition>
- </fail>
-
-<!--
- <echo>Tomcat Ports: ${tomcat1.ssl.port}, ${tomcat1.http.port}</echo>
--->
-
- <condition property="isTomcat1PortsSet">
- <and>
- <isset property="tomcat1.ssl.port"/>
- <isset property="tomcat1.http.port"/>
- </and>
- </condition>
- <antcall target="ask-to-reconfigure-tomcat-cluster-node1"/>
- <condition property="isTomcat2HomeSet">
- <isset property="tomcat2.home.dir"/>
- </condition>
- <antcall target="ask-to-reconfigure-tomcat-cluster-node2"/>
-
- <antcall target="first-time-user-configuration-message"/>
- <input message="Do you want to continue the configuration nevertheless? (yes/NO)" addproperty="answer" defaultvalue="NO"/>
-
- <condition property="yes.continue">
- <equals arg1="yes" arg2="${answer}"/>
- </condition>
- <antcall target="configure-local"/>
- </target>
-
- <target name="first-time-user-configuration-message">
- <echo>#################################################################################</echo>
- <echo># As a first time user one does NOT have to configure anything any further, but #</echo>
- <echo># rather exit here and just run build.sh on UNIX resp. build.bat on Windows! #</echo>
- <echo>#################################################################################</echo>
- </target>
-
- <target name="create-local-build-properties" if="local.build.properties.does.not.exist.yet" depends="init">
- <echo>Build configuration ${yanel.home.dir}/local.build.properties does not exist yet!</echo>
-
- <input message="Do you have an existing Tomcat instance which you want to use as servlet engine for Yanel? If so, please enter the path of your Tomcat instance (e.g. /home/yanel/jakarta-tomcat-5.0.30). IMPORTANT NOTE (especially for Windows): Please use '/' instead of '\' in the Tomcat path. Otherwise just hit return (recommended to first time users :-) and Tomcat ${tomcat.version} will be installed at ${default.tomcat.home.dir}. (You will always be able to change this setting at some later time within src/build/local.build.properties): " defaultvalue="${default.tomcat.home.dir.forward.slashes}" addproperty="pathOfUserSpecificTomcat"/>
-
- <echo>User specific Tomcat: ${pathOfUserSpecificTomcat}</echo>
-
- <copy file="${yanel.home.dir}/src/build/build.properties" tofile="${yanel.home.dir}/src/build/local.build.properties" overwrite="false"/>
- <replace file="${yanel.home.dir}/src/build/local.build.properties" value="tomcat1.home.dir=${pathOfUserSpecificTomcat}">
- <replacetoken>#tomcat1.home.dir=../tomcat-cluster/build/jakarta-tomcat-5.0.30-cnode1</replacetoken>
- </replace>
-
- <condition property="yes.install.default.tomcat">
- <equals arg1="${pathOfUserSpecificTomcat}" arg2="${default.tomcat.home.dir.forward.slashes}"/>
- </condition>
-
- <antcall target="install-default-tomcat"/>
- </target>
-
- <target name="configure-local" if="yes.continue">
- <echo>Will now create local properties files if these do not exist.</echo>
-
- <mkdir dir="${yanel.home.dir}/${local.config.dir}"/>
-
- <copy file="${yanel.home.dir}/conf/yanel.xml" tofile="${yanel.home.dir}/${local.config.dir}/local.yanel.xml" overwrite="false"/>
- <copy file="${yanel.home.dir}/conf/realms.xml" tofile="${yanel.home.dir}/${local.config.dir}/local.realms.xml" overwrite="false"/>
- <copy file="${yanel.home.dir}/conf/resource-types.xml" tofile="${yanel.home.dir}/${local.config.dir}/local.resource-types.xml" overwrite="false"/>
- <copy file="${yanel.home.dir}/conf/log4j.properties" tofile="${yanel.home.dir}/${local.config.dir}/local.log4j.properties" overwrite="false"/>
-
- <echo>Customize the ${local.config.dir}/local.* files and run build.sh OR run build.sh first and then customize the config files within build/webapps/yanel/WEB-INF/classes</echo>
- </target>
-
<target name="init" description="Initialize all parameters and other settings">
<echo>INFO: Building with ${ant.version} and Java version ${ant.java.version}</echo>
- <property name="yanel.home.dir" location="../../"/>
-<!--
- <echo>Yanel Home Dir: ${yanel.home.dir}</echo>
--->
- <path id="yanel.home.dir.ref">
- <pathelement location="${yanel.home.dir}"/>
+ <echo>Yanel Home Dir: ${yanel.source.home}</echo>
+ <path id="yanel.source.home.ref">
+ <pathelement location="${yanel.source.home}"/>
</path>
- <pathconvert targetos="unix" property="yanel.home.dir.forward.slashes" refid="yanel.home.dir.ref">
+ <pathconvert targetos="unix" property="yanel.source.home.forward.slashes" refid="yanel.source.home.ref">
</pathconvert>
- <property name="build.dir" location="${yanel.home.dir}/build"/>
+ <property name="build.dir" location="${yanel.source.home}/build"/>
<mkdir dir="${build.dir}"/>
<property name="classes.dir" location="${build.dir}/classes"/>
<property name="log4j.path" location="${build.dir}/logs"/>
@@ -256,9 +78,9 @@
-->
<!--
-<property name="default.tomcat.home.dir" value="${yanel.home.dir}/local/apache-tomcat-${tomcat.version}"/>
+<property name="default.tomcat.home.dir" value="${yanel.source.home}/local/apache-tomcat-${tomcat.version}"/>
-->
- <property name="default.tomcat.home.dir" location="${yanel.home.dir}/local/apache-tomcat-${tomcat.version}"/>
+ <property name="default.tomcat.home.dir" location="${yanel.source.home}/local/apache-tomcat-${tomcat.version}"/>
<path id="default.tomcat.home.dir.ref">
<pathelement location="${default.tomcat.home.dir}"/>
</path>
@@ -269,297 +91,97 @@
<echo>INFO: Set classpath ...</echo>
<path id="classpath.compile">
<!--
- <fileset dir="${yanel.home.dir}/lib">
+ <fileset dir="${yanel.source.home}/lib">
<include name="*.jar"/>
</fileset>
-->
<pathelement path="${maven2.cp}"/>
<pathelement path="${maven2.compile.cp}"/>
</path>
-
- <path id="classpath.cmdl">
- <pathelement path="${maven2.cp}"/>
- <pathelement path="${maven2.compile.cp}"/>
- </path>
</target>
- <target name="set-javadoc-classpath" description="Set javadoc classpath" depends="init, dependencies">
- <path id="classpath.javadoc">
- <pathelement path="${yanel.home.dir}/build/webapps/${servlet.context.prefix}/WEB-INF/classes"/>
- <fileset dir="${yanel.home.dir}/build/webapps/${servlet.context.prefix}/WEB-INF/lib">
- <include name="*.jar"/>
- </fileset>
-
- <pathelement path="${maven2.cp}"/>
- <pathelement path="${maven2.compile.cp}"/>
- </path>
- <property name="javadoc.cp" refid="classpath.javadoc"/>
- <echo>INFO: Classpath to generate Javadoc: ${javadoc.cp}</echo>
- </target>
-
- <target name="init-runtime" description="Initialize all parameters and other settings for runtime" depends="init, dependencies">
-<!--
- <target name="init-runtime" description="Initialize all parameters and other settings for runtime" depends="webapp">
--->
-
- <path id="classpath.run.cmdl">
- <!-- Properties files -->
- <pathelement path="${yanel.home.dir}/build/webapps/${servlet.context.prefix}/WEB-INF/classes"/>
-
- <!-- All from source generated libs -->
- <fileset dir="${yanel.home.dir}/build/webapps/${servlet.context.prefix}/WEB-INF/lib">
- <include name="*.jar"/>
- </fileset>
-
- <!-- All external dependencies -->
- <pathelement path="${maven2.cp}"/>
- <pathelement path="${maven2.compile.cp}"/>
- </path>
- <property name="run.cp" refid="classpath.run.cmdl"/>
-<!--
- <echo>Classpath to run yanel cmdl: ${run.cp}</echo>
--->
- </target>
-
<target name="compile-core" description="Compile Java classes of Yanel core" depends="init, set-classpath">
<mkdir dir="${classes.dir}"/>
- <javac srcdir="${yanel.home.dir}/src/core/java/org/wyona/yanel/core"
+ <javac srcdir="${yanel.source.home}/src/core/java/org/wyona/yanel/core"
destdir="${classes.dir}"
source="${source.java.version}"
target="${target.java.version}"
debug="true">
<classpath refid="classpath.compile"/>
</javac>
- <mkdir dir="${yanel.home.dir}/build/lib"/>
- <jar destfile="${yanel.home.dir}/build/lib/yanel-core-${yanel.version}-r${yanel.revision}.jar"
+ <mkdir dir="${yanel.source.home}/build/lib"/>
+ <jar destfile="${yanel.source.home}/build/lib/yanel-core-${yanel.version}-r${yanel.revision}.jar"
basedir="${classes.dir}"
includes="org/wyona/yanel/core/**"/>
- <copy file="${yanel.home.dir}/src/build/pom-core.xml" todir="${yanel.home.dir}/build/lib"/>
- <replace file="${yanel.home.dir}/build/lib/pom-core.xml" value="${yanel.version}-r${yanel.revision}">
+ <copy file="${yanel.source.home}/src/build/pom-core.xml" todir="${yanel.source.home}/build/lib"/>
+ <replace file="${yanel.source.home}/build/lib/pom-core.xml" value="${yanel.version}-r${yanel.revision}">
<replacetoken>@VERSION@</replacetoken>
</replace>
- <artifact:pom id="core.project" file="${yanel.home.dir}/build/lib/pom-core.xml"/>
+ <artifact:pom id="core.project" file="${yanel.source.home}/build/lib/pom-core.xml"/>
- <artifact:install file="${yanel.home.dir}/build/lib/yanel-core-${yanel.version}-r${yanel.revision}.jar">
+ <artifact:install file="${yanel.source.home}/build/lib/yanel-core-${yanel.version}-r${yanel.revision}.jar">
<pom refid="core.project"/>
</artifact:install>
</target>
<target name="compile-impl" description="Compile Java classes of Yanel implementation" depends="init">
<mkdir dir="${classes.dir}"/>
- <javac srcdir="${yanel.home.dir}/src/impl/java/org/wyona/yanel/impl" destdir="${classes.dir}" debug="true">
+ <javac srcdir="${yanel.source.home}/src/impl/java/org/wyona/yanel/impl" destdir="${classes.dir}" debug="true">
<classpath refid="classpath.compile"/>
</javac>
- <mkdir dir="${yanel.home.dir}/build/lib"/>
- <jar destfile="${yanel.home.dir}/build/lib/yanel-impl-${yanel.version}-r${yanel.revision}.jar"
+ <mkdir dir="${yanel.source.home}/build/lib"/>
+ <jar destfile="${yanel.source.home}/build/lib/yanel-impl-${yanel.version}-r${yanel.revision}.jar"
basedir="${classes.dir}"
includes="org/wyona/yanel/impl/**"/>
- <copy file="${yanel.home.dir}/src/build/pom-impl.xml" todir="${yanel.home.dir}/build/lib"/>
- <replace file="${yanel.home.dir}/build/lib/pom-impl.xml" value="${yanel.version}-r${yanel.revision}">
+ <copy file="${yanel.source.home}/src/build/pom-impl.xml" todir="${yanel.source.home}/build/lib"/>
+ <replace file="${yanel.source.home}/build/lib/pom-impl.xml" value="${yanel.version}-r${yanel.revision}">
<replacetoken>@VERSION@</replacetoken>
</replace>
- <artifact:pom id="impl.project" file="${yanel.home.dir}/build/lib/pom-impl.xml"/>
+ <artifact:pom id="impl.project" file="${yanel.source.home}/build/lib/pom-impl.xml"/>
- <artifact:install file="${yanel.home.dir}/build/lib/yanel-impl-${yanel.version}-r${yanel.revision}.jar">
+ <artifact:install file="${yanel.source.home}/build/lib/yanel-impl-${yanel.version}-r${yanel.revision}.jar">
<pom refid="impl.project"/>
</artifact:install>
</target>
- <target name="compile-cmdl" description="Compile Java classes of Yanel command line" depends="init, compile-core">
- <mkdir dir="${classes.dir}"/>
- <javac srcdir="${yanel.home.dir}/src/core/java/org/wyona/yanel/cmdl" destdir="${classes.dir}"
- debug="true"
- classpathref="classpath.cmdl"
- />
- <mkdir dir="${yanel.home.dir}/build/lib"/>
- <jar destfile="${yanel.home.dir}/build/lib/yanel-cmdl-${yanel.version}-r${yanel.revision}.jar"
- basedir="${classes.dir}"
- includes="org/wyona/yanel/cmdl/**"/>
- <copy file="${yanel.home.dir}/src/build/pom-cmdl.xml" tofile="${yanel.home.dir}/build/lib/pom-cmdl.xml"/>
- <replace file="${yanel.home.dir}/build/lib/pom-cmdl.xml" value="${yanel.version}-r${yanel.revision}">
- <replacetoken>@VERSION@</replacetoken>
- </replace>
-
- <artifact:pom id="cmdl.project" file="${yanel.home.dir}/build/lib/pom-cmdl.xml"/>
- <artifact:install file="${yanel.home.dir}/build/lib/yanel-cmdl-${yanel.version}-r${yanel.revision}.jar">
- <pom refid="cmdl.project"/>
- </artifact:install>
- </target>
-
- <target name="compile-webapp" description="Compile Java classes of Yanel webapp" depends="init, compile-core, compile-cmdl">
- <mkdir dir="${classes.dir}"/>
- <javac srcdir="${yanel.home.dir}/src/webapp/src/java/org/wyona/yanel/servlet" destdir="${classes.dir}"
- debug="true"
- classpathref="classpath.compile"
- />
- <mkdir dir="${yanel.home.dir}/build/lib"/>
- <jar destfile="${yanel.home.dir}/build/lib/yanel-webapp-${yanel.version}-r${yanel.revision}.jar"
- basedir="${classes.dir}"
- includes="org/wyona/yanel/servlet/**"/>
-
- <copy file="${yanel.home.dir}/src/build/pom-webapp.xml" todir="${yanel.home.dir}/build/lib"/>
- <replace file="${yanel.home.dir}/build/lib/pom-webapp.xml" value="${yanel.version}-r${yanel.revision}">
- <replacetoken>@VERSION@</replacetoken>
- </replace>
-
- <artifact:pom id="webapp.project" file="${yanel.home.dir}/build/lib/pom-webapp.xml"/>
-
- <artifact:install file="${yanel.home.dir}/build/lib/yanel-webapp-${yanel.version}-r${yanel.revision}.jar">
- <pom refid="webapp.project"/>
- </artifact:install>
- </target>
-
- <!-- TODO: Invoice depends on impl ...! -->
- <target name="webapp" description="Build webapp" depends="init, compile-core, compile-impl, compile-webapp, build-resources, build-realms">
-<!--
- <target name="webapp" description="Build webapp" depends="init, compile-webapp">
--->
- <mkdir dir="${build.dir}/webapps/${servlet.context.prefix}"/>
- <copy todir="${build.dir}/webapps/${servlet.context.prefix}">
- <fileset dir="${yanel.home.dir}/src/webapp">
- <exclude name="src/**"/>
- </fileset>
+ <target name="source-snapshot" description="Create a source code snapshot" depends="init, clean-all">
+ <delete dir="${build.dir}/source-snapshots"/>
+ <property name="snapshot.dir" value="${build.dir}/source-snapshots/wyona-yanel-SNAPSHOT-${yanel.version}-r${yanel.revision}-src"/>
+ <mkdir dir="${snapshot.dir}/src"/>
+ <copy file="${yanel.source.home}/README.txt" todir="${snapshot.dir}"/>
+ <copy file="${yanel.source.home}/configure.sh" todir="${snapshot.dir}"/>
+ <chmod file="${snapshot.dir}/configure.sh" perm="755"/>
+ <copy file="${yanel.source.home}/configure.bat" todir="${snapshot.dir}"/>
+ <copy file="${yanel.source.home}/build.sh" todir="${snapshot.dir}"/>
+ <chmod file="${snapshot.dir}/build.sh" perm="755"/>
+ <copy file="${yanel.source.home}/build.bat" todir="${snapshot.dir}"/>
+ <copy file="${yanel.source.home}/yanel.sh" todir="${snapshot.dir}"/>
+ <chmod file="${snapshot.dir}/yanel.sh" perm="755"/>
+ <copy file="${yanel.source.home}/yanel.bat" todir="${snapshot.dir}"/>
+ <copy todir="${snapshot.dir}/src">
+ <fileset dir="${yanel.source.home}/src" excludes="build/local.build.properties, contributions/resources/nutch/conf/nutch-local.xml"/>
</copy>
-
- <!-- TODO: Copy only core, impl, webapp, but NOT cmdl, etc. -->
- <copy todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib">
- <fileset dir="${yanel.home.dir}/build/lib"/>
+ <copy todir="${snapshot.dir}/tools">
+ <fileset dir="${yanel.source.home}/tools"/>
</copy>
-
- <antcall target="deploy-resources"/>
-
-<!--
- <copy todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes">
- <fileset dir="${yanel.home.dir}/lib">
- <include name="*.properties"/>
- <exclude name="local.*.properties"/>
- </fileset>
+ <chmod dir="${snapshot.dir}/tools/apache-ant-1.6.5/bin" perm="755" includes="*"/>
+ <copy todir="${snapshot.dir}/conf">
+ <fileset dir="${yanel.source.home}/conf" excludes="local/**"/>
</copy>
--->
- <copy file="${yanel.home.dir}/conf/CatalogManager.properties" todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes" overwrite="false"/>
- <copy file="${yanel.home.dir}/conf/catalog.xml" todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes" overwrite="false"/>
- <copy todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/entities" overwrite="false">
- <fileset dir="${yanel.home.dir}/conf/entities"/>
- </copy>
-
- <copy file="${yanel.home.dir}/conf/spring-yanel-config.xml" todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes" overwrite="false"/>
- <copy file="${yanel.home.dir}/conf/realms.xml" todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes" overwrite="false"/>
- <copy file="${yanel.home.dir}/conf/log4j.properties" todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes" overwrite="false"/>
- <!-- Create yanel.xml -->
- <condition property="local.yanel.config.exists">
- <available file="${yanel.home.dir}/${local.config.dir}/local.yanel.xml" type="file"/>
- </condition>
- <antcall target="generate-yanel-properties"/>
-
- <condition property="local.resource-types.config.exists">
- <available file="${yanel.home.dir}/${local.config.dir}/local.resource-types.xml" type="file"/>
- </condition>
- <antcall target="generate-resource-types-registry"/>
-
- <antcall target="check-config-version"/>
-
- <!-- Overwrite default by local properties -->
- <!-- TODO: Make the patching selectable within the build.properties of the build ... -->
- <copy file="${yanel.home.dir}/${local.config.dir}/local.log4j.properties" tofile="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/log4j.properties" overwrite="true" failonerror="false"/>
- <copy file="${yanel.home.dir}/${local.config.dir}/local.realms.xml" tofile="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/realms.xml" overwrite="true" failonerror="false"/>
- <antcall target="patch-with-local-yanel-config"/>
- <antcall target="patch-with-local-resource-types-registry"/>
-
-
- <!-- Patch properties ... -->
-
- <replace file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/yanel.xml" value="${yanel.home.dir.forward.slashes}">
- <replacetoken>..</replacetoken>
- </replace>
-
- <replace file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/realms.xml" value="${yanel.home.dir.forward.slashes}/src/realms">
- <replacetoken>@REALMS_DIR@</replacetoken>
- </replace>
-
- <replace file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/resource-types.xml" value="${yanel.home.dir.forward.slashes}">
- <replacetoken>@YANEL_SRC_DIR@</replacetoken>
- </replace>
-
- <!-- DEPRECATED -->
- <replace file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/resource-types.xml" value="${yanel.home.dir.forward.slashes}/src">
- <replacetoken>../src</replacetoken>
- </replace>
- <!-- /DEPRECATED -->
-
- <xslt in="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/resource-types.xml" out="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/resource-types.xml-OUT" style="fix-resources-src.xsl" force="true">
- </xslt>
- <move file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/resource-types.xml-OUT" tofile="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/resource-types.xml"/>
-
- <copy file="${yanel.home.dir}/src/build/install.rdf" todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes" overwrite="true"/>
- <replace file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/install.rdf" value="${yanel.version}">
- <replacetoken>@VERSION@</replacetoken>
- </replace>
- <replace file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/install.rdf" value="${yanel.revision}">
- <replacetoken>@REVISION@</replacetoken>
- </replace>
- <replace file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/install.rdf" value="source">
- <replacetoken>@INSTALLTYPE@</replacetoken>
- </replace>
-
- <replace file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/log4j.properties" value="${log4j.file.forward.slashes}">
- <replacetoken>@LOG4J_FILE@</replacetoken>
- </replace>
- <touch file="${log4j.file}"/>
-
- <copy todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib">
- <fileset refid="maven2.fileset"/>
- <mapper type="flatten"/>
- </copy>
-
- <!-- TODO: So far only the javadoc of the core is being built -->
- <condition property="javadoc-does-not-exist-yet">
- <not>
- <available file="${build.dir}/javadoc" type="dir"/>
- </not>
- </condition>
- <antcall target="generate-javadoc"/>
-
- <ant antfile="${yanel.home.dir}/build/build-resource-types.xml" target="copy-resources-dependencies"/>
-
- <antcall target="deploy-libs-of-realms"/>
+ <zip destfile="${build.dir}/source-snapshots/wyona-yanel-SNAPSHOT-${yanel.version}-r${yanel.revision}-src.zip">
+ <zipfileset dir="${build.dir}/source-snapshots/wyona-yanel-SNAPSHOT-${yanel.version}-r${yanel.revision}-src" prefix="wyona-yanel-SNAPSHOT-${yanel.version}-r${yanel.revision}-src" filemode="755"/>
+ </zip>
</target>
-
- <target name="war" description="Build war file" depends="init, webapp">
- <jar jarfile="${yanel.home.dir}/build/webapps/${servlet.context.prefix}.war" basedir="${yanel.home.dir}/build/webapps/${servlet.context.prefix}"/>
- </target>
-
- <target name="deploy" description="Deploy war file" depends="init, webapp">
- <condition property="property-tomcat-cluster-node1-is-set">
- <isset property="tomcat1.home.dir"/>
- </condition>
- <condition property="property-tomcat1-ssl-port-is-set">
- <isset property="tomcat1.ssl.port"/>
- </condition>
- <antcall target="deploy-to-tomcat-cluster-node1"/>
-
- <condition property="property-tomcat-cluster-node2-is-set">
- <isset property="tomcat2.home.dir"/>
- </condition>
- <condition property="property-tomcat2-ssl-port-is-set">
- <isset property="tomcat2.ssl.port"/>
- </condition>
- <antcall target="deploy-to-tomcat-cluster-node2"/>
-
- <antcall target="final-message"/>
- </target>
-
- <target name="final-message">
- <antcall target="final-message-windows"/>
- <antcall target="final-message-unix"/>
- </target>
- <target name="final-message-windows" if="isWindows">
+ <target name="final-message">
+ <echo/>
+ <echo/>
<echo message="*****************************************************************"/>
<echo message="*"/>
<echo message="* You have successfully built Yanel ${yanel.version} (Revision ${yanel.revision})"/>
@@ -567,7 +189,18 @@
<echo message="*"/>
<echo message="* Start using Yanel by typing"/>
<echo message="*"/>
- <echo message="* Tomcat: yanel start"/>
+ <if>
+ <equals arg1="${isWindows}" arg2="true" />
+ <then>
+ <echo message="* Tomcat: yanel start"/>
+ </then>
+ </if>
+ <if>
+ <equals arg1="${isUnix}" arg2="true" />
+ <then>
+ <echo message="* Tomcat: ./yanel.sh start"/>
+ </then>
+ </if>
<echo message="*"/>
<echo message="* and browse to "/>
<echo message="*"/>
@@ -585,528 +218,5 @@
<echo message="*"/>
<echo message="*****************************************************************"/>
</target>
-
- <target name="final-message-unix" if="isUnix">
- <echo message="*****************************************************************"/>
- <echo message="*"/>
- <echo message="* You have successfully built Yanel ${yanel.version} (Revision ${yanel.revision})"/>
- <echo message="*"/>
- <echo message="*"/>
- <echo message="* Start using Yanel by typing"/>
- <echo message="*"/>
- <echo message="* Tomcat: ./yanel.sh start"/>
- <echo message="*"/>
- <echo message="* and browse to "/>
- <echo message="*"/>
- <!-- TODO: Differentiate between ROOT context and regular context prefix! -->
- <echo message="* http://127.0.0.1:8080/${servlet.context.prefix}/"/>
- <echo message="*"/>
-<!-- TODO: Make Jetty available! -->
-<!--
- <echo message="* Jetty: ./yanel.sh start-jetty"/>
- <echo message="*"/>
- <echo message="* and browse to "/>
- <echo message="*"/>
- <echo message="* http://127.0.0.1:8888"/>
--->
- <echo message="*"/>
- <echo message="* Thanks for using Yanel"/>
- <echo message="*"/>
- <echo message="*****************************************************************"/>
- </target>
-
-
- <target name="deploy-to-tomcat-cluster-node1" if="property-tomcat-cluster-node1-is-set" description="Deploy webapp to Tomcat cluster node 1">
- <echo>Copy webapp (${tomcat1.webapps.dir}):</echo>
-
- <fail message="No such directory: ${tomcat1.webapps.dir}">
- <condition><not><available file="${tomcat1.webapps.dir}"/></not></condition>
- </fail>
-
- <copy todir="${tomcat1.webapps.dir}/${servlet.context.prefix}">
- <fileset dir="${yanel.home.dir}/build/webapps/${servlet.context.prefix}"/>
- </copy>
-
- <replace file="${tomcat1.webapps.dir}/${servlet.context.prefix}/WEB-INF/classes/log4j.properties" value="log4j-cnode1.log">
- <replacetoken>log4j-cmdl.log</replacetoken>
- </replace>
- <touch file="${log4j.path}/log4j-cnode1.log"/>
-
- <antcall target="patch-tomcat-cluster-node-1-ssl-port"/>
-
- <condition property="endorsed-xerces-at-node1-does-not-exist-yet">
- <not>
- <available file="${tomcat1.home.dir}/common/endorsed/${xerces.impl.artifactId}-${xerces.impl.version}.jar"/>
- </not>
- </condition>
- <antcall target="ask-to-copy-endorsed-xerces-to-node1"/>
-
- <condition property="ask-to-copy-endorsed-xml-apis-to-node1">
- <not>
- <available file="${tomcat1.home.dir}/common/endorsed/${xml.apis.artifactId}-${xml.apis.version}.jar"/>
- </not>
- </condition>
- <antcall target="ask-to-copy-endorsed-xml-apis-to-node1"/>
-
- <condition property="endorsed-xalan-at-node1-does-not-exist-yet">
- <not>
- <available file="${tomcat1.home.dir}/common/endorsed/${xalan.artifactId}-${xalan.version}.jar"/>
- </not>
- </condition>
- <antcall target="ask-to-copy-endorsed-xalan-to-node1"/>
-
- </target>
-
- <target name="patch-tomcat-cluster-node-1-ssl-port" if="property-tomcat1-ssl-port-is-set">
- <echo>ssl port for tomcat is set</echo>
- <xslt in="${tomcat1.home.dir}/webapps/${servlet.context.prefix}/WEB-INF/web.xml"
- out="${tomcat1.home.dir}/webapps/${servlet.context.prefix}/WEB-INF/web.xml.tmp"
- style="add-ssl-port.xsl">
- <param name="ssl-port" expression="${tomcat1.ssl.port}"/>
- </xslt>
- <move file="${tomcat1.home.dir}/webapps/${servlet.context.prefix}/WEB-INF/web.xml.tmp" tofile="${tomcat1.home.dir}/webapps/${servlet.context.prefix}/WEB-INF/web.xml"/>
- </target>
-
- <target name="patch-tomcat-cluster-node-2-ssl-port" if="property-tomcat2-ssl-port-is-set">
- <xslt in="${tomcat2.home.dir}/webapps/${servlet.context.prefix}/WEB-INF/web.xml"
- out="${tomcat2.home.dir}/webapps/${servlet.context.prefix}/WEB-INF/web.xml.tmp"
- style="add-ssl-port.xsl">
- <param name="ssl-port" expression="${tomcat2.ssl.port}"/>
- </xslt>
- <move file="${tomcat2.home.dir}/webapps/${servlet.context.prefix}/WEB-INF/web.xml.tmp" tofile="${tomcat2.home.dir}/webapps/${servlet.context.prefix}/WEB-INF/web.xml"/>
- </target>
-
-
- <target name="deploy-to-tomcat-cluster-node2" if="property-tomcat-cluster-node2-is-set" description="Deploy webapp to Tomcat cluster node 2">
- <echo>Copy webapp (${tomcat2.webapps.dir}):</echo>
-
- <fail message="No such directory: ${tomcat2.webapps.dir}">
- <condition><not><available file="${tomcat2.webapps.dir}"/></not></condition>
- </fail>
-
- <copy todir="${tomcat2.webapps.dir}/${servlet.context.prefix}">
- <fileset dir="${yanel.home.dir}/build/webapps/${servlet.context.prefix}"/>
- </copy>
-
- <replace file="${tomcat2.webapps.dir}/${servlet.context.prefix}/WEB-INF/classes/log4j.properties" value="log4j-cnode2.log">
- <replacetoken>log4j-cmdl.log</replacetoken>
- </replace>
- <touch file="${log4j.path}/log4j-cnode2.log"/>
-
- <antcall target="patch-tomcat-cluster-node-2-ssl-port"/>
-
- <condition property="endorsed-xerces-at-node2-does-not-exist-yet">
- <not>
- <available file="${tomcat2.home.dir}/common/endorsed/${xerces.impl.artifactId}-${xerces.impl.version}.jar"/>
- </not>
- </condition>
- <antcall target="ask-to-copy-endorsed-xerces-node2"/>
-
- <condition property="ask-to-copy-endorsed-xml-apis-node2">
- <not>
- <available file="${tomcat2.home.dir}/common/endorsed/${xml.apis.artifactId}-${xml.apis.version}.jar"/>
- </not>
- </condition>
- <antcall target="ask-to-copy-endorsed-xml-apis-node2"/>
-
- <condition property="endorsed-xalan-at-node2-does-not-exist-yet">
- <not>
- <available file="${tomcat2.home.dir}/common/endorsed/${xalan.artifactId}-${xalan.version}.jar"/>
- </not>
- </condition>
- <antcall target="ask-to-copy-endorsed-xalan-to-node2"/>
- </target>
-
- <target name="ask-to-copy-endorsed-xerces-to-node1" if="endorsed-xerces-at-node1-does-not-exist-yet">
- <echo>IMPORTANT: Please note that your Tomcat might already contain an endorsed xerces library at '${tomcat1.home.dir}/common/endorsed/'. Please make sure to resolve any conflicts!</echo>
- <input message="Endorsed lib is missing (${tomcat1.home.dir}/common/endorsed/${xerces.impl.artifactId}-${xerces.impl.version}.jar). Do you want it to be added? (YES/no):" addproperty="answer"/>
- <condition property="do-not-copy-endorsed-xerces-to-node1">
- <equals arg1="no" arg2="${answer}"/>
- </condition>
- <antcall target="do-copy-endorsed-xerces-to-node1"/>
- </target>
-
- <target name="ask-to-copy-endorsed-xml-apis-to-node1" if="ask-to-copy-endorsed-xml-apis-to-node1">
- <echo>IMPORTANT: Please note that your Tomcat might already contain an endorsed xml api library at '${tomcat1.home.dir}/common/endorsed/'. Please make sure to resolve any conflicts!</echo>
- <input message="Endorsed lib is missing (${tomcat1.home.dir}/common/endorsed/${xml.apis.artifactId}-${xml.apis.version}.jar). Do you want it to be added? (YES/no):" addproperty="answer"/>
- <condition property="do-not-copy-endorsed-xml-apis-to-node1">
- <equals arg1="no" arg2="${answer}"/>
- </condition>
- <antcall target="do-copy-endorsed-xml-apis-to-node1"/>
- </target>
-
- <target name="ask-to-copy-endorsed-xalan-to-node1" if="endorsed-xalan-at-node1-does-not-exist-yet">
- <echo>IMPORTANT: Please note that your Tomcat might already contain an endorsed xalan library at '${tomcat1.home.dir}/common/endorsed/'. Please make sure to resolve any conflicts!</echo>
- <input message="Endorsed lib is missing (${tomcat1.home.dir}/common/endorsed/${xalan.artifactId}-${xalan.version}.jar). Do you want it to be added? (YES/no):" addproperty="answer"/>
- <condition property="do-not-copy-endorsed-xalan-to-node1">
- <equals arg1="no" arg2="${answer}"/>
- </condition>
- <antcall target="do-copy-endorsed-xalan-to-node1"/>
- </target>
-
- <target name="ask-to-copy-endorsed-xalan-to-node2" if="endorsed-xalan-at-node2-does-not-exist-yet">
- <echo>IMPORTANT: Please note that your Tomcat might already contain an endorsed xalan library at '${tomcat2.home.dir}/common/endorsed/'. Please make sure to resolve any conflicts!</echo>
- <input message="Endorsed lib is missing (${tomcat2.home.dir}/common/endorsed/${xalan.artifactId}-${xalan.version}.jar). Do you want it to be added? (YES/no):" addproperty="answer"/>
- <condition property="do-not-copy-endorsed-xalan-to-node2">
- <equals arg1="no" arg2="${answer}"/>
- </condition>
- <antcall target="do-copy-endorsed-xalan-to-node2"/>
- </target>
-
- <target name="do-copy-endorsed-xerces-to-node1" unless="do-not-copy-endorsed-xerces-to-node1">
- <copy file="${yanel.home.dir}/build/webapps/${servlet.context.prefix}/WEB-INF/lib/${xerces.impl.artifactId}-${xerces.impl.version}.jar" todir="${tomcat1.home.dir}/common/endorsed" overwrite="false"/>
- </target>
-
- <target name="do-copy-endorsed-xml-apis-to-node1" unless="do-not-copy-endorsed-xml-apis-to-node1">
- <copy file="${yanel.home.dir}/build/webapps/${servlet.context.prefix}/WEB-INF/lib/${xml.apis.artifactId}-${xml.apis.version}.jar" todir="${tomcat1.home.dir}/common/endorsed" overwrite="false"/>
- </target>
-
- <target name="do-copy-endorsed-xalan-to-node1" unless="do-not-copy-endorsed-xalan-to-node1">
- <copy file="${yanel.home.dir}/build/webapps/${servlet.context.prefix}/WEB-INF/lib/${xalan.artifactId}-${xalan.version}.jar" todir="${tomcat1.home.dir}/common/endorsed" overwrite="false"/>
- </target>
-
- <target name="do-copy-endorsed-xalan-to-node2" unless="do-not-copy-endorsed-xalan-to-node2">
- <copy file="${yanel.home.dir}/build/webapps/${servlet.context.prefix}/WEB-INF/lib/${xalan.artifactId}-${xalan.version}.jar" todir="${tomcat2.home.dir}/common/endorsed" overwrite="false"/>
- </target>
-
- <target name="ask-to-copy-endorsed-xerces-node2" if="endorsed-xerces-at-node2-does-not-exist-yet">
- <echo>IMPORTANT: Please note that your Tomcat might already contain an endorsed xerces library at '${tomcat2.home.dir}/common/endorsed/'. Please make sure to resolve any conflicts!</echo>
- <input message="Endorsed lib is missing (${tomcat2.home.dir}/common/endorsed/${xerces.impl.artifactId}-${xerces.impl.version}.jar). Do you want it to be added? (YES/no):" addproperty="answer"/>
- <condition property="do-not-copy-endorsed-xerces-to-node2">
- <equals arg1="no" arg2="${answer}"/>
- </condition>
-
- <antcall target="do-copy-endorsed-xerces-to-node2"/>
- </target>
-
- <target name="do-copy-endorsed-xerces-to-node2" unless="do-not-copy-endorsed-xerces-to-node2">
- <copy file="${yanel.home.dir}/build/webapps/${servlet.context.prefix}/WEB-INF/lib/${xerces.impl.artifactId}-${xerces.impl.version}.jar" todir="${tomcat2.home.dir}/common/endorsed" overwrite="false"/>
- <echo>INFO: ${xerces.impl.artifactId}-${xerces.impl.version}.jar has been copied!</echo>
- </target>
-
- <target name="ask-to-copy-endorsed-xml-apis-node2" if="ask-to-copy-endorsed-xml-apis-node2">
- <echo>IMPORTANT: Please note that your Tomcat might already contain an endorsed xml api library at '${tomcat2.home.dir}/common/endorsed/'. Please make sure to resolve any conflicts!</echo>
- <input message="Endorsed lib is missing (${tomcat2.home.dir}/common/endorsed/${xml.apis.artifactId}-${xml.apis.version}.jar). Do you want it to be added? (YES/no):" addproperty="answer"/>
- <condition property="do-not-copy-endorsed-xml-apis-to-node2">
- <equals arg1="no" arg2="${answer}"/>
- </condition>
-
- <antcall target="do-copy-endorsed-xml-apis-to-node2"/>
- </target>
-
- <target name="do-copy-endorsed-xml-apis-to-node2" unless="do-not-copy-endorsed-xml-apis-to-node2">
- <copy file="${yanel.home.dir}/build/webapps/${servlet.context.prefix}/WEB-INF/lib/${xml.apis.artifactId}-${xml.apis.version}.jar" todir="${tomcat2.home.dir}/common/endorsed" overwrite="false"/>
- <echo>INFO: ${xml.apis.artifactId}-${xml.apis.version}.jar has been copied!</echo>
- </target>
-
- <target name="clean" description="Clean build" depends="init, clean-resources, clean-realms">
- <echo>INFO: Clean build</echo>
- <delete includeemptydirs="true">
- <fileset dir="${build.dir}" excludes="logs/**, javadoc/**"/>
- </delete>
-
- <!-- Jetty target -->
- <delete dir="${yanel.home.dir}/src/build/target"/>
-
- <condition property="yes-delete-tomcat-cluster-node1">
- <and>
- <isset property="tomcat1.home.dir"/>
- <available file="${tomcat1.webapps.dir}/${servlet.context.prefix}" type="dir"/>
- <istrue value="${force-clean}"/>
- </and>
- </condition>
- <antcall target="do-clean-tomcat-cluster-node1"/>
-
- <condition property="property-tomcat-cluster-node1-is-set">
- <and>
- <isset property="tomcat1.home.dir"/>
- <available file="${tomcat1.webapps.dir}/${servlet.context.prefix}" type="dir"/>
- </and>
- </condition>
- <antcall target="ask-to-clean-tomcat-cluster-node1"/>
-
-
- <condition property="yes-delete-tomcat-cluster-node2">
- <and>
- <isset property="tomcat1.home.dir"/>
- <available file="${tomcat1.webapps.dir}/${servlet.context.prefix}" type="dir"/>
- <istrue value="${force-clean}"/>
- </and>
- </condition>
- <antcall target="do-clean-tomcat-cluster-node2"/>
-
- <condition property="property-tomcat-cluster-node2-is-set">
- <and>
- <isset property="tomcat2.home.dir"/>
- <available file="${tomcat2.webapps.dir}/${servlet.context.prefix}" type="dir"/>
- </and>
- </condition>
- <antcall target="ask-to-clean-tomcat-cluster-node2"/>
- </target>
-
- <target name="clean-all" description="Clean All (including local configuration!)" depends="init, clean">
- <delete dir="${build.dir}"/>
- <delete dir="${yanel.home.dir}/local"/>
-
- <!-- Jetty target -->
- <delete dir="${yanel.home.dir}/src/build/target"/>
-
- <condition property="local.build.properties.exists">
- <available file="${yanel.home.dir}/src/build/local.build.properties" type="file"/>
- </condition>
- <antcall target="ask-if-local-build-properties-shall-be-deleted"/>
-
- <condition property="local.config.dir.exists">
- <available file="${yanel.home.dir}/${local.config.dir}" type="dir"/>
- </condition>
- <antcall target="ask-if-local-config-dir-shall-be-deleted"/>
- </target>
-
- <target name="ask-if-local-build-properties-shall-be-deleted" if="local.build.properties.exists">
- <input message="Do you really want to delete local build.properties file '${yanel.home.dir}/src/build/local.build.properties'? (yes/NO):" addproperty="answer"/>
- <condition property="yes-delete-local-build-properties">
- <equals arg1="yes" arg2="${answer}"/>
- </condition>
- <antcall target="do-delete-local-build-properties"/>
- </target>
-
- <target name="do-delete-local-build-properties" if="yes-delete-local-build-properties">
- <delete file="${yanel.home.dir}/src/build/local.build.properties"/>
- </target>
-
- <target name="ask-if-local-config-dir-shall-be-deleted" if="local.config.dir.exists">
- <input message="Do you really want to delete local config dir '${yanel.home.dir}/${local.config.dir}'? (yes/NO):" addproperty="answer"/>
- <condition property="yes-delete-local-config-dir">
- <equals arg1="yes" arg2="${answer}"/>
- </condition>
- <antcall target="do-delete-local-config-dir"/>
- </target>
-
- <target name="do-delete-local-config-dir" if="yes-delete-local-config-dir">
- <delete dir="${yanel.home.dir}/${local.config.dir}"/>
- </target>
-
- <target name="ask-to-clean-tomcat-cluster-node1" if="property-tomcat-cluster-node1-is-set" description="Clean Tomcat cluster node 1">
- <input message="Do you really want to delete your deployed (maybe productive) Yanel version at '${tomcat1.webapps.dir}/${servlet.context.prefix}'? (yes/NO):" addproperty="answer"/>
- <condition property="yes-delete-tomcat-cluster-node1">
- <equals arg1="yes" arg2="${answer}"/>
- </condition>
- <antcall target="do-clean-tomcat-cluster-node1"/>
- </target>
-
- <target name="do-clean-tomcat-cluster-node1" if="yes-delete-tomcat-cluster-node1" description="Clean Tomcat cluster node 1">
- <echo>Clean Tomcat cluster node 1:</echo>
-
- <fail message="No such directory: ${tomcat1.webapps.dir}">
- <condition><not><available file="${tomcat1.webapps.dir}"/></not></condition>
- </fail>
-
- <delete dir="${tomcat1.webapps.dir}/${servlet.context.prefix}"/>
- <delete dir="${tomcat1.work.dir}/${servlet.context.prefix}"/>
- </target>
-
- <target name="ask-to-clean-tomcat-cluster-node2" if="property-tomcat-cluster-node2-is-set" description="Clean Tomcat cluster node 2">
- <input message="Do you really want to delete your deployed (maybe productive) Yanel version at '${tomcat2.webapps.dir}/${servlet.context.prefix}'? (yes/NO):" addproperty="answer"/>
- <condition property="yes-delete-tomcat-cluster-node2">
- <equals arg1="yes" arg2="${answer}"/>
- </condition>
- <antcall target="do-clean-tomcat-cluster-node2"/>
- </target>
-
- <target name="do-clean-tomcat-cluster-node2" if="yes-delete-tomcat-cluster-node2" description="Clean Tomcat cluster node 2">
- <echo>Clean Tomcat cluster node 2:</echo>
-
- <fail message="No such directory: ${tomcat2.webapps.dir}">
- <condition><not><available file="${tomcat2.webapps.dir}"/></not></condition>
- </fail>
-
- <delete dir="${tomcat2.webapps.dir}/${servlet.context.prefix}"/>
- <delete dir="${tomcat2.work.dir}/${servlet.context.prefix}"/>
- </target>
-
- <target name="javadoc" description="Generate Javadoc" depends="init">
- <mkdir dir="${build.dir}/javadoc"/>
- <javadoc
- packagenames="org.*"
- sourcepath="${yanel.home.dir}/src/core/java"
- destdir="${yanel.home.dir}/build/javadoc"
- classpathref="classpath.javadoc"
- >
- </javadoc>
- </target>
-
- <target name="generate-javadoc" description="Generate Javadoc" if="javadoc-does-not-exist-yet">
- <antcall target="javadoc"/>
- </target>
-
- <target name="run-yanel-cmdl" description="Run command line tool" depends="init-runtime">
- <echo>Yanel Path: ${yanel.path}</echo>
- <!--
- <exec executable="java">
- <arg line="-classpath ${run.cp} org.wyona.yanel.cmdl.YanelCommandLine"/>
- </exec>
- -->
- <java classname="org.wyona.yanel.cmdl.YanelCommandLine">
- <classpath refid="classpath.run.cmdl"/>
- <arg value="${yanel.path}"/>
- <!-- On Linux, Java 1.4.2 needs this sysproperty whereas on Mac OS X it doesn't seem to be necessary -->
- <sysproperty key="org.xml.sax.driver" value="org.apache.xerces.parsers.SAXParser"/>
- </java>
- </target>
-
- <target name="generate-resources-build" description="Generate resources build" depends="init">
- <echo>INFO: Generate build file to build resources</echo>
- <condition property="local.resource-types.config.exists">
- <available file="${yanel.home.dir}/${local.config.dir}/local.resource-types.xml" type="file"/>
- </condition>
- <antcall target="generate-resources-build-from-default"/>
- <antcall target="generate-resources-build-from-local"/>
-
- <replace file="../../build/build-resource-types.xml" value="${yanel.home.dir.forward.slashes}">
- <replacetoken>@YANEL_SRC_DIR@</replacetoken>
- </replace>
- </target>
-
- <target name="generate-resources-build-from-default" description="Generate resources build from default config" depends="init" unless="local.resource-types.config.exists">
- <xslt in="${yanel.home.dir}/conf/resource-types.xml" out="../../build/build-resource-types.xml" style="yanel2resources.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="maven.url" expression="${maven.url}"/>
- </xslt>
- </target>
-
- <target name="generate-resources-build-from-local" description="Generate resources build from local config" depends="init" if="local.resource-types.config.exists">
- <xslt in="${yanel.home.dir}/${local.config.dir}/local.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="maven.url" expression="${maven.url}"/>
- </xslt>
- </target>
-
- <target name="build-resources" description="Build resources" depends="generate-resources-build">
- <ant antfile="${yanel.home.dir}/build/build-resource-types.xml" target="build-resources"/>
- </target>
-
- <target name="deploy-resources" description="Deploy resources" depends="generate-resources-build">
-
- <!-- TODO: Seems to copy global i18n files, but has nothing to do with resources. -->
- <copy todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/">
- <fileset dir="." casesensitive="yes">
- <include name="global_*.properties"/>
- </fileset>
- </copy>
-
- <ant antfile="${yanel.home.dir}/build/build-resource-types.xml" target="deploy-resources"/>
- </target>
-
- <target name="deploy-libs-of-realms" description="Deploy libraries of realms" depends="generate-realms-build">
- <ant antfile="${yanel.home.dir}/build/build-realms.xml" target="deploy-realms"/>
- </target>
-
- <target name="clean-resources" description="Clean resources" depends="generate-resources-build">
- <ant antfile="${yanel.home.dir}/build/build-resource-types.xml" target="clean-resources"/>
- </target>
-
- <target name="clean-realms" description="Clean realms" depends="generate-realms-build">
- <ant antfile="${yanel.home.dir}/build/build-realms.xml" target="clean-realms"/>
- </target>
-
-
-
- <!-- Build Realms -->
- <target name="build-realms" description="Build realms" depends="generate-realms-build">
- <ant antfile="${yanel.home.dir}/build/build-realms.xml" target="build-realms"/>
- <ant antfile="${yanel.home.dir}/build/build-realms.xml" target="copy-dependencies"/>
- </target>
-
- <target name="generate-realms-build" description="Generate realms build" depends="init">
- <condition property="local.realms.config.exists">
- <available file="${yanel.home.dir}/${local.config.dir}/local.realms.xml" type="file"/>
- </condition>
- <antcall target="generate-realms-build-from-default"/>
- <antcall target="generate-realms-build-from-local"/>
- </target>
-
- <target name="generate-realms-build-from-default" description="Generate realms build from default config" depends="init" unless="local.realms.config.exists">
- <xslt in="${yanel.home.dir}/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="maven.url" expression="${maven.url}"/>
- </xslt>
- <replace file="../../build/build-realms.xml" value="${yanel.home.dir.forward.slashes}/src/realms">
- <replacetoken>@REALMS_DIR@</replacetoken>
- </replace>
- </target>
-
- <target name="generate-realms-build-from-local" description="Generate realms build from local config" depends="init" if="local.realms.config.exists">
- <xslt in="${yanel.home.dir}/${local.config.dir}/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="maven.url" expression="${maven.url}"/>
- </xslt>
- <replace file="../../build/build-realms.xml" value="${yanel.home.dir.forward.slashes}/src/realms">
- <replacetoken>@REALMS_DIR@</replacetoken>
- </replace>
- </target>
-
-
-
- <target name="generate-yanel-properties" unless="local.yanel.config.exists">
- <xslt in="${yanel.home.dir}/conf/yanel.xml" out="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/yanel.xml" style="yanel2properties.xsl" force="false">
- <param name="servlet.context.prefix" expression="${servlet.context.prefix}"/>
- <param name="yanel.revision" expression="${yanel.revision}"/>
- <param name="yanel.version" expression="${yanel.version}"/>
- </xslt>
- </target>
-
- <target name="patch-with-local-yanel-config" if="local.yanel.config.exists">
- <xslt in="${yanel.home.dir}/${local.config.dir}/local.yanel.xml" out="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/yanel.xml" style="yanel2properties.xsl" force="true">
- <param name="servlet.context.prefix" expression="${servlet.context.prefix}"/>
- <param name="yanel.revision" expression="${yanel.revision}"/>
- <param name="yanel.version" expression="${yanel.version}"/>
- </xslt>
- </target>
-
- <target name="generate-resource-types-registry" unless="local.resource-types.config.exists">
- <copy file="${yanel.home.dir}/conf/resource-types.xml" tofile="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/resource-types.xml" overwrite="false"/>
- </target>
-
- <target name="patch-with-local-resource-types-registry" if="local.resource-types.config.exists">
- <copy file="${yanel.home.dir}/${local.config.dir}/local.resource-types.xml" tofile="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/resource-types.xml" overwrite="true"/>
- </target>
-
- <target name="test" description="Run tests">
- <ant dir="../test" target="test" inheritall="false"/>
- </target>
-
- <target name="source-snapshot" description="Create a source code snapshot" depends="init, clean-all">
- <delete dir="${build.dir}/source-snapshots"/>
- <property name="snapshot.dir" value="${build.dir}/source-snapshots/wyona-yanel-SNAPSHOT-${yanel.version}-r${yanel.revision}-src"/>
- <mkdir dir="${snapshot.dir}/src"/>
- <copy file="${yanel.home.dir}/README.txt" todir="${snapshot.dir}"/>
- <copy file="${yanel.home.dir}/configure.sh" todir="${snapshot.dir}"/>
- <chmod file="${snapshot.dir}/configure.sh" perm="755"/>
- <copy file="${yanel.home.dir}/configure.bat" todir="${snapshot.dir}"/>
- <copy file="${yanel.home.dir}/build.sh" todir="${snapshot.dir}"/>
- <chmod file="${snapshot.dir}/build.sh" perm="755"/>
- <copy file="${yanel.home.dir}/build.bat" todir="${snapshot.dir}"/>
- <copy file="${yanel.home.dir}/yanel.sh" todir="${snapshot.dir}"/>
- <chmod file="${snapshot.dir}/yanel.sh" perm="755"/>
- <copy file="${yanel.home.dir}/yanel.bat" todir="${snapshot.dir}"/>
- <copy todir="${snapshot.dir}/src">
- <fileset dir="${yanel.home.dir}/src" excludes="build/local.build.properties, contributions/resources/nutch/conf/nutch-local.xml"/>
- </copy>
- <copy todir="${snapshot.dir}/tools">
- <fileset dir="${yanel.home.dir}/tools"/>
- </copy>
- <chmod dir="${snapshot.dir}/tools/apache-ant-1.6.5/bin" perm="755" includes="*"/>
- <copy todir="${snapshot.dir}/conf">
- <fileset dir="${yanel.home.dir}/conf" excludes="local/**"/>
- </copy>
- <zip destfile="${build.dir}/source-snapshots/wyona-yanel-SNAPSHOT-${yanel.version}-r${yanel.revision}-src.zip">
- <zipfileset dir="${build.dir}/source-snapshots/wyona-yanel-SNAPSHOT-${yanel.version}-r${yanel.revision}-src" prefix="wyona-yanel-SNAPSHOT-${yanel.version}-r${yanel.revision}-src" filemode="755"/>
- </zip>
- </target>
-
</project>
Deleted: public/yanel/trunk/src/build/continuous-integration.properties
===================================================================
--- public/yanel/trunk/src/build/continuous-integration.properties 2008-08-19 14:28:12 UTC (rev 38122)
+++ public/yanel/trunk/src/build/continuous-integration.properties 2008-08-19 14:28:50 UTC (rev 38123)
@@ -1,8 +0,0 @@
-#tomcat ip
-tomcat.ip=127.0.0.1
-
-#tomcat port
-tomcat.port=8080
-
-#DOCUMENT ROOT of apache http to serve a page if tomcat is stoped while cruiscontrol is building
-document.root=/var/www
Deleted: public/yanel/trunk/src/build/continuous-integration.xml
===================================================================
--- public/yanel/trunk/src/build/continuous-integration.xml 2008-08-19 14:28:12 UTC (rev 38122)
+++ public/yanel/trunk/src/build/continuous-integration.xml 2008-08-19 14:28:50 UTC (rev 38123)
@@ -1,159 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="yanel-continuous-integration" default="continuous-integration" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
- <description>Yanel Build for Continuous Integration</description>
-
- <property file="local.continuous-integration.properties"/>
- <property file="continuous-integration.properties"/>
-
- <target name="continuous-integration">
- <echo>Cleaning Yanel</echo>
- <antcall target="clean"/>
- <echo>Deploying Yanel</echo>
- <antcall target="deploy"/>
- </target>
-
- <target name="start-tomcat" description="starts tomcat">
- <condition property="isWindows">
- <os family="windows"/>
- </condition>
- <condition property="isUnix">
- <os family="unix"/>
- </condition>
- <antcall target="startup-tomcat-windows"/>
- <antcall target="startup-tomcat-unix"/>
- <waitfor maxwait="60" maxwaitunit="second" checkevery="4000">
- <and>
- <socket server="${tomcat.ip}" port="${tomcat.port}"/>
- </and>
- </waitfor>
- <echo message="*****************************************************************"/>
- <echo message="*"/>
- <echo message="* You have successfully started Yanel ${yanel.version} (Revision ${yanel.revision})"/>
- <echo message="*"/>
- <echo message="*"/>
- <echo message="* Start you Browser and visit"/>
- <echo message="*"/>
- <echo message="* http://127.0.0.1:8080/${servlet.context.prefix}/"/>
- <echo message="*"/>
- <echo message="* Thanks for using Yanel"/>
- <echo message="*"/>
- <echo message="*****************************************************************"/>
- <available file="${document.root}/cruise_is_building.html" property="cruise_is_building_html_available"/>
- <antcall target="delete-building-hint"/>
- </target>
-
- <target name="startup-tomcat-windows" if="isWindows">
- <condition property="isTomcat1HomeSet">
- <isset property="tomcat1.home.dir"/>
- </condition>
- <antcall target="startup-tomcat-windows-node1"/>
- <condition property="isTomcat2HomeSet">
- <isset property="tomcat2.home.dir"/>
- </condition>
- <antcall target="startup-tomcat-windows-node2"/>
- </target>
-
- <target name="startup-tomcat-unix" if="isUnix">
- <condition property="isTomcat1HomeSet">
- <isset property="tomcat1.home.dir"/>
- </condition>
- <antcall target="startup-tomcat-unix-node1"/>
- <condition property="isTomcat2HomeSet">
- <isset property="tomcat2.home.dir"/>
- </condition>
- <antcall target="startup-tomcat-unix-node2"/>
- </target>
-
-
- <target name="startup-tomcat-windows-node1" if="isTomcat1HomeSet">
- <echo>Startup Tomcat Cluster Node 1: ${tomcat1.home.dir}/bin/startup.bat</echo>
- <!-- NOTE: Spawn is true because otherwise the batch script will not continue beyond this call (This is only necessary for Windows) -->
- <exec dir="${tomcat1.home.dir}/bin" resolveexecutable="true" executable="startup.bat" spawn="true"/>
- </target>
- <target name="startup-tomcat-unix-node1" if="isTomcat1HomeSet">
- <echo>Starting Tomcat (${tomcat1.home.dir}/bin/startup.sh) ...</echo>
- <chmod dir="${tomcat1.home.dir}/bin" perm="755" includes="*"/>
- <exec dir="${tomcat1.home.dir}/bin" resolveexecutable="true" executable="startup.sh" spawn="false"/>
- </target>
- <target name="startup-tomcat-windows-node2" if="isTomcat2HomeSet">
- <echo>Startup Tomcat Cluster Node 2: ${tomcat2.home.dir}/bin/startup.bat</echo>
- <!-- NOTE: Spawn is true because otherwise the batch script will not continue beyond this call (This is only necessary for Windows) -->
- <exec dir="${tomcat2.home.dir}/bin" resolveexecutable="true" executable="startup.bat" spawn="true"/>
- </target>
- <target name="startup-tomcat-unix-node2" if="isTomcat2HomeSet">
- <echo>Starting Tomcat (${tomcat2.home.dir}/bin/startup.sh) ...</echo>
- <chmod dir="${tomcat2.home.dir}/bin" perm="755" includes="*"/>
- <exec dir="${tomcat2.home.dir}/bin" resolveexecutable="true" executable="startup.sh" spawn="false"/>
- </target>
-
- <target name="stop-tomcat" description="stops tomcat">
- <available file="${document.root}/cruise_is_building.html.orig" property="cruise_is_building_html_orig_available"/>
- <antcall target="copy-building-hint"/>
- <condition property="isWindows">
- <os family="windows"/>
- </condition>
- <condition property="isUnix">
- <os family="unix"/>
- </condition>
- <antcall target="shutdown-tomcat-windows"/>
- <antcall target="shutdown-tomcat-unix"/>
- <echo message="*****************************************************************"/>
- <echo message="*"/>
- <echo message="* You have successfully stopped Yanel ${yanel.version} (Revision ${yanel.revision})"/>
- <echo message="*"/>
- <echo message="* Thanks for using Yanel"/>
- <echo message="*"/>
- <echo message="*****************************************************************"/>
- </target>
-
- <target name="shutdown-tomcat-windows" if="isWindows">
- <echo>Windows ...</echo>
- <condition property="isTomcat1HomeSet">
- <isset property="tomcat1.home.dir"/>
- </condition>
- <antcall target="shutdown-tomcat-windows-node1"/>
- <condition property="isTomcat2HomeSet">
- <isset property="tomcat2.home.dir"/>
- </condition>
- <antcall target="shutdown-tomcat-windows-node2"/>
- </target>
-
- <target name="shutdown-tomcat-unix" if="isUnix">
- <echo>Unix ...</echo>
- <condition property="isTomcat1HomeSet">
- <isset property="tomcat1.home.dir"/>
- </condition>
- <antcall target="shutdown-tomcat-unix-node1"/>
- <condition property="isTomcat2HomeSet">
- <isset property="tomcat2.home.dir"/>
- </condition>
- <antcall target="shutdown-tomcat-unix-node2"/>
- </target>
-
-
- <target name="shutdown-tomcat-windows-node1" if="isTomcat1HomeSet">
- <exec dir="${tomcat1.home.dir}/bin" resolveexecutable="true" executable="shutdown.bat" spawn="false"/>
- </target>
- <target name="shutdown-tomcat-unix-node1" if="isTomcat1HomeSet">
- <echo>Shutdown Tomcat (${tomcat1.home.dir}/bin/shutdown.sh) ...</echo>
- <chmod dir="${tomcat1.home.dir}/bin" perm="755" includes="*"/>
- <exec dir="${tomcat1.home.dir}/bin" resolveexecutable="true" executable="shutdown.sh" spawn="false"/>
- </target>
- <target name="shutdown-tomcat-windows-node2" if="isTomcat2HomeSet">
- <exec dir="${tomcat2.home.dir}/bin" resolveexecutable="true" executable="shutdown.bat" spawn="false"/>
- </target>
- <target name="shutdown-tomcat-unix-node2" if="isTomcat2HomeSet">
- <echo>Shutdown Tomcat (${tomcat2.home.dir}/bin/shutdown.sh) ...</echo>
- <chmod dir="${tomcat2.home.dir}/bin" perm="755" includes="*"/>
- <exec dir="${tomcat2.home.dir}/bin" resolveexecutable="true" executable="shutdown.sh" spawn="false"/>
- </target>
-
- <target name="copy-building-hint" if="cruise_is_building_html_orig_available" description="copy a message to the httpd saying yanel is stoped and building">
- <copy file="${document.root}/cruise_is_building.html.orig" tofile="${document.root}/cruise_is_building.html"/>
- </target>
-
- <target name="delete-building-hint" if="cruise_is_building_html_available" description="removes the message from the httpd saying yanel is stoped and building">
- <delete file="${document.root}/cruise_is_building.html"/>
- </target>
-</project>
Modified: public/yanel/trunk/src/build/targets/add-third-party-realm.xml
===================================================================
--- public/yanel/trunk/src/build/targets/add-third-party-realm.xml 2008-08-19 14:28:12 UTC (rev 38122)
+++ public/yanel/trunk/src/build/targets/add-third-party-realm.xml 2008-08-19 14:28:50 UTC (rev 38123)
@@ -4,16 +4,16 @@
<description>Add third party realm</description>
<target name="add-realm" description="Add third party realm" depends="init, build-add-realm-task">
- <echo>Add third party realm ${realm-config} to local config ${yanel.home.dir}/${local.config.dir}</echo>
+ <echo>Add third party realm ${realm-config} to local config ${yanel.source.home}/${local.config.dir}</echo>
- <taskdef name="addrealm" classpath="${yanel.home.dir}/build/classes" classname="org.wyona.yanel.ant.AddRealmTask"/>
+ <taskdef name="addrealm" classpath="${yanel.source.home}/build/classes" classname="org.wyona.yanel.ant.AddRealmTask"/>
<addrealm/>
</target>
<target name="build-add-realm-task" depends="init, compile-core">
- <javac srcdir="${yanel.home.dir}/src/build/java"
- destdir="${yanel.home.dir}/build/classes"
+ <javac srcdir="${yanel.source.home}/src/build/java"
+ destdir="${yanel.source.home}/build/classes"
/>
</target>
</project>
Modified: public/yanel/trunk/src/build/targets/build-binary-snapshot.xml
===================================================================
--- public/yanel/trunk/src/build/targets/build-binary-snapshot.xml 2008-08-19 14:28:12 UTC (rev 38122)
+++ public/yanel/trunk/src/build/targets/build-binary-snapshot.xml 2008-08-19 14:28:50 UTC (rev 38123)
@@ -36,9 +36,9 @@
<delete dir="${snapshot.dir}/META-INF"/>
<chmod dir="${snapshot.dir}/apache-tomcat-${tomcat.version}/bin" perm="755" includes="*"/>
<!-- TODO: Differentiate between Java 1.4 and higher (jmx.jar)! -->
- <copy file="${yanel.home.dir}/tools/apache-tomcat/java-1.4/apache-tomcat-5.5.20/bin/jmx.jar" todir="${snapshot.dir}/apache-tomcat-${tomcat.version}/bin"/>
- <copy file="${yanel.home.dir}/build/webapps/${servlet.context.prefix}/WEB-INF/lib/${xerces.impl.artifactId}-${xerces.impl.version}.jar" todir="${snapshot.dir}/apache-tomcat-${tomcat.version}/common/endorsed"/>
- <copy file="${yanel.home.dir}/build/webapps/${servlet.context.prefix}/WEB-INF/lib/${xml.apis.artifactId}-${xml.apis.version}.jar" todir="${snapshot.dir}/apache-tomcat-${tomcat.version}/common/endorsed"/>
+ <copy file="${yanel.source.home}/tools/apache-tomcat/java-1.4/apache-tomcat-5.5.20/bin/jmx.jar" todir="${snapshot.dir}/apache-tomcat-${tomcat.version}/bin"/>
+ <copy file="${yanel.source.home}/build/webapps/${servlet.context.prefix}/WEB-INF/lib/${xerces.impl.artifactId}-${xerces.impl.version}.jar" todir="${snapshot.dir}/apache-tomcat-${tomcat.version}/common/endorsed"/>
+ <copy file="${yanel.source.home}/build/webapps/${servlet.context.prefix}/WEB-INF/lib/${xml.apis.artifactId}-${xml.apis.version}.jar" todir="${snapshot.dir}/apache-tomcat-${tomcat.version}/common/endorsed"/>
<!-- delete unused tomcat files -->
<delete dir="${snapshot.dir}/apache-tomcat-${tomcat.version}/webapps/${target.servlet.context.prefix}"/>
<delete dir="${snapshot.dir}/apache-tomcat-${tomcat.version}/webapps/jsp-examples"/>
@@ -49,11 +49,11 @@
<mkdir dir="${snapshot.dir}/apache-tomcat-${tomcat.version}/yanel-webapps"/>
<!-- Add context file -->
- <copy file="${yanel.home.dir}/src/binary-dist/tomcat-context.xml" tofile="${snapshot.dir}/apache-tomcat-${tomcat.version}/conf/Catalina/localhost/wyona-yanel-webapp-v-${yanel.version}-r-${yanel.revision}.xml"/>
+ <copy file="${yanel.source.home}/src/binary-dist/tomcat-context.xml" tofile="${snapshot.dir}/apache-tomcat-${tomcat.version}/conf/Catalina/localhost/wyona-yanel-webapp-v-${yanel.version}-r-${yanel.revision}.xml"/>
<replace file="${snapshot.dir}/apache-tomcat-${tomcat.version}/conf/Catalina/localhost/wyona-yanel-webapp-v-${yanel.version}-r-${yanel.revision}.xml" value="wyona-yanel-webapp-v-${yanel.version}-r-${yanel.revision}">
<replacetoken>@YANEL_VERSION@</replacetoken>
</replace>
- <copy file="${yanel.home.dir}/src/binary-dist/tomcat-context.xml" tofile="${snapshot.dir}/apache-tomcat-${tomcat.version}/conf/Catalina/localhost/${target.servlet.context.prefix}.xml"/>
+ <copy file="${yanel.source.home}/src/binary-dist/tomcat-context.xml" tofile="${snapshot.dir}/apache-tomcat-${tomcat.version}/conf/Catalina/localhost/${target.servlet.context.prefix}.xml"/>
<replace file="${snapshot.dir}/apache-tomcat-${tomcat.version}/conf/Catalina/localhost/${target.servlet.context.prefix}.xml" value="wyona-yanel-webapp-v-${yanel.version}-r-${yanel.revision}">
<replacetoken>@YANEL_VERSION@</replacetoken>
</replace>
@@ -61,10 +61,10 @@
<target name="copy-realms-resources">
<copy todir="${snapshot.dir}/${target.servlet.context.prefix}">
- <fileset dir="${yanel.home.dir}/build/webapps/${servlet.context.prefix}"/>
+ <fileset dir="${yanel.source.home}/build/webapps/${servlet.context.prefix}"/>
</copy>
<copy todir="${snapshot.dir}/${target.servlet.context.prefix}/realms">
- <fileset dir="${yanel.home.dir}/src/realms"/>
+ <fileset dir="${yanel.source.home}/src/realms"/>
</copy>
<replace file="${snapshot.dir}/${target.servlet.context.prefix}/realms/javadoc/repository.xml" value="content">
<replacetoken>../../../build/javadoc</replacetoken>
@@ -73,15 +73,15 @@
<replacetoken>../../../../../local/test/data</replacetoken>
</replace>
<copy todir="${snapshot.dir}/${target.servlet.context.prefix}/realms/javadoc/content">
- <fileset dir="${yanel.home.dir}/build/javadoc"/>
+ <fileset dir="${yanel.source.home}/build/javadoc"/>
</copy>
- <copy file="${yanel.home.dir}/conf/realms.xml" todir="${snapshot.dir}/${target.servlet.context.prefix}/WEB-INF/classes" overwrite="true"/>
+ <copy file="${yanel.source.home}/conf/realms.xml" todir="${snapshot.dir}/${target.servlet.context.prefix}/WEB-INF/classes" overwrite="true"/>
<replace file="${snapshot.dir}/${target.servlet.context.prefix}/WEB-INF/classes/realms.xml" value="../../realms">
<replacetoken>@REALMS_DIR@</replacetoken>
</replace>
- <copy file="${yanel.home.dir}/conf/resource-types.xml" tofile="${snapshot.dir}/${target.servlet.context.prefix}/WEB-INF/classes/resource-types.xml" overwrite="true"/>
+ <copy file="${yanel.source.home}/conf/resource-types.xml" tofile="${snapshot.dir}/${target.servlet.context.prefix}/WEB-INF/classes/resource-types.xml" overwrite="true"/>
<replace file="${snapshot.dir}/${target.servlet.context.prefix}/WEB-INF/classes/resource-types.xml" value="../../resources">
<replacetoken>../src/resources</replacetoken>
@@ -94,15 +94,15 @@
</replace>
<copy todir="${snapshot.dir}/${target.servlet.context.prefix}/resources">
- <fileset dir="${yanel.home.dir}/src/resources"/>
+ <fileset dir="${yanel.source.home}/src/resources"/>
</copy>
<copy todir="${snapshot.dir}/${target.servlet.context.prefix}/resources">
- <fileset dir="${yanel.home.dir}/src/contributions/resources"/>
+ <fileset dir="${yanel.source.home}/src/contributions/resources"/>
</copy>
<copy todir="${snapshot.dir}/${target.servlet.context.prefix}/resources">
- <fileset dir="${yanel.home.dir}/src/realms/welcome-admin/yanel/resources"/>
+ <fileset dir="${yanel.source.home}/src/realms/welcome-admin/yanel/resources"/>
</copy>
- <xslt in="${yanel.home.dir}/conf/yanel.xml" out="${snapshot.dir}/${target.servlet.context.prefix}/WEB-INF/classes/yanel.properties" style="yanel2properties.xsl" force="true">
+ <xslt in="${yanel.source.home}/conf/yanel.xml" out="${snapshot.dir}/${target.servlet.context.prefix}/WEB-INF/classes/yanel.properties" style="yanel2properties.xsl" force="true">
<!--<param name="servlet.context.prefix" expression="${servlet.context.prefix}"/>-->
</xslt>
<replace file="${snapshot.dir}/${target.servlet.context.prefix}/WEB-INF/classes/yanel.properties" value="../../resources">
@@ -115,13 +115,13 @@
<replacetoken>../src/realms/welcome-admin/yanel/resources</replacetoken>
</replace>
- <copy file="${yanel.home.dir}/src/binary-dist/log4j.properties" todir="${snapshot.dir}/${target.servlet.context.prefix}/WEB-INF/classes" overwrite="true"/>
+ <copy file="${yanel.source.home}/src/binary-dist/log4j.properties" todir="${snapshot.dir}/${target.servlet.context.prefix}/WEB-INF/classes" overwrite="true"/>
<replace file="${snapshot.dir}/${target.servlet.context.prefix}/WEB-INF/classes/log4j.properties" value="wyona-yanel-webapp-v-${yanel.version}-r-${yanel.revision}">
<replacetoken>@SERVLET_CONTEXT@</replacetoken>
</replace>
<mkdir dir="${snapshot.dir}/${target.servlet.context.prefix}/WEB-INF/logs"/>
- <copy file="${yanel.home.dir}/src/build/install.rdf" todir="${snapshot.dir}/${target.servlet.context.prefix}/WEB-INF/classes" overwrite="true"/>
+ <copy file="${yanel.source.home}/src/build/install.rdf" todir="${snapshot.dir}/${target.servlet.context.prefix}/WEB-INF/classes" overwrite="true"/>
<replace file="${snapshot.dir}/${target.servlet.context.prefix}/WEB-INF/classes/install.rdf" value="${yanel.version}">
<replacetoken>@VERSION@</replacetoken>
</replace>
@@ -144,17 +144,17 @@
</copy>
<!-- <move file="${snapshot.dir}/${servlet.context.prefix}.war" todir="${snapshot.dir.win}/apache-tomcat-${tomcat.version}/webapps"/> -->
- <copy file="${yanel.home.dir}/LICENSE.txt" todir="${snapshot.dir.win}"/>
+ <copy file="${yanel.source.home}/LICENSE.txt" todir="${snapshot.dir.win}"/>
<!-- Copy Windows specific files -->
- <copy file="${yanel.home.dir}/src/binary-dist/README-WINDOWS.txt" tofile="${snapshot.dir.win}/README.txt"/>
- <copy file="${yanel.home.dir}/src/binary-dist/start.bat" todir="${snapshot.dir.win}"/>
- <copy file="${yanel.home.dir}/src/binary-dist/stop.bat" todir="${snapshot.dir.win}"/>
- <copy file="${yanel.home.dir}/src/binary-dist/windows/start.ico" todir="${snapshot.dir.win}"/>
- <copy file="${yanel.home.dir}/src/binary-dist/windows/stop.ico" todir="${snapshot.dir.win}"/>
- <copy file="${yanel.home.dir}/src/binary-dist/windows/install.ico" todir="${snapshot.dir.win}"/>
- <copy file="${yanel.home.dir}/src/binary-dist/windows/uninstall.ico" todir="${snapshot.dir.win}"/>
- <copy file="${yanel.home.dir}/src/binary-dist/windows/install-yanel.nsi" todir="${snapshot.dir.win}"/>
+ <copy file="${yanel.source.home}/src/binary-dist/README-WINDOWS.txt" tofile="${snapshot.dir.win}/README.txt"/>
+ <copy file="${yanel.source.home}/src/binary-dist/start.bat" todir="${snapshot.dir.win}"/>
+ <copy file="${yanel.source.home}/src/binary-dist/stop.bat" todir="${snapshot.dir.win}"/>
+ <copy file="${yanel.source.home}/src/binary-dist/windows/start.ico" todir="${snapshot.dir.win}"/>
+ <copy file="${yanel.source.home}/src/binary-dist/windows/stop.ico" todir="${snapshot.dir.win}"/>
+ <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}">
<replacetoken>@YANEL_VERSION@</replacetoken>
</replace>
@@ -172,9 +172,9 @@
</copy>
<delete dir="${snapshot.dir}/${target.servlet.context.prefix}"/>
<!-- Copy UNIX and Windows specific files -->
- <copy file="${yanel.home.dir}/src/binary-dist/README-UNIX.txt" tofile="${snapshot.dir}/README.txt" overwrite="true"/>
- <copy file="${yanel.home.dir}/src/binary-dist/start.sh" todir="${snapshot.dir}"/>
- <copy file="${yanel.home.dir}/src/binary-dist/stop.sh" todir="${snapshot.dir}"/>
+ <copy file="${yanel.source.home}/src/binary-dist/README-UNIX.txt" tofile="${snapshot.dir}/README.txt" overwrite="true"/>
+ <copy file="${yanel.source.home}/src/binary-dist/start.sh" todir="${snapshot.dir}"/>
+ <copy file="${yanel.source.home}/src/binary-dist/stop.sh" todir="${snapshot.dir}"/>
<!-- Create TGZ file -->
<tar destfile="${snapshot.dir}.tar">
Modified: public/yanel/trunk/src/build/targets/build-update-war.xml
===================================================================
--- public/yanel/trunk/src/build/targets/build-update-war.xml 2008-08-19 14:28:12 UTC (rev 38122)
+++ public/yanel/trunk/src/build/targets/build-update-war.xml 2008-08-19 14:28:50 UTC (rev 38123)
@@ -8,10 +8,10 @@
<mkdir dir="${update.dir}"/>
<copy todir="${update.dir}/${servlet.context.prefix}">
- <fileset dir="${yanel.home.dir}/build/webapps/${servlet.context.prefix}"/>
+ <fileset dir="${yanel.source.home}/build/webapps/${servlet.context.prefix}"/>
</copy>
<copy todir="${update.dir}/${servlet.context.prefix}/realms">
- <fileset dir="${yanel.home.dir}/src/realms"/>
+ <fileset dir="${yanel.source.home}/src/realms"/>
</copy>
<replace file="${update.dir}/${servlet.context.prefix}/realms/javadoc/repository.xml" value="content">
<replacetoken>../../../build/javadoc</replacetoken>
@@ -20,22 +20,22 @@
<replacetoken>../../../../../local/test/data</replacetoken>
</replace>
<copy todir="${update.dir}/${servlet.context.prefix}/realms/javadoc/content">
- <fileset dir="${yanel.home.dir}/build/javadoc"/>
+ <fileset dir="${yanel.source.home}/build/javadoc"/>
</copy>
- <copy file="${yanel.home.dir}/conf/realms.xml" todir="${update.dir}/${servlet.context.prefix}/WEB-INF/classes" overwrite="true"/>
+ <copy file="${yanel.source.home}/conf/realms.xml" todir="${update.dir}/${servlet.context.prefix}/WEB-INF/classes" overwrite="true"/>
<replace file="${update.dir}/${servlet.context.prefix}/WEB-INF/classes/realms.xml" value="../../realms">
<replacetoken>@REALMS_DIR@</replacetoken>
</replace>
<copy todir="${update.dir}/${servlet.context.prefix}/resources">
- <fileset dir="${yanel.home.dir}/src/resources"/>
+ <fileset dir="${yanel.source.home}/src/resources"/>
</copy>
<copy todir="${update.dir}/${servlet.context.prefix}/resources">
- <fileset dir="${yanel.home.dir}/src/contributions/resources"/>
+ <fileset dir="${yanel.source.home}/src/contributions/resources"/>
</copy>
<copy todir="${update.dir}/${servlet.context.prefix}/resources">
- <fileset dir="${yanel.home.dir}/src/realms/welcome-admin/yanel/resources"/>
+ <fileset dir="${yanel.source.home}/src/realms/welcome-admin/yanel/resources"/>
</copy>
- <xslt in="${yanel.home.dir}/conf/yanel.xml" out="${update.dir}/${servlet.context.prefix}/WEB-INF/classes/yanel.properties" style="yanel2properties.xsl" force="true">
+ <xslt in="${yanel.source.home}/conf/yanel.xml" out="${update.dir}/${servlet.context.prefix}/WEB-INF/classes/yanel.properties" style="yanel2properties.xsl" force="true">
<!--<param name="servlet.context.prefix" expression="${servlet.context.prefix}"/>-->
</xslt>
<replace file="${update.dir}/${servlet.context.prefix}/WEB-INF/classes/yanel.properties" value="../../resources">
@@ -47,13 +47,13 @@
<replace file="${update.dir}/${servlet.context.prefix}/WEB-INF/classes/yanel.properties" value="../../resources">
<replacetoken>../src/realms/welcome-admin/yanel/resources</replacetoken>
</replace>
- <copy file="${yanel.home.dir}/src/binary-dist/log4j.properties" todir="${update.dir}/${servlet.context.prefix}/WEB-INF/classes" overwrite="true"/>
+ <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-v-${yanel.version}-r-${yanel.revision}">
<replacetoken>@SERVLET_CONTEXT@</replacetoken>
</replace>
<mkdir dir="${update.dir}/${servlet.context.prefix}/WEB-INF/logs"/>
- <copy file="${yanel.home.dir}/src/build/install.rdf" todir="${update.dir}/${servlet.context.prefix}/WEB-INF/classes" overwrite="true"/>
+ <copy file="${yanel.source.home}/src/build/install.rdf" todir="${update.dir}/${servlet.context.prefix}/WEB-INF/classes" overwrite="true"/>
<replace file="${update.dir}/${servlet.context.prefix}/WEB-INF/classes/install.rdf" value="${yanel.version}">
<replacetoken>@VERSION@</replacetoken>
</replace>
Modified: public/yanel/trunk/src/build/targets/check-conf-version.xml
===================================================================
--- public/yanel/trunk/src/build/targets/check-conf-version.xml 2008-08-19 14:28:12 UTC (rev 38122)
+++ public/yanel/trunk/src/build/targets/check-conf-version.xml 2008-08-19 14:28:50 UTC (rev 38123)
@@ -4,17 +4,17 @@
<target name="check-config-version" depends="init">
<condition property="local.yanel.config.exists">
- <available file="${yanel.home.dir}/${local.config.dir}/local.yanel.xml" type="file"/>
+ <available file="${yanel.source.home}/${local.config.dir}/local.yanel.xml" type="file"/>
</condition>
<antcall target="check-config-version-yanel-xml"/>
<condition property="local.realms.config.exists">
- <available file="${yanel.home.dir}/${local.config.dir}/local.realms.xml" type="file"/>
+ <available file="${yanel.source.home}/${local.config.dir}/local.realms.xml" type="file"/>
</condition>
<antcall target="check-config-version-realms-xml"/>
<condition property="local.resource-types.config.exists">
- <available file="${yanel.home.dir}/${local.config.dir}/local.resource-types.xml" type="file"/>
+ <available file="${yanel.source.home}/${local.config.dir}/local.resource-types.xml" type="file"/>
</condition>
<antcall target="check-config-version-resource-types-xml"/>
</target>
@@ -23,8 +23,8 @@
<target name="check-config-version-yanel-xml" if="local.yanel.config.exists">
<echo>Check version of local.yanel.xml ...</echo>
- <xmlproperty file="${yanel.home.dir}/conf/yanel.xml" prefix="defaultconf" collapseAttributes="true"/>
- <xmlproperty file="${yanel.home.dir}/${local.config.dir}/local.yanel.xml" prefix="localconf" collapseAttributes="true"/>
+ <xmlproperty file="${yanel.source.home}/conf/yanel.xml" prefix="defaultconf" collapseAttributes="true"/>
+ <xmlproperty file="${yanel.source.home}/${local.config.dir}/local.yanel.xml" prefix="localconf" collapseAttributes="true"/>
<condition property="local.yanel.properties.in.sync">
<equals arg1="${defaultconf.yanel.version}" arg2="${localconf.yanel.version}"/>
</condition>
@@ -33,8 +33,8 @@
<target name="check-config-version-realms-xml" if="local.realms.config.exists">
<echo>Check version of local.realms.xml ...</echo>
- <xmlproperty file="${yanel.home.dir}/conf/realms.xml" prefix="defaultconf" collapseAttributes="true"/>
- <xmlproperty file="${yanel.home.dir}/${local.config.dir}/local.realms.xml" prefix="localconf" collapseAttributes="true"/>
+ <xmlproperty file="${yanel.source.home}/conf/realms.xml" prefix="defaultconf" collapseAttributes="true"/>
+ <xmlproperty file="${yanel.source.home}/${local.config.dir}/local.realms.xml" prefix="localconf" collapseAttributes="true"/>
<condition property="local.realms.properties.in.sync">
<equals arg1="${defaultconf.realms.version}" arg2="${localconf.realms.version}"/>
</condition>
@@ -43,8 +43,8 @@
<target name="check-config-version-resource-types-xml" if="local.resource-types.config.exists">
<echo>Check version of local.resource-types.xml ...</echo>
- <xmlproperty file="${yanel.home.dir}/conf/resource-types.xml" prefix="defaultconf" collapseAttributes="true"/>
- <xmlproperty file="${yanel.home.dir}/${local.config.dir}/local.resource-types.xml" prefix="localconf" collapseAttributes="true"/>
+ <xmlproperty file="${yanel.source.home}/conf/resource-types.xml" prefix="defaultconf" collapseAttributes="true"/>
+ <xmlproperty file="${yanel.source.home}/${local.config.dir}/local.resource-types.xml" prefix="localconf" collapseAttributes="true"/>
<condition property="local.resource-types.properties.in.sync">
<equals arg1="${defaultconf.resource-types.version}" arg2="${localconf.resource-types.version}"/>
</condition>
Modified: public/yanel/trunk/src/build/targets/create-new-resource-type.xml
===================================================================
--- public/yanel/trunk/src/build/targets/create-new-resource-type.xml 2008-08-19 14:28:12 UTC (rev 38122)
+++ public/yanel/trunk/src/build/targets/create-new-resource-type.xml 2008-08-19 14:28:50 UTC (rev 38123)
@@ -5,7 +5,7 @@
<description>Create new resource-type</description>
<target name="new-resource-type" description="Create a new resource-type" depends="init">
- <echo>Create new resource-type from scratch ${yanel.home.dir}/src/build/targets/create-new-resource-type/from-scratch-resource-template</echo>
+ <echo>Create new resource-type from scratch ${yanel.source.home}/src/build/targets/create-new-resource-type/from-scratch-resource-template</echo>
<input message="Please enter the resource-type name (e.g. calendar):" defaultvalue="null" addproperty="new.resource.name"/>
<input message="Please enter the namespace of this new resource-type (e.g. http://foo.bar/yanel/resource/1.0):" defaultvalue="null" addproperty="new.resource.namespace"/>
@@ -25,45 +25,45 @@
<property name="new.resource.test.java.class.fs.path.full" value="${new.resource.java.class.fs.path}/${new.resource.java.class.name}Test.java"/>
<property name="new.resource.webtest.java.class.fs.path.full" value="${new.resource.java.class.fs.path}/${new.resource.java.class.name}WebTest.java"/>
- <property name="new.resource.java.class.location" location="${yanel.home.dir}/src/contributions/resources/${new.resource.name}/src/java/${new.resource.java.class.fs.path.full}"/>
- <property name="new.resource.test.java.class.location" location="${yanel.home.dir}/src/contributions/resources/${new.resource.name}/src/test/junit/${new.resource.test.java.class.fs.path.full}"/>
- <property name="new.resource.webtest.java.class.location" location="${yanel.home.dir}/src/contributions/resources/${new.resource.name}/src/test/htmlunit/${new.resource.webtest.java.class.fs.path.full}"/>
+ <property name="new.resource.java.class.location" location="${yanel.source.home}/src/contributions/resources/${new.resource.name}/src/java/${new.resource.java.class.fs.path.full}"/>
+ <property name="new.resource.test.java.class.location" location="${yanel.source.home}/src/contributions/resources/${new.resource.name}/src/test/junit/${new.resource.test.java.class.fs.path.full}"/>
+ <property name="new.resource.webtest.java.class.location" location="${yanel.source.home}/src/contributions/resources/${new.resource.name}/src/test/htmlunit/${new.resource.webtest.java.class.fs.path.full}"/>
<property name="new.resource.java.class" value="${new.resource.java.class.package}.${new.resource.java.class.name}"/>
- <copy todir="${yanel.home.dir}/src/contributions/resources/${new.resource.name}">
- <fileset dir="${yanel.home.dir}/src/build/targets/create-new-resource-type/from-scratch-resource-template" excludes="build/**,src/java/**,src/test/**,interfaces/**,src/build/dependencies**,examples/**"/>
+ <copy todir="${yanel.source.home}/src/contributions/resources/${new.resource.name}">
+ <fileset dir="${yanel.source.home}/src/build/targets/create-new-resource-type/from-scratch-resource-template" excludes="build/**,src/java/**,src/test/**,interfaces/**,src/build/dependencies**,examples/**"/>
</copy>
<!-- Patch resource.xml -->
- <replace file="${yanel.home.dir}/src/contributions/resources/${new.resource.name}/resource.xml" value="${new.resource.name}">
+ <replace file="${yanel.source.home}/src/contributions/resources/${new.resource.name}/resource.xml" value="${new.resource.name}">
<replacetoken>from-scratch</replacetoken>
</replace>
- <replace file="${yanel.home.dir}/src/contributions/resources/${new.resource.name}/resource.xml" value="${new.resource.namespace}">
+ <replace file="${yanel.source.home}/src/contributions/resources/${new.resource.name}/resource.xml" value="${new.resource.namespace}">
<replacetoken>http://foo.bar/yanel/resource/1.0</replacetoken>
</replace>
- <replace file="${yanel.home.dir}/src/contributions/resources/${new.resource.name}/resource.xml" value="${new.resource.description}">
+ <replace file="${yanel.source.home}/src/contributions/resources/${new.resource.name}/resource.xml" value="${new.resource.description}">
<replacetoken>From Scratch Resource Template</replacetoken>
</replace>
- <replace file="${yanel.home.dir}/src/contributions/resources/${new.resource.name}/resource.xml" value="${new.resource.java.class}">
+ <replace file="${yanel.source.home}/src/contributions/resources/${new.resource.name}/resource.xml" value="${new.resource.java.class}">
<replacetoken>bar.foo.yanel.impl.resources.FromScratchResource</replacetoken>
</replace>
<!-- Patch doc/index.html -->
- <replace file="${yanel.home.dir}/src/contributions/resources/${new.resource.name}/yanel-htdocs/doc/index.html" value="${new.resource.name}">
+ <replace file="${yanel.source.home}/src/contributions/resources/${new.resource.name}/yanel-htdocs/doc/index.html" value="${new.resource.name}">
<replacetoken>from-scratch</replacetoken>
</replace>
- <replace file="${yanel.home.dir}/src/contributions/resources/${new.resource.name}/yanel-htdocs/doc/index.html" value="${new.resource.namespace}">
+ <replace file="${yanel.source.home}/src/contributions/resources/${new.resource.name}/yanel-htdocs/doc/index.html" value="${new.resource.namespace}">
<replacetoken>http://foo.bar/yanel/resource/1.0</replacetoken>
</replace>
- <replace file="${yanel.home.dir}/src/contributions/resources/${new.resource.name}/yanel-htdocs/doc/index.html" value="${new.resource.description}">
+ <replace file="${yanel.source.home}/src/contributions/resources/${new.resource.name}/yanel-htdocs/doc/index.html" value="${new.resource.description}">
<replacetoken>From Scratch Resource Template</replacetoken>
</replace>
- <replace file="${yanel.home.dir}/src/contributions/resources/${new.resource.name}/yanel-htdocs/doc/index.html" value="${new.resource.java.class}">
+ <replace file="${yanel.source.home}/src/contributions/resources/${new.resource.name}/yanel-htdocs/doc/index.html" value="${new.resource.java.class}">
<replacetoken>bar.foo.yanel.impl.resources.FromScratchResource</replacetoken>
</replace>
<!-- Patch build.properties -->
- <replace file="${yanel.home.dir}/src/contributions/resources/${new.resource.name}/src/build/build.properties" value="${new.resource.name}">
+ <replace file="${yanel.source.home}/src/contributions/resources/${new.resource.name}/src/build/build.properties" value="${new.resource.name}">
<replacetoken>from-scratch</replacetoken>
</replace>
@@ -73,14 +73,14 @@
<equals arg1="${new.resource.java.class.template}" arg2="empty" />
<then>
<echo message="Based on template empty" />
- <copy file="${yanel.home.dir}/src/build/targets/create-new-resource-type/from-scratch-resource-template/src/java/bar/foo/yanel/impl/resources/FromScratchResource-empty.java" tofile="${new.resource.java.class.location}"/>
- <copy file="${yanel.home.dir}/src/build/targets/create-new-resource-type/from-scratch-resource-template/src/test/junit/bar/foo/yanel/impl/resources/FromScratchResourceTest.java" tofile="${new.resource.test.java.class.location}"/>
- <copy file="${yanel.home.dir}/src/build/targets/create-new-resource-type/from-scratch-resource-template/src/test/htmlunit/bar/foo/yanel/impl/resources/FromScratchResourceWebTest.java" tofile="${new.resource.webtest.java.class.location}"/>
- <copy file="${yanel.home.dir}/src/build/targets/create-new-resource-type/from-scratch-resource-template/src/build/dependencies-with-javax.xml" tofile="${yanel.home.dir}/src/contributions/resources/${new.resource.name}/src/build/dependencies.xml"/>
+ <copy file="${yanel.source.home}/src/build/targets/create-new-resource-type/from-scratch-resource-template/src/java/bar/foo/yanel/impl/resources/FromScratchResource-empty.java" tofile="${new.resource.java.class.location}"/>
+ <copy file="${yanel.source.home}/src/build/targets/create-new-resource-type/from-scratch-resource-template/src/test/junit/bar/foo/yanel/impl/resources/FromScratchResourceTest.java" tofile="${new.resource.test.java.class.location}"/>
+ <copy file="${yanel.source.home}/src/build/targets/create-new-resource-type/from-scratch-resource-template/src/test/htmlunit/bar/foo/yanel/impl/resources/FromScratchResourceWebTest.java" tofile="${new.resource.webtest.java.class.location}"/>
+ <copy file="${yanel.source.home}/src/build/targets/create-new-resource-type/from-scratch-resource-template/src/build/dependencies-with-javax.xml" tofile="${yanel.source.home}/src/contributions/resources/${new.resource.name}/src/build/dependencies.xml"/>
<replace file="${new.resource.java.class.location}" value="${new.resource.java.class.name}">
<replacetoken>FromScratchResource</replacetoken>
</replace>
- <replace file="${yanel.home.dir}/src/contributions/resources/${new.resource.name}/src/build/dependencies.xml" value="${new.resource.name}">
+ <replace file="${yanel.source.home}/src/contributions/resources/${new.resource.name}/src/build/dependencies.xml" value="${new.resource.name}">
<replacetoken>FromScratchResource</replacetoken>
</replace>
<replace file="${new.resource.test.java.class.location}" value="${new.resource.java.class.name}">
@@ -108,7 +108,7 @@
<then>
<for param="file">
<path>
- <dirset dir="${yanel.home.dir}/src/build/targets/create-new-resource-type/from-scratch-resource-template/interfaces/" includes="*/**"/>
+ <dirset dir="${yanel.source.home}/src/build/targets/create-new-resource-type/from-scratch-resource-template/interfaces/" includes="*/**"/>
</path>
<sequential>
<var name="new.resource.java.interface.name" unset="true"/>
@@ -160,7 +160,7 @@
<var name="new.resource.example.names" value=""/>
<for param="file">
<path>
- <dirset dir="${yanel.home.dir}/src/build/targets/create-new-resource-type/from-scratch-resource-template/examples/" includes="*/**"/>
+ <dirset dir="${yanel.source.home}/src/build/targets/create-new-resource-type/from-scratch-resource-template/examples/" includes="*/**"/>
</path>
<sequential>
<propertyregex override="yes"
@@ -178,15 +178,15 @@
<echo>${new.resource.java.example.implement}</echo>
<echo>Creating resource based on template ${new.resource.java.example.implement}</echo>
- <copy file="${yanel.home.dir}/src/build/targets/create-new-resource-type/from-scratch-resource-template/examples/${new.resource.java.example.implement}/FromScratchResource.java" tofile="${new.resource.java.class.location}"/>
- <copy file="${yanel.home.dir}/src/build/targets/create-new-resource-type/from-scratch-resource-template/examples/${new.resource.java.example.implement}/dependencies.xml" tofile="${yanel.home.dir}/src/contributions/resources/${new.resource.name}/src/build/dependencies.xml"/>
+ <copy file="${yanel.source.home}/src/build/targets/create-new-resource-type/from-scratch-resource-template/examples/${new.resource.java.example.implement}/FromScratchResource.java" tofile="${new.resource.java.class.location}"/>
+ <copy file="${yanel.source.home}/src/build/targets/create-new-resource-type/from-scratch-resource-template/examples/${new.resource.java.example.implement}/dependencies.xml" tofile="${yanel.source.home}/src/contributions/resources/${new.resource.name}/src/build/dependencies.xml"/>
<replace file="${new.resource.java.class.location}" value="${new.resource.java.class.name}">
<replacetoken>FromScratchResource</replacetoken>
</replace>
<replace file="${new.resource.java.class.location}" value="${new.resource.java.class.package}">
<replacetoken>bar.foo.yanel.impl.resources</replacetoken>
</replace>
- <replace file="${yanel.home.dir}/src/contributions/resources/${new.resource.name}/src/build/dependencies.xml" value="${new.resource.name}">
+ <replace file="${yanel.source.home}/src/contributions/resources/${new.resource.name}/src/build/dependencies.xml" value="${new.resource.name}">
<replacetoken>FromScratchResource</replacetoken>
</replace>
</then>
@@ -195,15 +195,15 @@
<equals arg1="${new.resource.java.class.template}" arg2="xml" />
<then>
<echo message="Based on template xml" />
- <copy file="${yanel.home.dir}/src/build/targets/create-new-resource-type/from-scratch-resource-template/src/java/bar/foo/yanel/impl/resources/FromScratchResource-xml.java" tofile="${new.resource.java.class.location}"/>
- <copy file="${yanel.home.dir}/src/build/targets/create-new-resource-type/from-scratch-resource-template/src/build/dependencies-with-yanel-impl.xml" tofile="${yanel.home.dir}/src/contributions/resources/${new.resource.name}/src/build/dependencies.xml" overwrite="true"/>
+ <copy file="${yanel.source.home}/src/build/targets/create-new-resource-type/from-scratch-resource-template/src/java/bar/foo/yanel/impl/resources/FromScratchResource-xml.java" tofile="${new.resource.java.class.location}"/>
+ <copy file="${yanel.source.home}/src/build/targets/create-new-resource-type/from-scratch-resource-template/src/build/dependencies-with-yanel-impl.xml" tofile="${yanel.source.home}/src/contributions/resources/${new.resource.name}/src/build/dependencies.xml" overwrite="true"/>
<replace file="${new.resource.java.class.location}" value="${new.resource.java.class.name}">
<replacetoken>FromScratchResource</replacetoken>
</replace>
<replace file="${new.resource.java.class.location}" value="${new.resource.java.class.package}">
<replacetoken>bar.foo.yanel.impl.resources</replacetoken>
</replace>
- <replace file="${yanel.home.dir}/src/contributions/resources/${new.resource.name}/src/build/dependencies.xml" value="${new.resource.name}">
+ <replace file="${yanel.source.home}/src/contributions/resources/${new.resource.name}/src/build/dependencies.xml" value="${new.resource.name}">
<replacetoken>FromScratchResource</replacetoken>
</replace>
</then>
@@ -212,15 +212,15 @@
<equals arg1="${new.resource.java.class.template}" arg2="usecase" />
<then>
<echo message="Based on template usecase" />
- <copy file="${yanel.home.dir}/src/build/targets/create-new-resource-type/from-scratch-resource-template/src/java/bar/foo/yanel/impl/resources/FromScratchResource-usecase.java" tofile="${new.resource.java.class.location}"/>
- <copy file="${yanel.home.dir}/src/build/targets/create-new-resource-type/from-scratch-resource-template/src/build/dependencies-with-yanel-impl.xml" tofile="${yanel.home.dir}/src/contributions/resources/${new.resource.name}/src/build/dependencies.xml" overwrite="true"/>
+ <copy file="${yanel.source.home}/src/build/targets/create-new-resource-type/from-scratch-resource-template/src/java/bar/foo/yanel/impl/resources/FromScratchResource-usecase.java" tofile="${new.resource.java.class.location}"/>
+ <copy file="${yanel.source.home}/src/build/targets/create-new-resource-type/from-scratch-resource-template/src/build/dependencies-with-yanel-impl.xml" tofile="${yanel.source.home}/src/contributions/resources/${new.resource.name}/src/build/dependencies.xml" overwrite="true"/>
<replace file="${new.resource.java.class.location}" value="${new.resource.java.class.name}">
<replacetoken>FromScratchResource</replacetoken>
</replace>
<replace file="${new.resource.java.class.location}" value="${new.resource.java.class.package}">
<replacetoken>bar.foo.yanel.impl.resources</replacetoken>
</replace>
- <replace file="${yanel.home.dir}/src/contributions/resources/${new.resource.name}/src/build/dependencies.xml" value="${new.resource.name}">
+ <replace file="${yanel.source.home}/src/contributions/resources/${new.resource.name}/src/build/dependencies.xml" value="${new.resource.name}">
<replacetoken>FromScratchResource</replacetoken>
</replace>
</then>
Modified: public/yanel/trunk/src/build/targets/execute-jmeter.xml
===================================================================
--- public/yanel/trunk/src/build/targets/execute-jmeter.xml 2008-08-19 14:28:12 UTC (rev 38122)
+++ public/yanel/trunk/src/build/targets/execute-jmeter.xml 2008-08-19 14:28:50 UTC (rev 38123)
@@ -2,17 +2,15 @@
<project name="execute jmeter test plan" default="jmeter">
-<property name="yanel.home.dir" location="../../"/>
-
- <target name="jmeter" description="executes jmeter tesplan">
+ <target name="jmeter" description="executes jmeter tesplan">
<tstamp>
<format property="test.exec.time" pattern="yyyy-MM-dd-HH-mm-ss"/>
</tstamp>
<taskdef name="jmeter" classname="org.programmerplanet.ant.taskdefs.jmeter.JMeterTask"/>
<jmeter
jmeterhome="${jmeter.home.dir}"
- testplan="${yanel.home.dir}/local/test/data/jmeter/testplan/yanel_test_plan.jmx"
- resultlog="${yanel.home.dir}/local/test/data/jmeter/jmeter-results/JMeterResults-${test.exec.time}.jtl"/>
+ testplan="${yanel.source.home}/local/test/data/jmeter/testplan/yanel_test_plan.jmx"
+ resultlog="${yanel.source.home}/local/test/data/jmeter/jmeter-results/JMeterResults-${test.exec.time}.jtl"/>
</target>
</project>
Modified: public/yanel/trunk/src/build/targets/install-tomcat.xml
===================================================================
--- public/yanel/trunk/src/build/targets/install-tomcat.xml 2008-08-19 14:28:12 UTC (rev 38122)
+++ public/yanel/trunk/src/build/targets/install-tomcat.xml 2008-08-19 14:28:50 UTC (rev 38123)
@@ -13,8 +13,8 @@
<dependency groupId="apache-org" artifactId="apache-tomcat" version="${tomcat.version}" scope="provided"/>
</artifact:dependencies>
- <mkdir dir="${yanel.home.dir}/local"/>
- <unzip dest="${yanel.home.dir}/local">
+ <mkdir dir="${yanel.source.home}/local"/>
+ <unzip dest="${yanel.source.home}/local">
<fileset refid="maven2.tomcat.fileset"/>
</unzip>
<chmod perm="755">
@@ -22,23 +22,23 @@
<include name="*.sh"/>
</fileset>
</chmod>
- <delete dir="${yanel.home.dir}/local/META-INF"/>
+ <delete dir="${yanel.source.home}/local/META-INF"/>
<condition property="isJava1.4">
<equals arg1="${ant.java.version}" arg2="1.4"/>
</condition>
<antcall target="copy-java1.4-libs"/>
- <replace file="${yanel.home.dir}/src/build/local.build.properties" value="tomcat1.http.port=8080">
+ <replace file="${yanel.source.home}/src/build/local.build.properties" value="tomcat1.http.port=8080">
<replacetoken>#tomcat1.http.port=9190</replacetoken>
</replace>
- <replace file="${yanel.home.dir}/src/build/local.build.properties" value="tomcat1.ssl.port=8443">
+ <replace file="${yanel.source.home}/src/build/local.build.properties" value="tomcat1.ssl.port=8443">
<replacetoken>#tomcat1.ssl.port=9143</replacetoken>
</replace>
</target>
<target name="copy-java1.4-libs" if="isJava1.4" description="Copy jars specific to java 1.4" depends="init">
- <copy file="${yanel.home.dir}/tools/apache-tomcat/java-1.4/apache-tomcat-${tomcat.version}/bin/jmx.jar" todir="${default.tomcat.home.dir}/bin"/>
+ <copy file="${yanel.source.home}/tools/apache-tomcat/java-1.4/apache-tomcat-${tomcat.version}/bin/jmx.jar" todir="${default.tomcat.home.dir}/bin"/>
</target>
</project>
More information about the Yanel-commits
mailing list