[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Geronimo Development (GMOxDEV) http://cwiki.apache.org/confluence/display/GMOxDEV | |-Pages Added or Edited in This Space |-- JSR 77 Performance Monitoring (Stats Interfaces) was created by ccardona (03:27 PM). | http://cwiki.apache.org/confluence/display/GMOxDEV/JSR+77+Performance+Monitoring+%28Stats+Interfaces%29 |-- Java EE 5 Annotations was last edited by mcconne (06:46 AM). | http://cwiki.apache.org/confluence/display/GMOxDEV/Java+EE+5+Annotations Apache Geronimo SandBox (GMOxSBOX) http://cwiki.apache.org/confluence/display/GMOxSBOX | |-Pages Added or Edited in This Space |-- Test13 was created by davecola (06:25 AM). | http://cwiki.apache.org/confluence/display/GMOxSBOX/Test13 |-- Test 5 was last edited by davecola (06:13 AM). | http://cwiki.apache.org/confluence/display/GMOxSBOX/Test+5 Apache Qpid (qpid) http://cwiki.apache.org/confluence/display/qpid | |-Pages Added or Edited in This Space |-- Qpid 'C++' Documentation was last edited by aconway (06:35 AM). | http://cwiki.apache.org/confluence/pages/viewpage.action?pageId=28284 Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-Pages Added or Edited in This Space |-- Tutorials was last edited by husted (08:41 AM). | http://cwiki.apache.org/confluence/display/WW/Tutorials |-- Creating and Signing a Distribution was last edited by husted (04:22 AM). | http://cwiki.apache.org/confluence/display/WW/Creating+and+Signing+a+Distribution |-- Release Notes 2.0.0 was last edited by husted (04:06 AM). | http://cwiki.apache.org/confluence/display/WW/Release+Notes+2.0.0 |-- Release Notes 2.0.2 was last edited by husted (04:04 AM). | http://cwiki.apache.org/confluence/display/WW/Release+Notes+2.0.2 |-- Release Notes 2.0.3 was last edited by husted (04:04 AM). | http://cwiki.apache.org/confluence/display/WW/Release+Notes+2.0.3 |-- Release Notes 2.0.4 was last edited by husted (04:02 AM). | http://cwiki.apache.org/confluence/display/WW/Release+Notes+2.0.4 |-- Release Notes 2.0.5 was created by husted (04:01 AM). | http://cwiki.apache.org/confluence/display/WW/Release+Notes+2.0.5 |-- Migration Guide was last edited by husted (03:53 AM). | http://cwiki.apache.org/confluence/display/WW/Migration+Guide Apache Directory Server v1.0 (DIRxSRVx10) http://cwiki.apache.org/confluence/display/DIRxSRVx10 | |-Pages Added or Edited in This Space |-- SchemaService Interceptor was last edited by elecharny (09:07 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/SchemaService+Interceptor |-- Collective Attributes was last edited by elecharny (07:56 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/Collective+Attributes UIMA (UIMA) http://cwiki.apache.org/confluence/display/UIMA | |-Pages Added or Edited in This Space |-- TestPlan2.1 was last edited by alally (03:04 PM). | http://cwiki.apache.org/confluence/display/UIMA/TestPlan2.1 |-- Test Plan Template was created by mbaessler (05:50 AM). | http://cwiki.apache.org/confluence/display/UIMA/Test+Plan+Template |-- Release Plan was last edited by mbaessler (05:55 AM). | http://cwiki.apache.org/confluence/display/UIMA/Release+Plan Apache Directory Website (DIRxSITE) http://cwiki.apache.org/confluence/display/DIRxSITE | |-Pages Added or Edited in This Space |-- Index was last edited by elecharny (10:13 AM). | http://cwiki.apache.org/confluence/display/DIRxSITE/Index Apache Yoko Project Website (YOKO) http://cwiki.apache.org/confluence/display/YOKO | |-Pages Added or Edited in This Space |-- Download was created by adisakala (01:39 PM). | http://cwiki.apache.org/confluence/display/YOKO/Download Apache Directory Project Management (DIRxPMGT) http://cwiki.apache.org/confluence/display/DIRxPMGT | |-Pages Added or Edited in This Space |-- Web site management was last edited by ersiner (09:58 AM). | http://cwiki.apache.org/confluence/display/DIRxPMGT/Web+site+management |-- Index was last edited by ersiner (05:14 AM). | http://cwiki.apache.org/confluence/display/DIRxPMGT/Index Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET | |-Pages Added or Edited in This Space |-- Migrate-1.3 was last edited by ehillenius (10:28 AM). | http://cwiki.apache.org/confluence/display/WICKET/Migrate-1.3 |-- User Stories was last edited by jonathanlocke (08:03 AM). | http://cwiki.apache.org/confluence/display/WICKET/User+Stories |-- Jobindsats was created by xfactor (12:24 AM). | http://cwiki.apache.org/confluence/display/WICKET/Jobindsats Apache Directory LDAP Studio (DIRxSTUDIO) http://cwiki.apache.org/confluence/display/DIRxSTUDIO | |-Pages Added or Edited in This Space |-
svn commit: r501513 - /struts/struts2/trunk/plugins/tiles/pom.xml
Author: germuska Date: Tue Jan 30 10:47:55 2007 New Revision: 501513 URL: http://svn.apache.org/viewvc?view=rev&rev=501513 Log: switch Tiles dependency to new TLP location Modified: struts/struts2/trunk/plugins/tiles/pom.xml Modified: struts/struts2/trunk/plugins/tiles/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/pom.xml?view=diff&rev=501513&r1=501512&r2=501513 == --- struts/struts2/trunk/plugins/tiles/pom.xml (original) +++ struts/struts2/trunk/plugins/tiles/pom.xml Tue Jan 30 10:47:55 2007 @@ -20,9 +20,9 @@ -org.apache.struts.tiles +org.apache.tiles tiles-core -2.0-r488734-SNAPSHOT +2.0-SNAPSHOT javax.servlet
svn commit: r501618 - /struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/Bind.js
Author: mrdon
Date: Tue Jan 30 14:46:48 2007
New Revision: 501618
URL: http://svn.apache.org/viewvc?view=rev&rev=501618
Log:
Fixed embarrasing lack of faith in the "if" statement
Modified:
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/Bind.js
Modified:
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/Bind.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/Bind.js?view=diff&rev=501618&r1=501617&r2=501618
==
---
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/Bind.js
(original)
+++
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/Bind.js
Tue Jan 30 14:46:48 2007
@@ -44,13 +44,9 @@
this.log("Listening to " + this.listenTopics + " to refresh");
var topics = this.listenTopics.split(",");
if(topics) {
-if(topics) {
- if(topics) {
-dojo.lang.forEach(topics, function(topic){
- dojo.event.topic.subscribe(topic, self, "reloadContents");
-});
- }
-}
+dojo.lang.forEach(topics, function(topic){
+ dojo.event.topic.subscribe(topic, self, "reloadContents");
+});
}
}
svn commit: r501683 - /struts/struts2/trunk/plugins/pell-multipart/src/main/resources/struts-plugin.xml
Author: mrdon Date: Tue Jan 30 17:34:42 2007 New Revision: 501683 URL: http://svn.apache.org/viewvc?view=rev&rev=501683 Log: Fixed class name WW-1692 Modified: struts/struts2/trunk/plugins/pell-multipart/src/main/resources/struts-plugin.xml Modified: struts/struts2/trunk/plugins/pell-multipart/src/main/resources/struts-plugin.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/pell-multipart/src/main/resources/struts-plugin.xml?view=diff&rev=501683&r1=501682&r2=501683 == --- struts/struts2/trunk/plugins/pell-multipart/src/main/resources/struts-plugin.xml (original) +++ struts/struts2/trunk/plugins/pell-multipart/src/main/resources/struts-plugin.xml Tue Jan 30 17:34:42 2007 @@ -5,5 +5,5 @@ "http://struts.apache.org/dtds/struts-2.0.dtd";> - +
svn commit: r501717 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/config/ main/resources/org/apache/struts2/dispatcher/ test/java/org/apache/struts2/config/
Author: mrdon
Date: Tue Jan 30 19:51:11 2007
New Revision: 501717
URL: http://svn.apache.org/viewvc?view=rev&rev=501717
Log:
Fixed custom parent packages not inherited properly with namespace annotation,
fixed problem report when single exception
WW-1679 WW-1687
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl
struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/ClasspathConfigurationProviderTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java?view=diff&rev=501717&r1=501716&r2=501717
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
Tue Jan 30 19:51:11 2007
@@ -289,6 +289,11 @@
PackageConfig pkgConfig = loadPackageConfig(actionNamespace,
actionPackage, cls);
+// In case the package changed due to namespace annotation processing
+if (!actionPackage.equals(pkgConfig.getName())) {
+actionPackage = pkgConfig.getName();
+}
+
Annotation annotation = cls.getAnnotation(ParentPackage.class);
if (annotation != null) {
String parent = ((ParentPackage)annotation).value();
@@ -323,7 +328,6 @@
actionConfig.setPackageName(actionPackage);
actionConfig.setResults(new ResultMap(cls,
actionName, pkgConfig));
-
pkgConfig.addActionConfig(actionName, actionConfig);
}
@@ -475,33 +479,6 @@
}
}
return map;
-}
-
-/**
- * Retrieve ResultConfig from cache.
- *
- * @param key Name of ResultConfig
- * @return ResultConfig correspnding to key
- */
-public V get(Object key) {
-
-V result = super.get(key);
-if (result != null) {
-return result;
-} else {
-
-// This code should never actually be called,
-// due to how the runtime configuration is created.
-String actionPath = pkgConfig.getNamespace() + "/" +
actionName;
-
-String fileName = actionPath + "-" + key +
defaultPageExtension;
-if (pageLocator.locate(defaultPagePrefix + fileName) == null) {
-fileName = actionPath + defaultPageExtension;
-}
-
-String location = defaultPagePrefix + fileName;
-return (V) createResultConfig(key, null, location, null);
-}
}
/**
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=501717&r1=501716&r2=501717
==
---
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
Tue Jan 30 19:51:11 2007
@@ -50,7 +50,7 @@
<#elseif (msgs?size == 1)>
-<#if (msg?is_method)>
+<#if (msgs[0]?is_method)>
${msgs[0][0]}
<#else>
${msgs[0]}
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/ClasspathConfigurationProviderTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/ClasspathConfigurationProviderTest.java?view=diff&rev=501717&r1=501716&r2=501717
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/ClasspathConfigurationProviderTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/ClasspathConfigurationProviderTest.java
Tue Jan 30 19:51:11 2007
@@ -59,7 +59,8 @@
Map configs = pkg.getActionConfigs();
assertNotNull(configs);
// assertEquals(1, configs.size());
-assertNotNull(configs.get("customParentPackage"));
+ActionConfig actionConfig = (ActionConfig)
configs.get("customParentPackage");
+assertNotNull(actionConfig);
}
public void testParentPackage() {
@@ -76,9 +77,12 @@
Map configs = pkg.getAllActionConfigs();
// assertEquals(2, configs.size());
ActionConfig config =
svn commit: r501734 - /struts/struts2/trunk/core/src/main/resources/template/css_xhtml/datetimepicker.ftl
Author: mrdon
Date: Tue Jan 30 21:14:16 2007
New Revision: 501734
URL: http://svn.apache.org/viewvc?view=rev&rev=501734
Log:
Added control header and footer to datetimepicker in css_xhtml theme
WW-1689
Modified:
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/datetimepicker.ftl
Modified:
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/datetimepicker.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/css_xhtml/datetimepicker.ftl?view=diff&rev=501734&r1=501733&r2=501734
==
---
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/datetimepicker.ftl
(original)
+++
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/datetimepicker.ftl
Tue Jan 30 21:14:16 2007
@@ -1 +1,4 @@
-<#include "/${parameters.templateDir}/simple/datetimepicker.ftl" />
\ No newline at end of file
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
+<#include "/${parameters.templateDir}/simple/datetimepicker.ftl" />
+<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
+<#nt/>
\ No newline at end of file
svn commit: r501736 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
Author: mrdon
Date: Tue Jan 30 21:38:02 2007
New Revision: 501736
URL: http://svn.apache.org/viewvc?view=rev&rev=501736
Log:
Fixing servlet action redirect not passing injected mapper to super class
WW-1662
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java?view=diff&rev=501736&r1=501735&r2=501736
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
Tue Jan 30 21:38:02 2007
@@ -135,7 +135,6 @@
protected String actionName;
protected String namespace;
protected String method;
-protected ActionMapper actionMapper;
private Map requestParameters = new HashMap();
@@ -158,11 +157,6 @@
this.method = method;
}
-@Inject
-public void setActionMapper(ActionMapper mapper) {
-this.actionMapper = mapper;
-}
-
protected List prohibitedResultParam = Arrays.asList(new String[] {
DEFAULT_PARAM, "namespace", "method", "encode", "parse",
"location",
"prependServletContext" });
svn commit: r501746 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2: components/OptGroup.java dispatcher/ServletRedirectResult.java
Author: mrdon
Date: Tue Jan 30 22:22:43 2007
New Revision: 501746
URL: http://svn.apache.org/viewvc?view=rev&rev=501746
Log:
Fixed optgroup throwing NPE, added file missing from commit fixing servlet
action redirect
WW-1670 WW-1662
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java?view=diff&rev=501746&r1=501745&r2=501746
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java
Tue Jan 30 22:22:43 2007
@@ -32,6 +32,8 @@
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -89,6 +91,11 @@
return "empty";
}
};
+}
+
+@Inject
+public void setContainer(Container container) {
+container.inject(internalUiBean);
}
public boolean end(Writer writer, String body) {
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java?view=diff&rev=501746&r1=501745&r2=501746
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
Tue Jan 30 22:22:43 2007
@@ -85,7 +85,7 @@
protected boolean prependServletContext = true;
-private ActionMapper actionMapper;
+protected ActionMapper actionMapper;
public ServletRedirectResult() {
super();
svn commit: r501749 - in /struts/struts2/trunk/core/src: main/resources/template/ajax/ main/resources/template/simple/ main/resources/template/xhtml/ test/resources/org/apache/struts2/views/jsp/ui/
Author: mrdon Date: Tue Jan 30 22:59:58 2007 New Revision: 501749 URL: http://svn.apache.org/viewvc?view=rev&rev=501749 Log: Fixed missing type attribute from script elements WW-1627 Modified: struts/struts2/trunk/core/src/main/resources/template/ajax/form-close.ftl struts/struts2/trunk/core/src/main/resources/template/simple/combobox.ftl struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt Modified: struts/struts2/trunk/core/src/main/resources/template/ajax/form-close.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/ajax/form-close.ftl?view=diff&rev=501749&r1=501748&r2=501749 == --- struts/struts2/trunk/core/src/main/resources/template/ajax/form-close.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/ajax/form-close.ftl Tue Jan 30 22:59:58 2007 @@ -1,6 +1,6 @@ <#if (parameters.customOnsubmitEnabled?default(false))> - +