You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2008/12/05 19:09:49 UTC
svn commit: r723805 - in /tapestry/tapestry5/trunk: tapestry-core/pom.xml
tapestry-core/tapestry-core.iml tapestry-hibernate/tapestry-hibernate.iml
tapestry-spring/tapestry-spring.iml tapestry-tutorial1/tutorial1.iml
tapestry-upload/tapestry-upload.iml
Author: hlship
Date: Fri Dec 5 10:09:49 2008
New Revision: 723805
URL: http://svn.apache.org/viewvc?rev=723805&view=rev
Log:
TAP5-79: Improve Tapestry's property expression language to include OGNL-like features
- Adjust Maven plugin version
- Exclude the stringtemplate runtime dependency (it is not needed)
Modified:
tapestry/tapestry5/trunk/tapestry-core/pom.xml
tapestry/tapestry5/trunk/tapestry-core/tapestry-core.iml
tapestry/tapestry5/trunk/tapestry-hibernate/tapestry-hibernate.iml
tapestry/tapestry5/trunk/tapestry-spring/tapestry-spring.iml
tapestry/tapestry5/trunk/tapestry-tutorial1/tutorial1.iml
tapestry/tapestry5/trunk/tapestry-upload/tapestry-upload.iml
Modified: tapestry/tapestry5/trunk/tapestry-core/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/pom.xml?rev=723805&r1=723804&r2=723805&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/pom.xml Fri Dec 5 10:09:49 2008
@@ -45,16 +45,22 @@
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr-runtime</artifactId>
- <version>3.0.1</version>
+ <version>3.1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.antlr</groupId>
+ <artifactId>stringtemplate</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
+ <groupId>org.antlr</groupId>
<artifactId>antlr3-maven-plugin</artifactId>
- <version>1.0</version>
+ <version>3.1.1.2</version>
<executions>
<execution>
<goals>
Modified: tapestry/tapestry5/trunk/tapestry-core/tapestry-core.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/tapestry-core.iml?rev=723805&r1=723804&r2=723805&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/tapestry-core.iml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/tapestry-core.iml Fri Dec 5 10:09:49 2008
@@ -9,11 +9,8 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/antlr" isTestSource="false" />
- <excludeFolder url="file://$MODULE_DIR$/target/Custom suite" />
- <excludeFolder url="file://$MODULE_DIR$/target/Tapestry Core" />
<excludeFolder url="file://$MODULE_DIR$/target/classes" />
<excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
- <excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" />
<excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
<excludeFolder url="file://$MODULE_DIR$/test-output" />
</content>
@@ -66,8 +63,7 @@
<orderEntry type="library" name="Maven: org.testng:testng:jdk15:5.7" level="project" />
<orderEntry type="library" exported="" name="Maven: commons-codec:commons-codec:1.3" level="project" />
<orderEntry type="library" name="Maven: org.easymock:easymock:2.4" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.antlr:antlr-runtime:3.0.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.antlr:stringtemplate:3.1-b1" level="project" />
+ <orderEntry type="library" exported="" name="Maven: org.antlr:antlr-runtime:3.1.1" level="project" />
</component>
</module>
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/tapestry-hibernate.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/tapestry-hibernate.iml?rev=723805&r1=723804&r2=723805&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/tapestry-hibernate.iml (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/tapestry-hibernate.iml Fri Dec 5 10:09:49 2008
@@ -46,8 +46,7 @@
<orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
<orderEntry type="library" exported="" name="Maven: org.slf4j:slf4j-log4j12:1.5.2" level="project" />
<orderEntry type="library" exported="" name="Maven: commons-codec:commons-codec:1.3" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.antlr:antlr-runtime:3.0.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.antlr:stringtemplate:3.1-b1" level="project" />
+ <orderEntry type="library" exported="" name="Maven: org.antlr:antlr-runtime:3.1.1" level="project" />
<orderEntry type="module" module-name="tapestry-hibernate-core" exported="" />
<orderEntry type="library" exported="" name="Maven: org.hibernate:hibernate-core:3.3.1.GA" level="project" />
<orderEntry type="library" exported="" name="Maven: antlr:antlr:2.7.6" level="project" />
Modified: tapestry/tapestry5/trunk/tapestry-spring/tapestry-spring.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-spring/tapestry-spring.iml?rev=723805&r1=723804&r2=723805&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-spring/tapestry-spring.iml (original)
+++ tapestry/tapestry5/trunk/tapestry-spring/tapestry-spring.iml Fri Dec 5 10:09:49 2008
@@ -46,8 +46,7 @@
<orderEntry type="library" exported="" name="Maven: log4j:log4j:1.2.14" level="project" />
<orderEntry type="library" exported="" name="Maven: org.slf4j:slf4j-log4j12:1.5.2" level="project" />
<orderEntry type="library" exported="" name="Maven: commons-codec:commons-codec:1.3" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.antlr:antlr-runtime:3.0.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.antlr:stringtemplate:3.1-b1" level="project" />
+ <orderEntry type="library" exported="" name="Maven: org.antlr:antlr-runtime:3.1.1" level="project" />
<orderEntry type="module" module-name="tapestry-test" />
<orderEntry type="library" name="Maven: org.openqa.selenium.client-drivers:selenium-java-client-driver:1.0-beta-1" level="project" />
<orderEntry type="library" name="Maven: org.openqa.selenium.core:selenium-core:1.0-beta-1" level="project" />
Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/tutorial1.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/tutorial1.iml?rev=723805&r1=723804&r2=723805&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/tutorial1.iml (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/tutorial1.iml Fri Dec 5 10:09:49 2008
@@ -53,11 +53,7 @@
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib/" />
</containerElement>
- <containerElement type="library" name="Maven: org.antlr:antlr-runtime:3.0.1" level="project">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/" />
- </containerElement>
- <containerElement type="library" name="Maven: org.antlr:stringtemplate:3.1-b1" level="project">
+ <containerElement type="library" name="Maven: org.antlr:antlr-runtime:3.1.1" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib/" />
</containerElement>
@@ -155,8 +151,7 @@
<orderEntry type="library" exported="" name="Maven: log4j:log4j:1.2.14" level="project" />
<orderEntry type="library" exported="" name="Maven: org.slf4j:slf4j-log4j12:1.5.2" level="project" />
<orderEntry type="library" exported="" name="Maven: commons-codec:commons-codec:1.3" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.antlr:antlr-runtime:3.0.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.antlr:stringtemplate:3.1-b1" level="project" />
+ <orderEntry type="library" exported="" name="Maven: org.antlr:antlr-runtime:3.1.1" level="project" />
<orderEntry type="module" module-name="tapestry-hibernate-core" exported="" />
<orderEntry type="library" exported="" name="Maven: org.hibernate:hibernate-core:3.3.1.GA" level="project" />
<orderEntry type="library" exported="" name="Maven: antlr:antlr:2.7.6" level="project" />
Modified: tapestry/tapestry5/trunk/tapestry-upload/tapestry-upload.iml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/tapestry-upload.iml?rev=723805&r1=723804&r2=723805&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/tapestry-upload.iml (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/tapestry-upload.iml Fri Dec 5 10:09:49 2008
@@ -46,8 +46,7 @@
<orderEntry type="library" exported="" name="Maven: log4j:log4j:1.2.14" level="project" />
<orderEntry type="library" exported="" name="Maven: org.slf4j:slf4j-log4j12:1.5.2" level="project" />
<orderEntry type="library" exported="" name="Maven: commons-codec:commons-codec:1.3" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.antlr:antlr-runtime:3.0.1" level="project" />
- <orderEntry type="library" exported="" name="Maven: org.antlr:stringtemplate:3.1-b1" level="project" />
+ <orderEntry type="library" exported="" name="Maven: org.antlr:antlr-runtime:3.1.1" level="project" />
<orderEntry type="module" module-name="tapestry-test" />
<orderEntry type="library" name="Maven: org.openqa.selenium.client-drivers:selenium-java-client-driver:1.0-beta-1" level="project" />
<orderEntry type="library" name="Maven: org.openqa.selenium.core:selenium-core:1.0-beta-1" level="project" />