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 2006/07/19 04:38:03 UTC
svn commit: r423345 - in /tapestry/tapestry4/trunk: ./
tapestry-examples/TimeTracker/
tapestry-examples/TimeTracker/src/context/WEB-INF/
tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/
tapestry-framework/src/java/org/apache...
Author: jkuhnert
Date: Tue Jul 18 19:38:03 2006
New Revision: 423345
URL: http://svn.apache.org/viewvc?rev=423345&view=rev
Log:
Updated deployment target for new m2 repo layout on people.apache.org
Added:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/version.properties
Modified:
tapestry/tapestry4/trunk/pom.xml
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/pom.xml
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/timetracker.db.xml
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetService.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/EnhancementOperationImpl.java
Modified: tapestry/tapestry4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/pom.xml?rev=423345&r1=423344&r2=423345&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/pom.xml (original)
+++ tapestry/tapestry4/trunk/pom.xml Tue Jul 18 19:38:03 2006
@@ -321,11 +321,11 @@
</site>
<repository>
<id>tapestry-repo</id>
- <url>scp://apache.org/www/www.apache.org/dist/maven-repository</url>
+ <url>scp://apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
</repository>
<snapshotRepository>
<id>tapestry-snapshot-repo</id>
- <url>scp://apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
+ <url>scp://apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
</snapshotRepository>
</distributionManagement>
Modified: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/pom.xml?rev=423345&r1=423344&r2=423345&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/pom.xml Tue Jul 18 19:38:03 2006
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-TimeTracker</artifactId>
- <packaging>jar</packaging>
+ <packaging>war</packaging>
<version>4.1.0-SNAPSHOT</version>
<!-- This should change to tapestry-project -->
<parent>
@@ -79,11 +79,11 @@
<version>1.8.0.1</version>
</dependency>
</dependencies>
-
+
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
-
+
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
@@ -106,9 +106,26 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <webResources>
+ <resource>
+ <!-- this is relative to the pom.xml directory -->
+ <directory>src/context</directory>
+ </resource>
+ <resource>
+ <directory>src/config</directory>
+ <targetPath>/WEB-INF</targetPath>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
</plugins>
</build>
-
+
<reporting>
<plugins>
<plugin>
Modified: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/timetracker.db.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/timetracker.db.xml?rev=423345&r1=423344&r2=423345&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/timetracker.db.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/timetracker.db.xml Tue Jul 18 19:38:03 2006
@@ -61,7 +61,7 @@
DB Connection for derby database
<invoke-factory service-id="HsqlConnProxyFactory" model="threaded" />
</service-point>
-
+
<service-point id="DatabaseInstaller" interface="DatabaseInstaller">
Ensures the database has been created/initialised.
<invoke-factory service-id="hivemind.BuilderFactory">
Modified: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java?rev=423345&r1=423344&r2=423345&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java Tue Jul 18 19:38:03 2006
@@ -100,11 +100,11 @@
* selection list.
*/
@EventListener(events = "selectOption", targets = "projectChoose",
- submitForm = "taskForm", async=false)
+ submitForm = "taskForm", async=true)
public void projectSelected(IRequestCycle cycle)
{
- //cycle.getResponseBuilder().updateComponent("projectDescription");
- //cycle.getResponseBuilder().updateComponent("feedbackBlock");
+ cycle.getResponseBuilder().updateComponent("projectDescription");
+ cycle.getResponseBuilder().updateComponent("feedbackBlock");
}
public void linkUpdateClicked()
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetService.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetService.java?rev=423345&r1=423344&r2=423345&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetService.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/AssetService.java Tue Jul 18 19:38:03 2006
@@ -310,7 +310,7 @@
} catch (ParseException e) { e.printStackTrace(); }
if (resource.lastModified() > modify
- || _lastResetTime > modify)
+ || (_lastResetTime > modify))
return false;
_response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/EnhancementOperationImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/EnhancementOperationImpl.java?rev=423345&r1=423344&r2=423345&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/EnhancementOperationImpl.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/EnhancementOperationImpl.java Tue Jul 18 19:38:03 2006
@@ -520,7 +520,7 @@
private Constructor findConstructor()
{
Class componentClass = _classFab.createClass();
-
+
// The fabricated base class always has exactly one constructor
return componentClass.getConstructors()[0];
Added: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/version.properties
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/version.properties?rev=423345&view=auto
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/version.properties (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/version.properties Tue Jul 18 19:38:03 2006
@@ -0,0 +1 @@
+project.version=4.1