[CONF] Confluence Changes in the last 24 hours

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

-
Updated Spaces:
-

Apache Geronimo v1.1 (GMOxDOC11) 
http://cwiki.apache.org/confluence/display/GMOxDOC11
|
|-Pages Added or Edited in This Space
 |-- Very simple Session EJB example was created by [EMAIL PROTECTED] (03:14 
PM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDOC11/Very+simple+Session+EJB+example

Apache Cayenne (CAY) http://cwiki.apache.org/confluence/display/CAY
|
|-Pages Added or Edited in This Space
 |-- Compiling Cayenne was last edited by andrus (06:38 PM).
 |   http://cwiki.apache.org/confluence/display/CAY/Compiling+Cayenne
 |-- ish onCourse uses Cayenne Remote Object Persistence was created by andrus 
(09:33 AM).
 |   
http://cwiki.apache.org/confluence/display/CAY/2006/09/30/ish+onCourse+uses+Cayenne+Remote+Object+Persistence
 |-- Cayenne-based Search Engine Sites in Croatia and Bosnia and Herzegovina 
was created by andrus (09:22 AM).
 |   
http://cwiki.apache.org/confluence/display/CAY/2006/09/30/Cayenne-based+Search+Engine+Sites+in+Croatia+and+Bosnia+and+Herzegovina

-
Updated User Profiles:
-

[EMAIL PROTECTED]
|- http://cwiki.apache.org/confluence/display/[EMAIL PROTECTED]

-
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: r451724 - /struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java

2006-10-01 Thread tmjee 
Author: tmjee
Date: Sun Oct  1 01:39:39 2006
New Revision: 451724

URL: http://svn.apache.org/viewvc?view=rev&rev=451724
Log:
WW-1453
  - removed duplicated import statement


Modified:

struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java?view=diff&rev=451724&r1=451723&r2=451724
==
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java
 Sun Oct  1 01:39:39 2006
@@ -26,7 +26,6 @@
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.util.ValueStackFactory;
 
 import freemarker.ext.beans.CollectionModel;

svn commit: r451737 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/ main/java/org/apache/struts2/dispatcher/ main/java/org/apache/struts2/interceptor/debugging/ test/resources/

2006-10-01 Thread mrdon 
Author: mrdon
Date: Sun Oct  1 04:00:04 2006
New Revision: 451737

URL: http://svn.apache.org/viewvc?view=rev&rev=451737
Log:
Turning off xml output when viewing debug console, exposing result
location information, storing action mapping in context for later
retrieval
WW-1459

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/ServletActionContext.java

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

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

struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java
struts/struts2/trunk/core/src/test/resources/struts.xml

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/ServletActionContext.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/ServletActionContext.java?view=diff&rev=451737&r1=451736&r2=451737
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/ServletActionContext.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/ServletActionContext.java
 Sun Oct  1 04:00:04 2006
@@ -24,6 +24,8 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.jsp.PageContext;
 
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
+
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.util.ValueStack;
 
@@ -38,6 +40,7 @@
private static final long serialVersionUID = -666854718275106687L;

public static final String STRUTS_VALUESTACK_KEY = "struts.valueStack";
+public static final String ACTION_MAPPING = "struts.actionMapping";
 
 @SuppressWarnings("unused")
 private ServletActionContext(Map context) {
@@ -67,6 +70,15 @@
  */
 public static ValueStack getValueStack(HttpServletRequest req) {
 return (ValueStack) req.getAttribute(STRUTS_VALUESTACK_KEY);
+}
+
+/**
+ * Gets the action mapping for this context
+ * 
+ * @return The action mapping
+ */
+public static ActionMapping getActionMapping() {
+return (ActionMapping) ActionContext.getContext().get(ACTION_MAPPING);
 }
 
 /**

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=451737&r1=451736&r2=451737
==
--- 
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
 Sun Oct  1 04:00:04 2006
@@ -375,7 +375,9 @@
 // application map wrapping the ServletContext
 Map application = new ApplicationMap(context);
 
-return createContextMap(requestMap, params, session, application, 
request, response, context);
+Map extraContext = createContextMap(requestMap, params, 
session, application, request, response, context);
+extraContext.put(ServletActionContext.ACTION_MAPPING, mapping);
+return extraContext;
 }
 
 /**
@@ -388,7 +390,7 @@
  * @param applicationMap a Map of all servlet context attributes.
  * @param requestthe HttpServletRequest object.
  * @param response   the HttpServletResponse object.
- * @param servletContext the ServletContext object.
+ * @param servletContext the ServletContextmapping object.
  * @return a HashMap representing the Action context.
  */
 public HashMap createContextMap(Map requestMap,

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java?view=diff&rev=451737&r1=451736&r2=451737
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
 Sun Oct  1 04:00:04 2006
@@ -107,6 +107,7 @@
 protected boolean parse = true;
 protected boolean encode = false;
 protected String location;
+protected String lastFinalLocation;
 
 /**
  * The location to go to after action execution. This could be a JSP page 
or another action.
@@ -119,6 +120,13 @@
 public void setLocation(String location) {
 this.location = location;
 }
+
+/**
+ * Returns the last parsed and encoded location value
+ */
+public String getLastFinalLocation() {
+return lastFinalLocation;
+}

svn commit: r451738 - in /struts/struts2/trunk/apps/showcase: ./ src/main/java/org/apache/struts2/showcase/source/ src/main/resources/ src/main/webapp/ src/main/webapp/WEB-INF/ src/main/webapp/WEB-INF

2006-10-01 Thread mrdon 
Author: mrdon
Date: Sun Oct  1 04:02:46 2006
New Revision: 451738

URL: http://svn.apache.org/viewvc?view=rev&rev=451738
Log:
Added a view source capability to the showcase
WW-1461

Added:

struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/source/

struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java
struts/struts2/trunk/apps/showcase/src/main/webapp/viewSource.jsp
Modified:
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml

struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.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=451738&r1=451737&r2=451738
==
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Sun Oct  1 04:02:46 2006
@@ -47,7 +47,7 @@
 struts2-sitemesh-plugin
 ${pom.version}
 
- 
+
 
 org.apache.struts
 struts2-tiles-plugin
@@ -61,6 +61,22 @@
provided
 
 
+
+
+velocity
+velocity
+1.4
+true
+
+
+
+velocity-tools
+velocity-tools
+1.1
+true
+
+
+
 
 opensymphony
 sitemesh
@@ -128,5 +144,15 @@
 
 
 
+
+
+
+src/main/java
+
+**/*.java
+ 
+ 
+
+
 
 

Added: 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java?view=auto&rev=451738
==
--- 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java
 (added)
+++ 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java
 Sun Oct  1 04:02:46 2006
@@ -0,0 +1,217 @@
+/*
+ * $Id: CreatePerson.java 420385 2006-07-10 00:57:05Z mrdon $
+ *
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.struts2.showcase.source;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.ServletContext;
+
+import org.apache.struts2.util.ServletContextAware;
+
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
+
+/**
+ * Processes configuration, page, and action class paths to create snippets
+ * of the files for display.
+ */
+public class ViewSourceAction extends ActionSupport implements 
ServletContextAware {
+
+private String page;
+private String className;
+private String config;
+
+private List pageLines;
+private List classLines;
+private List configLines;
+
+private int configLine;
+private int padding = 10;
+
+private ServletContext servletContext;
+
+public String execute() throws MalformedURLException, IOException {
+
+if (page != null) {
+
+InputStream in = 
ClassLoaderUtil.getResourceAsStream(page.substring(page.indexOf("//")+1), 
getClass());
+page = page.replace("//", "/");
+
+if (in == null) {
+in = servletContext.getResourceAsStream(page);
+while (in == null && page.indexOf('/', 1) > 0) {
+page = page.substring(page.indexOf('/', 1));
+in = servletContext.getResourceAsStream(page);
+}
+}
+pageLines = read(in, -1);
+}
+
+if (c

svn commit: r451759 - in /struts/struts2/trunk/plugins: jasperreports/src/main/resources/struts-plugin.xml jfreechart/src/main/resources/struts-plugin.xml

2006-10-01 Thread tmjee 
Author: tmjee
Date: Sun Oct  1 08:26:22 2006
New Revision: 451759

URL: http://svn.apache.org/viewvc?view=rev&rev=451759
Log:
WW-1457
  - when introducing plugin, extra is being break into jasperreports and 
jfreechart plugins, but their package name remain the same "extra-default" 
causing problem with both jars are in the classpath


Modified:

struts/struts2/trunk/plugins/jasperreports/src/main/resources/struts-plugin.xml
struts/struts2/trunk/plugins/jfreechart/src/main/resources/struts-plugin.xml

Modified: 
struts/struts2/trunk/plugins/jasperreports/src/main/resources/struts-plugin.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/src/main/resources/struts-plugin.xml?view=diff&rev=451759&r1=451758&r2=451759
==
--- 
struts/struts2/trunk/plugins/jasperreports/src/main/resources/struts-plugin.xml 
(original)
+++ 
struts/struts2/trunk/plugins/jasperreports/src/main/resources/struts-plugin.xml 
Sun Oct  1 08:26:22 2006
@@ -5,7 +5,7 @@
 "http://struts.apache.org/dtds/struts-2.0.dtd";>
 
 
-
+
 



Modified: 
struts/struts2/trunk/plugins/jfreechart/src/main/resources/struts-plugin.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jfreechart/src/main/resources/struts-plugin.xml?view=diff&rev=451759&r1=451758&r2=451759
==
--- 
struts/struts2/trunk/plugins/jfreechart/src/main/resources/struts-plugin.xml 
(original)
+++ 
struts/struts2/trunk/plugins/jfreechart/src/main/resources/struts-plugin.xml 
Sun Oct  1 08:26:22 2006
@@ -5,7 +5,7 @@
 "http://struts.apache.org/dtds/struts-2.0.dtd";>
 
 
-
+

svn commit: r451867 - in /struts/struts2/trunk/core/src/main: java/org/apache/struts2/dispatcher/Dispatcher.java resources/org/apache/struts2/dispatcher/error.ftl

2006-10-01 Thread mrdon 
Author: mrdon
Date: Sun Oct  1 20:53:59 2006
New Revision: 451867

URL: http://svn.apache.org/viewvc?view=rev&rev=451867
Log:
Minor error message change for XW-420, minor formatting on error report
WW-1453

Modified:

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

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

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=451867&r1=451866&r2=451867
==
--- 
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
 Sun Oct  1 20:53:59 2006
@@ -333,7 +333,7 @@
 
request.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, stack);
 }
 } catch (ConfigurationException e) {
-LOG.error("Could not find action", e);
+LOG.error("Could not find action or result", e);
 sendError(request, response, context, 
HttpServletResponse.SC_NOT_FOUND, e);
 } catch (Exception e) {
 LOG.error("Could not execute action", e);

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=451867&r1=451866&r2=451867
==
--- 
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
 Sun Oct  1 20:53:59 2006
@@ -72,10 +72,10 @@
 
 <#list snippet as line>
 <#if (line_index == 2)>
-<#if (rootloc.columnNumber >= 0)>
+   <#if (rootloc.columnNumber >= 0)>
 ${(line[0..(rootloc.columnNumber-3)]?html)}${(line[(rootloc.columnNumber-2)]?html)}<#if 
((rootloc.columnNumber)${(line[(rootloc.columnNumber-1)..]?html)}
 <#else>
-${line?html}
+   ${line?html}
 
 <#else>
 ${line?html}

svn commit: r451869 - /struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp

2006-10-01 Thread mrdon 
Author: mrdon
Date: Sun Oct  1 20:54:36 2006
New Revision: 451869

URL: http://svn.apache.org/viewvc?view=rev&rev=451869
Log:
Better handle when no result, probably due to an error
WW-1453

Modified:

struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp

Modified: 
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp?view=diff&rev=451869&r1=451868&r2=451869
==
--- 
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp 
(original)
+++ 
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp 
Sun Oct  1 20:54:36 2006
@@ -13,7 +13,10 @@
 if (inv != null) {
 sourceUrl += 
"?config="+inv.getProxy().getConfig().getLocation().getURI()+":"+inv.getProxy().getConfig().getLocation().getLineNumber();
 sourceUrl += "&className="+inv.getProxy().getConfig().getClassName();
-sourceUrl += 
"&page="+mapping.getNamespace()+"/"+((org.apache.struts2.dispatcher.StrutsResultSupport)inv.getResult()).getLastFinalLocation();
+
+if (inv.getResult() != null && inv.getResult() instanceof 
org.apache.struts2.dispatcher.StrutsResultSupport) {
+   sourceUrl += 
"&page="+mapping.getNamespace()+"/"+((org.apache.struts2.dispatcher.StrutsResultSupport)inv.getResult()).getLastFinalLocation();
+}
 } else {
 sourceUrl += "?page="+request.getServletPath();
 }