date:20061009

[CONF] Confluence Changes in the last 24 hours

2006-10-09 Thread confluence

-
This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-

OpenEJB (OPENEJB) http://cwiki.apache.org/confluence/display/OPENEJB
|
|-Pages Added or Edited in This Space
 |-- OpenEJB 3 RoadMap was last edited by dblevins (12:24 PM).
 |   http://cwiki.apache.org/confluence/display/OPENEJB/OpenEJB+3+RoadMap

Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW
|
|-Pages Added or Edited in This Space
 |-- Plugin Guide was last edited by husted (06:35 PM).
 |   http://cwiki.apache.org/confluence/display/WW/Plugin+Guide
 |-- JFreeChart Plugin was last edited by husted (06:24 PM).
 |   http://cwiki.apache.org/confluence/display/WW/JFreeChart+Plugin
 |-- Cookbook was last edited by husted (06:24 PM).
 |   http://cwiki.apache.org/confluence/display/WW/Cookbook
 |-- JasperReports Plugin was last edited by husted (06:22 PM).
 |   http://cwiki.apache.org/confluence/display/WW/JasperReports+Plugin
 |-- Result Types was last edited by husted (06:22 PM).
 |   http://cwiki.apache.org/confluence/display/WW/Result+Types
 |-- Guides was last edited by husted (06:19 PM).
 |   http://cwiki.apache.org/confluence/display/WW/Guides
 |-- Migration Guide was last edited by husted (06:18 PM).
 |   http://cwiki.apache.org/confluence/display/WW/Migration+Guide
 |-- Contributors Guide was last edited by husted (06:18 PM).
 |   http://cwiki.apache.org/confluence/display/WW/Contributors+Guide
 |-- FAQs was last edited by husted (06:11 PM).
 |   http://cwiki.apache.org/confluence/display/WW/FAQs
 |-- Can we use Acegi Security with the framework was last edited by husted 
(06:11 PM).
 |   
http://cwiki.apache.org/confluence/display/WW/Can+we+use+Acegi+Security+with+the+framework
 |-- Release Notes 2.0.0 was last edited by husted (06:11 PM).
 |   http://cwiki.apache.org/confluence/display/WW/Release+Notes+2.0.0
 |-- Core Developers Guide was last edited by husted (06:01 PM).
 |   http://cwiki.apache.org/confluence/display/WW/Core+Developers+Guide
 |-- Spring was last edited by husted (06:00 PM).
 |   http://cwiki.apache.org/confluence/display/WW/Spring
 |-- How can we schedule Quartz jobs was last edited by husted (05:59 PM).
 |   
http://cwiki.apache.org/confluence/display/WW/How+can+we+schedule+Quartz+jobs
 |-- Can we use JUnit with the framework was last edited by husted (05:57 PM).
 |   
http://cwiki.apache.org/confluence/display/WW/Can+we+use+JUnit+with+the+framework
 |-- Action Configuration was last edited by husted (05:57 PM).
 |   http://cwiki.apache.org/confluence/display/WW/Action+Configuration
 |-- Can we use JSTL with the framework was last edited by husted (05:55 PM).
 |   
http://cwiki.apache.org/confluence/display/WW/Can+we+use+JSTL+with+the+framework
 |-- Does the framework integrate with Hibernate was last edited by husted 
(05:51 PM).
 |   
http://cwiki.apache.org/confluence/display/WW/Does+the+framework+integrate+with+Hibernate
 |-- Dependency Injection was last edited by husted (05:45 PM).
 |   http://cwiki.apache.org/confluence/display/WW/Dependency+Injection
 |-- Creating and Signing a Distribution was last edited by husted (04:07 PM).
 |   
http://cwiki.apache.org/confluence/display/WW/Creating+and+Signing+a+Distribution

Apache Struts 2 Wiki (S2WIKI) http://cwiki.apache.org/confluence/display/S2WIKI
|
|-Pages Added or Edited in This Space
 |-- Articles and press was last edited by husted (06:04 PM).
 |   http://cwiki.apache.org/confluence/display/S2WIKI/Articles+and+press


-
CONFLUENCE INFORMATION
This message is automatically generated by Confluence

Unsubscribe or edit your notifications preferences
   http://cwiki.apache.org/confluence/users/viewnotifications.action

If you think it was sent incorrectly contact one of the administrators
   http://cwiki.apache.org/confluence/administrators.action

If you want more information on Confluence, or have a bug to report see
   http://www.atlassian.com/software/confluence

svn commit: r454348 - in /struts/sandbox/trunk/tiles/tiles-core/src/main: java/org/apache/tiles/taglib/GetAsStringTag.java java/org/apache/tiles/taglib/GetAttributeTag.java resources/META-INF/tiles-co

2006-10-09 Thread apetrelli

Author: apetrelli
Date: Mon Oct  9 04:53:30 2006
New Revision: 454348

URL: http://svn.apache.org/viewvc?view=rev&rev=454348
Log:
SB-53
Renamed GetAttributeTag to GetAsStringTag

Added:

struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/GetAsStringTag.java
  - copied, changed from r453561, 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/GetAttributeTag.java
Removed:

struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/GetAttributeTag.java
Modified:

struts/sandbox/trunk/tiles/tiles-core/src/main/resources/META-INF/tiles-core.tld

Copied: 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/GetAsStringTag.java
 (from r453561, 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/GetAttributeTag.java)
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/GetAsStringTag.java?view=diff&rev=454348&p1=struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/GetAttributeTag.java&r1=453561&p2=struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/GetAsStringTag.java&r2=454348
==
--- 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/GetAttributeTag.java
 (original)
+++ 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/GetAsStringTag.java
 Mon Oct  9 04:53:30 2006
@@ -33,7 +33,7 @@
* and render it to the current JspWriter as a String.
* The usual toString() conversion is applied on the found value.
*/
-public class GetAttributeTag extends TagSupport implements ComponentConstants {
+public class GetAsStringTag extends TagSupport implements ComponentConstants {
 
   private String attribute = null;
 /** Role attribute */
@@ -47,7 +47,7 @@
   /**
* Default constructor.
*/
-  public GetAttributeTag() {
+  public GetAsStringTag() {
 super();
   }
 

Modified: 
struts/sandbox/trunk/tiles/tiles-core/src/main/resources/META-INF/tiles-core.tld
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/resources/META-INF/tiles-core.tld?view=diff&rev=454348&r1=454347&r2=454348
==
--- 
struts/sandbox/trunk/tiles/tiles-core/src/main/resources/META-INF/tiles-core.tld
 (original)
+++ 
struts/sandbox/trunk/tiles/tiles-core/src/main/resources/META-INF/tiles-core.tld
 Mon Oct  9 04:53:30 2006
@@ -352,7 +352,7 @@


   getAsString
-  org.apache.tiles.taglib.GetAttributeTag
+  org.apache.tiles.taglib.GetAsStringTag
   empty

svn commit: r454353 - /struts/sandbox/trunk/tiles/src/site/fml/faq.fml

2006-10-09 Thread apetrelli

Author: apetrelli
Date: Mon Oct  9 05:05:48 2006
New Revision: 454353

URL: http://svn.apache.org/viewvc?view=rev&rev=454353
Log:
SB-53
Added FAQ entry regarding renaming GetAttributeTag to GetAsStringTag

Modified:
struts/sandbox/trunk/tiles/src/site/fml/faq.fml

Modified: struts/sandbox/trunk/tiles/src/site/fml/faq.fml
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/src/site/fml/faq.fml?view=diff&rev=454353&r1=454352&r2=454353
==
--- struts/sandbox/trunk/tiles/src/site/fml/faq.fml (original)
+++ struts/sandbox/trunk/tiles/src/site/fml/faq.fml Mon Oct  9 05:05:48 2006
@@ -31,6 +31,16 @@
 
 
 
+
+What happened to GetAttributeTag class?
+
+
+The GetAttributeTag class has been renamed to
+GetAsStringTag to conform to conventions on 
tag
+libraries.
+
+
+
 
 What happened to 'attribute' and 'definition'?

svn commit: r454447 - /struts/struts2/trunk/pom.xml

2006-10-09 Thread wsmoak

Author: wsmoak
Date: Mon Oct  9 11:12:06 2006
New Revision: 454447

URL: http://svn.apache.org/viewvc?view=rev&rev=454447
Log:
Set the snapshot repository URL.  This can be removed once struts-master v4 is 
released.

Modified:
struts/struts2/trunk/pom.xml

Modified: struts/struts2/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?view=diff&rev=454447&r1=454446&r2=454447
==
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Mon Oct  9 11:12:06 2006
@@ -69,6 +69,12 @@
Apache Maven Repository (Snapshots and Test Builds)

scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
 
+
+   apache.snapshots
+   false
+   Apache Maven Repository (Snapshots and Test Builds)
+   
scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
+
 
 apache-site
 scp://people.apache.org/www/struts.apache.org/2.x/

svn commit: r454455 - in /struts/struts2/trunk: ./ core/ core/src/main/java/org/apache/struts2/dispatcher/ core/src/main/java/org/apache/struts2/portlet/result/ core/src/main/java/org/apache/struts2/v

2006-10-09 Thread mrdon

Author: mrdon
Date: Mon Oct  9 11:49:38 2006
New Revision: 454455

URL: http://svn.apache.org/viewvc?view=rev&rev=454455
Log:
Adding more friendly result constructors and setters, changed
xwork dep to beta 1
WW-1463 WW-1453


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

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletResult.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java

struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java

struts/struts2/trunk/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java

struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesResult.java

struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
struts/struts2/trunk/pom.xml

Modified: struts/struts2/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?view=diff&rev=454455&r1=454454&r2=454455
==
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Mon Oct  9 11:49:38 2006
@@ -36,20 +36,10 @@
  
 
 
-
 
 opensymphony
 xwork
-2.0-SNAPSHOT
+2.0-beta-1
 
 
 

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java?view=diff&rev=454455&r1=454454&r2=454455
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java
 Mon Oct  9 11:49:38 2006
@@ -75,8 +75,19 @@
 
 
 private boolean parse = true;
-private Map headers;
+private Map headers;
 private int status = -1;
+
+public HttpHeaderResult() {
+   super();
+   headers = new HashMap();
+}
+
+public HttpHeaderResult(int status) {
+   this();
+   this.status = status;
+   this.parse = false;
+}
 
 
 /**
@@ -85,10 +96,6 @@
  * @return a Map of all HTTP headers.
  */
 public Map getHeaders() {
-if (headers == null) {
-headers = new HashMap();
-}
-
 return headers;
 }
 
@@ -98,8 +105,9 @@
  * @param parse true if HTTP header values should be evaluated 
agains the ValueStack, false
  *  otherwise.
  */
-public void setParse(boolean parse) {
+public HttpHeaderResult setParse(boolean parse) {
 this.parse = parse;
+return this;
 }
 
 /**
@@ -108,8 +116,19 @@
  * @param status the Http status code
  * @see javax.servlet.http.HttpServletResponse#setStatus(int)
  */
-public void setStatus(int status) {
+public HttpHeaderResult setStatus(int status) {
 this.status = status;
+return this;
+}
+
+/**
+ * Adds an HTTP header to the response
+ * @param name
+ * @param value
+ */
+public HttpHeaderResult addHeader(String name, String value) {
+   headers.put(name, value);
+   return this;
 }
 
 /**

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java?view=diff&rev=454455&r1=454454&r2=454455
==
--- 
struts/struts2/trunk/core/src/main/java/o

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

2006-10-09 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by BillabongCamps:
http://wiki.apache.org/struts/BillabongCamps

New page:
 ||'''Heading'''||
 ||cell 1||cell2||cell 3||
 || spanning rows spanning 2 columns||
 ||cell2||cell 3||
 Cell width::
 || narrow ||<:99%> wide ||
 Spanning rows and columns::
 ||<|2> 2 rows || row 1 ||
 || row 2 ||
 ||<-2> row 3 over 2 columns ||
 Alignment::
 ||<(> left ||<^|3> top || bottom ||
 ||<:> centered ||
 ||<)> right ||
 Colors::
 ||<#FF8080> red ||<#80FF80> green ||<#8080FF> blue ||

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

2006-10-09 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by BillabongCamps:
http://wiki.apache.org/struts/BillabongCamps

--
-  ||'''Heading'''||
+  ||'''Table of Contents'''||
-  ||cell 1||cell2||cell 3||
+  ||Page||Name||Link||
   || spanning rows spanning 2 columns||
   ||cell2||cell 3||
   Cell width::

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

2006-10-09 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by BillabongCamps:
http://wiki.apache.org/struts/BillabongCamps

--
   ||'''Table of Contents'''||
-  ||Page||Name||Link||
+  ||Inventory|| spanning rows spanning 2 
columns||
   || spanning rows spanning 2 columns||
   ||cell2||cell 3||
   Cell width::

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

2006-10-09 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by BillabongCamps:
http://wiki.apache.org/struts/BillabongCamps

--
   ||'''Table of Contents'''||
-  ||Inventory|| spanning rows spanning 2 
columns||
+  ||Inventory|| spanning 2 columns||
   || spanning rows spanning 2 columns||
   ||cell2||cell 3||
   Cell width::

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

2006-10-09 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by BillabongCamps:
http://wiki.apache.org/struts/BillabongCamps

--
   ||'''Table of Contents'''||
-  ||Inventory|| spanning 2 columns||
+  ||Inventory|| spanning 3 columns ||
   || spanning rows spanning 2 columns||
   ||cell2||cell 3||
   Cell width::

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

2006-10-09 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by BillabongCamps:
http://wiki.apache.org/struts/BillabongCamps

--
   ||Inventory|| spanning 3 columns ||
   || spanning rows spanning 2 columns||
   ||cell2||cell 3||
+  
-  Cell width::
-  || narrow ||<:99%> wide ||
-  Spanning rows and columns::
-  ||<|2> 2 rows || row 1 ||
-  || row 2 ||
-  ||<-2> row 3 over 2 columns ||
-  Alignment::
-  ||<(> left ||<^|3> top || bottom ||
-  ||<:> centered ||
-  ||<)> right ||
-  Colors::
-  ||<#FF8080> red ||<#80FF80> green ||<#8080FF> blue ||

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

2006-10-09 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by BillabongCamps:
http://wiki.apache.org/struts/BillabongCamps

--
   ||'''Table of Contents'''||
   ||Inventory|| spanning 3 columns ||
+ 
-  || spanning rows spanning 2 columns||
-  ||cell2||cell 3||

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

2006-10-09 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by BillabongCamps:
http://wiki.apache.org/struts/BillabongCamps

--
-  ||'''Table of Contents'''||
+  ||'''TABLE OF CONTENTS'''||
-  ||Inventory|| spanning 3 columns ||
+  ||'''Inventory'''|| spanning 3 columns||

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

2006-10-09 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by BillabongCamps:
http://wiki.apache.org/struts/BillabongCamps

--
   ||'''TABLE OF CONTENTS'''||
-  ||'''Inventory'''|| spanning 3 columns||
+  ||'''Inventory'''|| Link||

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

2006-10-09 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by BillabongCamps:
http://wiki.apache.org/struts/BillabongCamps

--
   ||'''TABLE OF CONTENTS'''||
-  ||'''Inventory'''|| Link||
+  ||'''Inventory'''|| JoinCapitalizedWords; ["brackets and 
double quotes"]; url; [url]; [url label]. ||

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

2006-10-09 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by BillabongCamps:
http://wiki.apache.org/struts/BillabongCamps

--
   ||'''TABLE OF CONTENTS'''||
-  ||'''Inventory'''|| JoinCapitalizedWords; ["brackets and 
double quotes"]; url; [url]; [url label]. ||
+  ||'''Inventory'''|| Spread Sheet; ["brackets and double 
quotes"]; url; [url]; [url label]. ||

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

2006-10-09 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by BillabongCamps:
http://wiki.apache.org/struts/BillabongCamps

--
   ||'''TABLE OF CONTENTS'''||
-  ||'''Inventory'''|| Spread Sheet; ["brackets and double 
quotes"]; url; [url]; [url label]. ||
+  ||'''Camp Proposal'''|| Spread Sheet; ["brackets and 
double quotes"]; url; [url]; [url label]. ||

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

2006-10-09 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by BillabongCamps:
http://wiki.apache.org/struts/BillabongCamps

--
   ||'''TABLE OF CONTENTS'''||
-  ||'''Camp Proposal'''|| Spread Sheet; ["brackets and 
double quotes"]; url; [url]; [url label]. ||
+  ||'''Camp Proposal'''|| AlohaSurfCamp; ["Aloha Surf 
Camp"]; url; [url]; [url label]. ||

[Struts Wiki] Update of "AlohaSurfCamp" by BillabongCamps

2006-10-09 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by BillabongCamps:
http://wiki.apache.org/struts/AlohaSurfCamp

New page:
BILLABONG SURF CAMP OFFER

Billabong, Inc. is pursuing the concept of branded surf camps in Mainland US, 
Hawaii, Canada and select foreign destinations. Billabong plans to provide its 
independent operators with resources that encourage the development and growth 
of the operatorâs business, while enriching the overall experience of the 
camper. The interest of Billabong is to introduce the brand to a new segment of 
the youth market and have them identify their unique camp experience with the 
brand. We want to stress the partnership aspect, and emphasize the deep 
commitment, flexible approach and customized program Billabong is willing to 
develop with you as an operator.

[Struts Wiki] Update of "AlohaSurfCamp" by BillabongCamps

2006-10-09 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by BillabongCamps:
http://wiki.apache.org/struts/AlohaSurfCamp

--
  Billabong, Inc. is pursuing the concept of branded surf camps in Mainland US, 
Hawaii, Canada and select foreign destinations. Billabong plans to provide its 
independent operators with resources that encourage the development and growth 
of the operatorâs business, while enriching the overall experience of the 
camper. The interest of Billabong is to introduce the brand to a new segment of 
the youth market and have them identify their unique camp experience with the 
brand. We want to stress the partnership aspect, and emphasize the deep 
commitment, flexible approach and customized program Billabong is willing to 
develop with you as an operator.
  
   
+ What we offer
  
+ Estimated Number of Campers: 700
+ 
+ PRODUCT & EQUIPMENT
+ ï    Billabong Spring Wetsuits
+ ï    Hooded Sweatshirts
+ ï    Surftech, Softops for use during operations, renewed annually
+ ï    Instructor items ( trunks, tees, etc)
+ ï    Global Surf industries, Supersoft foam for use during operation
+ ï    10X 10 tents
+ ï    Instructor Lycras
+ ï    Instructor wetsuits
+ ï    Billabong camps tee personalized with operator logo
+ CAMPER GIVEAWAYS
+ ï    Billabong DVDS
+ ï    12 month subscription to Transworld Surf for each fulfillment address 
provided to TWS
+ ï    Smart water drinks
+ ï    Drinks Hansenâs Beverage Co. for every camper, drinks cannot be 
shipped
+ ï    700 posters, 700 hats, 700 calendars
+ ï    Additional gift items â contest t-shirt, wallet, or girlâs 
accessories
+ ï    Simple gift items
+ ï    Current issue of Transworld Surf Magazine for every camper
+ ï    Chipotle Free Lunch Cards for every camper
+ ADVERTISING
+ ï    Two full pages in Transwolrd Surf plus select advertising in regional 
publications.
+ ï    Cover Wrap on select Time, INC titles including Sports Illustrated for 
Kids and Teen People
+ ï    AmeriKidz magazine double insertion
+ ï    Full Page Advertisement in Surfer Magazine Camps directory
+ ï    Flyers
+ ï    Medium Billabong stickers
+ ï    Design and Production of Billabong Camps brochures for distribution at 
Billabong Retailers
+ ï    Banner Ads and Listings on top camp Website directories
+ ï    Rotating Advertisement Banners on www.surfline.com, 1 Million Visitor 
Sessions/Monthly
+ MARKETING
+ ï    Dedicated Camp Website with unique operator link, 9,000 Visitor 
Sessions/Monthly
+ ï    Online registration vehicle provided by The Active Network 
+ ï    Online promotion via billabong.com, including e-mail blasts to 150K 
person database
+ ï    10'x10' Billabong Canopy for use during Camp Operations
+ ï    Appearance of Billabong Team Rider, based on availability
+ ï    Retailer Incentive Program to Promote Awareness and Encourage Camps 
Sales
+ 
+ Estimated Value of Package: $185,010
+ 
+ Requirements of Operator 
+ 
+ ï    Use of Billabong Product, Equipment and Signage during Camp Operations
+ ï    Competing Product, Equipment and Signage No to be used during camp 
operations
+ ï    Presence of Billabong Camp Logo on marketing materials as mutually 
agreed upon
+ ï    Use of active.com as online registration system with attached Billabong 
waiver. 
+ ï    Operator Investment $16 per each day camper or $11,000 licensing fee, 
whichever is greater 
+ 
+ Payment Required: $10,000
+ 
+ 
+ Signatures
+ 
+ 
+ X 
+ 
+ 
+ 
+ X
+

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

2006-10-09 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by BillabongCamps:
http://wiki.apache.org/struts/BillabongCamps

--
   ||'''TABLE OF CONTENTS'''||
-  ||'''Camp Proposal'''|| AlohaSurfCamp; ["Aloha Surf 
Camp"]; url; [url]; [url label]. ||
+  ||'''Camp Proposal'''|| AlohaSurfCamp
  
-  
-

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

2006-10-09 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by BillabongCamps:
http://wiki.apache.org/struts/BillabongCamps

--
   ||'''TABLE OF CONTENTS'''||
-  ||'''Camp Proposal'''|| AlohaSurfCamp
+  ||'''Camp Proposal'''|| AlohaSurfCamp;

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

2006-10-09 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by BillabongCamps:
http://wiki.apache.org/struts/BillabongCamps

--
   ||'''TABLE OF CONTENTS'''||
-  ||'''Camp Proposal'''|| AlohaSurfCamp;
+  ||'''Camp Proposal'''|| AlohaSurfCamp||

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

2006-10-09 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by BillabongCamps:
http://wiki.apache.org/struts/BillabongCamps

--
   ||'''TABLE OF CONTENTS'''||
   ||'''Camp Proposal'''|| AlohaSurfCamp||
+  ||'''Billabong Camps Website'''|| BillabongCampWebsite 
[www.billabongcamps.com]||

[Struts Wiki] Update of "AlohaSurfCamp" by GregReddin

2006-10-09 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by GregReddin:
http://wiki.apache.org/struts/AlohaSurfCamp

The comment on the change is:
Please do not use the wiki for spam or off-topic content.

--
- BILLABONG SURF CAMP OFFER
+ deleted
  
- Billabong, Inc. is pursuing the concept of branded surf camps in Mainland US, 
Hawaii, Canada and select foreign destinations. Billabong plans to provide its 
independent operators with resources that encourage the development and growth 
of the operatorâs business, while enriching the overall experience of the 
camper. The interest of Billabong is to introduce the brand to a new segment of 
the youth market and have them identify their unique camp experience with the 
brand. We want to stress the partnership aspect, and emphasize the deep 
commitment, flexible approach and customized program Billabong is willing to 
develop with you as an operator.
- 
-  
- What we offer
- 
- Estimated Number of Campers: 700
- 
- PRODUCT & EQUIPMENT
- ï    Billabong Spring Wetsuits
- ï    Hooded Sweatshirts
- ï    Surftech, Softops for use during operations, renewed annually
- ï    Instructor items ( trunks, tees, etc)
- ï    Global Surf industries, Supersoft foam for use during operation
- ï    10X 10 tents
- ï    Instructor Lycras
- ï    Instructor wetsuits
- ï    Billabong camps tee personalized with operator logo
- CAMPER GIVEAWAYS
- ï    Billabong DVDS
- ï    12 month subscription to Transworld Surf for each fulfillment address 
provided to TWS
- ï    Smart water drinks
- ï    Drinks Hansenâs Beverage Co. for every camper, drinks cannot be 
shipped
- ï    700 posters, 700 hats, 700 calendars
- ï    Additional gift items â contest t-shirt, wallet, or girlâs 
accessories
- ï    Simple gift items
- ï    Current issue of Transworld Surf Magazine for every camper
- ï    Chipotle Free Lunch Cards for every camper
- ADVERTISING
- ï    Two full pages in Transwolrd Surf plus select advertising in regional 
publications.
- ï    Cover Wrap on select Time, INC titles including Sports Illustrated for 
Kids and Teen People
- ï    AmeriKidz magazine double insertion
- ï    Full Page Advertisement in Surfer Magazine Camps directory
- ï    Flyers
- ï    Medium Billabong stickers
- ï    Design and Production of Billabong Camps brochures for distribution at 
Billabong Retailers
- ï    Banner Ads and Listings on top camp Website directories
- ï    Rotating Advertisement Banners on www.surfline.com, 1 Million Visitor 
Sessions/Monthly
- MARKETING
- ï    Dedicated Camp Website with unique operator link, 9,000 Visitor 
Sessions/Monthly
- ï    Online registration vehicle provided by The Active Network 
- ï    Online promotion via billabong.com, including e-mail blasts to 150K 
person database
- ï    10'x10' Billabong Canopy for use during Camp Operations
- ï    Appearance of Billabong Team Rider, based on availability
- ï    Retailer Incentive Program to Promote Awareness and Encourage Camps 
Sales
- 
- Estimated Value of Package: $185,010
- 
- Requirements of Operator 
- 
- ï    Use of Billabong Product, Equipment and Signage during Camp Operations
- ï    Competing Product, Equipment and Signage No to be used during camp 
operations
- ï    Presence of Billabong Camp Logo on marketing materials as mutually 
agreed upon
- ï    Use of active.com as online registration system with attached Billabong 
waiver. 
- ï    Operator Investment $16 per each day camper or $11,000 licensing fee, 
whichever is greater 
- 
- Payment Required: $10,000
- 
- 
- Signatures
- 
- 
- X 
- 
- 
- 
- X
-

[Struts Wiki] Update of "BillabongCamps" by GregReddin

2006-10-09 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by GregReddin:
http://wiki.apache.org/struts/BillabongCamps

The comment on the change is:
Please do not use the wiki for spam or off-topic content.

--
+ deleted
-  ||'''TABLE OF CONTENTS'''||
-  ||'''Camp Proposal'''|| AlohaSurfCamp||
-  ||'''Billabong Camps Website'''|| BillabongCampWebsite 
[www.billabongcamps.com]||

svn commit: r454473 - in /struts/struts2/trunk/plugins/tiles/src/main/resources: ./ struts-plugin.xml

2006-10-09 Thread mrdon

Author: mrdon
Date: Mon Oct  9 12:50:21 2006
New Revision: 454473

URL: http://svn.apache.org/viewvc?view=rev&rev=454473
Log:
Adding missing tiles config file
WW-1464

Added:
struts/struts2/trunk/plugins/tiles/src/main/resources/
struts/struts2/trunk/plugins/tiles/src/main/resources/struts-plugin.xml

Added: struts/struts2/trunk/plugins/tiles/src/main/resources/struts-plugin.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/src/main/resources/struts-plugin.xml?view=auto&rev=454473
==
--- struts/struts2/trunk/plugins/tiles/src/main/resources/struts-plugin.xml 
(added)
+++ struts/struts2/trunk/plugins/tiles/src/main/resources/struts-plugin.xml Mon 
Oct  9 12:50:21 2006
@@ -0,0 +1,11 @@
+http://struts.apache.org/dtds/struts-2.0.dtd";>
+
+
+
+
+
+
+
+

svn commit: r454501 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java

2006-10-09 Thread mrdon

Author: mrdon
Date: Mon Oct  9 13:49:26 2006
New Revision: 454501

URL: http://svn.apache.org/viewvc?view=rev&rev=454501
Log:
Slightly optimize servlet request wrapper
WW-1453

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java?view=diff&rev=454501&r1=454500&r2=454501
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java
 Mon Oct  9 13:49:26 2006
@@ -57,10 +57,11 @@
 return super.getAttribute(s);
 }
 
+ActionContext ctx = ActionContext.getContext();
 Object attribute = super.getAttribute(s);
 
 boolean alreadyIn = false;
-Boolean b = (Boolean) 
ActionContext.getContext().get("__requestWrapper.getAttribute");
+Boolean b = (Boolean) ctx.get("__requestWrapper.getAttribute");
 if (b != null) {
 alreadyIn = b.booleanValue();
 }
@@ -70,13 +71,13 @@
 if (!alreadyIn && attribute == null && s.indexOf("#") == -1) {
 try {
 // If not found, then try the ValueStack
-
ActionContext.getContext().put("__requestWrapper.getAttribute", Boolean.TRUE);
-ValueStack stack = ActionContext.getContext().getValueStack();
+ctx.put("__requestWrapper.getAttribute", Boolean.TRUE);
+ValueStack stack = ctx.getValueStack();
 if (stack != null) {
 attribute = stack.findValue(s);
 }
 } finally {
-
ActionContext.getContext().put("__requestWrapper.getAttribute", Boolean.FALSE);
+ctx.put("__requestWrapper.getAttribute", Boolean.FALSE);
 }
 }
 return attribute;

svn commit: r454518 - in /struts/struts2/trunk: all/pom.xml plugins/portlet/

2006-10-09 Thread jmitchell

Author: jmitchell
Date: Mon Oct  9 14:22:56 2006
New Revision: 454518

URL: http://svn.apache.org/viewvc?view=rev&rev=454518
Log:
WW-1453
 - Remove (per Don) the portlet plugin attempt
 - Add the correct modules to build the -all- jar




Removed:
struts/struts2/trunk/plugins/portlet/
Modified:
struts/struts2/trunk/all/pom.xml

Modified: struts/struts2/trunk/all/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/all/pom.xml?view=diff&rev=454518&r1=454517&r2=454518
==
--- struts/struts2/trunk/all/pom.xml (original)
+++ struts/struts2/trunk/all/pom.xml Mon Oct  9 14:22:56 2006
@@ -35,11 +35,85 @@
 struts2-api
 ${version}
 
+
 
 org.apache.struts
-struts2-toolbox
+
+struts2-config-browser-plugin
+
 ${version}
 
+
+org.apache.struts
+
+struts2-jasperreports-plugin
+
+${version}
+
+
+org.apache.struts
+
+struts2-jfreechart-plugin
+
+${version}
+
+
+org.apache.struts
+
+struts2-jsf-plugin
+
+${version}
+
+
+org.apache.struts
+
+struts2-pell-multipart-plugin
+
+${version}
+
+
+org.apache.struts
+
+struts2-plexus-plugin
+
+${version}
+
+
+org.apache.struts
+
+struts2-quickstart-plugin
+
+${version}
+
+
+org.apache.struts
+
+struts2-sitegraph-plugin
+
+${version}
+
+
+org.apache.struts
+
+struts2-sitemesh-plugin
+
+${version}
+
+
+org.apache.struts
+
+struts2-struts1-plugin
+
+${version}
+
+
+org.apache.struts
+
+struts2-tiles-plugin
+
+${version}
+
+

 
${project.build.directory}/classes

svn commit: r454565 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/ main/java/org/apache/struts2/config/ main/java/org/apache/struts2/dispatcher/ main/java/org/apache/str

2006-10-09 Thread jmitchell

Author: jmitchell
Date: Mon Oct  9 17:02:56 2006
New Revision: 454565

URL: http://svn.apache.org/viewvc?view=rev&rev=454565
Log:
WW-1453
 Simple cleanup items
  - remove duplicate and/or unused imports
  - change static access to class, not instance




Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Debug.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/IteratorComponent.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Push.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java

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

struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/Sorter.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/SessionMapTest.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java

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

struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java

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

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

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

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

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

struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java?view=diff&rev=454565&r1=454564&r2=454565
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java 
(original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java 
Mon Oct  9 17:02:56 2006
@@ -26,7 +26,6 @@
 import com.opensymphony.xwork2.ObjectFactory;
 import com.opensymphony.xwork2.util.OgnlUtil;
 import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
 
 /**
  * 

Modified: 
str

svn commit: r454571 - in /struts/struts2/trunk/core/src/test/java/org/apache/struts2: components/ComponentTest.java portlet/util/PortletUrlHelperTest.java views/jsp/AbstractTagTest.java

2006-10-09 Thread jmitchell

Author: jmitchell
Date: Mon Oct  9 17:22:09 2006
New Revision: 454571

URL: http://svn.apache.org/viewvc?view=rev&rev=454571
Log:
WW-1453
 Simple cleanup items
  - remove unused variables
  - change static access to static call


Modified:

struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java

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

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java?view=diff&rev=454571&r1=454570&r2=454571
==
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java
 Mon Oct  9 17:22:09 2006
@@ -19,7 +19,6 @@
 
 import java.util.Iterator;
 import java.util.Locale;
-import java.util.ResourceBundle;
 import java.util.Stack;
 
 import javax.servlet.jsp.tagext.TagSupport;
@@ -436,7 +435,6 @@
t.setPageContext(pageContext);
t.setName("textFieldName");

-ResourceBundle bundle = 
ResourceBundle.getBundle("org.apache.struts2.components.tempo");

LocalizedTextUtil.addDefaultResourceBundle("org.apache.struts2.components.temp");

I18nTag tag = new I18nTag();

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java?view=diff&rev=454571&r1=454570&r2=454571
==
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java
 Mon Oct  9 17:22:09 2006
@@ -92,7 +92,7 @@
 renderRequestControl.replay();
 renderResponseControl.replay();
 portletUrlControl.replay();
-String urlStr = PortletUrlHelper.buildUrl("testAction", null,
+PortletUrlHelper.buildUrl("testAction", null,
 new HashMap(), null, null, null);
 portletUrlControl.verify();
 renderRequestControl.verify();
@@ -110,7 +110,7 @@
 renderRequestControl.replay();
 renderResponseControl.replay();
 portletUrlControl.replay();
-String urlStr = PortletUrlHelper.buildUrl("testAction", null,
+PortletUrlHelper.buildUrl("testAction", null,
 new HashMap(), null, "edit", null);
 portletUrlControl.verify();
 renderRequestControl.verify();
@@ -128,7 +128,7 @@
 renderRequestControl.replay();
 renderResponseControl.replay();
 portletUrlControl.replay();
-String urlStr = PortletUrlHelper.buildUrl("testAction", null,
+PortletUrlHelper.buildUrl("testAction", null,
 new HashMap(), null, null, "maximized");
 portletUrlControl.verify();
 renderRequestControl.verify();
@@ -146,7 +146,7 @@
 renderRequestControl.replay();
 renderResponseControl.replay();
 portletUrlControl.replay();
-String urlStr = PortletUrlHelper.buildUrl("testAction", null,
+PortletUrlHelper.buildUrl("testAction", null,
 new HashMap(), "action", null, null);
 portletUrlControl.verify();
 renderRequestControl.verify();

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java?view=diff&rev=454571&r1=454570&r2=454571
==
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java
 Mon Oct  9 17:22:09 2006
@@ -100,7 +100,7 @@
 pageContext.setServletContext(servletContext);
 
 Dispatcher du = new Dispatcher(pageContext.getServletContext());
-du.setInstance(du);
+Dispatcher.setInstance(du);
 du.setConfigurationManager(configurationManager);
 session = new SessionMap(request);
 Map extraContext = du.createContextMap(new RequestMap(request),

svn commit: r454597 - in /struts/struts2/trunk: assembly/pom.xml assembly/src/main/assembly/all.xml src/site/site.xml

2006-10-09 Thread husted

Author: husted
Date: Mon Oct  9 20:50:09 2006
New Revision: 454597

URL: http://svn.apache.org/viewvc?view=rev&rev=454597
Log:
WW-1489 POM updates.

Modified:
struts/struts2/trunk/assembly/pom.xml
struts/struts2/trunk/assembly/src/main/assembly/all.xml
struts/struts2/trunk/src/site/site.xml

Modified: struts/struts2/trunk/assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?view=diff&rev=454597&r1=454596&r2=454597
==
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Mon Oct  9 20:50:09 2006
@@ -103,6 +103,7 @@
 opensymphony
 xwork
 javadoc
+2.0-beta-1
 
 
 
${project.build.directory}/xwork-apidocs

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?view=diff&rev=454597&r1=454596&r2=454597
==
--- struts/struts2/trunk/assembly/src/main/assembly/all.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/all.xml Mon Oct  9 20:50:09 
2006
@@ -67,6 +67,58 @@
 docs/struts2-core
   
 
+  
+  
+  
+../plugins/config-browser/target/site
+
docs/struts2-plugins/struts2-config-browser-plugin
+  
+  
+../plugins/jasperreports/target/site
+
docs/struts2-plugins/struts2-jasperreports-plugin
+  
+  
+../plugins/jfreechart/target/site
+
docs/struts2-plugins/struts2-jfreechart-plugin
+  
+  
+../plugins/jsf/target/site
+
docs/struts2-plugins/struts2-jsf-plugin
+  
+  
+../plugins/pell-multipart/target/site
+
docs/struts2-plugins/struts2-pell-multipart-plugin
+  
+  
+../plugins/plexus/target/site
+
docs/struts2-plugins/struts2-plexus-plugin
+  
+  
+../plugins/quickstart/target/site
+
docs/struts2-plugins/struts2-quickstart-plugin
+  
+  
+../plugins/struts1/target/site
+
docs/struts2-plugins/struts2-struts1-plugin
+  
+  
+../plugins/sitegraph/target/site
+
docs/struts2-plugins/struts2-sitegraph-plugin
+  
+  
+../plugins/sitemesh/target/site
+
docs/struts2-plugins/struts2-sitemesh-plugin
+  
+  
+../plugins/tiles/target/site
+
docs/struts2-plugins/struts2-tiles-plugin
+  
+
 
 
   ../

Modified: struts/struts2/trunk/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/site.xml?view=diff&rev=454597&r1=454596&r2=454597
==
--- struts/struts2/trunk/src/site/site.xml (original)
+++ struts/struts2/trunk/src/site/site.xml Mon Oct  9 20:50:09 2006
@@ -75,62 +75,60 @@
 

 

 
 
 

 

 

 

 

 

 

 
-

 
 
 
-${reports}

svn commit: r454611 - /struts/struts2/trunk/apps/showcase/pom.xml

2006-10-09 Thread wsmoak

Author: wsmoak
Date: Mon Oct  9 21:29:33 2006
New Revision: 454611

URL: http://svn.apache.org/viewvc?view=rev&rev=454611
Log:
Include files in src/main/resources in the webapp.
WW-1453

Modified:
struts/struts2/trunk/apps/showcase/pom.xml

Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?view=diff&rev=454611&r1=454610&r2=454611
==
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Mon Oct  9 21:29:33 2006
@@ -147,6 +147,9 @@
 
 
 
+src/main/resources
+
+
 src/main/java
 
 **/*.java

svn commit: r454614 - /struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl

2006-10-09 Thread mrdon

Author: mrdon
Date: Mon Oct  9 21:39:48 2006
New Revision: 454614

URL: http://svn.apache.org/viewvc?view=rev&rev=454614
Log:
Fixed problem report when column number < 3
WW-1453

Modified:

struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl

Modified: 
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl?view=diff&rev=454614&r1=454613&r2=454614
==
--- 
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl
 (original)
+++ 
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl
 Mon Oct  9 21:39:48 2006
@@ -78,7 +78,7 @@
 
 <#list snippet as line>
 <#if (line_index == 2)>
-   <#if (rootloc.columnNumber >= 0)>
+   <#if (rootloc.columnNumber >= 3)>
 ${(line[0..(rootloc.columnNumber-3)]?html)}${(line[(rootloc.columnNumber-2)]?html)}<#if 
((rootloc.columnNumber)${(line[(rootloc.columnNumber-1)..]?html)}
 <#else>
${line?html}

svn commit: r454616 - in /struts/struts2/trunk/apps/mailreader: ./ src/main/java/ src/main/java/mailreader2/ src/main/resources/ src/main/webapp/WEB-INF/

2006-10-09 Thread jmitchell

Author: jmitchell
Date: Mon Oct  9 21:58:51 2006
New Revision: 454616

URL: http://svn.apache.org/viewvc?view=rev&rev=454616
Log:
WW-1453
 - fixing mailreader to correctly load the database.xml file from WEB-INF
 - fix the pom.xml to correctly use src/main/java as the resource path for 
*.xml and *.properties



Added:
struts/struts2/trunk/apps/mailreader/src/main/java/alternate.properties
  - copied unchanged from r454597, 
struts/struts2/trunk/apps/mailreader/src/main/resources/alternate.properties
struts/struts2/trunk/apps/mailreader/src/main/java/alternate_ja.properties
  - copied unchanged from r454597, 
struts/struts2/trunk/apps/mailreader/src/main/resources/alternate_ja.properties
struts/struts2/trunk/apps/mailreader/src/main/webapp/WEB-INF/database.xml
  - copied unchanged from r454597, 
struts/struts2/trunk/apps/mailreader/src/main/resources/database.xml
Removed:
struts/struts2/trunk/apps/mailreader/src/main/resources/alternate.properties

struts/struts2/trunk/apps/mailreader/src/main/resources/alternate_ja.properties
struts/struts2/trunk/apps/mailreader/src/main/resources/database.xml
Modified:
struts/struts2/trunk/apps/mailreader/pom.xml

struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java

Modified: struts/struts2/trunk/apps/mailreader/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/pom.xml?view=diff&rev=454616&r1=454615&r2=454616
==
--- struts/struts2/trunk/apps/mailreader/pom.xml (original)
+++ struts/struts2/trunk/apps/mailreader/pom.xml Mon Oct  9 21:58:51 2006
@@ -28,6 +28,15 @@
 
 
 
+   
+   
+   src/main/java
+   
+   **/*.xml
+   **/*.properties
+   
+   
+   


org.mortbay.jetty

Modified: 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java?view=diff&rev=454616&r1=454615&r2=454616
==
--- 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java
 (original)
+++ 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java
 Mon Oct  9 21:58:51 2006
@@ -100,7 +100,7 @@
  * The web application resource path of our persistent database storage
  * file.
  */
-private String pathname = "/WEB-INF/classes/database.xml";
+private String pathname = "/WEB-INF/database.xml";
 
 /**
  * Return the application resource path to the database.

svn commit: r454642 - in /struts/struts2/trunk: apps/blank/src/main/resources/ apps/blank/src/main/webapp/ apps/blank/src/main/webapp/WEB-INF/ apps/blank/src/main/webapp/example/ apps/mailreader/src/m

2006-10-09 Thread husted

Author: husted
Date: Mon Oct  9 23:52:49 2006
New Revision: 454642

URL: http://svn.apache.org/viewvc?view=rev&rev=454642
Log:
WW-1453 Struts-Blank: Add missing Register.jsp. Dispatcher: Move default file 
list to default.properties. 

Added:
struts/struts2/trunk/apps/blank/src/main/webapp/example/Register.jsp
  - copied unchanged from r454616, 
struts/struts2/trunk/apps/blank/src/main/webapp/example/Menu.jsp
Modified:
struts/struts2/trunk/apps/blank/src/main/resources/struts.xml
struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml
struts/struts2/trunk/apps/blank/src/main/webapp/example/Welcome.jsp
struts/struts2/trunk/apps/blank/src/main/webapp/index.html
struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java

struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties

Modified: struts/struts2/trunk/apps/blank/src/main/resources/struts.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/resources/struts.xml?view=diff&rev=454642&r1=454641&r2=454642
==
--- struts/struts2/trunk/apps/blank/src/main/resources/struts.xml (original)
+++ struts/struts2/trunk/apps/blank/src/main/resources/struts.xml Mon Oct  9 
23:52:49 2006
@@ -4,8 +4,6 @@
 
 
 
-
-
 
 
 

Modified: struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml?view=diff&rev=454642&r1=454641&r2=454642
==
--- struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml (original)
+++ struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml Mon Oct  9 
23:52:49 2006
@@ -1,6 +1,5 @@
-
-http://java.sun.com/dtd/web-app_2_3.dtd";>
-
+
+http://java.sun.com/xml/ns/j2ee"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
 
 Struts Blank
 

Modified: struts/struts2/trunk/apps/blank/src/main/webapp/example/Welcome.jsp
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/webapp/example/Welcome.jsp?view=diff&rev=454642&r1=454641&r2=454642
==
--- struts/struts2/trunk/apps/blank/src/main/webapp/example/Welcome.jsp 
(original)
+++ struts/struts2/trunk/apps/blank/src/main/webapp/example/Welcome.jsp Mon Oct 
 9 23:52:49 2006
@@ -10,7 +10,6 @@
 
 Commands
 
-">Register
 ">Sign On
 
 
@@ -24,9 +23,9 @@
 
 
 
-ja
+es
 
-Japanese
+Espanol
 
 
 

Modified: struts/struts2/trunk/apps/blank/src/main/webapp/index.html
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/webapp/index.html?view=diff&rev=454642&r1=454641&r2=454642
==
--- struts/struts2/trunk/apps/blank/src/main/webapp/index.html (original)
+++ struts/struts2/trunk/apps/blank/src/main/webapp/index.html Mon Oct  9 
23:52:49 2006
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
 

Modified: struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml?view=diff&rev=454642&r1=454641&r2=454642
==
--- struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml (original)
+++ struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml Mon Oct  9 
23:52:49 2006
@@ -5,8 +5,6 @@
 
 
 
-
-
 
 
 

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java?view=diff&rev=454642&r1=454641&r2=454642
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
 Mon Oct  9 23:52:49 2006
@@ -88,9 +88,9 @@
 private static final Log LOG = LogFactory.getLog(Dispatcher.class);
 
 private static ThreadLocal instance = new 
ThreadLocal();
-private static List dispatcherListeners = 
+private static List dispatcherListeners =
 new ArrayList();
-
+
 private ConfigurationManager configurationManager;
 private static boolean portletSupportActive;
 private boolean devMode = false;
@@ -100,34 +100,34 @@
 
 /**
  * Gets the current instance for this thread
- * 
+ *
  * @return The dispatcher instance

[CONF] Confluence Changes in the last 24 hours

svn commit: r454348 - in /struts/sandbox/trunk/tiles/tiles-core/src/main: java/org/apache/tiles/taglib/GetAsStringTag.java java/org/apache/tiles/taglib/GetAttributeTag.java resources/META-INF/tiles-co

svn commit: r454353 - /struts/sandbox/trunk/tiles/src/site/fml/faq.fml

svn commit: r454447 - /struts/struts2/trunk/pom.xml

svn commit: r454455 - in /struts/struts2/trunk: ./ core/ core/src/main/java/org/apache/struts2/dispatcher/ core/src/main/java/org/apache/struts2/portlet/result/ core/src/main/java/org/apache/struts2/v

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

[Struts Wiki] Update of "AlohaSurfCamp" by BillabongCamps

[Struts Wiki] Update of "AlohaSurfCamp" by BillabongCamps

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

[Struts Wiki] Update of "BillabongCamps" by BillabongCamps

[Struts Wiki] Update of "AlohaSurfCamp" by GregReddin

[Struts Wiki] Update of "BillabongCamps" by GregReddin

svn commit: r454473 - in /struts/struts2/trunk/plugins/tiles/src/main/resources: ./ struts-plugin.xml

svn commit: r454501 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java

svn commit: r454518 - in /struts/struts2/trunk: all/pom.xml plugins/portlet/

svn commit: r454565 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/ main/java/org/apache/struts2/config/ main/java/org/apache/struts2/dispatcher/ main/java/org/apache/str

svn commit: r454571 - in /struts/struts2/trunk/core/src/test/java/org/apache/struts2: components/ComponentTest.java portlet/util/PortletUrlHelperTest.java views/jsp/AbstractTagTest.java

svn commit: r454597 - in /struts/struts2/trunk: assembly/pom.xml assembly/src/main/assembly/all.xml src/site/site.xml

svn commit: r454611 - /struts/struts2/trunk/apps/showcase/pom.xml

svn commit: r454614 - /struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl

svn commit: r454616 - in /struts/struts2/trunk/apps/mailreader: ./ src/main/java/ src/main/java/mailreader2/ src/main/resources/ src/main/webapp/WEB-INF/

svn commit: r454642 - in /struts/struts2/trunk: apps/blank/src/main/resources/ apps/blank/src/main/webapp/ apps/blank/src/main/webapp/WEB-INF/ apps/blank/src/main/webapp/example/ apps/mailreader/src/m

36 matches

Site Navigation

Mail list logo

Footer information