[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - OpenJPA (openjpa) http://cwiki.apache.org/confluence/display/openjpa | |-Pages Added or Edited in This Space |-- Building OpenJPA was last edited by michael.d.d...@gmail.com (12:05 PM). | http://cwiki.apache.org/confluence/display/openjpa/Building+OpenJPA Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL | |-Pages Added or Edited in This Space |-- tutorial-osgi-camel-part1 was last edited by cmoulli...@xpectis.com (08:28 AM). | http://cwiki.apache.org/confluence/display/CAMEL/tutorial-osgi-camel-part1 Apache Sling (SLING) http://cwiki.apache.org/confluence/display/SLING | |-Pages Added or Edited in This Space |-- Authentication Initiation was created by fmeschbe (07:33 AM). | http://cwiki.apache.org/confluence/display/SLING/Authentication+Initiation |-- Testing gliffy diagrams was created by bdelacretaz (07:19 AM). | http://cwiki.apache.org/confluence/display/SLING/Testing+gliffy+diagrams |-- Sling-based JCR explorer was last edited by bdelacretaz (07:18 AM). | http://cwiki.apache.org/confluence/display/SLING/Sling-based+JCR+explorer Apache Click (CLICK) http://cwiki.apache.org/confluence/display/CLICK | |-Pages Added or Edited in This Space |-- Bringing Back DateField was last edited by medgar (11:26 PM). | http://cwiki.apache.org/confluence/display/CLICK/Bringing+Back+DateField Apache Cassandra (CSDR) http://cwiki.apache.org/confluence/display/CSDR | |-Pages Added or Edited in This Space |-- GettingStarted was last edited by jbellis (12:05 PM). | http://cwiki.apache.org/confluence/display/CSDR/GettingStarted |-- Index was last edited by jbellis (12:01 PM). | http://cwiki.apache.org/confluence/display/CSDR/Index Apache ActiveMQ (ACTIVEMQ) http://cwiki.apache.org/confluence/display/ACTIVEMQ | |-Pages Added or Edited in This Space |-- How to disable multicast discovery? was created by gtully (07:31 AM). | http://cwiki.apache.org/confluence/pages/viewpage.action?pageId=115374 Apache Stonehenge (STONEHENGE) http://cwiki.apache.org/confluence/display/STONEHENGE | |-Pages Added or Edited in This Space |-- Stonehenge PHP and WSAS Stocktrader Installation Guide was last edited by shankar (09:55 PM). | http://cwiki.apache.org/confluence/display/STONEHENGE/Stonehenge+PHP+and+WSAS+Stocktrader+Installation+Guide Apache VCL (VCL) http://cwiki.apache.org/confluence/display/VCL | |-Pages Added or Edited in This Space |-- Documentation Organization was last edited by jfthomps (02:17 PM). | http://cwiki.apache.org/confluence/display/VCL/Documentation+Organization |-- Web code installation was created by jfthomps (02:07 PM). | http://cwiki.apache.org/confluence/display/VCL/Web+code+installation |-- Network Diagram was created by fapeeler (06:09 AM). | http://cwiki.apache.org/confluence/display/VCL/Network+Diagram |-- Web Code Overview was created by jfthomps (10:06 AM). | http://cwiki.apache.org/confluence/display/VCL/Web+Code+Overview Apache Pivot (PIVOT) http://cwiki.apache.org/confluence/display/PIVOT | |-Pages Added or Edited in This Space |-- Charting Demo was last edited by gkbr...@mac.com (03:03 PM). | http://cwiki.apache.org/confluence/display/PIVOT/Charting+Demo |-- File Browser Demo was last edited by gkbr...@mac.com (02:56 PM). | http://cwiki.apache.org/confluence/display/PIVOT/File+Browser+Demo Apache MINA (MINA) http://cwiki.apache.org/confluence/display/MINA | |-Pages Added or Edited in This Space |-- Navigation was last edited by jvermillard (07:19 AM). | http://cwiki.apache.org/confluence/display/MINA/Navigation Apache Ode (ODExSITE) http://cwiki.apache.org/confluence/display/ODExSITE | |-Pages Added or Edited in This Space |-- Release Guidelines was last edited by alexism (05:19 PM). | http://cwiki.apache.org/confluence/display/ODExSITE/Release+Guidelines Apache Buildr (BUILDR) http://cwiki.apache.org/confluence/display/BUILDR | |-Pages Added or Edited in This Space |-- Release process was last edited by boisvert (10:38 PM). | http://cwiki.apache.org/confluence/display/BUILDR/Release+process - 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: r767507 - in /struts/struts2/trunk/plugins/jasperreports: pom.xml src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
Author: hermanns
Date: Wed Apr 22 13:09:32 2009
New Revision: 767507
URL: http://svn.apache.org/viewvc?rev=767507&view=rev
Log:
WWW-2884 Support for report JDBC connection
Modified:
struts/struts2/trunk/plugins/jasperreports/pom.xml
struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
Modified: struts/struts2/trunk/plugins/jasperreports/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/pom.xml?rev=767507&r1=767506&r2=767507&view=diff
==
--- struts/struts2/trunk/plugins/jasperreports/pom.xml (original)
+++ struts/struts2/trunk/plugins/jasperreports/pom.xml Wed Apr 22 13:09:32 2009
@@ -43,7 +43,7 @@
jasperreports
jasperreports
-3.0.0
+3.1.2
provided
Modified:
struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java?rev=767507&r1=767506&r2=767507&view=diff
==
---
struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
(original)
+++
struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
Wed Apr 22 13:09:32 2009
@@ -27,6 +27,7 @@
import java.util.HashMap;
import java.util.Map;
import java.util.TimeZone;
+import java.sql.Connection;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -113,6 +114,11 @@
* encryption and set the user password to a string known to the report
creator.
*
*
+ *
+ * connection - (2.1.7+) JDBC Connection which can be passed to the
+ * report instead of dataSource
+ *
+ *
*
*
*
@@ -154,6 +160,12 @@
protected String timeZone;
/**
+ * Connection which can be passed to the report
+ * instead od dataSource.
+ */
+protected String connection;
+
+/**
* Names a report parameters map stack value, allowing
* additional report parameters from the action.
*/
@@ -234,6 +246,14 @@
this.exportParameters = exportParameters;
}
+public String getConnection() {
+return connection;
+}
+
+public void setConnection(String connection) {
+this.connection = connection;
+}
+
protected void doExecute(String finalLocation, ActionInvocation
invocation) throws Exception {
// Will throw a runtime exception if no "datasource" property. TODO
Best place for that is...?
initializeProperties(invocation);
@@ -263,7 +283,11 @@
// Construct the data source for the report.
ValueStack stack = invocation.getStack();
-ValueStackDataSource stackDataSource = new ValueStackDataSource(stack,
dataSource);
+ValueStackDataSource stackDataSource = null;
+
+Connection conn = (Connection) stack.findValue(connection);
+if (conn == null)
+stackDataSource = new ValueStackDataSource(stack, dataSource);
// Determine the directory that the report file is in and set the
reportDirectory parameter
// For WW 2.1.7:
@@ -298,7 +322,10 @@
// Fill the report and produce a print object
try {
JasperReport jasperReport = (JasperReport)
JRLoader.loadObject(systemId);
-jasperPrint = JasperFillManager.fillReport(jasperReport,
parameters, stackDataSource);
+if (conn == null)
+jasperPrint = JasperFillManager.fillReport(jasperReport,
parameters, stackDataSource);
+else
+jasperPrint = JasperFillManager.fillReport(jasperReport,
parameters, conn);
} catch (JRException e) {
LOG.error("Error building report for uri " + systemId, e);
throw new ServletException(e.getMessage(), e);
@@ -410,12 +437,13 @@
* @throws Exception on initialization error.
*/
private void initializeProperties(ActionInvocation invocation) throws
Exception {
-if (dataSource == null) {
+if (dataSource == null && connection == null) {
String message = "No dataSource specified...";
LOG.error(message);
throw new RuntimeException(message);
}
-dataSource = conditionalParse(dataSource, invocation);
+if (dataSource != null)
+dataSource = conditionalParse(dataSource, invocation);
format = conditionalParse(format, invocation);
if (StringUtils.isEmpty(format)) {
svn commit: r767518 - in /struts/struts2/trunk/plugins/javatemplates/src: main/java/org/apache/struts2/views/java/ main/java/org/apache/struts2/views/java/simple/ test/java/org/apache/struts2/views/ja
Author: hermanns
Date: Wed Apr 22 13:37:01 2009
New Revision: 767518
URL: http://svn.apache.org/viewvc?rev=767518&view=rev
Log:
WW-3009 Extensibility Improvements to javatemplates plugin - patch (project
scope)
submitted by Eric Chijioke
Modified:
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/Attributes.java
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/DefaultTheme.java
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/JavaTemplateEngine.java
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/XHTMLTagSerializer.java
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/DivHandler.java
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/HeadHandler.java
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SelectHandler.java
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java
struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/HeadTest.java
Modified:
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/Attributes.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/Attributes.java?rev=767518&r1=767517&r2=767518&view=diff
==
---
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/Attributes.java
(original)
+++
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/Attributes.java
Wed Apr 22 13:37:01 2009
@@ -30,6 +30,8 @@
*/
public class Attributes extends LinkedHashMap {
+private static final long serialVersionUID = 4103241472140545630L;
+
public Attributes add(String key, String value) {
return add(key, value, true);
}
Modified:
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/DefaultTheme.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/DefaultTheme.java?rev=767518&r1=767517&r2=767518&view=diff
==
---
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/DefaultTheme.java
(original)
+++
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/DefaultTheme.java
Wed Apr 22 13:37:01 2009
@@ -38,7 +38,7 @@
private static final Logger LOG =
LoggerFactory.getLogger(DefaultTheme.class);
private String name;
-private Map> handlerFactories;
+protected Map> handlerFactories;
protected void setName(String name) {
this.name = name;
@@ -48,6 +48,47 @@
this.handlerFactories = handlers;
}
+
+/**
+ * Set (replace if exists) the tag handler factories for specific tag
+ *
+ * @param tagName
+ * @param handlers
+ */
+protected void setTagHandlerFactories(String tagName,
List handlers) {
+if (tagName != null && handlers != null && this.handlerFactories !=
null) {
+handlerFactories.put(tagName, handlers);
+}
+}
+
+/**
+ * Insert a new tag handler into a sequence of tag handlers for a specific
tag
+ * TODO: Need to take care of serializers, if handler specified is not a
TagSerializer it should never
+ * be placed after the serializer, but if it is not a TagSerializer, it
should never
+ *
+ * @param tagName
+ * @param sequence
+ * @param factory
+ */
+protected void insertTagHandlerFactory(String tagName, int sequence,
TagHandlerFactory factory) {
+
+if (tagName != null && factory != null && this.handlerFactories !=
null) {
+
+List tagHandlerFactories =
handlerFactories.get(tagName);
+
+if (tagHandlerFactories == null) {
+tagHandlerFactories = new ArrayList();
//TODO: Could use public FactoryList here
+}
+
+if (sequence > tagHandlerFactories.size()) {
+sequence = tagHandlerFactories.size();
+}
+
+//TODO, need to account for TagHandlers vs. TagSerializers here
+tagHandlerFactories.add(sequence, factory);
+}
+}
+
public String getName() {
return name;
}
@@ -70,7 +111,7 @@
handlers.add(0, prev);
}
-TagSerializer ser = (TagSerializer) handlers.get(handlers.size() - 1);
+// TagSerializer ser = (TagSerializer) handlers.get(handlers.size() -
1);
TagGenerator gen = (TagGenerator) handlers.get(0);
try {
Modifi
svn commit: r767529 - /struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl
Author: hermanns
Date: Wed Apr 22 14:05:52 2009
New Revision: 767529
URL: http://svn.apache.org/viewvc?rev=767529&view=rev
Log:
WW-2809 doubleselect ignores preselection of a multiple subselect
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl?rev=767529&r1=767528&r2=767529&view=diff
==
---
struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl
(original)
+++
struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl
Wed Apr 22 14:05:52 2009
@@ -121,13 +121,22 @@
for (i = 0; i < ${parameters.id}Group[x].length; i++) {
${parameters.id}Temp.options[i] = new
Option(${parameters.id}Group[x][i].text, ${parameters.id}Group[x][i].value);
-<#if parameters.doubleNameValue??>
- if (${parameters.id}Temp.options[i].value ==
'${parameters.doubleNameValue}') {
- ${parameters.id}Temp.options[i].selected = true;
- selected = true;
- }
-
-}
+<#if parameters.doubleNameValue?exists>
+ <#if parameters.doubleMultiple?exists>
+ for (j = 0; j < ${parameters.doubleNameValue}.length;
j++) {
+ if (${parameters.id}Temp.options[i].value ==
${parameters.doubleNameValue}[j]) {
+ ${parameters.id}Temp.options[i].selected = true;
+selected = true;
+ }
+}
+ <#else>
+if (${parameters.id}Temp.options[i].value ==
'${parameters.doubleNameValue}') {
+${parameters.id}Temp.options[i].selected = true;
+selected = true;
+}
+
+
+ }
if ((${parameters.id}Temp.options.length > 0) && (! selected)) {
${parameters.id}Temp.options[0].selected = true;
