Author: ate
Date: Mon Sep 5 15:44:01 2005
New Revision: 278878
URL: http://svn.apache.org/viewcvs?rev=278878&view=rev
Log:
Upgrade to Struts 1.2.7 and the corresponding Struts Bridge
Modified:
portals/jetspeed-2/trunk/.classpath
portals/jetspeed-2/trunk/applications/jpetstore/project.xml
portals/jetspeed-2/trunk/applications/struts-demo/project.xml
portals/jetspeed-2/trunk/project.properties
Modified: portals/jetspeed-2/trunk/.classpath
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/.classpath?rev=278878&r1=278877&r2=278878&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/.classpath (original)
+++ portals/jetspeed-2/trunk/.classpath Mon Sep 5 15:44:01 2005
@@ -60,7 +60,7 @@
<classpathentry kind="var" path="MAVEN_REPO/jdom/jars/jdom-1.0.jar"/>
<classpathentry exported="true" kind="var"
path="MAVEN_REPO/commons-beanutils/jars/commons-beanutils-1.7.0.jar"/>
<classpathentry exported="true" kind="var"
path="MAVEN_REPO/castor/jars/castor-0.9.4.3.jar"/>
- <classpathentry kind="var"
path="MAVEN_REPO/commons-digester/jars/commons-digester-1.5.jar"/>
+ <classpathentry kind="var"
path="MAVEN_REPO/commons-digester/jars/commons-digester-1.6.jar"/>
<classpathentry exported="true" kind="var"
path="MAVEN_REPO/commons-io/jars/commons-io-0.1.jar"/>
<classpathentry exported="true" kind="var"
path="MAVEN_REPO/commons-lang/jars/commons-lang-2.0.jar"/>
<classpathentry exported="true" kind="var"
path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.3.jar"/>
@@ -94,13 +94,13 @@
<classpathentry kind="var"
path="MAVEN_REPO/nekohtml/jars/nekohtml-0.9.3.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/oro/jars/oro-2.0.7.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/commons-codec/jars/commons-codec-1.3.jar"/>
- <classpathentry exported="true" kind="var"
path="MAVEN_REPO/commons-validator/jars/commons-validator-1.1.3.jar"/>
+ <classpathentry kind="var"
path="MAVEN_REPO/commons-validator/jars/commons-validator-1.1.4.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/rome/jars/rome-0.4.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/ibatis/jars/ibatis-common-2.0.8.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/ibatis/jars/ibatis-dao-2.0.8.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/ibatis/jars/ibatis-sqlmap-2.0.8.jar"/>
- <classpathentry kind="var"
path="MAVEN_REPO/struts/jars/struts-1.2.4.jar"/>
- <classpathentry kind="var"
path="MAVEN_REPO/struts/jars/struts-el-1.2.4.jar"/>
+ <classpathentry kind="var"
path="MAVEN_REPO/struts/jars/struts-1.2.7.jar"/>
+ <classpathentry kind="var"
path="MAVEN_REPO/struts/jars/struts-el-1.2.7.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/taglibs/jars/standard-1.0.6.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/myfaces/jars/myfaces-jsf-api-1.0.9.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/myfaces/jars/myfaces-1.0.9.jar"/>
@@ -112,7 +112,7 @@
<classpathentry kind="var"
path="MAVEN_REPO/portals-bridges/jars/portals-bridges-jsf-0.4-SNAPSHOT.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/portals-bridges/jars/portals-bridges-perl-0.4-SNAPSHOT.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/portals-bridges/jars/portals-bridges-php-0.4-SNAPSHOT.jar"/>
- <classpathentry kind="var"
path="MAVEN_REPO/portals-bridges/jars/portals-bridges-struts-0.4-SNAPSHOT.jar"/>
+ <classpathentry kind="var"
path="MAVEN_REPO/portals-bridges/jars/portals-bridges-struts-1.2.7-0.4-SNAPSHOT.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/portals-bridges/jars/portals-bridges-velocity-0.4-SNAPSHOT.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/jmx/jars/jmxri-1.2.1.jar"/>
<classpathentry kind="output" path="bin"/>
Modified: portals/jetspeed-2/trunk/applications/jpetstore/project.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jpetstore/project.xml?rev=278878&r1=278877&r2=278878&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/jpetstore/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/jpetstore/project.xml Mon Sep 5
15:44:01 2005
@@ -88,25 +88,16 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.6.1</version>
+ <version>1.7.0</version>
<url>http://jakarta.apache.org/commons/beanutils.html</url>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.1</version>
- <url>http://jakarta.apache.org/commons/collections.html</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
- <version>1.5</version>
+ <version>1.6</version>
<url>http://jakarta.apache.org/commons/digester.html</url>
<properties>
<war.bundle>true</war.bundle>
@@ -122,18 +113,9 @@
</properties>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.0</version>
- <url>http://jakarta.apache.org/commons/lang.html</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
- <version>1.1.3</version>
+ <version>1.1.4</version>
<url>http://jakarta.apache.org/commons/validator/</url>
<properties>
<war.bundle>true</war.bundle>
@@ -160,7 +142,7 @@
<dependency>
<groupId>struts</groupId>
<artifactId>struts</artifactId>
- <version>1.2.4</version>
+ <version>1.2.7</version>
<url>http://jakarta.apache.org/struts/</url>
<properties>
<war.bundle>true</war.bundle>
@@ -169,7 +151,7 @@
<dependency>
<groupId>struts</groupId>
<artifactId>struts-el</artifactId>
- <version>1.2.4</version>
+ <version>1.2.7</version>
<url>http://jakarta.apache.org/struts/</url>
<properties>
<war.bundle>true</war.bundle>
@@ -214,7 +196,7 @@
<dependency>
<groupId>portals-bridges</groupId>
<artifactId>portals-bridges-struts</artifactId>
- <version>${portals.bridges.common.version}</version>
+ <version>${portals.bridges.struts.version}</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
Modified: portals/jetspeed-2/trunk/applications/struts-demo/project.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/struts-demo/project.xml?rev=278878&r1=278877&r2=278878&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/struts-demo/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/struts-demo/project.xml Mon Sep 5
15:44:01 2005
@@ -86,23 +86,15 @@
</dependency>
<dependency>
<id>commons-beanutils</id>
- <version>1.6.1</version>
+ <version>1.7.0</version>
<url>http://jakarta.apache.org/commons/beanutils.html</url>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
- <id>commons-collections</id>
- <version>2.1</version>
- <url>http://jakarta.apache.org/commons/collections.html</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
<id>commons-digester</id>
- <version>1.5</version>
+ <version>1.6</version>
<url>http://jakarta.apache.org/commons/digester.html</url>
<properties>
<war.bundle>true</war.bundle>
@@ -117,16 +109,8 @@
</properties>
</dependency>
<dependency>
- <id>commons-lang</id>
- <version>2.0</version>
- <url>http://jakarta.apache.org/commons/lang.html</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
<id>commons-validator</id>
- <version>1.1.3</version>
+ <version>1.1.4</version>
<url>http://jakarta.apache.org/commons/validator/</url>
<properties>
<war.bundle>true</war.bundle>
@@ -142,7 +126,7 @@
</dependency>
<dependency>
<id>struts</id>
- <version>1.2.4</version>
+ <version>1.2.7</version>
<url>http://jakarta.apache.org/struts/</url>
<properties>
<war.bundle>true</war.bundle>
Modified: portals/jetspeed-2/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/project.properties?rev=278878&r1=278877&r2=278878&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/project.properties (original)
+++ portals/jetspeed-2/trunk/project.properties Mon Sep 5 15:44:01 2005
@@ -25,7 +25,7 @@
portals.bridges.jsf.version=0.4-SNAPSHOT
portals.bridges.perl.version=0.4-SNAPSHOT
portals.bridges.php.version=0.4-SNAPSHOT
-portals.bridges.struts.version=0.4-SNAPSHOT
+portals.bridges.struts.version=1.2.7-0.4-SNAPSHOT
portals.bridges.velocity.version=0.4-SNAPSHOT
commons.logging.version=1.0.3
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]