[Yanel-commits] rev 24594 -
public/yanel/contributions/projects/yanel-minimal
simon at wyona.com
simon at wyona.com
Mon May 21 21:53:59 CEST 2007
Author: simon
Date: 2007-05-21 21:53:57 +0200 (Mon, 21 May 2007)
New Revision: 24594
Modified:
public/yanel/contributions/projects/yanel-minimal/build.xml
public/yanel/contributions/projects/yanel-minimal/dependencies.xml
Log:
dependencies fixed
Modified: public/yanel/contributions/projects/yanel-minimal/build.xml
===================================================================
--- public/yanel/contributions/projects/yanel-minimal/build.xml 2007-05-21 19:53:11 UTC (rev 24593)
+++ public/yanel/contributions/projects/yanel-minimal/build.xml 2007-05-21 19:53:57 UTC (rev 24594)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project name="yanel-minimal" default="build-webapp" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project name="yanel-minimal" default="war" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<description>Yanel-minimal Build</description>
<property file="local.build.properties"/>
@@ -26,7 +26,17 @@
<exclude name="web.xml"/>
</fileset>
</copy>
-
+
+ <replace file="webapps/${project.name}/WEB-INF/classes/install.rdf" value="${project.name}">
+ <replacetoken>@PROJECTNAME@</replacetoken>
+ </replace>
+ <replace file="webapps/${project.name}/WEB-INF/classes/install.rdf" value="${project.version}-r${project.revision}">
+ <replacetoken>@VERSION@</replacetoken>
+ </replace>
+ <replace file="webapps/${project.name}/WEB-INF/classes/install.rdf" value="war">
+ <replacetoken>@INSTALLTYPE@</replacetoken>
+ </replace>
+
<copy todir="webapps/${project.name}/realms">
<fileset dir="realms"/>
</copy>
@@ -43,13 +53,13 @@
<target name="build-resources" description="Build resources">
<ant target="compile" antfile="${build.dir}/resource-types/file/build.xml" inheritAll="false">
- <property value="0.0.1-dev-rREVISION" name="yanel.source.version"/>
+ <property value="${yanel.version}-r${yanel.revision}" name="yanel.source.version"/>
</ant>
<ant target="copy-dependencies" antfile="${build.dir}/resource-types/file/build.xml" inheritAll="false">
<property value="${build.dir}" name="build.dir"/>
<property value="yanel" name="servlet.context.prefix"/>
- <property value="0.0.1-dev-rREVISION" name="yanel.source.version"/>
+ <property value="${yanel.version}-r${yanel.revision}" name="yanel.source.version"/>
</ant>
<copy todir="${build.dir}/webapps/${project.name}/WEB-INF/lib">
@@ -63,7 +73,7 @@
<target name="clean" description="clean" depends="init">
<ant target="clean" antfile="${build.dir}/resource-types/file/build.xml" inheritAll="false">
- <property value="0.0.1-dev-rREVISION" name="yanel.source.version"/>
+ <property value="${yanel.version}-r${yanel.revision}" name="yanel.source.version"/>
</ant>
<delete dir="webapps"/>
</target>
Modified: public/yanel/contributions/projects/yanel-minimal/dependencies.xml
===================================================================
--- public/yanel/contributions/projects/yanel-minimal/dependencies.xml 2007-05-21 19:53:11 UTC (rev 24593)
+++ public/yanel/contributions/projects/yanel-minimal/dependencies.xml 2007-05-21 19:53:57 UTC (rev 24594)
@@ -35,17 +35,15 @@
<dependency groupId="wyona-org-security" artifactId="wyona-org-security-impl"
version="0.0.1-dev-r23969"/>
<dependency groupId="wyona-org-yanel" artifactId="yanel-core"
- version="0.0.1-dev-r22926"/>
+ version="${yanel.version}-r${yanel.revision}"/>
<dependency groupId="wyona-org-yanel" artifactId="yanel-impl"
- version="0.0.1-dev-r22926"/>
+ version="${yanel.version}-r${yanel.revision}"/>
<dependency groupId="wyona-org-yanel" artifactId="yanel-webapp"
- version="0.0.1-dev-r22926"/>
+ version="${yanel.version}-r${yanel.revision}"/>
<dependency groupId="yarep" artifactId="yarep-core"
version="0.0.1-dev-r23202"/>
<dependency groupId="yarep" artifactId="yarep-impl"
version="0.0.1-dev-r23202"/>
-
-
</artifact:dependencies>
<property name="maven2.cp" refid="maven2.classpath"/>
More information about the Yanel-commits
mailing list