You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/07/22 20:00:02 UTC
svn commit: r424610 - in /tapestry/tapestry4/trunk:
tapestry-examples/TimeTracker/ tapestry-examples/TimeTracker/src/main/
tapestry-examples/TimeTracker/src/main/resources/
tapestry-framework/src/scripts/
Author: jkuhnert
Date: Sat Jul 22 11:00:01 2006
New Revision: 424610
URL: http://svn.apache.org/viewvc?rev=424610&view=rev
Log:
Fixed timetracker war packaging issues, asset service changes to integration tests.
Added:
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/main/
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/main/resources/
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/main/resources/createDatabase.sql
Modified:
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/pom.xml
tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestAssetService.xml
tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestLocalization.xml
tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestRelativeAssets.xml
Modified: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/pom.xml?rev=424610&r1=424609&r2=424610&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/pom.xml Sat Jul 22 11:00:01 2006
@@ -109,14 +109,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.0</version>
+ <version>2.0.1-SNAPSHOT</version>
<configuration>
- <webResources>
- <resource>
- <!-- this is relative to the pom.xml directory -->
- <directory>src/context</directory>
- </resource>
- </webResources>
+ <warSourceDirectory>${basedir}/src/context</warSourceDirectory>
</configuration>
</plugin>
</plugins>
Added: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/main/resources/createDatabase.sql
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/main/resources/createDatabase.sql?rev=424610&view=auto
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/main/resources/createDatabase.sql (added)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/main/resources/createDatabase.sql Sat Jul 22 11:00:01 2006
@@ -0,0 +1,20 @@
+create table projects (
+ project_id int generated by default as IDENTITY not null,
+ name varchar(40) not null,
+ PRIMARY KEY (project_id),
+ UNIQUE (name)
+);
+
+insert into projects(name) values ('Code Zeitgeist');
+insert into projects(name) values ('Zooland Systems');
+insert into projects(name) values ('Weedasher Industries');
+
+create table tasks (
+ task_id int generated by default as IDENTITY not null,
+ project_id int not null,
+ start_dt timestamp not null,
+ end_dt timestamp not null,
+ descr_txt varchar(200) not null,
+ PRIMARY KEY (task_id),
+ FOREIGN KEY (project_id) references projects(project_id)
+);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestAssetService.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestAssetService.xml?rev=424610&r1=424609&r2=424610&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestAssetService.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestAssetService.xml Sat Jul 22 11:00:01 2006
@@ -32,7 +32,7 @@
<assert-output name="Image Tag">
<![CDATA[
-<img src="/c16/app?digest=f6324ac8f24f0a7f4850221b0f14c865&service=asset&path=%2Forg%2Fapache%2Ftapestry%2Fjunit%2Fmock%2Fc16%2Flogo.png"/>
+<img src="/c16/app?service=asset&path=%2Forg%2Fapache%2Ftapestry%2Fjunit%2Fmock%2Fc16%2Flogo.png"/>
]]>
</assert-output>
</request>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestLocalization.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestLocalization.xml?rev=424610&r1=424609&r2=424610&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestLocalization.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestLocalization.xml Sat Jul 22 11:00:01 2006
@@ -65,7 +65,7 @@
<assert-output name="English Home image">
<![CDATA[
-/mock/app?digest=980b1f24a8d2381f7fa75b095989f7e7&service=asset&path=%2Forg%2Fapache%2Ftapestry%2Fjunit%2Fmock%2Fapp%2Fhome.png
+/mock/app?service=asset&path=%2Forg%2Fapache%2Ftapestry%2Fjunit%2Fmock%2Fapp%2Fhome.png
]]>
</assert-output>
@@ -86,7 +86,7 @@
<assert-output name="French Home image">
<![CDATA[
-/mock/app?digest=64c0a48177b614031fcd8039550334ed&service=asset&path=%2Forg%2Fapache%2Ftapestry%2Fjunit%2Fmock%2Fapp%2Fhome_fr.png
+/mock/app?service=asset&path=%2Forg%2Fapache%2Ftapestry%2Fjunit%2Fmock%2Fapp%2Fhome_fr.png
]]>
</assert-output>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestRelativeAssets.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestRelativeAssets.xml?rev=424610&r1=424609&r2=424610&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestRelativeAssets.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestRelativeAssets.xml Sat Jul 22 11:00:01 2006
@@ -37,7 +37,7 @@
<assert-output name="Private Asset">
<![CDATA[
-/mock/app?digest=a87e71b10295ea577a18c087e8cc035d&service=asset&path=%2Forg%2Fapache%2Ftapestry%2Fjunit%2Fmock%2Fapp%2Fimages%2FPrivateAsset.gif
+/mock/app?service=asset&path=%2Forg%2Fapache%2Ftapestry%2Fjunit%2Fmock%2Fapp%2Fimages%2FPrivateAsset.gif
]]>
</assert-output>