[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Directory Community & Resources (directory) http://cwiki.apache.org/confluence/display/directory | |-Pages Added or Edited in This Space |-- LDAP entmystifiziert (JUG Berlin) was created by szoerner (06:03 AM). | http://cwiki.apache.org/confluence/display/directory/LDAP+entmystifiziert+%28JUG+Berlin%29 |-- Conference materials was last edited by szoerner (06:01 AM). | http://cwiki.apache.org/confluence/display/directory/Conference+materials Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL | |-Pages Added or Edited in This Space |-- Walk through an Example was last edited by davsclaus (11:33 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Walk+through+an+Example Apache CXF Documentation (CXF20DOC) http://cwiki.apache.org/confluence/display/CXF20DOC | |-Pages Added or Edited in This Space |-- Servlet Transport was last edited by njiang (01:20 AM). | http://cwiki.apache.org/confluence/display/CXF20DOC/Servlet+Transport | |-New Comments in This Space |-- http://cwiki.apache.org/confluence/display/CXF20DOC/Jax-WS+Java+First+with+jms+Transport (1) Apache ServiceMix Kernel (SMX4KNL) http://cwiki.apache.org/confluence/display/SMX4KNL | |-Pages Added or Edited in This Space |-- 4.6. Provisioning was created by gnodet (09:13 AM). | http://cwiki.apache.org/confluence/display/SMX4KNL/4.6.+Provisioning |-- Release process was last edited by gnodet (07:51 AM). | http://cwiki.apache.org/confluence/display/SMX4KNL/Release+process |-- ServiceMix Kernel 1.0-rc1 was last edited by gnodet (06:54 AM). | http://cwiki.apache.org/confluence/display/SMX4KNL/ServiceMix+Kernel+1.0-rc1 Apache Geronimo v2.1 (GMOxDOC21) http://cwiki.apache.org/confluence/display/GMOxDOC21 | |-Pages Added or Edited in This Space |-- Annotations was last edited by mcconne (07:19 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Annotations |-- Deployment was last edited by mcconne (06:12 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Deployment |-- geronimo-application.xml was last edited by bjreed (01:32 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/geronimo-application.xml |-- openejb-jar.xml was last edited by mcconne (11:32 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/openejb-jar.xml |-- geronimo-web.xml was last edited by mcconne (11:27 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/geronimo-web.xml |-- Tutorials was last edited by hcunico (11:23 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Tutorials |-- geronimo-ra.xml was last edited by bjreed (08:26 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/geronimo-ra.xml |-- geronimo-application-client.xml was last edited by bjreed (08:25 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/geronimo-application-client.xml |-- Documentation was last edited by hcunico (07:41 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Documentation |-- Persistence was last edited by hcunico (07:39 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Persistence Apache Struts 2 Wiki (S2WIKI) http://cwiki.apache.org/confluence/display/S2WIKI | |-Pages Added or Edited in This Space |-- Convention,Codebehind and REST 2.3 was created by musachy (02:23 PM). | http://cwiki.apache.org/confluence/display/S2WIKI/Convention%2CCodebehind+and+REST+2.3 Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET | |-Pages Added or Edited in This Space |-- Index was last edited by gwynevans (12:50 AM). | http://cwiki.apache.org/confluence/display/WICKET/Index OpenEJB (OPENEJB) http://cwiki.apache.org/confluence/display/OPENEJB | |-Pages Added or Edited in This Space |-- EJB Annotation Examples was created by dblevins (03:20 PM). | http://cwiki.apache.org/confluence/display/OPENEJB/EJB+Annotation+Examples |-- EJB Annotation Example was created by dblevins (03:19 PM). | http://cwiki.apache.org/confluence/display/OPENEJB/EJB+Annotation+Example |-- EJB3 Annotation Example was created by dblevins (03:18 PM). | http://cwiki.apache.org/confluence/display/OPENEJB/EJB3+Annotation+Example |-- EJB Sample was created by dblevins (03:16 PM). | http://cwiki.apache.org/confluence/display/OPENEJB/EJB+Sample |-- EJB3 Sample was created by dblevins (02:56 PM). | http://cwiki.apache.org/confluence/display/OPENEJB/EJB3+Sample |-- EJB Example was created by dblevins (02:55 PM). | http://cwiki.apache.org/confluence/display/OPENEJB/EJB+Example |-- EJB3 Example was created by dblevins (02:53 PM). | http://cwiki.apache.org/confluence/display/OPENEJB/EJB3+Example |-- EJB Tutorial was create
svn commit: r663497 - in /struts/struts1/trunk: core/pom.xml el/pom.xml extras/pom.xml faces/pom.xml mailreader-dao/pom.xml pom.xml scripting/pom.xml taglib/pom.xml tiles/pom.xml tiles2/pom.xml
Author: niallp
Date: Thu Jun 5 01:13:33 2008
New Revision: 663497
URL: http://svn.apache.org/viewvc?rev=663497&view=rev
Log:
STR-3148 Add OSGi headers to the jar's MANIFEST files
Modified:
struts/struts1/trunk/core/pom.xml
struts/struts1/trunk/el/pom.xml
struts/struts1/trunk/extras/pom.xml
struts/struts1/trunk/faces/pom.xml
struts/struts1/trunk/mailreader-dao/pom.xml
struts/struts1/trunk/pom.xml
struts/struts1/trunk/scripting/pom.xml
struts/struts1/trunk/taglib/pom.xml
struts/struts1/trunk/tiles/pom.xml
struts/struts1/trunk/tiles2/pom.xml
Modified: struts/struts1/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/pom.xml?rev=663497&r1=663496&r2=663497&view=diff
==
--- struts/struts1/trunk/core/pom.xml (original)
+++ struts/struts1/trunk/core/pom.xml Thu Jun 5 01:13:33 2008
@@ -48,6 +48,10 @@
+
+
org.apache.struts.core
+
+
Modified: struts/struts1/trunk/el/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/el/pom.xml?rev=663497&r1=663496&r2=663497&view=diff
==
--- struts/struts1/trunk/el/pom.xml (original)
+++ struts/struts1/trunk/el/pom.xml Thu Jun 5 01:13:33 2008
@@ -47,6 +47,11 @@
scp://people.apache.org/www/struts.apache.org/1.x/struts-el
+
+
+
org.apache.strutsel.taglib
+
org.apache.strutsel.*;version=${pom.version}
+
Modified: struts/struts1/trunk/extras/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/extras/pom.xml?rev=663497&r1=663496&r2=663497&view=diff
==
--- struts/struts1/trunk/extras/pom.xml (original)
+++ struts/struts1/trunk/extras/pom.xml Thu Jun 5 01:13:33 2008
@@ -48,6 +48,10 @@
+
+
org.apache.struts.extras
+
+
Modified: struts/struts1/trunk/faces/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/faces/pom.xml?rev=663497&r1=663496&r2=663497&view=diff
==
--- struts/struts1/trunk/faces/pom.xml (original)
+++ struts/struts1/trunk/faces/pom.xml Thu Jun 5 01:13:33 2008
@@ -48,6 +48,10 @@
+
+
org.apache.struts.faces
+
+
Modified: struts/struts1/trunk/mailreader-dao/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/mailreader-dao/pom.xml?rev=663497&r1=663496&r2=663497&view=diff
==
--- struts/struts1/trunk/mailreader-dao/pom.xml (original)
+++ struts/struts1/trunk/mailreader-dao/pom.xml Thu Jun 5 01:13:33 2008
@@ -41,6 +41,10 @@
http://svn.apache.org/repos/asf/struts/struts1/trunk/mailreader-dao/
+
+
org.apache.struts.apps.mailreader.dao
+
+
Modified: struts/struts1/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/pom.xml?rev=663497&r1=663496&r2=663497&view=diff
==
--- struts/struts1/trunk/pom.xml (original)
+++ struts/struts1/trunk/pom.xml Thu Jun 5 01:13:33 2008
@@ -172,6 +172,7 @@
2.1
+${struts.manifestfile}
true
true
@@ -192,6 +193,12 @@
true
+
+org.apache.felix
+maven-bundle-plugin
+1.4.0
+true
+
@@ -218,6 +225,33 @@
+
+org.apache.felix
+maven-bundle-plugin
+
+true
+target/osgi
+
+<_nouses>true
+
${struts.osgi.symbolicName}
+${struts.osgi.export}
+
${struts.osgi.private}
+${struts.osgi.import}
+
${struts.osgi.dynamicImport}
+${project.url}
+
+
+
+
+bundle-manifest
+process-classes
+
+manifest
+
+
+
+
+
install
@@ -268,6 +302,12 @@
1.0.9
+
org.apache.${artifactId}
+
org.
svn commit: r663603 - in /struts/struts2/trunk/plugins: codebehind/src/main/java/ codebehind/src/main/java/org/apache/struts2/config/ codebehind/src/main/resources/ rest/ rest/src/main/java/org/apache
Author: musachy
Date: Thu Jun 5 06:29:25 2008
New Revision: 663603
URL: http://svn.apache.org/viewvc?rev=663603&view=rev
Log:
WW-2667 REST should not extend Codebehind
Removed:
struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/ControllerClasspathPackageProvider.java
Modified:
struts/struts2/trunk/plugins/codebehind/src/main/java/ (props changed)
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
struts/struts2/trunk/plugins/codebehind/src/main/resources/struts-plugin.xml
struts/struts2/trunk/plugins/rest/pom.xml
struts/struts2/trunk/plugins/rest/src/main/resources/struts-plugin.xml
Propchange: struts/struts2/trunk/plugins/codebehind/src/main/java/
--
--- svn:ignore (added)
+++ svn:ignore Thu Jun 5 06:29:25 2008
@@ -0,0 +1 @@
+META-INF
Modified:
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java?rev=663603&r1=663602&r2=663603&view=diff
==
---
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
(original)
+++
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
Thu Jun 5 06:29:25 2008
@@ -84,7 +84,7 @@
* to use in place of "struts-default".
*/
protected static final String DEFAULT_PARENT_PACKAGE =
"struts.configuration.classpath.defaultParentPackage";
-
+
/**
* A setting to disable action scanning.
*/
@@ -109,10 +109,25 @@
*/
private boolean forceLowerCase = true;
+protected static final String CLASS_SUFFIX =
"struts.codebehind.classSuffix";
/**
* Default suffix that can be used to indicate POJO "Action" classes.
*/
-private static final String ACTION = "Action";
+protected String classSuffix = "Action";
+
+protected static final String CHECK_IMPLEMENTS_ACTION =
"struts.codebehind.checkImplementsAction";
+
+/**
+ * When testing a class, check that it implements Action
+ */
+protected boolean checkImplementsAction = true;
+
+protected static final String CHECK_ANNOTATION =
"struts.codebehind.checkAnnotation";
+
+/**
+ * When testing a class, check that it has an @Action annotation
+ */
+protected boolean checkAnnotation = true;
/**
* Helper class to scan class path for server pages.
@@ -126,7 +141,7 @@
* @see #needsReload
*/
private boolean initialized = false;
-
+
private boolean disableActionScanning = false;
private PackageLoader packageLoader;
@@ -165,12 +180,12 @@
return ClassLoaderUtil.getResource(path, getClass());
}
}
-
+
@Inject("actionPackages")
public void setActionPackages(String packages) {
this.actionPackages = packages;
}
-
+
public void setServletContext(ServletContext ctx) {
this.servletContext = ctx;
}
@@ -184,7 +199,27 @@
public void setDisableActionScanning(String disableActionScanning) {
this.disableActionScanning = "true".equals(disableActionScanning);
}
-
+
+/**
+ * Check that the class implements Action
+ *
+ * @param checkImplementsAction True to check
+ */
+@Inject(value=CHECK_IMPLEMENTS_ACTION, required=false)
+public void setCheckImplementsAction(String checkImplementsAction) {
+this.checkImplementsAction = "true".equals(checkImplementsAction);
+}
+
+/**
+ * Check that the class has an @Action annotation
+ *
+ * @param checkImplementsAction True to check
+ */
+@Inject(value=CHECK_ANNOTATION, required=false)
+public void setCheckAnnotation(String checkAnnotation) {
+this.checkAnnotation = "true".equals(checkAnnotation);
+}
+
/**
* Register a default parent package for the actions.
*
@@ -214,10 +249,20 @@
public void setDefaultPagePrefix(String defaultPagePrefix) {
this.defaultPagePrefix = defaultPagePrefix;
}
-
+
+/**
+ * Default suffix that can be used to indicate POJO "Action" classes.
+ *
+ * @param defaultPagePrefix the defaultPagePrefix to set
+ */
+@Inject(value=CLASS_SUFFIX, required=false)
+public void setClassSuffix(String classSuffix) {
+this.classSuffix = classSuffix;
+}
+
/**
* Whether to use a lowercase letter as the initial letter of an action.
- *
+ *
* @param force If false, actions will retain the initial uppercase letter
from the Action class.
* (view.action (true) versus View.action
(false)).
*/
@@ -268,16 +313,16 @@
svn commit: r663605 - /struts/struts2/trunk/plugins/rest/src/main/resources/struts-plugin.xml
Author: musachy Date: Thu Jun 5 06:31:01 2008 New Revision: 663605 URL: http://svn.apache.org/viewvc?rev=663605&view=rev Log: WW-2667 REST should not extend Codebehind Modified: struts/struts2/trunk/plugins/rest/src/main/resources/struts-plugin.xml Modified: struts/struts2/trunk/plugins/rest/src/main/resources/struts-plugin.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/rest/src/main/resources/struts-plugin.xml?rev=663605&r1=663604&r2=663605&view=diff == --- struts/struts2/trunk/plugins/rest/src/main/resources/struts-plugin.xml (original) +++ struts/struts2/trunk/plugins/rest/src/main/resources/struts-plugin.xml Thu Jun 5 06:31:01 2008 @@ -42,7 +42,7 @@ - +
svn commit: r663836 - in /struts/struts1/trunk/taglib/src/main: java/org/apache/struts/taglib/html/MessagesTag.java java/org/apache/struts/taglib/logic/MessagesPresentTag.java resources/META-INF/tld/s
Author: pbenedict
Date: Thu Jun 5 23:19:40 2008
New Revision: 663836
URL: http://svn.apache.org/viewvc?rev=663836&view=rev
Log:
STR-2913: Expose count of messages as page attribute
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/MessagesTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/MessagesPresentTag.java
struts/struts1/trunk/taglib/src/main/resources/META-INF/tld/struts-html.tld
struts/struts1/trunk/taglib/src/main/resources/META-INF/tld/struts-logic.tld
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/MessagesTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/MessagesTag.java?rev=663836&r1=663835&r2=663836&view=diff
==
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/MessagesTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/MessagesTag.java
Thu Jun 5 23:19:40 2008
@@ -102,6 +102,12 @@
* will be used to retrieve the messages from scope.
*/
protected String message = null;
+
+/**
+ * The name of the page-scoped attribute to be populated
+ * with the message count of the specifie dproperty.
+ */
+protected String count;
/**
* Filter the message replacement values for characters that are
@@ -180,6 +186,14 @@
public void setFilterArgs(boolean filterArgs) {
this.filterArgs = filterArgs;
}
+
+public void setCount(String count) {
+ this.count = count;
+}
+
+public String getCount() {
+ return count;
+}
/**
* Construct an iterator for the specified collection, and begin looping
@@ -210,9 +224,20 @@
}
// Acquire the collection we are going to iterate over
-this.iterator =
-(property == null) ? messages.get() : messages.get(property);
-
+int size;
+if (property == null) {
+ this.iterator = messages.get();
+ size = messages.size();
+} else {
+ this.iterator = messages.get(property);
+ size = messages.size(property);
+}
+
+// Expose the count when specified
+if (count != null) {
+ pageContext.setAttribute(count, new Integer(size));
+}
+
// Store the first value and evaluate, or skip the body if none
if (!this.iterator.hasNext()) {
return SKIP_BODY;
@@ -335,6 +360,10 @@
}
}
+ if (count != null) {
+pageContext.removeAttribute(count);
+ }
+
return EVAL_PAGE;
}
@@ -354,5 +383,6 @@
footer = null;
message = null;
filterArgs = false;
+count = null;
}
}
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/MessagesPresentTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/MessagesPresentTag.java?rev=663836&r1=663835&r2=663836&view=diff
==
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/MessagesPresentTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/MessagesPresentTag.java
Thu Jun 5 23:19:40 2008
@@ -39,12 +39,19 @@
* @since Struts 1.1
*/
public class MessagesPresentTag extends ConditionalTagBase {
-/**
+
+ /**
* If this is set to 'true', then the Globals.MESSAGE_KEY
* will be used to retrieve the messages from scope.
*/
protected String message = null;
+/**
+ * The name of the page-scoped attribute to be populated
+ * with the message count of the specifie dproperty.
+ */
+protected String count;
+
public MessagesPresentTag() {
name = Globals.ERROR_KEY;
}
@@ -57,6 +64,14 @@
this.message = message;
}
+public void setCount(String count) {
+ this.count = count;
+}
+
+public String getCount() {
+ return count;
+}
+
/**
* Evaluate the condition that is being tested by this particular tag, and
* return true if the nested body content of this tag should
@@ -94,11 +109,32 @@
throw e;
}
-Iterator iterator = (property == null) ? am.get() : am.get(property);
+// Acquire the collection of messages
+Iterator iterator;
+int size;
+if (property == null) {
+ iterator = am.get();
+ size = am.size();
+} else {
+iterator = am.get(property);
+size = am.size(property);
+}
+// Expose the count when specified
+if (count != null) {
+
