[CONF] Confluence Changes in the last 24 hours

2008-01-24 Thread confluence
-
This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-

Apache Geronimo Development (GMOxDEV) 
http://cwiki.apache.org/confluence/display/GMOxDEV
|
|-Pages Added or Edited in This Space
 |-- Building Apache Geronimo was last edited by shujian (11:13 PM).
 |   http://cwiki.apache.org/confluence/display/GMOxDEV/Building+Apache+Geronimo

Apache Struts 2 Plugin Registry (S2PLUGINS) 
http://cwiki.apache.org/confluence/display/S2PLUGINS
|
|-Pages Added or Edited in This Space
 |-- Portlet Plugin was last edited by nilsga (01:14 PM).
 |   http://cwiki.apache.org/confluence/display/S2PLUGINS/Portlet+Plugin

Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW
 |
 |-New Comments in This Space
 |-- http://cwiki.apache.org/confluence/display/WW/Stream+Result (1)

Apache ServiceMix Kernel (SMX4KNL) 
http://cwiki.apache.org/confluence/display/SMX4KNL
|
|-Pages Added or Edited in This Space
 |-- Navigation was last edited by gnodet (08:33 AM).
 |   http://cwiki.apache.org/confluence/display/SMX4KNL/Navigation
 |-- QuickLinks was created by gnodet (08:03 AM).
 |   http://cwiki.apache.org/confluence/display/SMX4KNL/QuickLinks
 |-- Index was last edited by gnodet (07:50 AM).
 |   http://cwiki.apache.org/confluence/display/SMX4KNL/Index
 |-- 2. Overview was last edited by gnodet (07:28 AM).
 |   http://cwiki.apache.org/confluence/display/SMX4KNL/2.+Overview
 |-- Kernel Overview was created by gnodet (07:27 AM).
 |   http://cwiki.apache.org/confluence/display/SMX4KNL/Kernel+Overview
 |-- Snippets was created by gnodet (07:27 AM).
 |   http://cwiki.apache.org/confluence/display/SMX4KNL/Snippets
 |-- Download was last edited by gnodet (06:39 AM).
 |   http://cwiki.apache.org/confluence/display/SMX4KNL/Download

Apache Struts 2 Wiki (S2WIKI) http://cwiki.apache.org/confluence/display/S2WIKI
|
|-Pages Added or Edited in This Space
 |-- I Love Struts 2 was created by [EMAIL PROTECTED] (09:38 PM).
 |   http://cwiki.apache.org/confluence/display/S2WIKI/I+Love+Struts+2

Apache Tuscany (TUSCANY) http://cwiki.apache.org/confluence/display/TUSCANY
|
|-Pages Added or Edited in This Space
 |-- SDO Java Get Involved was last edited by [EMAIL PROTECTED] (05:20 AM).
 |   http://cwiki.apache.org/confluence/display/TUSCANY/SDO+Java+Get+Involved
 |-- SDO Project Code Structure was last edited by [EMAIL PROTECTED] (04:52 AM).
 |   
http://cwiki.apache.org/confluence/display/TUSCANY/SDO+Project+Code+Structure
 |-- Developing SDO Java was last edited by [EMAIL PROTECTED] (12:56 AM).
 |   http://cwiki.apache.org/confluence/display/TUSCANY/Developing+SDO+Java

Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET
|
|-Pages Added or Edited in This Space
 |-- Passing parameters to pages was created by [EMAIL PROTECTED] (04:19 AM).
 |   
http://cwiki.apache.org/confluence/display/WICKET/Passing+parameters+to+pages
 |-- Request cycle and request cycle processor was last edited by gwynevans 
(01:26 AM).
 |   
http://cwiki.apache.org/confluence/display/WICKET/Request+cycle+and+request+cycle+processor
 |-- Request processing overview was last edited by gwynevans (01:25 AM).
 |   
http://cwiki.apache.org/confluence/display/WICKET/Request+processing+overview
 |-- Page maps was last edited by gwynevans (01:24 AM).
 |   http://cwiki.apache.org/confluence/display/WICKET/Page+maps

Apache Geronimo (GMOxSITE) http://cwiki.apache.org/confluence/display/GMOxSITE
|
|-Pages Added or Edited in This Space
 |-- Committers was last edited by ginemesis (12:06 PM).
 |   http://cwiki.apache.org/confluence/display/GMOxSITE/Committers

Apache Qpid (qpid) http://cwiki.apache.org/confluence/display/qpid
|
|-Pages Added or Edited in This Space
 |-- ConnectionURLFormat was last edited by ritchiem (07:39 AM).
 |   http://cwiki.apache.org/confluence/display/qpid/ConnectionURLFormat

OpenEJB 3.0.x documentation (OPENEJBx30) 
http://cwiki.apache.org/confluence/display/OPENEJBx30
|
|-Pages Added or Edited in This Space
 |-- Helloworld Weblogic was created by joanna (12:11 AM).
 |   http://cwiki.apache.org/confluence/display/OPENEJBx30/Helloworld+Weblogic

Apache ServiceMix NMR (SMX4NMR) 
http://cwiki.apache.org/confluence/display/SMX4NMR
|
|-Pages Added or Edited in This Space
 |-- Navigation was last edited by gnodet (12:18 AM).
 |   http://cwiki.apache.org/confluence/display/SMX4NMR/Navigation

Apache Geronimo v2.0 (GMOxDOC20) 
http://cwiki.apache.org/confluence/display/GMOxDOC20
|
|-Pages Added or Edited in This Space
 |-- Apache Harmony was last edited by vmz (03:45 PM).
 |   http://cwiki.apache.org/confluence/display/GMOxDOC20/Apache+Harmony

Apache ServiceMix (SM) http://cwiki.apache.org/confluence/display/SM
|
|-Pages Added or Edited in This Space
 |-- Navigation was last edited by gnodet (07:31 AM).
 

svn commit: r614842 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/Label.java test/java/org/apache/struts2/TestAction.java test/java/org/apache/struts2/views/jsp/ui/Label

2008-01-24 Thread husted
Author: husted
Date: Thu Jan 24 03:09:59 2008
New Revision: 614842

URL: http://svn.apache.org/viewvc?rev=614842&view=rev
Log:
WW-2171 "Label tag does not use key attribute to lookup value in resources when 
using simple theme" Apply patch provided by Maja S Bratseth.

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Label.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Label.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Label.java?rev=614842&r1=614841&r2=614842&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Label.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Label.java
 Thu Jan 24 03:09:59 2008
@@ -78,15 +78,17 @@
 addParameter("for", findString(forAttr));
 }
 
-// try value first, then name (this overrides the default behavior in 
the superclass)
+// try value, then key, then name (this overrides the default behavior 
in the superclass)
 if (value != null) {
 addParameter("nameValue", findString(value));
+} else if (key != null) {
+String expr = "%{getText('"+ key +"')}";
+addParameter("nameValue", findString(expr));
 } else if (name != null) {
 String expr = name;
 if (altSyntax()) {
 expr = "%{" + expr + "}";
 }
-
 addParameter("nameValue", findString(expr));
 }
 }

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java?rev=614842&r1=614841&r2=614842&view=diff
==
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java 
(original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java 
Thu Jan 24 03:09:59 2008
@@ -20,10 +20,7 @@
  */
 package org.apache.struts2;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import org.apache.struts2.views.jsp.ui.User;
 
@@ -49,6 +46,19 @@
 private List list2;
 private List list3;
 private SomeEnum status = SomeEnum.COMPLETED;
+
+private final Map texts = new HashMap();
+
+public void setText(String key, String value) {
+this.texts.put(key, value);
+}
+
+public String getText(String key) {
+if (this.texts.containsKey(key)) {
+return (String) this.texts.get(key);
+}
+return super.getText(key);
+}
 
 public Collection getCollection() {
 return collection;

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java?rev=614842&r1=614841&r2=614842&view=diff
==
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java
 Thu Jan 24 03:09:59 2008
@@ -108,4 +108,26 @@
 LabelTag tag = new LabelTag();
 verifyGenericProperties(tag, "xhtml", null);
 }
+
+public void testWithKey() throws Exception {
+TestAction testAction = (TestAction) action;
+final String key = "labelKey";
+final String value = "baz";
+testAction.setText(key, value);
+
+testAction.setFoo("notToBeOutput");
+
+LabelTag tag = new LabelTag();
+tag.setPageContext(pageContext);
+tag.setLabel("mylabel");
+tag.setFor("for");
+tag.setName("foo");
+tag.setKey(key);
+
+tag.doStartTag();
+tag.doEndTag();
+
+verify(LabelTest.class.getResource("Label-2.txt"));
+}
+
 }




[OSS Bamboo] Struts 2 SVN - Main Build build 685 has FAILED (0 tests failed). Change made by husted

2008-01-24 Thread Atlassian Open Source Bamboo Integration Server
The project Struts 2 SVN - Main Build has the following 1 change by 1 author:

*husted* made the following changes at 

Comment:
WW-2171 "Label tag does not use key attribute to lookup value in resources when 
using simple theme" Apply patch provided by Maja S Bratseth.

> /struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java
>  (614842)
> /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Label.java
>  (614842)
> /struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java 
> (614842)



---

No failed tests found, a possible compilation error.

Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-685 to find out 
more.

Thanks,

Bamboo


[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 331 has FAILED (0 tests failed). Change made by husted

2008-01-24 Thread Atlassian Open Source Bamboo Integration Server
The project Struts 2 SVN - Main Build (Java 6) has the following 1 change by 1 
author:

*husted* made the following changes at 

Comment:
WW-2171 "Label tag does not use key attribute to lookup value in resources when 
using simple theme" Apply patch provided by Maja S Bratseth.

> /struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java
>  (614842)
> /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Label.java
>  (614842)
> /struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java 
> (614842)



---

No failed tests found, a possible compilation error.

Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-331 to find 
out more.

Thanks,

Bamboo


[OSS Bamboo] Struts 2 SVN - Main Build build 686 has FAILED (0 tests failed)

2008-01-24 Thread Atlassian Open Source Bamboo Integration Server
This is a manual build of Struts 2 SVN - Main Build.

---

No failed tests found, a possible compilation error.

Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-686 to find out 
more.

Thanks,

Bamboo


svn commit: r614969 - in /struts/struts2/trunk: assembly/src/main/assembly/ assembly/src/main/resources/ plugins/plexus/src/main/resources/

2008-01-24 Thread apetrelli
Author: apetrelli
Date: Thu Jan 24 12:12:19 2008
New Revision: 614969

URL: http://svn.apache.org/viewvc?rev=614969&view=rev
Log:
WW-2437
Added Classworlds notice.

Added:

struts/struts2/trunk/plugins/plexus/src/main/resources/CLASSWORLDS-LICENSE.txt  
 (with props)
Modified:
struts/struts2/trunk/assembly/src/main/assembly/all.xml
struts/struts2/trunk/assembly/src/main/assembly/lib.xml
struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt
struts/struts2/trunk/plugins/plexus/src/main/resources/NOTICE.txt

Modified: struts/struts2/trunk/assembly/src/main/assembly/all.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/all.xml?rev=614969&r1=614968&r2=614969&view=diff
==
--- struts/struts2/trunk/assembly/src/main/assembly/all.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/all.xml Thu Jan 24 12:12:19 
2008
@@ -45,8 +45,15 @@
   
 
 
-../plugins/struts1/src/main/resources
-
+  ../plugins/plexus/src/main/resources
+  
+  
+CLASSWORLDS-LICENSE.txt
+  
+
+
+  ../plugins/struts1/src/main/resources
+  
   
 ANTLR-LICENSE.txt
   

Modified: struts/struts2/trunk/assembly/src/main/assembly/lib.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/lib.xml?rev=614969&r1=614968&r2=614969&view=diff
==
--- struts/struts2/trunk/assembly/src/main/assembly/lib.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/lib.xml Thu Jan 24 12:12:19 
2008
@@ -45,8 +45,15 @@
   
 
 
-../plugins/struts1/src/main/resources
-
+  ../plugins/plexus/src/main/resources
+  
+  
+CLASSWORLDS-LICENSE.txt
+  
+
+
+  ../plugins/struts1/src/main/resources
+  
   
 ANTLR-LICENSE.txt
   

Modified: struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt?rev=614969&r1=614968&r2=614969&view=diff
==
--- struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt (original)
+++ struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt Thu Jan 24 
12:12:19 2008
@@ -8,3 +8,4 @@
 
 The binary distributions includes the following third party software:
 ANTLR (http://www.antlr.org/).
+Classworlds (http://classworlds.codehaus.org/).

Added: 
struts/struts2/trunk/plugins/plexus/src/main/resources/CLASSWORLDS-LICENSE.txt
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/plexus/src/main/resources/CLASSWORLDS-LICENSE.txt?rev=614969&view=auto
==
--- 
struts/struts2/trunk/plugins/plexus/src/main/resources/CLASSWORLDS-LICENSE.txt 
(added)
+++ 
struts/struts2/trunk/plugins/plexus/src/main/resources/CLASSWORLDS-LICENSE.txt 
Thu Jan 24 12:12:19 2008
@@ -0,0 +1,47 @@
+
+
+/*
+ $Id$
+
+ Copyright 2002 (C) The Codehaus. All Rights Reserved.
+ 
+ Redistribution and use of this software and associated documentation
+ ("Software"), with or without modification, are permitted provided
+ that the following conditions are met:
+
+ 1. Redistributions of source code must retain copyright
+statements and notices.  Redistributions must also contain a
+copy of this document.
+ 
+ 2. Redistributions in binary form must reproduce the
+above copyright notice, this list of conditions and the
+following disclaimer in the documentation and/or other
+materials provided with the distribution.
+ 
+ 3. The name "classworlds" must not be used to endorse or promote
+products derived from this Software without prior written
+permission of The Codehaus.  For written permission, please 
+contact [EMAIL PROTECTED]
+ 
+ 4. Products derived from this Software may not be called "classworlds"
+nor may "classworlds" appear in their names without prior written
+permission of The Codehaus. "classworlds" is a registered
+trademark of The Codehaus.
+ 
+ 5. Due credit should be given to The Codehaus.
+(http://classworlds.codehaus.org/).
+ 
+ THIS SOFTWARE IS PROVIDED BY THE CODEHAUS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+ NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ THE CODEHAUS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLU

[OSS Bamboo] Struts 2 SVN - Main Build build 687 has FAILED (0 tests failed). Change made by apetrelli

2008-01-24 Thread Atlassian Open Source Bamboo Integration Server
The project Struts 2 SVN - Main Build has the following 1 change by 1 author:

*apetrelli* made the following changes at 

Comment:
WW-2437
Added Classworlds notice.

> /struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt (614969)
> /struts/struts2/trunk/assembly/src/main/assembly/all.xml (614969)
> /struts/struts2/trunk/assembly/src/main/assembly/lib.xml (614969)
> /struts/struts2/trunk/plugins/plexus/src/main/resources/NOTICE.txt (614969)
> /struts/struts2/trunk/plugins/plexus/src/main/resources/CLASSWORLDS-LICENSE.txt
>  (614969)



---

No failed tests found, a possible compilation error.

Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-687 to find out 
more.

Thanks,

Bamboo


[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 332 has FAILED (0 tests failed). Change made by apetrelli

2008-01-24 Thread Atlassian Open Source Bamboo Integration Server
The project Struts 2 SVN - Main Build (Java 6) has the following 1 change by 1 
author:

*apetrelli* made the following changes at 

Comment:
WW-2437
Added Classworlds notice.

> /struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt (614969)
> /struts/struts2/trunk/assembly/src/main/assembly/all.xml (614969)
> /struts/struts2/trunk/assembly/src/main/assembly/lib.xml (614969)
> /struts/struts2/trunk/plugins/plexus/src/main/resources/NOTICE.txt (614969)
> /struts/struts2/trunk/plugins/plexus/src/main/resources/CLASSWORLDS-LICENSE.txt
>  (614969)



---

No failed tests found, a possible compilation error.

Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-332 to find 
out more.

Thanks,

Bamboo


svn commit: r614986 - in /struts/struts2/trunk: assembly/ assembly/src/main/assembly/ assembly/src/main/resources/ core/src/main/resources/ plugins/rest/src/main/resources/

2008-01-24 Thread apetrelli
Author: apetrelli
Date: Thu Jan 24 12:53:03 2008
New Revision: 614986

URL: http://svn.apache.org/viewvc?rev=614986&view=rev
Log:
WW-2437
Added FreeMarker, JSON-lib and EZMorph notices.

Added:
struts/struts2/trunk/core/src/main/resources/FREEMARKER-LICENSE.txt   (with 
props)
struts/struts2/trunk/plugins/rest/src/main/resources/NOTICE.txt   (with 
props)
Modified:
struts/struts2/trunk/assembly/pom.xml
struts/struts2/trunk/assembly/src/main/assembly/all.xml
struts/struts2/trunk/assembly/src/main/assembly/lib.xml
struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt
struts/struts2/trunk/core/src/main/resources/NOTICE.txt

Modified: struts/struts2/trunk/assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=614986&r1=614985&r2=614986&view=diff
==
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Thu Jan 24 12:53:03 2008
@@ -117,7 +117,7 @@
 
 
 
-
+
 
 maven-assembly-plugin
 2.2-beta-1

Modified: struts/struts2/trunk/assembly/src/main/assembly/all.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/all.xml?rev=614986&r1=614985&r2=614986&view=diff
==
--- struts/struts2/trunk/assembly/src/main/assembly/all.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/all.xml Thu Jan 24 12:53:03 
2008
@@ -45,6 +45,13 @@
   
 
 
+  ../core/src/main/resources
+  
+  
+FREEMARKER-LICENSE.txt
+  
+
+
   ../plugins/plexus/src/main/resources
   
   

Modified: struts/struts2/trunk/assembly/src/main/assembly/lib.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/lib.xml?rev=614986&r1=614985&r2=614986&view=diff
==
--- struts/struts2/trunk/assembly/src/main/assembly/lib.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/lib.xml Thu Jan 24 12:53:03 
2008
@@ -45,6 +45,13 @@
   
 
 
+  ../core/src/main/resources
+  
+  
+FREEMARKER-LICENSE.txt
+  
+
+
   ../plugins/plexus/src/main/resources
   
   

Modified: struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt?rev=614986&r1=614985&r2=614986&view=diff
==
--- struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt (original)
+++ struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt Thu Jan 24 
12:53:03 2008
@@ -9,3 +9,6 @@
 The binary distributions includes the following third party software:
 ANTLR (http://www.antlr.org/).
 Classworlds (http://classworlds.codehaus.org/).
+EZMorph (http://ezmorph.sourceforge.net/)
+FreeMarker (http://freemarker.org/).
+JSON-lib (http://json-lib.sourceforge.net/).

Added: struts/struts2/trunk/core/src/main/resources/FREEMARKER-LICENSE.txt
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/FREEMARKER-LICENSE.txt?rev=614986&view=auto
==
--- struts/struts2/trunk/core/src/main/resources/FREEMARKER-LICENSE.txt (added)
+++ struts/struts2/trunk/core/src/main/resources/FREEMARKER-LICENSE.txt Thu Jan 
24 12:53:03 2008
@@ -0,0 +1,46 @@
+FreeMarker 1.x was released under the LGPL license. Later, by community
+consensus, we have switched over to a BSD-style license. As of FreeMarker
+2.2pre1, the original author, Benjamin Geer, has relinquished the copyright in
+behalf of Visigoth Software Society. The current copyright holder is the
+Visigoth Software Society.
+
+--
+Copyright (c) 2003 The Visigoth Software Society. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1.  Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+2.  The end-user documentation included with the redistribution, if any, must
+include the following acknowlegement:
+  "This product includes software developed by the 
+  Visigoth Software Society (http://www.visigoths.org/)."
+Alternately, this acknowlegement may appear in the software itself, if and
+wherever such third-party acknowlegements normally appear.
+
+3.  Neither the name "FreeMarker", "Visigoth", nor any of the names of the
+project contributors may be used to endorse or promote products derived
+

svn commit: r614987 - in /struts/struts2/trunk: apps/portlet/src/main/java/org/apache/struts2/portlet/example/fileupload/ core/src/main/java/org/apache/struts2/interceptor/ core/src/test/java/org/apac

2008-01-24 Thread apetrelli
Author: apetrelli
Date: Thu Jan 24 12:54:27 2008
New Revision: 614987

URL: http://svn.apache.org/viewvc?rev=614987&view=rev
Log:
WW-2421
Fixed Subversion properties.

Modified:

struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/fileupload/FileUploadAction.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookiesAware.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DispatcherServlet.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletContextAware.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletRequestAware.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletResponseAware.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletHttpSession.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletConfig.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletContext.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletInputStream.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletOutputStream.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequest.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequestDispatcher.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponse.java

struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java

struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java

Modified: 
struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/fileupload/FileUploadAction.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/fileupload/FileUploadAction.java?rev=614987&r1=614986&r2=614987&view=diff
==
(empty)

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java?rev=614987&r1=614986&r2=614987&view=diff
==
(empty)

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookiesAware.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookiesAware.java?rev=614987&r1=614986&r2=614987&view=diff
==
(empty)

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java?rev=614987&r1=614986&r2=614987&view=diff
==
(empty)

Modified: 
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DispatcherServlet.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DispatcherServlet.java?rev=614987&r1=614986&r2=614987&view=diff
==
(empty)

Modified: 
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java?rev=614987&r1=614986&r2=614987&view=diff
==
(empty)

Modified

svn commit: r614989 - /struts/struts2/trunk/assembly/pom.xml

2008-01-24 Thread apetrelli
Author: apetrelli
Date: Thu Jan 24 12:57:20 2008
New Revision: 614989

URL: http://svn.apache.org/viewvc?rev=614989&view=rev
Log:
WW-2437
I commented by mistake a piece of the assembly pom, fixed.

Modified:
struts/struts2/trunk/assembly/pom.xml

Modified: struts/struts2/trunk/assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=614989&r1=614988&r2=614989&view=diff
==
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Thu Jan 24 12:57:20 2008
@@ -117,7 +117,7 @@
 
 
 
-
+
 
 maven-assembly-plugin
 2.2-beta-1




[OSS Bamboo] Struts 2 SVN - Main Build build 688 has FAILED (0 tests failed). Change made by apetrelli

2008-01-24 Thread Atlassian Open Source Bamboo Integration Server
The project Struts 2 SVN - Main Build has the following 2 changes by 1 author:

*apetrelli* made the following changes at 

Comment:
WW-2437
Added FreeMarker, JSON-lib and EZMorph notices.

> /struts/struts2/trunk/core/src/main/resources/NOTICE.txt (614986)
> /struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt (614986)
> /struts/struts2/trunk/assembly/src/main/assembly/all.xml (614986)
> /struts/struts2/trunk/core/src/main/resources/FREEMARKER-LICENSE.txt (614986)
> /struts/struts2/trunk/assembly/pom.xml (614986)
> /struts/struts2/trunk/assembly/src/main/assembly/lib.xml (614986)
> /struts/struts2/trunk/plugins/rest/src/main/resources/NOTICE.txt (614986)
*apetrelli* made the following changes at 

Comment:
WW-2421
Fixed Subversion properties.

> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequest.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletContextAware.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponse.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletHttpSession.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletResponseAware.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java
>  (614987)
> /struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookiesAware.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequestDispatcher.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletOutputStream.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletContext.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletInputStream.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DispatcherServlet.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletRequestAware.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletConfig.java
>  (614987)
> /struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/fileupload/FileUploadAction.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java
>  (614987)
> /struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
>  (614987)
> /struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
>  (614987)



---

No failed tests found, a possible compilation error.

Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-688 to find out 
more.

Thanks,

Bamboo


[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 333 has FAILED (0 tests failed). Change made by apetrelli

2008-01-24 Thread Atlassian Open Source Bamboo Integration Server
The project Struts 2 SVN - Main Build (Java 6) has the following 2 changes by 1 
author:

*apetrelli* made the following changes at 

Comment:
WW-2437
Added FreeMarker, JSON-lib and EZMorph notices.

> /struts/struts2/trunk/core/src/main/resources/NOTICE.txt (614986)
> /struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt (614986)
> /struts/struts2/trunk/assembly/src/main/assembly/all.xml (614986)
> /struts/struts2/trunk/core/src/main/resources/FREEMARKER-LICENSE.txt (614986)
> /struts/struts2/trunk/assembly/pom.xml (614986)
> /struts/struts2/trunk/assembly/src/main/assembly/lib.xml (614986)
> /struts/struts2/trunk/plugins/rest/src/main/resources/NOTICE.txt (614986)
*apetrelli* made the following changes at 

Comment:
WW-2421
Fixed Subversion properties.

> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequest.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletContextAware.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponse.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletHttpSession.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletResponseAware.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java
>  (614987)
> /struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookiesAware.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequestDispatcher.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletOutputStream.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletContext.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletInputStream.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DispatcherServlet.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletRequestAware.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletConfig.java
>  (614987)
> /struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/fileupload/FileUploadAction.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java
>  (614987)
> /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java
>  (614987)
> /struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
>  (614987)
> /struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
>  (614987)



---

No failed tests found, a possible compilation error.

Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-333 to find 
out more.

Thanks,

Bamboo


[OSS Bamboo] Struts 2 SVN - Main Build build 689 has FAILED (0 tests failed). Change made by apetrelli

2008-01-24 Thread Atlassian Open Source Bamboo Integration Server
The project Struts 2 SVN - Main Build has the following 1 change by 1 author:

*apetrelli* made the following changes at 

Comment:
WW-2437
I commented by mistake a piece of the assembly pom, fixed.

> /struts/struts2/trunk/assembly/pom.xml (614989)



---

No failed tests found, a possible compilation error.

Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-689 to find out 
more.

Thanks,

Bamboo


[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 334 has FAILED (0 tests failed). Change made by apetrelli

2008-01-24 Thread Atlassian Open Source Bamboo Integration Server
The project Struts 2 SVN - Main Build (Java 6) has the following 1 change by 1 
author:

*apetrelli* made the following changes at 

Comment:
WW-2437
I commented by mistake a piece of the assembly pom, fixed.

> /struts/struts2/trunk/assembly/pom.xml (614989)



---

No failed tests found, a possible compilation error.

Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-334 to find 
out more.

Thanks,

Bamboo


svn commit: r615103 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java

2008-01-24 Thread jmitchell
Author: jmitchell
Date: Thu Jan 24 19:50:48 2008
New Revision: 615103

URL: http://svn.apache.org/viewvc?rev=615103&view=rev
Log:
WW-2414 - followup on earlier commit -- recursively replace 

[OSS Bamboo] Struts 2 SVN - Main Build build 690 has FAILED (0 tests failed). Change made by jmitchell

2008-01-24 Thread Atlassian Open Source Bamboo Integration Server
The project Struts 2 SVN - Main Build has the following 1 change by 1 author:

*jmitchell* made the following changes at 

Comment:
WW-2414 - followup on earlier commit -- recursively replace 

[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 335 has FAILED (0 tests failed). Change made by jmitchell

2008-01-24 Thread Atlassian Open Source Bamboo Integration Server
The project Struts 2 SVN - Main Build (Java 6) has the following 1 change by 1 
author:

*jmitchell* made the following changes at 

Comment:
WW-2414 - followup on earlier commit -- recursively replace