You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2007/04/14 15:58:29 UTC

svn commit: r528810 [1/3] - in /tapestry/tapestry4/trunk: ./ tapestry-annotations/ tapestry-annotations/src/java/org/apache/tapestry/annotations/ tapestry-annotations/src/test/org/apache/tapestry/annotations/ tapestry-annotations/src/test/org/apache/ta...

Author: jkuhnert
Date: Sat Apr 14 06:58:27 2007
New Revision: 528810

URL: http://svn.apache.org/viewvc?view=rev&rev=528810
Log:
Fixes TAPESTRY-1396 and TAPESTRY-1091.

Added:
    tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/images/
    tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/images/test-asset.txt   (with props)
    tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/images/body-bkg.png   (with props)
    tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/images/Continue.gif
    tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/dateIcon.gif
      - copied unchanged from r528339, tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/images/dateIcon.gif
    tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/fields/images/
    tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/fields/images/Continue.gif
Removed:
    tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/images/.cvsignore
    tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/images/.cvsignore
    tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/components/.cvsignore
Modified:
    tapestry/tapestry4/trunk/pom.xml
    tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/annotations/AnnotationEnhancementWorker.java
    tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/annotations/AssetAnnotationWorker.java
    tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/AnnotatedPage.java
    tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestAssetAnnotationWorker.java
    tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml
    tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml
    tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml
    tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml
    tapestry/tapestry4/trunk/tapestry-examples/Workbench/pom.xml
    tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/Dates.html
    tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Fields.page
    tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/Dates.java
    tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/fields/Fields.java
    tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.asset.xml
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetFactory.java
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetSource.java
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetSourceImpl.java
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/ClasspathAssetFactory.java
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/ContextAssetFactory.java
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/DefaultAssetFactory.java
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/pageload/PageLoader.java
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/resolver/ComponentSpecificationResolverImpl.java
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/spec/ComponentSpecification.java
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/web/LocalizedWebContextResourceFinder.java
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/web/WebContextResource.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ContextAssetFactoryTest.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestAssetSource.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestDefaultAssetFactory.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/state/TestApplicationStateManager.java
    tapestry/tapestry4/trunk/tapestry-framework/tapestry-framework.iml
    tapestry/tapestry4/trunk/tapestry-portlet/tapestry-portlet.iml
    tapestry/tapestry4/trunk/tapestry.iml
    tapestry/tapestry4/trunk/tapestry.ipr
    tapestry/tapestry4/trunk/tapestry.iws

Modified: tapestry/tapestry4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/pom.xml?view=diff&rev=528810&r1=528809&r2=528810
==============================================================================
--- tapestry/tapestry4/trunk/pom.xml (original)
+++ tapestry/tapestry4/trunk/pom.xml Sat Apr 14 06:58:27 2007
@@ -158,7 +158,7 @@
             <dependency>
                 <groupId>org.testng</groupId>
                 <artifactId>testng</artifactId>
-                <version>5.1</version>
+                <version>5.5</version>
                 <classifier>jdk15</classifier>
                 <scope>test</scope>
             </dependency>
@@ -270,7 +270,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.8-SNAPSHOT</version>
+                    <version>2.4-SNAPSHOT</version>
                     <inherited>true</inherited>
                     <configuration>
                         <systemProperties>
@@ -397,7 +397,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>2.4-SNAPSHOT</version>
                 <inherited>true</inherited>
             </plugin>
             <plugin>

Modified: tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/annotations/AnnotationEnhancementWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/annotations/AnnotationEnhancementWorker.java?view=diff&rev=528810&r1=528809&r2=528810
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/annotations/AnnotationEnhancementWorker.java (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/annotations/AnnotationEnhancementWorker.java Sat Apr 14 06:58:27 2007
@@ -14,11 +14,6 @@
 
 package org.apache.tapestry.annotations;
 
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.hivemind.ClassResolver;
 import org.apache.hivemind.ErrorLog;
 import org.apache.hivemind.Location;
@@ -28,6 +23,11 @@
 import org.apache.tapestry.enhance.EnhancementWorker;
 import org.apache.tapestry.spec.IComponentSpecification;
 import org.apache.tapestry.util.DescribedLocation;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Implementation of {@link org.apache.tapestry.enhance.EnhancementWorker} that finds class and

Modified: tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/annotations/AssetAnnotationWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/annotations/AssetAnnotationWorker.java?view=diff&rev=528810&r1=528809&r2=528810
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/annotations/AssetAnnotationWorker.java (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/annotations/AssetAnnotationWorker.java Sat Apr 14 06:58:27 2007
@@ -14,23 +14,19 @@
 
 package org.apache.tapestry.annotations;
 
-import java.lang.reflect.Method;
-
 import org.apache.hivemind.Location;
-import org.apache.hivemind.Resource;
 import org.apache.tapestry.enhance.EnhancementOperation;
 import org.apache.tapestry.spec.AssetSpecification;
 import org.apache.tapestry.spec.IAssetSpecification;
 import org.apache.tapestry.spec.IComponentSpecification;
-import org.apache.tapestry.util.DescribedLocation;
+
+import java.lang.reflect.Method;
 
 /**
  * Uses the {@link org.apache.tapestry.annotations.Asset} annotation to create a new
  * {@link org.apache.tapestry.spec.IAssetSpecification} which is then added to the
  * {@link org.apache.tapestry.spec.IComponentSpecification}.
  * 
- * @author Howard Lewis Ship
- * @since 4.0
  */
 public class AssetAnnotationWorker implements MethodAnnotationEnhancementWorker
 {
@@ -48,10 +44,10 @@
         // Very important for assets, as they need a location (really, the Resource
         // of a location) to figure out what kind of asset they are.
 
-        Resource specResource = spec.getSpecificationLocation();
-        Location assetLocation = new DescribedLocation(specResource, location.toString());
-
-        as.setLocation(assetLocation);
+        //Resource specResource = spec.getSpecificationLocation();
+        //Location assetLocation = new DescribedLocation(specResource, location.toString());
+        
+        as.setLocation(location);
 
         spec.addAsset(propertyName, as);
     }

Modified: tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/AnnotatedPage.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/AnnotatedPage.java?view=diff&rev=528810&r1=528809&r2=528810
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/AnnotatedPage.java (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/AnnotatedPage.java Sat Apr 14 06:58:27 2007
@@ -14,19 +14,15 @@
 
 package org.apache.tapestry.annotations;
 
-import java.lang.annotation.Target;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tapestry.IAsset;
-import org.apache.tapestry.IComponent;
-import org.apache.tapestry.IForm;
-import org.apache.tapestry.IPage;
-import org.apache.tapestry.IScript;
+import org.apache.tapestry.*;
 import org.apache.tapestry.form.Checkbox;
 import org.apache.tapestry.form.TextField;
 import org.apache.tapestry.html.BasePage;
 
+import java.lang.annotation.Target;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * Used by {@link org.apache.tapestry.annotations.AnnotationEnhancementWorkerTest}. Also a chance
  * to try each of the annotations out.
@@ -177,5 +173,7 @@
     
     @Persist
     public abstract SubSimpleBean getSubBean();
-    
+
+    @Asset("images/test-asset.txt")
+    public abstract IAsset getTextAsset();
 }

Modified: tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestAssetAnnotationWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestAssetAnnotationWorker.java?view=diff&rev=528810&r1=528809&r2=528810
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestAssetAnnotationWorker.java (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/TestAssetAnnotationWorker.java Sat Apr 14 06:58:27 2007
@@ -14,27 +14,24 @@
 
 package org.apache.tapestry.annotations;
 
-import java.lang.reflect.Method;
-
 import org.apache.hivemind.Location;
 import org.apache.hivemind.Resource;
 import org.apache.tapestry.enhance.EnhancementOperation;
 import org.apache.tapestry.spec.ComponentSpecification;
 import org.apache.tapestry.spec.IAssetSpecification;
 import org.apache.tapestry.spec.IComponentSpecification;
-import org.apache.tapestry.util.DescribedLocation;
 import org.testng.annotations.Test;
 
+import java.lang.reflect.Method;
+
 /**
  * Tests for {@link org.apache.tapestry.annotations.AssetAnnotationWorker}.
  * 
- * @author Howard Lewis Ship
- * @since 4.0
  */
 @Test
 public class TestAssetAnnotationWorker extends BaseAnnotationTestCase
 {
-    public void testSuccess()
+    public void test_Success()
     {
         Location l = newLocation();
         Resource r = newMock(Resource.class);
@@ -51,8 +48,32 @@
         verify();
 
         IAssetSpecification as = spec.getAsset("globalStylesheet");
+
         assertEquals("/style/global.css", as.getPath());
-        assertEquals(new DescribedLocation(r, l.toString()), as.getLocation());
+        assertEquals(as.getLocation(), l);
         assertEquals("globalStylesheet", as.getPropertyName());
+    }
+
+    public void test_Class_Relative_Asset()
+    {
+        Location l = newLocation();
+        Resource r = newMock(Resource.class);
+        EnhancementOperation op = newOp();
+        IComponentSpecification spec = new ComponentSpecification();
+        spec.setSpecificationLocation(r);
+
+        replay();
+
+        Method m = findMethod(AnnotatedPage.class, "getTextAsset");
+
+        new AssetAnnotationWorker().performEnhancement(op, spec, m, l);
+
+        verify();
+
+        IAssetSpecification as = spec.getAsset("textAsset");
+
+        assertEquals("images/test-asset.txt", as.getPath());
+        assertEquals(as.getLocation(), l);
+        assertEquals("textAsset", as.getPropertyName());
     }
 }

Added: tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/images/test-asset.txt
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/images/test-asset.txt?view=auto&rev=528810
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/images/test-asset.txt (added)
+++ tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/images/test-asset.txt Sat Apr 14 06:58:27 2007
@@ -0,0 +1 @@
+foo

Propchange: tapestry/tapestry4/trunk/tapestry-annotations/src/test/org/apache/tapestry/annotations/images/test-asset.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml?view=diff&rev=528810&r1=528809&r2=528810
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/tapestry-annotations.iml Sat Apr 14 06:58:27 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
+<module relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="ModuleRootManager" />
   <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <output url="file://$MODULE_DIR$/target/classes" />
     <exclude-output />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/descriptor/META-INF" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
@@ -12,261 +13,220 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="tapestry-framework" />
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: backport-util-concurrent:backport-util-concurrent:jar:2.2:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/backport-util-concurrent/backport-util-concurrent/2.2/backport-util-concurrent-2.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/easymock/easymock/2.2/easymock-2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/backport-util-concurrent/backport-util-concurrent/2.2/backport-util-concurrent-2.2-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: cglib:cglib-nodep:jar:2.1_3:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-pool/commons-pool/1.3/commons-pool-1.3.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: com.javaforge.tapestry:tapestry-testng:jar:1.0.0-SNAPSHOT:provided">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/com/javaforge/tapestry/tapestry-testng/1.0.0-SNAPSHOT/tapestry-testng-1.0.0-SNAPSHOT.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/oro/oro/2.0.8/oro-2.0.8.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/com/javaforge/tapestry/tapestry-testng/1.0.0-SNAPSHOT/tapestry-testng-1.0.0-SNAPSHOT-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: commons-beanutils:commons-beanutils:jar:1.7.0:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/javassist/3.4.ga/javassist-3.4.ga.jar!/" />
         </CLASSES>
-        <JAVADOC>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-javadoc.jar!/" />
-        </JAVADOC>
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
-        </SOURCES>
+        <JAVADOC />
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: commons-codec:commons-codec:jar:1.3:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar!/" />
         </CLASSES>
-        <JAVADOC>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-javadoc.jar!/" />
-        </JAVADOC>
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" />
-        </SOURCES>
+        <JAVADOC />
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: commons-fileupload:commons-fileupload:jar:1.2:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/tapestry/tapestry-test/4.1.1-SNAPSHOT/tapestry-test-4.1.1-SNAPSHOT.jar!/" />
         </CLASSES>
-        <JAVADOC>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-javadoc.jar!/" />
-        </JAVADOC>
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-sources.jar!/" />
-        </SOURCES>
+        <JAVADOC />
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: commons-io:commons-io:jar:1.3.1:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/testng/testng/5.1/testng-5.1-jdk15.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: commons-lang:commons-lang:jar:2.2:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-lang/commons-lang/2.2/commons-lang-2.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
         </CLASSES>
-        <JAVADOC>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-lang/commons-lang/2.2/commons-lang-2.2-javadoc.jar!/" />
-        </JAVADOC>
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-lang/commons-lang/2.2/commons-lang-2.2-sources.jar!/" />
-        </SOURCES>
+        <JAVADOC />
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: commons-logging:commons-logging:jar:1.1:provided">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-logging/commons-logging/1.1/commons-logging-1.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/hivemind/hivemind-lib/1.1.1/hivemind-lib-1.1.1.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: commons-pool:commons-pool:jar:1.3:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-pool/commons-pool/1.3/commons-pool-1.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/ognl/ognl/2.7-SNAPSHOT/ognl-2.7-SNAPSHOT.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: hivemind:hivemind-lib:jar:1.1.1:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/hivemind/hivemind-lib/1.1.1/hivemind-lib-1.1.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/com/javaforge/tapestry/tapestry-testng/1.0.0-SNAPSHOT/tapestry-testng-1.0.0-SNAPSHOT.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/hivemind/hivemind-lib/1.1.1/hivemind-lib-1.1.1-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: hivemind:hivemind:jar:1.1.1:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/hivemind/hivemind/1.1.1/hivemind-1.1.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/logkit/logkit/1.0.1/logkit-1.0.1.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/hivemind/hivemind/1.1.1/hivemind-1.1.1-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: javax.servlet:servlet-api:jar:2.4:provided">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-lang/commons-lang/2.2/commons-lang-2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/javax/servlet/servlet-api/2.4/servlet-api-2.4-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: jboss:javassist:jar:3.4.ga:runtime">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/javassist/3.4.ga/javassist-3.4.ga.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: junit:junit:jar:3.8.1:provided">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/easymock/easymockclassextension/2.2/easymockclassextension-2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: log4j:log4j:jar:1.2.9:test">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/log4j/log4j/1.2.9/log4j-1.2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/log4j/log4j/1.2.9/log4j-1.2.9-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: ognl:ognl:jar:2.7-SNAPSHOT:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/ognl/ognl/2.7-SNAPSHOT/ognl-2.7-SNAPSHOT.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-logging/commons-logging/1.1/commons-logging-1.1.jar!/" />
         </CLASSES>
-        <JAVADOC>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/ognl/ognl/2.7-SNAPSHOT/ognl-2.7-SNAPSHOT-javadoc.jar!/" />
-        </JAVADOC>
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/ognl/ognl/2.7-SNAPSHOT/ognl-2.7-SNAPSHOT-sources.jar!/" />
-        </SOURCES>
+        <JAVADOC />
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="Maven Dependency: org.apache.tapestry:tapestry-framework:jar:4.1.2-SNAPSHOT:compile">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/tapestry/tapestry-framework/4.1.2-SNAPSHOT/tapestry-framework-4.1.2-SNAPSHOT.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/backport-util-concurrent/backport-util-concurrent/2.2/backport-util-concurrent-2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/tapestry/tapestry-framework/4.1.2-SNAPSHOT/tapestry-framework-4.1.2-SNAPSHOT-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: org.apache.tapestry:tapestry-test:jar:4.1.1-SNAPSHOT:test">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/tapestry/tapestry-test/4.1.1-SNAPSHOT/tapestry-test-4.1.1-SNAPSHOT.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/tapestry/tapestry-test/4.1.1-SNAPSHOT/tapestry-test-4.1.1-SNAPSHOT-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: org.easymock:easymock:jar:2.2:test">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/easymock/easymock/2.2/easymock-2.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/easymock/easymock/2.2/easymock-2.2-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: org.easymock:easymockclassextension:jar:2.2:test">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/easymock/easymockclassextension/2.2/easymockclassextension-2.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/hivemind/hivemind/1.1.1/hivemind-1.1.1.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/easymock/easymockclassextension/2.2/easymockclassextension-2.2-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="Maven Dependency: org.testng:testng:jar:jdk15:5.1:test">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/testng/testng/5.1/testng-5.1-jdk15.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: oro:oro:jar:2.0.8:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/oro/oro/2.0.8/oro-2.0.8.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/log4j/log4j/1.2.9/log4j-1.2.9.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/oro/oro/2.0.8/oro-2.0.8-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntryProperties />

Modified: tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml?view=diff&rev=528810&r1=528809&r2=528810
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/tapestry-contrib.iml Sat Apr 14 06:58:27 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
+<module relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="ModuleRootManager" />
   <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <output url="file://$MODULE_DIR$/target/classes" />
     <exclude-output />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/descriptor/META-INF" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
@@ -12,270 +13,229 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="tapestry-framework" exported="" />
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: backport-util-concurrent:backport-util-concurrent:jar:2.2:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/backport-util-concurrent/backport-util-concurrent/2.2/backport-util-concurrent-2.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/easymock/easymock/2.2/easymock-2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/backport-util-concurrent/backport-util-concurrent/2.2/backport-util-concurrent-2.2-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: cglib:cglib-nodep:jar:2.1_3:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-pool/commons-pool/1.3/commons-pool-1.3.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: com.javaforge.tapestry:tapestry-testng:jar:1.0.0-SNAPSHOT:provided">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/com/javaforge/tapestry/tapestry-testng/1.0.0-SNAPSHOT/tapestry-testng-1.0.0-SNAPSHOT.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/oro/oro/2.0.8/oro-2.0.8.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/com/javaforge/tapestry/tapestry-testng/1.0.0-SNAPSHOT/tapestry-testng-1.0.0-SNAPSHOT-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: commons-beanutils:commons-beanutils:jar:1.7.0:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/javassist/3.4.ga/javassist-3.4.ga.jar!/" />
         </CLASSES>
-        <JAVADOC>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-javadoc.jar!/" />
-        </JAVADOC>
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
-        </SOURCES>
+        <JAVADOC />
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: commons-codec:commons-codec:jar:1.3:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar!/" />
         </CLASSES>
-        <JAVADOC>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-javadoc.jar!/" />
-        </JAVADOC>
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" />
-        </SOURCES>
+        <JAVADOC />
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: commons-fileupload:commons-fileupload:jar:1.2:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/tapestry/tapestry-test/4.1.1-SNAPSHOT/tapestry-test-4.1.1-SNAPSHOT.jar!/" />
         </CLASSES>
-        <JAVADOC>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-javadoc.jar!/" />
-        </JAVADOC>
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-sources.jar!/" />
-        </SOURCES>
+        <JAVADOC />
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: commons-io:commons-io:jar:1.3.1:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: commons-lang:commons-lang:jar:2.2:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-lang/commons-lang/2.2/commons-lang-2.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/testng/testng/5.1/testng-5.1-jdk15.jar!/" />
         </CLASSES>
-        <JAVADOC>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-lang/commons-lang/2.2/commons-lang-2.2-javadoc.jar!/" />
-        </JAVADOC>
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-lang/commons-lang/2.2/commons-lang-2.2-sources.jar!/" />
-        </SOURCES>
+        <JAVADOC />
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: commons-logging:commons-logging:jar:1.1:provided">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-logging/commons-logging/1.1/commons-logging-1.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/ognl/ognl/2.7-SNAPSHOT/ognl-2.7-SNAPSHOT.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: commons-pool:commons-pool:jar:1.3:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-pool/commons-pool/1.3/commons-pool-1.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/hivemind/hivemind-lib/1.1.1/hivemind-lib-1.1.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: hivemind:hivemind-lib:jar:1.1.1:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/hivemind/hivemind-lib/1.1.1/hivemind-lib-1.1.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/com/javaforge/tapestry/tapestry-testng/1.0.0-SNAPSHOT/tapestry-testng-1.0.0-SNAPSHOT.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/hivemind/hivemind-lib/1.1.1/hivemind-lib-1.1.1-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: hivemind:hivemind:jar:1.1.1:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/hivemind/hivemind/1.1.1/hivemind-1.1.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/logkit/logkit/1.0.1/logkit-1.0.1.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/hivemind/hivemind/1.1.1/hivemind-1.1.1-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: javax.servlet:servlet-api:jar:2.4:provided">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-lang/commons-lang/2.2/commons-lang-2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/javax/servlet/servlet-api/2.4/servlet-api-2.4-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: jboss:javassist:jar:3.4.ga:runtime">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/javassist/3.4.ga/javassist-3.4.ga.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: jboss:jboss-j2ee:jar:4.0.2:provided">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-j2ee/4.0.2/jboss-j2ee-4.0.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/easymock/easymockclassextension/2.2/easymockclassextension-2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: junit:junit:jar:3.8.1:test">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: log4j:log4j:jar:1.2.9:test">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/log4j/log4j/1.2.9/log4j-1.2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-logging/commons-logging/1.1/commons-logging-1.1.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/log4j/log4j/1.2.9/log4j-1.2.9-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: ognl:ognl:jar:2.7-SNAPSHOT:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/ognl/ognl/2.7-SNAPSHOT/ognl-2.7-SNAPSHOT.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-j2ee/4.0.2/jboss-j2ee-4.0.2.jar!/" />
         </CLASSES>
-        <JAVADOC>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/ognl/ognl/2.7-SNAPSHOT/ognl-2.7-SNAPSHOT-javadoc.jar!/" />
-        </JAVADOC>
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/ognl/ognl/2.7-SNAPSHOT/ognl-2.7-SNAPSHOT-sources.jar!/" />
-        </SOURCES>
+        <JAVADOC />
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="Maven Dependency: org.apache.tapestry:tapestry-framework:jar:4.1.2-SNAPSHOT:compile">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/tapestry/tapestry-framework/4.1.2-SNAPSHOT/tapestry-framework-4.1.2-SNAPSHOT.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/backport-util-concurrent/backport-util-concurrent/2.2/backport-util-concurrent-2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/tapestry/tapestry-framework/4.1.2-SNAPSHOT/tapestry-framework-4.1.2-SNAPSHOT-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: org.apache.tapestry:tapestry-test:jar:4.1.1-SNAPSHOT:test">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/tapestry/tapestry-test/4.1.1-SNAPSHOT/tapestry-test-4.1.1-SNAPSHOT.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/tapestry/tapestry-test/4.1.1-SNAPSHOT/tapestry-test-4.1.1-SNAPSHOT-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: org.easymock:easymock:jar:2.2:test">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/easymock/easymock/2.2/easymock-2.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/easymock/easymock/2.2/easymock-2.2-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: org.easymock:easymockclassextension:jar:2.2:test">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/easymock/easymockclassextension/2.2/easymockclassextension-2.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/hivemind/hivemind/1.1.1/hivemind-1.1.1.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/easymock/easymockclassextension/2.2/easymockclassextension-2.2-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: org.testng:testng:jar:jdk15:5.1:test">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/testng/testng/5.1/testng-5.1-jdk15.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Maven Dependency: oro:oro:jar:2.0.8:compile">
+    <orderEntry type="module-library">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/oro/oro/2.0.8/oro-2.0.8.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/log4j/log4j/1.2.9/log4j-1.2.9.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../.m2/repository/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../.m2/repository/oro/oro/2.0.8/oro-2.0.8-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntryProperties />

Modified: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml?view=diff&rev=528810&r1=528809&r2=528810
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/TimeTracker.iml Sat Apr 14 06:58:27 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="J2EE_WEB_MODULE">
+<module relativePaths="true" type="J2EE_WEB_MODULE" version="4">
   <component name="AppServerSpecificValidatorsManager" />
   <component name="ModuleRootManager" />
   <component name="NewModuleRootManager" inherit-compiler-output="true">
@@ -379,7 +379,6 @@
     <setting name="EXPLODED_ENABLED" value="false" />
     <setting name="JAR_URL" value="file://" />
     <setting name="JAR_ENABLED" value="false" />
-    <setting name="SYNC_EXPLODED_DIR" value="true" />
     <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
     <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
     <setting name="RUN_JASPER_VALIDATION" value="true" />
@@ -399,6 +398,176 @@
     </containerElement>
     <containerElement type="library" level="module">
       <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/ant-1.6.5.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/ant/ant/1.6.5/ant-1.6.5.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/avalon-framework-4.1.3.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/backport-util-concurrent-2.2.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/backport-util-concurrent/backport-util-concurrent/2.2/backport-util-concurrent-2.2.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/cglib-nodep-2.1_3.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/tapestry-testng-1.0.0-SNAPSHOT.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/com/javaforge/tapestry/tapestry-testng/1.0.0-SNAPSHOT/tapestry-testng-1.0.0-SNAPSHOT.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/commons-beanutils-1.7.0.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/commons-codec-1.3.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/commons-fileupload-1.2.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/commons-io-1.3.1.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/commons-lang-2.2.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/commons-lang/commons-lang/2.2/commons-lang-2.2.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/commons-logging-1.1.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/commons-logging/commons-logging/1.1/commons-logging-1.1.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/commons-pool-1.3.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/commons-pool/commons-pool/1.3/commons-pool-1.3.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/hivemind-lib-1.1.1.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/hivemind/hivemind-lib/1.1.1/hivemind-lib-1.1.1.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/hivemind-1.1.1.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/hivemind/hivemind/1.1.1/hivemind-1.1.1.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="&lt;N/A&gt;" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/javassist-3.4.ga.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/jboss/javassist/3.4.ga/javassist-3.4.ga.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/jboss-j2ee-4.0.2.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/jboss/jboss-j2ee/4.0.2/jboss-j2ee-4.0.2.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/jdom-1.0.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/jdom/jdom/1.0/jdom-1.0.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/org.mortbay.jetty-5.1.10.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/jetty/org.mortbay.jetty/5.1.10/org.mortbay.jetty-5.1.10.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/junit-3.8.1.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/log4j-1.2.8.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/log4j/log4j/1.2.8/log4j-1.2.8.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/log4j-1.2.9.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/log4j/log4j/1.2.9/log4j-1.2.9.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/logkit-1.0.1.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/logkit/logkit/1.0.1/logkit-1.0.1.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/ognl-2.7-SNAPSHOT.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/ognl/ognl/2.7-SNAPSHOT/ognl-2.7-SNAPSHOT.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/tapestry-test-4.1.1-SNAPSHOT.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/org/apache/tapestry/tapestry-test/4.1.1-SNAPSHOT/tapestry-test-4.1.1-SNAPSHOT.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/easymock-2.2.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/org/easymock/easymock/2.2/easymock-2.2.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/easymockclassextension-2.2.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/org/easymock/easymockclassextension/2.2/easymockclassextension-2.2.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/selenium-java-client-driver-0.9.1-SNAPSHOT.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/org/openqa/selenium/client-drivers/selenium-java-client-driver/0.9.1-SNAPSHOT/selenium-java-client-driver-0.9.1-SNAPSHOT.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/selenium-core-0.8.2-SNAPSHOT.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/org/openqa/selenium/core/selenium-core/0.8.2-SNAPSHOT/selenium-core-0.8.2-SNAPSHOT.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/selenium-server-coreless-0.9.1-SNAPSHOT.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/org/openqa/selenium/server/selenium-server-coreless/0.9.1-SNAPSHOT/selenium-server-coreless-0.9.1-SNAPSHOT.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="&lt;N/A&gt;" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/org/openqa/selenium/server/selenium-server/0.9.1-SNAPSHOT/selenium-server-0.9.1-SNAPSHOT-standalone.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/selenium-server-0.9.1-SNAPSHOT.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/org/openqa/selenium/server/selenium-server/0.9.1-SNAPSHOT/selenium-server-0.9.1-SNAPSHOT.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/testng-5.1-jdk15.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/org/testng/testng/5.1/testng-5.1-jdk15.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/oro-2.0.8.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/oro/oro/2.0.8/oro-2.0.8.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
       <attribute name="URI" value="&lt;N/A&gt;" />
       <url>jar://$MODULE_DIR$/../../../idea/lib/j2ee.jar!/</url>
     </containerElement>
@@ -530,6 +699,18 @@
       <attribute name="method" value="0" />
       <attribute name="URI" value="/WEB-INF/lib/ognl-2.7-SNAPSHOT.jar" />
     </containerElement>
+    <containerElement type="library" name="Maven Dependency: org.apache.tapestry:tapestry-annotations:jar:4.1.2-SNAPSHOT:compile" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/tapestry-annotations-4.1.2-SNAPSHOT.jar" />
+    </containerElement>
+    <containerElement type="library" name="Maven Dependency: org.apache.tapestry:tapestry-contrib:jar:4.1.2-SNAPSHOT:compile" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/tapestry-contrib-4.1.2-SNAPSHOT.jar" />
+    </containerElement>
+    <containerElement type="library" name="Maven Dependency: org.apache.tapestry:tapestry-framework:jar:4.1.2-SNAPSHOT:compile" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/tapestry-framework-4.1.2-SNAPSHOT.jar" />
+    </containerElement>
     <containerElement type="library" name="Maven Dependency: org.apache.tapestry:tapestry-test:jar:4.1.1-SNAPSHOT:test" level="module">
       <attribute name="method" value="0" />
       <attribute name="URI" value="/WEB-INF/lib/tapestry-test-4.1.1-SNAPSHOT.jar" />
@@ -590,10 +771,11 @@
       <attribute name="method" value="0" />
       <attribute name="URI" value="/WEB-INF/lib/xml-apis-1.0.b2.jar" />
     </containerElement>
-    <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/context/WEB-INF/web.xml" optional="false" version="2.3" />
+    <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/context/WEB-INF/web.xml" optional="false" version="2.4" />
     <webroots>
       <root url="file://$MODULE_DIR$/src/context/WEB-INF" relative="/WEB-INF" />
     </webroots>
   </component>
+  <component name="WeblogicWebModuleProperties" />
 </module>
 

Added: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/images/body-bkg.png
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/images/body-bkg.png?view=auto&rev=528810
==============================================================================
Binary file - no diff available.

Propchange: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/images/body-bkg.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml?view=diff&rev=528810&r1=528809&r2=528810
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/Workbench.iml Sat Apr 14 06:58:27 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="J2EE_WEB_MODULE">
+<module relativePaths="true" type="J2EE_WEB_MODULE" version="4">
   <component name="AppServerSpecificValidatorsManager" />
   <component name="ModuleRootManager" />
   <component name="NewModuleRootManager" inherit-compiler-output="true">
@@ -291,7 +291,6 @@
     <setting name="EXPLODED_ENABLED" value="false" />
     <setting name="JAR_URL" value="file://" />
     <setting name="JAR_ENABLED" value="false" />
-    <setting name="SYNC_EXPLODED_DIR" value="true" />
     <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
     <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
     <setting name="RUN_JASPER_VALIDATION" value="false" />
@@ -311,6 +310,176 @@
     </containerElement>
     <containerElement type="library" level="module">
       <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/ant-1.6.5.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/ant/ant/1.6.5/ant-1.6.5.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/avalon-framework-4.1.3.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/backport-util-concurrent-2.2.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/backport-util-concurrent/backport-util-concurrent/2.2/backport-util-concurrent-2.2.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/cglib-nodep-2.1_3.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/tapestry-testng-1.0.0-SNAPSHOT.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/com/javaforge/tapestry/tapestry-testng/1.0.0-SNAPSHOT/tapestry-testng-1.0.0-SNAPSHOT.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/commons-beanutils-1.7.0.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/commons-codec-1.3.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/commons-fileupload-1.2.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/commons-io-1.3.1.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/commons-lang-2.2.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/commons-lang/commons-lang/2.2/commons-lang-2.2.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/commons-logging-1.1.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/commons-logging/commons-logging/1.1/commons-logging-1.1.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/commons-pool-1.3.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/commons-pool/commons-pool/1.3/commons-pool-1.3.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/hivemind-lib-1.1.1.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/hivemind/hivemind-lib/1.1.1/hivemind-lib-1.1.1.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/hivemind-1.1.1.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/hivemind/hivemind/1.1.1/hivemind-1.1.1.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="&lt;N/A&gt;" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/javassist-3.4.ga.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/jboss/javassist/3.4.ga/javassist-3.4.ga.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/jboss-j2ee-4.0.2.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/jboss/jboss-j2ee/4.0.2/jboss-j2ee-4.0.2.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/jdom-1.0.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/jdom/jdom/1.0/jdom-1.0.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/org.mortbay.jetty-5.1.10.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/jetty/org.mortbay.jetty/5.1.10/org.mortbay.jetty-5.1.10.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/junit-3.8.1.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/log4j-1.2.8.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/log4j/log4j/1.2.8/log4j-1.2.8.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/log4j-1.2.9.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/log4j/log4j/1.2.9/log4j-1.2.9.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/logkit-1.0.1.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/logkit/logkit/1.0.1/logkit-1.0.1.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/ognl-2.7-SNAPSHOT.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/ognl/ognl/2.7-SNAPSHOT/ognl-2.7-SNAPSHOT.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/tapestry-test-4.1.1-SNAPSHOT.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/org/apache/tapestry/tapestry-test/4.1.1-SNAPSHOT/tapestry-test-4.1.1-SNAPSHOT.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/easymock-2.2.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/org/easymock/easymock/2.2/easymock-2.2.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/easymockclassextension-2.2.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/org/easymock/easymockclassextension/2.2/easymockclassextension-2.2.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/selenium-java-client-driver-0.9.1-SNAPSHOT.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/org/openqa/selenium/client-drivers/selenium-java-client-driver/0.9.1-SNAPSHOT/selenium-java-client-driver-0.9.1-SNAPSHOT.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/selenium-core-0.8.2-SNAPSHOT.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/org/openqa/selenium/core/selenium-core/0.8.2-SNAPSHOT/selenium-core-0.8.2-SNAPSHOT.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/selenium-server-coreless-0.9.1-SNAPSHOT.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/org/openqa/selenium/server/selenium-server-coreless/0.9.1-SNAPSHOT/selenium-server-coreless-0.9.1-SNAPSHOT.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="&lt;N/A&gt;" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/org/openqa/selenium/server/selenium-server/0.9.1-SNAPSHOT/selenium-server-0.9.1-SNAPSHOT-standalone.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/selenium-server-0.9.1-SNAPSHOT.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/org/openqa/selenium/server/selenium-server/0.9.1-SNAPSHOT/selenium-server-0.9.1-SNAPSHOT.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/testng-5.1-jdk15.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/org/testng/testng/5.1/testng-5.1-jdk15.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/oro-2.0.8.jar" />
+      <url>jar://$MODULE_DIR$/../../../../.m2/repository/oro/oro/2.0.8/oro-2.0.8.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
       <attribute name="URI" value="&lt;N/A&gt;" />
       <url>jar://$MODULE_DIR$/../../../idea/lib/j2ee.jar!/</url>
     </containerElement>
@@ -438,6 +607,18 @@
       <attribute name="method" value="0" />
       <attribute name="URI" value="&lt;N/A&gt;" />
     </containerElement>
+    <containerElement type="library" name="Maven Dependency: org.apache.tapestry:tapestry-annotations:jar:4.1.2-SNAPSHOT:compile" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/tapestry-annotations-4.1.2-SNAPSHOT.jar" />
+    </containerElement>
+    <containerElement type="library" name="Maven Dependency: org.apache.tapestry:tapestry-contrib:jar:4.1.2-SNAPSHOT:compile" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/tapestry-contrib-4.1.2-SNAPSHOT.jar" />
+    </containerElement>
+    <containerElement type="library" name="Maven Dependency: org.apache.tapestry:tapestry-framework:jar:4.1.2-SNAPSHOT:compile" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/tapestry-framework-4.1.2-SNAPSHOT.jar" />
+    </containerElement>
     <containerElement type="library" name="Maven Dependency: org.apache.tapestry:tapestry-test:jar:4.1.1-SNAPSHOT:test" level="module">
       <attribute name="method" value="0" />
       <attribute name="URI" value="/WEB-INF/lib/tapestry-test-4.1.1-SNAPSHOT.jar" />
@@ -478,10 +659,11 @@
       <attribute name="method" value="0" />
       <attribute name="URI" value="&lt;N/A&gt;" />
     </containerElement>
-    <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/context/WEB-INF/web.xml" optional="false" version="2.3" />
+    <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/context/WEB-INF/web.xml" optional="false" version="2.4" />
     <webroots>
       <root url="file://$MODULE_DIR$/src/context/WEB-INF" relative="/WEB-INF" />
     </webroots>
   </component>
+  <component name="WeblogicWebModuleProperties" />
 </module>
 

Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/pom.xml?view=diff&rev=528810&r1=528809&r2=528810
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/pom.xml Sat Apr 14 06:58:27 2007
@@ -51,6 +51,16 @@
         <sourceDirectory>src/java</sourceDirectory>
         <testSourceDirectory>src/test</testSourceDirectory>
 
+        <resources>
+            <resource>
+                <directory>src/java</directory>
+                <includes>
+                    <include>**/*.gif</include>
+                    <include>**/*.png</include>
+                </includes>
+            </resource>
+        </resources>
+        
         <plugins>
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>

Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/Dates.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/Dates.html?view=diff&rev=528810&r1=528809&r2=528810
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/Dates.html (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/Dates.html Sat Apr 14 06:58:27 2007
@@ -7,7 +7,7 @@
 via an XHR request.
 </p>
 
-<form jwcid="valid@Form">
+    <form jwcid="valid@Form">
 <input jwcid="inputEnabled"/> Enable Client Side Validation
 </form>
 

Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Fields.page
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Fields.page?view=diff&rev=528810&r1=528809&r2=528810
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Fields.page (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Fields.page Sat Apr 14 06:58:27 2007
@@ -110,8 +110,6 @@
     <binding name="validators" value="validators:required,minLength=20"/>
     <binding name="displayName" value="literal:Text Area"/>
   </component>
-  
-  <asset name="continue" path="images/Continue.gif"/>
 
 </page-specification>
 

Added: tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/images/Continue.gif
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/images/Continue.gif?view=auto&rev=528810
==============================================================================
Binary files /tmp/tmp2fgb4v and /tmp/tmpKQbZ3C differ

Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/Dates.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/Dates.java?view=diff&rev=528810&r1=528809&r2=528810
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/Dates.java (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/Dates.java Sat Apr 14 06:58:27 2007
@@ -13,13 +13,13 @@
 // limitations under the License.
 package org.apache.tapestry.workbench;
 
-import java.util.Date;
-
 import org.apache.tapestry.annotations.EventListener;
 import org.apache.tapestry.html.BasePage;
 import org.apache.tapestry.services.ResponseBuilder;
 import org.apache.tapestry.valid.IValidationDelegate;
 
+import java.util.Date;
+
 
 /**
  * Sample page.
@@ -33,7 +33,7 @@
     public abstract Date getStartDate();
     
     public abstract IValidationDelegate getDelegate();
-    
+
     @EventListener(targets = "startDate", events = {"onchange"}, submitForm = "dateForm", focus = false)
     public void startChanged()
     {

Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/fields/Fields.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/fields/Fields.java?view=diff&rev=528810&r1=528809&r2=528810
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/fields/Fields.java (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/fields/Fields.java Sat Apr 14 06:58:27 2007
@@ -14,14 +14,16 @@
 
 package org.apache.tapestry.workbench.fields;
 
-import java.math.BigDecimal;
-
+import org.apache.tapestry.IAsset;
 import org.apache.tapestry.IPage;
+import org.apache.tapestry.annotations.Asset;
 import org.apache.tapestry.annotations.InjectPage;
 import org.apache.tapestry.annotations.InjectState;
 import org.apache.tapestry.html.BasePage;
 import org.apache.tapestry.workbench.Visit;
 
+import java.math.BigDecimal;
+
 /**
  * @author Howard Lewis Ship
  * @since 1.0.7
@@ -63,4 +65,7 @@
     
     @InjectState("session-data")
     public abstract Visit getVisit();
+
+    @Asset("images/Continue.gif")
+    public abstract IAsset getContinue();
 }

Added: tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/fields/images/Continue.gif
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/fields/images/Continue.gif?view=auto&rev=528810
==============================================================================
Binary files /tmp/tmpNwcef0 and /tmp/tmpDCtVAJ differ