[Yanel-commits] rev 41804 - in public/yanel/trunk/src/build:
resource-types
targets/create-new-resource-type/from-scratch-resource-template
guillaume at wyona.com
guillaume at wyona.com
Thu Mar 5 15:22:22 CET 2009
Author: guillaume
Date: 2009-03-05 15:22:22 +0100 (Thu, 05 Mar 2009)
New Revision: 41804
Modified:
public/yanel/trunk/src/build/resource-types/resource-type.build.xml
public/yanel/trunk/src/build/targets/create-new-resource-type/from-scratch-resource-template/build.xml
Log:
Removed duplicate Ant codee from the from-scratch resource template.
The common resource-type build file was changed to cater for resources
that have several "resource-*.xml" files (only "user-mgmt" ATM).
It seems like there are no other "resource**" files than that:
find ~/yanel-trunk.VC/ ~/yanel-contributions.VC/ \( -wholename "*resources/*/build.xml" -or -wholename "*resource-types/*/build.xml" -or -wholename "*create-new-resource-type/*/build.xml" \) -exec ./ls_dirname_other_resource_prefixed '{}' \;
..with: 'ls_dirname_other_resource_prefixed' being:
#!/bin/sh
ls `dirname $1`/resource* | grep -v "resource\.xml"
gives no other results.
Issue: 6898
Modified: public/yanel/trunk/src/build/resource-types/resource-type.build.xml
===================================================================
--- public/yanel/trunk/src/build/resource-types/resource-type.build.xml 2009-03-05 13:28:35 UTC (rev 41803)
+++ public/yanel/trunk/src/build/resource-types/resource-type.build.xml 2009-03-05 14:22:22 UTC (rev 41804)
@@ -58,7 +58,7 @@
global="true"
casesensitive="false" />
<copy todir="${resource.classes.dir}/${new.resource.java.class.fs.path}">
- <fileset dir="${resource.home.dir}" includes="resource.xml,htdocs/**,yanel-htdocs/**"/>
+ <fileset dir="${resource.home.dir}" includes="resource*.xml,htdocs/**,yanel-htdocs/**"/><!--NOTE: only the "user-mgmt" resource-type folder contains several "resource-*.xml" files, all other resource-types only have one "resource.xml" (as of revision 41802 at least) -->
</copy>
<mkdir dir="${resource.lib.dir}"/>
<jar destfile="${resource.lib.dir}/yanel-resource-${resource.name}-${resource.version}.jar"
Modified: public/yanel/trunk/src/build/targets/create-new-resource-type/from-scratch-resource-template/build.xml
===================================================================
--- public/yanel/trunk/src/build/targets/create-new-resource-type/from-scratch-resource-template/build.xml 2009-03-05 13:28:35 UTC (rev 41803)
+++ public/yanel/trunk/src/build/targets/create-new-resource-type/from-scratch-resource-template/build.xml 2009-03-05 14:22:22 UTC (rev 41804)
@@ -1,65 +1,3 @@
-<?xml version="1.0"?>
-
-<project name="yanel-resource" default="compile">
-
- <import file="src/build/dependencies.xml"/>
-
- <target name="init" description="Initialize build" depends="dependencies">
- <echo>Initialize build</echo>
-
- <dirname property="resource.home.dir" file="${ant.file}"/>
- <echo>Resource Home Directory: ${resource.home.dir}</echo>
-
- <property file="${resource.home.dir}/src/build/local.build.properties"/>
- <property file="${resource.home.dir}/src/build/build.properties"/>
-
- <path id="classpath">
- <pathelement path="${maven2.cp}"/>
- </path>
- <property name="resource.build.dir" value="${resource.home.dir}/build"/>
- <property name="resource.classes.dir" value="${resource.build.dir}/classes"/>
- <property name="resource.lib.dir" value="${resource.build.dir}/lib"/>
- <property name="resource.java.dir" value="${resource.home.dir}/src/java"/>
- <property name="resource.resource.xml" value="${resource.home.dir}/resource.xml"/>
- <xmlproperty prefix="resource.resource.xml" file="${resource.resource.xml}"/>
- </target>
-
- <target name="compile" description="Compile Java classes" depends="init">
-
- <mkdir dir="${resource.classes.dir}"/>
- <javac srcdir="${resource.java.dir}" destdir="${resource.classes.dir}"
- classpathref="classpath"
- debug="true"
- />
- <propertyregex property="new.resource.java.classname.fs.path"
- input="${resource.resource.xml.resource(class)}"
- regexp="[.]"
- replace="/"
- global="true"
- casesensitive="false" />
- <propertyregex property="new.resource.java.class.fs.path"
- input="${new.resource.java.classname.fs.path}"
- regexp="\/[^/]*$"
- replace=""
- global="true"
- casesensitive="false" />
- <copy todir="${resource.classes.dir}/${new.resource.java.class.fs.path}">
- <fileset dir="${resource.home.dir}" includes="resource**,htdocs/**,yanel-htdocs/**"/>
- </copy>
- <mkdir dir="${resource.lib.dir}"/>
- <jar destfile="${resource.lib.dir}/yanel-resource-${resource.name}-${resource.version}.jar"
- basedir="${resource.classes.dir}"
- />
- </target>
-
- <target name="clean" depends="init">
- <delete dir="${resource.build.dir}"/>
- </target>
-
- <target name="copy-dependencies" depends="init">
- <copy todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib">
- <fileset refid="maven2.resource.fileset"/>
- <mapper type="flatten"/>
- </copy>
- </target>
+<project name="yanel-resource">
+ <import file="${yanel.source.home}/src/build/resource-types/resource-type.build.xml"/>
</project>
More information about the Yanel-commits
mailing list