You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by lg...@apache.org on 2007/01/26 14:23:42 UTC
svn commit: r500236 - in /cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl:
build.xml pom.xml
Author: lgawron
Date: Fri Jan 26 05:23:41 2007
New Revision: 500236
URL: http://svn.apache.org/viewvc?view=rev&rev=500236
Log:
dojo resources were unpacked to an wrong directory so _cocoon/resources/dojo/dojo.js was not served correctly
Modified:
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/build.xml
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml
Modified: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/build.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/build.xml?view=diff&rev=500236&r1=500235&r2=500236
==============================================================================
--- cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/build.xml (original)
+++ cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/build.xml Fri Jan 26 05:23:41 2007
@@ -20,7 +20,9 @@
<!-- FIXME : Use maven built-in properties to locate source and destination folders -->
<property name="srcDir" location="src/main/resources/org/apache/cocoon/dojo/resources"/>
<property name="destDir" location="target/classes/org/apache/cocoon/dojo/resources"/>
- <unzip dest="${destDir}">
+ <!-- build.xml:25: The 'unwar' type doesn't support the nested "regexpmapper" element. -->
+ <delete dir="target/dojo-temp"/>
+ <unzip dest="target/dojo-temp">
<fileset dir="${srcDir}">
<include name="dojo-*.zip"/>
</fileset>
@@ -28,5 +30,10 @@
<delete>
<fileset dir="${destDir}" includes="dojo-*.zip"/>
</delete>
+ <copy todir="${destDir}">
+ <fileset dir="target/dojo-temp"/>
+ <regexpmapper from="^([^/]+)/(.*)$$" to="\2" handledirsep="true"/>
+ </copy>
+ <echo>copied</echo>
</target>
</project>
Modified: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml?view=diff&rev=500236&r1=500235&r2=500236
==============================================================================
--- cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml Fri Jan 26 05:23:41 2007
@@ -69,6 +69,18 @@
</goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-apache-oro</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.daisycms</groupId>