tapestry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jkuhn...@apache.org
Subject svn commit: r408792 - in /tapestry/tapestry4/trunk/framework: build.xml src/descriptor/META-INF/tapestry.event.xml src/descriptor/META-INF/tapestry.render.xml src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java
Date Mon, 22 May 2006 23:54:44 GMT
Author: jkuhnert
Date: Mon May 22 16:54:43 2006
New Revision: 408792

URL: http://svn.apache.org/viewvc?rev=408792&view=rev
Log:
Fixed build so that unit tests run happily again

Modified:
    tapestry/tapestry4/trunk/framework/build.xml
    tapestry/tapestry4/trunk/framework/src/descriptor/META-INF/tapestry.event.xml
    tapestry/tapestry4/trunk/framework/src/descriptor/META-INF/tapestry.render.xml
    tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java

Modified: tapestry/tapestry4/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/build.xml?rev=408792&r1=408791&r2=408792&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/build.xml (original)
+++ tapestry/tapestry4/trunk/framework/build.xml Mon May 22 16:54:43 2006
@@ -24,7 +24,7 @@
   <property name="module.junit.jvmarg" value="-Duser.language=en -Duser.country=US"/>
   <property name="module.javac-test.source" value="1.5"/>
   <property name="module.javac-test.target" value="1.5"/>
-    
+  
   <property name="root.dir" value=".."/>
   <property file="${root.dir}/config/build.properties"/>
   <property file="${root.dir}/config/common.properties"/>
@@ -72,7 +72,18 @@
 </echo>
   </target>
 	
+
+	<property name="js.dir" value="src/js" />
+	<property name="dojo.js.dir" value="${js.dir}/dojo" />
+	<property name="tapestry.js.dir" value="${js.dir}/tapestry" />
+	
  <target name="compile" depends="compile-dependencies,create-version-file">
+ 	<copy todir="${java.classes.dir}/dojo" overwrite="true" preservelastmodified="true">
+ 		<fileset dir="${dojo.js.dir}" />
+ 	</copy>
+ 	<copy todir="${java.classes.dir}/tapestry" overwrite="true" preservelastmodified="true">
+ 	 	<fileset dir="${tapestry.js.dir}" />
+ 	</copy>
     <default-compile/>
   </target>	
   

Modified: tapestry/tapestry4/trunk/framework/src/descriptor/META-INF/tapestry.event.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/descriptor/META-INF/tapestry.event.xml?rev=408792&r1=408791&r2=408792&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/descriptor/META-INF/tapestry.event.xml (original)
+++ tapestry/tapestry4/trunk/framework/src/descriptor/META-INF/tapestry.event.xml Mon May
22 16:54:43 2006
@@ -46,4 +46,4 @@
         </invoke-factory>
     </service-point>
   
-</module>
\ No newline at end of file
+</module>

Modified: tapestry/tapestry4/trunk/framework/src/descriptor/META-INF/tapestry.render.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/descriptor/META-INF/tapestry.render.xml?rev=408792&r1=408791&r2=408792&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/descriptor/META-INF/tapestry.render.xml (original)
+++ tapestry/tapestry4/trunk/framework/src/descriptor/META-INF/tapestry.render.xml Mon May
22 16:54:43 2006
@@ -59,4 +59,4 @@
     <command id="component-event-connection" object="service:ComponentEventConnectionWorker"
/>
   </contribution>
   
-</module>
\ No newline at end of file
+</module>

Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java?rev=408792&r1=408791&r2=408792&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java
(original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java
Mon May 22 16:54:43 2006
@@ -182,7 +182,7 @@
         factory.setAssetService(assetService);
         factory.setLocalizer(new DefaultResourceLocalizer());
         
-        String path = "/org/apache/tapestry/html/dojo/dojo.js";
+        String path = "/dojo/dojo.js";
         
         IAsset asset = factory.createAsset(shell, path, 
                 Locale.getDefault(),
@@ -210,7 +210,7 @@
         factory.setAssetService(assetService);
         factory.setLocalizer(new DefaultResourceLocalizer());
         
-        String path = "/org/apache/tapestry/html/dojo/";
+        String path = "/dojo/";
         
         IAsset asset = factory.createAsset(shell, path, 
                 Locale.getDefault(),



Mime
View raw message