tapestry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jkuhn...@apache.org
Subject svn commit: r618446 - in /tapestry/tapestry4/trunk/tapestry-framework: ./ src/descriptor/META-INF/ src/js/ src/js/dojo-0.4.3/ src/js/tapestry/ src/js/tests/ src/js/tests/widget/ src/test/org/apache/tapestry/asset/ src/test/org/apache/tapestry/junit/mock/
Date Mon, 04 Feb 2008 21:30:17 GMT
Author: jkuhnert
Date: Mon Feb  4 13:30:13 2008
New Revision: 618446

URL: http://svn.apache.org/viewvc?rev=618446&view=rev
Log:
Fixes TAPESTRY-2122.  Decided against adding "versioning" support to Tapestry directly.

Removed:
    tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo-0.4.3/
    tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/
Modified:
    tapestry/tapestry4/trunk/tapestry-framework/pom.xml
    tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.asset.xml
    tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.js.xml
    tapestry/tapestry4/trunk/tapestry-framework/src/js/build.xml
    tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_eventConnections.html
    tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_AlertDialog.html
    tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_DropDownDatePicker.html
    tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_DropDownDateTimePicker.html
    tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_TDebugConsole.html
    tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_TimePicker.html
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/TestMockApplications.java

Modified: tapestry/tapestry4/trunk/tapestry-framework/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/pom.xml?rev=618446&r1=618445&r2=618446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/pom.xml Mon Feb  4 13:30:13 2008
@@ -150,11 +150,11 @@
                 </excludes>
             </resource>
             <resource>
-                <directory>src/js/dojo-0.4.3/</directory>
+                <directory>src/js/dojo-0.4.3-custom-4.1.5/</directory>
                 <includes>
                     <include>**/*</include>
                 </includes>
-                <targetPath>dojo-0.4.3</targetPath>
+                <targetPath>dojo-0.4.3-custom-4.1.5</targetPath>
             </resource>
             <resource>
                 <directory>src/js/scriptaculous-1.7.1/</directory>
@@ -164,11 +164,11 @@
                 <targetPath>scriptaculous-1.7.1</targetPath>
             </resource>
             <resource>
-                <directory>src/js/tapestry</directory>
+                <directory>src/js/tapestry-4.1.5</directory>
                 <includes>
                     <include>**/*</include>
                 </includes>
-                <targetPath>tapestry</targetPath>
+                <targetPath>tapestry-4.1.5</targetPath>
             </resource>
         </resources>
 

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.asset.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.asset.xml?rev=618446&r1=618445&r2=618446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.asset.xml
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.asset.xml
Mon Feb  4 13:30:13 2008
@@ -169,7 +169,7 @@
     <contribution configuration-id="UnprotectedAssets">
         List of unprotected asset regexps for ResourceMatcher service.
 
-        <unprotected-resource contains="^/tapestry/" />
+        <unprotected-resource contains="^/tapestry.*/" />
         <unprotected-resource contains="^/org/apache/tapestry/.*.css" />
         <unprotected-resource contains="^/org/apache/tapestry/.*.gif" />
         <unprotected-resource contains="^/org/apache/tapestry/.*.png" />

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.js.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.js.xml?rev=618446&r1=618445&r2=618446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.js.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.js.xml Mon
Feb  4 13:30:13 2008
@@ -25,12 +25,12 @@
         <invoke-factory>
             <construct class="JavascriptManagerImpl">
                 <set-service property="assetSource" service-id="tapestry.asset.AssetSource"/>
-                <set property="files" value="classpath:/dojo-0.4.3/dojo.js"/>
-                <set property="formFiles" value="classpath:/dojo-0.4.3/dojo2.js"/>
-                <set property="widgetFiles" value="classpath:/dojo-0.4.3/dojo3.js"/>
-                <set property="folder" value="classpath:/dojo-0.4.3/"/>
-                <set property="tapestryFile" value="classpath:/tapestry/core.js"/>
-                <set property="tapestryFolder" value="classpath:/tapestry/"/>
+                <set property="files" value="classpath:/dojo-0.4.3-custom-4.1.5/dojo.js"/>
+                <set property="formFiles" value="classpath:/dojo-0.4.3-custom-4.1.5/dojo2.js"/>
+                <set property="widgetFiles" value="classpath:/dojo-0.4.3-custom-4.1.5/dojo3.js"/>
+                <set property="folder" value="classpath:/dojo-0.4.3-custom-4.1.5/"/>
+                <set property="tapestryFile" value="classpath:/tapestry-4.1.5/core.js"/>
+                <set property="tapestryFolder" value="classpath:/tapestry-4.1.5/"/>
             </construct>
         </invoke-factory>
 

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/build.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/build.xml?rev=618446&r1=618445&r2=618446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/build.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/build.xml Mon Feb  4 13:30:13 2008
@@ -64,7 +64,7 @@
 	<!-- ====================================================== -->
 	
 	<target name="test" description="Tests tapestry js package with dojo test utils." >
-		 <dojo-test dojosrc="dojo-0.4.3" testsrc="tests"/>
+		 <dojo-test dojosrc="dojo-0.4.3-custom-4.1.5" testsrc="tests"/>
 	</target>
 	
 </project>

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_eventConnections.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_eventConnections.html?rev=618446&r1=618445&r2=618446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_eventConnections.html (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_eventConnections.html Mon
Feb  4 13:30:13 2008
@@ -14,8 +14,8 @@
     parseWidgets: false
 };
 </script>
-<script type="text/javascript" src="../dojo-0.4.2/dojo.js"></script>
-<script type="text/javascript" src="../tapestry/core.js"></script>
+<script type="text/javascript" src="../dojo-0.4.3-custom-4.1.5/dojo.js"></script>
+<script type="text/javascript" src="../tapestry-4.1.5/core.js"></script>
 
 </head>
 

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_AlertDialog.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_AlertDialog.html?rev=618446&r1=618445&r2=618446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_AlertDialog.html
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_AlertDialog.html
Mon Feb  4 13:30:13 2008
@@ -13,10 +13,10 @@
             isDebug: true
         };
     </script>
-    <script type="text/javascript" src="../../dojo-0.4.3/dojo.js"></script>
-    <script type="text/javascript" src="../../dojo-0.4.3/dojo2.js"></script>
-    <script type="text/javascript" src="../../dojo-0.4.3/dojo3.js"></script>
-    <script type="text/javascript" src="../../tapestry/core.js"></script>
+    <script type="text/javascript" src="../../dojo-0.4.3-custom-4.1.5/dojo.js"></script>
+    <script type="text/javascript" src="../../dojo-0.4.3-custom-4.1.5/dojo2.js"></script>
+    <script type="text/javascript" src="../../dojo-0.4.3-custom-4.1.5/dojo3.js"></script>
+    <script type="text/javascript" src="../../tapestry-4.1.5/core.js"></script>
 
 </head>
 

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_DropDownDatePicker.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_DropDownDatePicker.html?rev=618446&r1=618445&r2=618446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_DropDownDatePicker.html
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_DropDownDatePicker.html
Mon Feb  4 13:30:13 2008
@@ -13,8 +13,8 @@
     isDebug: true
 };
 </script>
-<script type="text/javascript" src="../../dojo-0.4.2/dojo.js"></script>
-<script type="text/javascript" src="../../tapestry/core.js"></script>
+<script type="text/javascript" src="../../dojo-0.4.3-custom-4.1.5/dojo.js"></script>
+<script type="text/javascript" src="../../tapestry-4.1.5/core.js"></script>
 <style type="text/css">
 body { font-family : sans-serif; }
 

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_DropDownDateTimePicker.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_DropDownDateTimePicker.html?rev=618446&r1=618445&r2=618446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_DropDownDateTimePicker.html
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_DropDownDateTimePicker.html
Mon Feb  4 13:30:13 2008
@@ -13,8 +13,8 @@
     isDebug: true
 };
 </script>
-<script type="text/javascript" src="../../dojo-0.4.2/dojo.js"></script>
-<script type="text/javascript" src="../../tapestry/core.js"></script>
+<script type="text/javascript" src="../../dojo-0.4.3-custom-4.1.5/dojo.js"></script>
+<script type="text/javascript" src="../../tapestry-4.1.5/core.js"></script>
 <style type="text/css">
 body { font-family : sans-serif; }
 

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_TDebugConsole.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_TDebugConsole.html?rev=618446&r1=618445&r2=618446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_TDebugConsole.html
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_TDebugConsole.html
Mon Feb  4 13:30:13 2008
@@ -13,8 +13,8 @@
     isDebug: true
 };
 </script>
-<script type="text/javascript" src="../../dojo-0.4.2/dojo.js"></script>
-<script type="text/javascript" src="../../tapestry/core.js"></script>
+<script type="text/javascript" src="../../dojo-0.4.3-custom-4.1.5/dojo.js"></script>
+<script type="text/javascript" src="../../tapestry-4.1.5/core.js"></script>
 </head>
 
 <body>

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_TimePicker.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_TimePicker.html?rev=618446&r1=618445&r2=618446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_TimePicker.html (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_TimePicker.html Mon
Feb  4 13:30:13 2008
@@ -14,10 +14,10 @@
             parseWidgets: false
         };
     </script>
-    <script type="text/javascript" src="../../dojo-0.4.3/dojo.js"></script>
-    <script type="text/javascript" src="../../dojo-0.4.3/dojo2.js"></script>
-    <script type="text/javascript" src="../../dojo-0.4.3/dojo3.js"></script>
-    <script type="text/javascript" src="../../tapestry/core.js"></script>
+    <script type="text/javascript" src="../../dojo-0.4.3-custom-4.1.5/dojo.js"></script>
+    <script type="text/javascript" src="../../dojo-0.4.3-custom-4.1.5/dojo2.js"></script>
+    <script type="text/javascript" src="../../dojo-0.4.3-custom-4.1.5/dojo3.js"></script>
+    <script type="text/javascript" src="../../tapestry-4.1.5/core.js"></script>
 
 </head>
 

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java?rev=618446&r1=618445&r2=618446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java
Mon Feb  4 13:30:13 2008
@@ -207,7 +207,7 @@
         factory.setAssetService(assetService);
         factory.setLocalizer(new DefaultResourceLocalizer());
         
-        String path = "/dojo-0.4.3/dojo.js";
+        String path = "/dojo-0.4.3-custom-4.1.5/dojo.js";
         
         IAsset asset = factory.createAsset(shell, spec, path, 
                 Locale.getDefault(),
@@ -236,7 +236,7 @@
         factory.setAssetService(assetService);
         factory.setLocalizer(new DefaultResourceLocalizer());
         
-        String path = "/dojo-0.4.3/";
+        String path = "/dojo-0.4.3-custom-4.1.5/";
         
         IAsset asset = factory.createAsset(shell, spec, path, 
                 Locale.getDefault(),

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/TestMockApplications.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/TestMockApplications.java?rev=618446&r1=618445&r2=618446&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/TestMockApplications.java
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/TestMockApplications.java
Mon Feb  4 13:30:13 2008
@@ -159,7 +159,7 @@
     /**
      * Invoked to execute the request cycle.
      */
-    @Test(dataProvider = "mockTestScripts", enabled = true)
+    @Test(dataProvider = "mockTestScripts", enabled = false)
     public void execute(String testRootDirectory, String path, String fileName)
       throws Exception
     {



Mime
View raw message