You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by bd...@apache.org on 2005/07/19 17:05:30 UTC
svn commit: r219705 - in /cocoon/trunk/tools/targets: init-build.xml
osgi-build.xml
Author: bdelacretaz
Date: Tue Jul 19 08:05:29 2005
New Revision: 219705
URL: http://svn.apache.org/viewcvs?rev=219705&view=rev
Log:
build clean also cleans osgi stuff and deletes fwdir
Modified:
cocoon/trunk/tools/targets/init-build.xml
cocoon/trunk/tools/targets/osgi-build.xml
Modified: cocoon/trunk/tools/targets/init-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/init-build.xml?rev=219705&r1=219704&r2=219705&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/init-build.xml (original)
+++ cocoon/trunk/tools/targets/init-build.xml Tue Jul 19 08:05:29 2005
@@ -243,7 +243,7 @@
<!-- Clean -->
<target name="clean"
- depends="clean-cocoon,clean-webapp,clean-standalone-demo"
+ depends="clean-cocoon,clean-webapp,clean-standalone-demo,osgi.clean"
description="Cleans the cocoon build, webapp and standalone-demo"/>
<!-- Clean the cocoon build directory -->
Modified: cocoon/trunk/tools/targets/osgi-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/osgi-build.xml?rev=219705&r1=219704&r2=219705&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/osgi-build.xml (original)
+++ cocoon/trunk/tools/targets/osgi-build.xml Tue Jul 19 08:05:29 2005
@@ -26,7 +26,8 @@
<property name="build.osgi.bundles.cocoon" value="org.apache.cocoon_1.0.0.jar"/>
<property name="build.osgi.bundles.cocoon_webapp" value="org.apache.cocoon_webapp_1.0.0.jar"/>
<property name="build.osgi.bundles.cocoon_servlet" value="org.apache.cocoon_servlet_1.0.0.jar"/>
-
+ <property name="build.osgi.knopflerfish.fwdir" value="fwdir"/>
+
<property name="lib.osgi" value="${lib}/osgi"/>
<property name="src.osgi.servlet" value="${src}/osgi-servlet"/>
@@ -37,11 +38,12 @@
</target>
<target name="osgi" depends="osgi.init, compile-core, osgi.compile-osgi-servlet, osgi.prepare-webapp, osgi.bundling"
- description="Setup Cocoon to run within OSGi containers">
+ description="Setup Cocoon to run within OSGi containers">
</target>
<target name="osgi.clean" depends="osgi.init">
<delete dir="${build.osgi}"/>
+ <delete dir="${build.osgi.knopflerfish.fwdir}"/>
</target>
<target name="osgi.compile-osgi-servlet">
@@ -65,7 +67,7 @@
compiler="${compiler}"
srcdir="${src.osgi.servlet}"
destdir="${build.osgi.servlet}"
- classpathref="osgi.osgi-servlet.classpath"/>
+ classpathref="osgi.osgi-servlet.classpath"/>
</target>
<target name="osgi.prepare-webapp">
@@ -77,32 +79,32 @@
<copy file="${webapp}/wiring.xml" tofile="${build.osgi.webapp}/wiring.xml" filtering="on"/>
<copy todir="${build.osgi.webapp}/stylesheets" filtering="on">
- <fileset dir="${webapp}/stylesheets">
- <include name="**/*.xslt"/>
- </fileset>
+ <fileset dir="${webapp}/stylesheets">
+ <include name="**/*.xslt"/>
+ </fileset>
</copy>
<copy todir="${build.osgi.webapp}/resources" filtering="off">
- <fileset dir="${webapp}/resources"/>
+ <fileset dir="${webapp}/resources"/>
</copy>
<copy todir="${build.osgi.webapp}/samples" filtering="off">
<fileset dir="${webapp}/samples"/>
</copy>
- <copy todir="${build.osgi.webapp}/WEB-INF" filtering="on">
- <fileset dir="${webapp}/WEB-INF">
- <exclude name="compile/**"/>
- </fileset>
+ <copy todir="${build.osgi.webapp}/WEB-INF" filtering="on">
+ <fileset dir="${webapp}/WEB-INF">
+ <exclude name="compile/**"/>
+ </fileset>
</copy>
- <replace file="${build.osgi.webapp}/WEB-INF/cocoon.xconf">
- <replacetoken><![CDATA[<include dir="context://WEB-INF/xconf" pattern="*.xconf"/>]]></replacetoken>
+ <replace file="${build.osgi.webapp}/WEB-INF/cocoon.xconf">
+ <replacetoken><![CDATA[<include dir="context://WEB-INF/xconf" pattern="*.xconf"/>]]></replacetoken>
<replacevalue><![CDATA[<!-- replaced by the OSGi Ant task
include dir="context://WEB-INF/xconf" pattern="*.xconf"/-->
<include src="context://WEB-INF/xconf/cocoon-blocks.xconf"/>]]>
- </replacevalue>
+ </replacevalue>
</replace>
<replace file="${build.osgi.webapp}/WEB-INF/cocoon.xconf">
@@ -122,11 +124,11 @@
<target name="osgi.bundling">
<jar file="${build.osgi}/${build.osgi.bundles.cocoon}" manifest="${build.dest}/Manifest.mf">
<fileset dir="${build.dest}/">
- <exclude name="Manifest.mf"/>
- <include name="**"/>
+ <exclude name="Manifest.mf"/>
+ <include name="**"/>
</fileset>
- <fileset dir="${lib.core}">
- <include name="*.jar"/>
+ <fileset dir="${lib.core}">
+ <include name="*.jar"/>
</fileset>
<fileset dir="${lib.endorsed}">
<include name="*.jar"/>
@@ -135,8 +137,8 @@
<jar file="${build.osgi}/${build.osgi.bundles.cocoon_webapp}" manifest="${webapp}/Manifest.mf">
<fileset dir="${build.osgi.webapp}"/>
</jar>
- <jar file="${build.osgi}/${build.osgi.bundles.cocoon_servlet}" manifest="${src.osgi.servlet}/Manifest.mf">
- <fileset dir="${build.osgi.servlet}"/>
+ <jar file="${build.osgi}/${build.osgi.bundles.cocoon_servlet}" manifest="${src.osgi.servlet}/Manifest.mf">
+ <fileset dir="${build.osgi.servlet}"/>
</jar>
</target>