svn commit: r520391 - /struts/struts2/tags/STRUTS_2_0_7/
Author: husted Date: Tue Mar 20 06:59:26 2007 New Revision: 520391 URL: http://svn.apache.org/viewvc?view=rev&rev=520391 Log: WW-1767 Removing first try at 2.0.7. Removed: struts/struts2/tags/STRUTS_2_0_7/
svn commit: r520393 - /struts/struts2/tags/STRUTS_2_0_7/
Author: husted Date: Tue Mar 20 07:01:59 2007 New Revision: 520393 URL: http://svn.apache.org/viewvc?view=rev&rev=520393 Log: WW-1767 Tag r520528 as Struts 2.0.7 (again) Added: struts/struts2/tags/STRUTS_2_0_7/ - copied from r520258, struts/struts2/branches/STRUTS_2_0_X/
svn commit: r520399 - in /struts/struts2/branches/STRUTS_2_0_X: ./ apps/ apps/blank/ apps/mailreader/ apps/portlet/ apps/showcase/ assembly/ core/ plugins/ plugins/codebehind/ plugins/config-browser/
Author: husted Date: Tue Mar 20 07:04:53 2007 New Revision: 520399 URL: http://svn.apache.org/viewvc?view=rev&rev=520399 Log: WW-1767 Set STRUTS_2_0_X "head" to 2.0.8-SNAPSHOT Modified: struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml struts/struts2/branches/STRUTS_2_0_X/core/pom.xml struts/struts2/branches/STRUTS_2_0_X/plugins/codebehind/pom.xml struts/struts2/branches/STRUTS_2_0_X/plugins/config-browser/pom.xml struts/struts2/branches/STRUTS_2_0_X/plugins/jasperreports/pom.xml struts/struts2/branches/STRUTS_2_0_X/plugins/jfreechart/pom.xml struts/struts2/branches/STRUTS_2_0_X/plugins/jsf/pom.xml struts/struts2/branches/STRUTS_2_0_X/plugins/pell-multipart/pom.xml struts/struts2/branches/STRUTS_2_0_X/plugins/plexus/pom.xml struts/struts2/branches/STRUTS_2_0_X/plugins/pom.xml struts/struts2/branches/STRUTS_2_0_X/plugins/sitegraph/pom.xml struts/struts2/branches/STRUTS_2_0_X/plugins/sitemesh/pom.xml struts/struts2/branches/STRUTS_2_0_X/plugins/spring/pom.xml struts/struts2/branches/STRUTS_2_0_X/plugins/struts1/pom.xml struts/struts2/branches/STRUTS_2_0_X/plugins/tiles/pom.xml struts/struts2/branches/STRUTS_2_0_X/pom.xml Modified: struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml?view=diff&rev=520399&r1=520398&r2=520399 == --- struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml (original) +++ struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml Tue Mar 20 07:04:53 2007 @@ -5,7 +5,7 @@ org.apache.struts struts2-apps -2.0.7 +2.0.8-SNAPSHOT org.apache.struts struts2-blank Modified: struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml?view=diff&rev=520399&r1=520398&r2=520399 == --- struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml (original) +++ struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml Tue Mar 20 07:04:53 2007 @@ -5,7 +5,7 @@ org.apache.struts struts2-apps - 2.0.7 + 2.0.8-SNAPSHOT org.apache.struts struts2-mailreader Modified: struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml?view=diff&rev=520399&r1=520398&r2=520399 == --- struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml (original) +++ struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml Tue Mar 20 07:04:53 2007 @@ -25,7 +25,7 @@ org.apache.struts struts2-parent -2.0.7 +2.0.8-SNAPSHOT org.apache.struts struts2-apps Modified: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml?view=diff&rev=520399&r1=520398&r2=520399 == --- struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml (original) +++ struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml Tue Mar 20 07:04:53 2007 @@ -5,7 +5,7 @@ org.apache.struts struts2-apps - 2.0.7 + 2.0.8-SNAPSHOT org.apache.struts struts2-portlet Modified: struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml?view=diff&rev=520399&r1=520398&r2=520399 == --- struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml (original) +++ struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml Tue Mar 20 07:04:53 2007 @@ -5,7 +5,7 @@ org.apache.struts struts2-apps -2.0.7 +2.0.8-SNAPSHOT org.apache.struts struts2-showcase Modified: struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml?view=diff&rev=520399&r1=520398&r2=520399 == --- struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml (original) +++ struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml Tue Mar 20 07:04:53 2007 @@ -33,7 +33,7 @@ org.apache.struts struts2-parent -
svn commit: r520762 - /struts/struts1/trunk/core/src/test/java/org/apache/struts/validator/TestValidWhen.java
Author: bayard
Date: Tue Mar 20 22:53:44 2007
New Revision: 520762
URL: http://svn.apache.org/viewvc?view=rev&rev=520762
Log:
Breaking the build by putting the unit test for STR-2802 fully in
Modified:
struts/struts1/trunk/core/src/test/java/org/apache/struts/validator/TestValidWhen.java
Modified:
struts/struts1/trunk/core/src/test/java/org/apache/struts/validator/TestValidWhen.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/test/java/org/apache/struts/validator/TestValidWhen.java?view=diff&rev=520762&r1=520761&r2=520762
==
---
struts/struts1/trunk/core/src/test/java/org/apache/struts/validator/TestValidWhen.java
(original)
+++
struts/struts1/trunk/core/src/test/java/org/apache/struts/validator/TestValidWhen.java
Tue Mar 20 22:53:44 2007
@@ -229,19 +229,9 @@
* Test Indexed Property.
*/
public void testIndexedValue() {
-
// Test Case for Jira Issue STR-2802
// see https://issues.apache.org/struts/browse/STR-2802
-//
-// Currently validwhen is throwing an exception when using
-// the "indexed" syntax - this test case is to help resolve
-// that - logging the exception
-//
-try {
-doParse("(stringArray[1] == 'one')", testBean, 1,
"stringArray[1]");
-} catch(Exception e) {
-log.error("TestValidWhen.testIndexedValue() threw exception", e);
-}
+doParse("(stringArray[1] == 'one')", testBean, 1, "stringArray[1]",
true);
}
/**
svn commit: r520763 - in /struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen: ValidWhenParser.g ValidWhenParser.java
Author: bayard
Date: Tue Mar 20 22:57:10 2007
New Revision: 520763
URL: http://svn.apache.org/viewvc?view=rev&rev=520763
Log:
Fixing STR-2802 by removing the unnecessary LBRACKET. Test now passes and I
don't understand what the LBRACKET would have been there for so I think it was
just an error that's been in there forever and ever.
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.g
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.java
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.g
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.g?view=diff&rev=520763&r1=520762&r2=520763
==
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.g
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.g
Tue Mar 20 22:57:10 2007
@@ -182,7 +182,7 @@
Object i3 = argStack.pop();
argStack.push(ValidatorUtils.getValueAsString(form, i3 + "[" + i4
+ "]" + i5));
}
-| identifier LBRACKET integer RBRACKET LBRACKET {
+| identifier LBRACKET integer RBRACKET {
Object i7 = argStack.pop();
Object i6 = argStack.pop();
argStack.push(ValidatorUtils.getValueAsString(form, i6 + "[" + i7
+ "]"));
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.java?view=diff&rev=520763&r1=520762&r2=520763
==
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.java
Tue Mar 20 22:57:10 2007
@@ -273,12 +273,11 @@
argStack.push(ValidatorUtils.getValueAsString(form, i3
+ "[" + i4 + "]" + i5));
}
- else if ((LA(1)==IDENTIFIER) && (LA(2)==LBRACKET) && ((LA(3) >=
DECIMAL_LITERAL && LA(3) <= OCTAL_LITERAL)) && (LA(4)==RBRACKET) &&
(LA(5)==LBRACKET)) {
+ else if ((LA(1)==IDENTIFIER) && (LA(2)==LBRACKET) && ((LA(3) >=
DECIMAL_LITERAL && LA(3) <= OCTAL_LITERAL)) && (LA(4)==RBRACKET) &&
(_tokenSet_0.member(LA(5 {
identifier();
match(LBRACKET);
integer();
match(RBRACKET);
- match(LBRACKET);
Object i7 = argStack.pop();
Object i6 = argStack.pop();
[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL | |-Pages Added or Edited in This Space |-- Selective Consumer was created by jstrachan (07:48 PM). | http://cwiki.apache.org/confluence/display/CAMEL/Selective+Consumer |-- Enterprise Integration Patterns was last edited by jstrachan (07:43 PM). | http://cwiki.apache.org/confluence/display/CAMEL/Enterprise+Integration+Patterns |-- Event Driven Consumer was created by jstrachan (07:42 PM). | http://cwiki.apache.org/confluence/display/CAMEL/Event+Driven+Consumer |-- Message Endpoint was created by jstrachan (07:32 PM). | http://cwiki.apache.org/confluence/display/CAMEL/Message+Endpoint |-- Message Channel was created by jstrachan (07:35 PM). | http://cwiki.apache.org/confluence/display/CAMEL/Message+Channel |-- Message was created by jstrachan (07:28 PM). | http://cwiki.apache.org/confluence/display/CAMEL/Message |-- Message Router was created by jstrachan (07:21 PM). | http://cwiki.apache.org/confluence/display/CAMEL/Message+Router |-- Splitter was created by jstrachan (11:47 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Splitter |-- Why the name Camel was last edited by jstrachan (08:10 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Why+the+name+Camel |-- EIP was created by jstrachan (05:56 AM). | http://cwiki.apache.org/confluence/display/CAMEL/EIP |-- DSL was last edited by jstrachan (06:09 AM). | http://cwiki.apache.org/confluence/display/CAMEL/DSL |-- Navigation was last edited by jstrachan (06:07 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Navigation |-- Index was last edited by jstrachan (06:04 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Index |-- Architecture was created by jstrachan (05:50 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Architecture |-- Getting Started was last edited by jstrachan (06:02 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Getting+Started |-- FAQ was last edited by jstrachan (06:00 AM). | http://cwiki.apache.org/confluence/display/CAMEL/FAQ |-- User Guide was created by jstrachan (05:59 AM). | http://cwiki.apache.org/confluence/display/CAMEL/User+Guide |-- OldLinks was created by jstrachan (05:57 AM). | http://cwiki.apache.org/confluence/display/CAMEL/OldLinks |-- Wire Tap was last edited by jstrachan (05:56 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Wire+Tap |-- Recipient List was created by jstrachan (04:55 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Recipient+List |-- Predicate was last edited by jstrachan (05:56 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Predicate |-- Message Filter was last edited by jstrachan (05:56 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Message+Filter |-- Expression was created by jstrachan (05:46 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Expression |-- Content Based Router was last edited by jstrachan (05:56 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Content+Based+Router |-- Routes was last edited by jstrachan (05:53 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Routes |-- URIs was last edited by jstrachan (05:53 AM). | http://cwiki.apache.org/confluence/display/CAMEL/URIs Apache Geronimo SandBox (GMOxSBOX) http://cwiki.apache.org/confluence/display/GMOxSBOX | |-Pages Added or Edited in This Space |-- Geronimo confluence user groups was created by hcunico (06:06 AM). | http://cwiki.apache.org/confluence/display/GMOxSBOX/Geronimo+confluence+user+groups Apache Directory Server v1.5 (DIRxSRVx11) http://cwiki.apache.org/confluence/display/DIRxSRVx11 | |-Pages Added or Edited in This Space |-- Normalizer Interceptor was created by elecharny (03:24 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/Normalizer+Interceptor Apache Roller (ROLLER) http://cwiki.apache.org/confluence/display/ROLLER | |-Pages Added or Edited in This Space |-- Proposal Email Registration was created by snoopdave (08:10 PM). | http://cwiki.apache.org/confluence/display/ROLLER/Proposal+Email+Registration |-- Roller Proposals was last edited by snoopdave (07:52 PM). | http://cwiki.apache.org/confluence/display/ROLLER/Roller+Proposals |-- Proposal Theme XML Descriptor was last edited by agilliland (10:23 AM). | http://cwiki.apache.org/confluence/display/ROLLER/Proposal+Theme+XML+Descriptor Apache Geronimo Project Management (GMOxPMGT) http://cwiki.apache.org/confluence/display/GMOxPMGT | |-Pages Added or Edited in This Space |-- Geronimo 2.0 Web Services support was last edited by [EMAIL PROTECTED] (12:26 PM). | http://cwiki.apac
