[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 |-- Index was last edited by [EMAIL PROTECTED] (11:18 AM). | http://cwiki.apache.org/confluence/display/openjpa/Index |-- Mailing Lists was last edited by [EMAIL PROTECTED] (09:29 AM). | http://cwiki.apache.org/confluence/display/openjpa/Mailing+Lists |-- OpenJPA 1.0.3 released! was created by [EMAIL PROTECTED] (07:47 AM). | http://cwiki.apache.org/confluence/display/openjpa/2008/07/28/OpenJPA+1.0.3+released%21 |-- Downloads was last edited by [EMAIL PROTECTED] (07:46 AM). | http://cwiki.apache.org/confluence/display/openjpa/Downloads Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL | |-Pages Added or Edited in This Space |-- Bean was last edited by njiang (01:35 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Bean Apache Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX | |-Pages Added or Edited in This Space |-- Accessing services inside inner and anonymous classes was created by clement.escoffier (12:01 PM). | http://cwiki.apache.org/confluence/display/FELIX/Accessing+services+inside+inner+and+anonymous+classes Apache MINA FtpServer (FTPSERVER) http://cwiki.apache.org/confluence/display/FTPSERVER | |-Pages Added or Edited in This Space |-- Server was created by ngn (02:26 PM). | http://cwiki.apache.org/confluence/display/FTPSERVER/Server |-- Documentation was last edited by ngn (02:19 PM). | http://cwiki.apache.org/confluence/display/FTPSERVER/Documentation Apache Qpid (qpid) http://cwiki.apache.org/confluence/display/qpid | |-New Comments in This Space |-- http://cwiki.apache.org/confluence/display/qpid/Producer+flow+control (2) Apache Sanselan (SANSELAN) http://cwiki.apache.org/confluence/display/SANSELAN | |-Pages Added or Edited in This Space |-- FormatSupport was last edited by [EMAIL PROTECTED] (04:46 AM). | http://cwiki.apache.org/confluence/display/SANSELAN/FormatSupport Apache ServiceMix (SM) http://cwiki.apache.org/confluence/display/SM | |-Pages Added or Edited in This Space |-- 3.4. Exchanging messages with other JBI services was last edited by gertvanthienen (11:17 PM). | http://cwiki.apache.org/confluence/display/SM/3.4.+Exchanging+messages+with+other+JBI+services Tuscany Wiki (TUSCANYWIKI) http://cwiki.apache.org/confluence/display/TUSCANYWIKI | |-Pages Added or Edited in This Space |-- Scenarios was last edited by slaws (07:27 AM). | http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Scenarios Apache Geronimo v2.1 (GMOxDOC21) http://cwiki.apache.org/confluence/display/GMOxDOC21 | |-Pages Added or Edited in This Space |-- Documentation was last edited by gawor (05:05 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Documentation |-- RELEASE-NOTES-2.1.2.TXT was created by gawor (05:03 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/RELEASE-NOTES-2.1.2.TXT |-- What changed in 2.1 was last edited by gawor (03:27 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/What+changed+in+2.1 |-- Installing and removing applications was last edited by gawor (09:43 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Installing+and+removing+applications |-- Tools and commands was last edited by gawor (09:32 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Tools+and+commands |-- Administering the Apache Geronimo Server was last edited by gawor (08:37 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Administering+the+Apache+Geronimo+Server |-- Configure secure JMX server was created by gawor (08:35 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Configure+secure+JMX+server |-- Starting and stopping the server was last edited by gawor (07:13 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Starting+and+stopping+the+server |-- Deployment was last edited by gawor (06:52 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Deployment Apache MINA (MINA) http://cwiki.apache.org/confluence/display/MINA | |-Pages Added or Edited in This Space |-- Site Template was last edited by jvermillard (11:49 PM). | http://cwiki.apache.org/confluence/display/MINA/Site+Template Apache Tuscany (TUSCANY) http://cwiki.apache.org/confluence/display/TUSCANY | |-Pages Added or Edited in This Space |-- SDO Java - What's to be done was last edited by [EMAIL PROTECTED] (02:22 AM). | http://cwiki.apache.org/confluence/display/TUSCANY/SDO+Java+-+What%27s+to+be+done - CONFLUENCE INFORMATION This message is automatically generated
svn commit: r680686 - in /struts/struts2/trunk/plugins/rest/src: main/java/org/apache/struts2/rest/RestActionMapper.java test/java/org/apache/struts2/rest/RestActionMapperTest.java
Author: mrdon
Date: Tue Jul 29 05:53:18 2008
New Revision: 680686
URL: http://svn.apache.org/viewvc?rev=680686&view=rev
Log:
Better handle ;jsessionid in rest plugin
WW-2328
Modified:
struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
struts/struts2/trunk/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
Modified:
struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java?rev=680686&r1=680685&r2=680686&view=diff
==
---
struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
(original)
+++
struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
Tue Jul 29 05:53:18 2008
@@ -183,6 +183,13 @@
String fullName = mapping.getName();
// Only try something if the action name is specified
if (fullName != null && fullName.length() > 0) {
+
+// cut off any ;jsessionid= type appendix but allow the rails-like
;edit
+int scPos = fullName.indexOf(';');
+if (scPos > -1 && !"edit".equals(fullName.substring(scPos+1))) {
+fullName = fullName.substring(0, scPos);
+}
+
int lastSlashPos = fullName.lastIndexOf('/');
String id = null;
if (lastSlashPos > -1) {
@@ -240,7 +247,7 @@
}
}
}
-
+
// cut off the id parameter, even if a method is specified
if (id != null) {
if (!"new".equals(id)) {
Modified:
struts/struts2/trunk/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java?rev=680686&r1=680685&r2=680686&view=diff
==
---
struts/struts2/trunk/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
(original)
+++
struts/struts2/trunk/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
Tue Jul 29 05:53:18 2008
@@ -156,6 +156,19 @@
assertEquals("edit", mapping.getMethod());
}
+public void testGetJsessionIdSemicolonMapping() throws Exception {
+req.setRequestURI("/myapp/animals/dog/fido;jsessionid=29fefpv23do1g");
+req.setServletPath("/animals/dog/fido");
+req.setMethod("GET");
+
+ActionMapping mapping = mapper.getMapping(req, configManager);
+
+assertEquals("/animals", mapping.getNamespace());
+assertEquals("dog", mapping.getName());
+assertEquals("fido", ((String[])mapping.getParams().get("id"))[0]);
+assertEquals("show", mapping.getMethod());
+}
+
public void testParseNameAndNamespace() {
tryUri("/foo/23", "", "foo/23");
tryUri("/foo/", "", "foo/");
svn commit: r680692 - /struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
Author: mrdon
Date: Tue Jul 29 06:34:58 2008
New Revision: 680692
URL: http://svn.apache.org/viewvc?rev=680692&view=rev
Log:
Fixing invalid TLD due to display-name position
WW-2740
Modified:
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
Modified:
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java?rev=680692&r1=680691&r2=680692&view=diff
==
---
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
(original)
+++
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
Tue Jul 29 06:34:58 2008
@@ -327,13 +327,13 @@
// tag lib attributes
appendTextNode(document, tagLib, "description",
getOption("description"), true);
+appendTextNode(document, tagLib, "display-name",
+getOption("displayName"), false);
appendTextNode(document, tagLib, "tlib-version",
getOption("tlibVersion"), false);
appendTextNode(document, tagLib, "short-name",
getOption("shortName"), false);
appendTextNode(document, tagLib, "uri", getOption("uri"), false);
-appendTextNode(document, tagLib, "display-name",
-getOption("displayName"), false);
// create tags
for (Map.Entry entry : tags.entrySet()) {
svn commit: r680693 - in /struts/struts2/trunk: ./ core/src/site/resources/tags/ core/src/site/resources/tags/ajax/
Author: mrdon Date: Tue Jul 29 06:38:35 2008 New Revision: 680693 URL: http://svn.apache.org/viewvc?rev=680693&view=rev Log: Updating to latest struts annotations to fix invalid tld issue WW-2740 Modified: struts/struts2/trunk/core/src/site/resources/tags/a.html struts/struts2/trunk/core/src/site/resources/tags/action.html struts/struts2/trunk/core/src/site/resources/tags/actionerror.html struts/struts2/trunk/core/src/site/resources/tags/actionmessage.html struts/struts2/trunk/core/src/site/resources/tags/ajax/submit.html struts/struts2/trunk/core/src/site/resources/tags/append.html struts/struts2/trunk/core/src/site/resources/tags/bean.html struts/struts2/trunk/core/src/site/resources/tags/checkbox.html struts/struts2/trunk/core/src/site/resources/tags/checkboxlist.html struts/struts2/trunk/core/src/site/resources/tags/combobox.html struts/struts2/trunk/core/src/site/resources/tags/component.html struts/struts2/trunk/core/src/site/resources/tags/date.html struts/struts2/trunk/core/src/site/resources/tags/debug.html struts/struts2/trunk/core/src/site/resources/tags/div.html struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html struts/struts2/trunk/core/src/site/resources/tags/else.html struts/struts2/trunk/core/src/site/resources/tags/elseif.html struts/struts2/trunk/core/src/site/resources/tags/fielderror.html struts/struts2/trunk/core/src/site/resources/tags/file.html struts/struts2/trunk/core/src/site/resources/tags/form.html struts/struts2/trunk/core/src/site/resources/tags/generator.html struts/struts2/trunk/core/src/site/resources/tags/head.html struts/struts2/trunk/core/src/site/resources/tags/hidden.html struts/struts2/trunk/core/src/site/resources/tags/i18n.html struts/struts2/trunk/core/src/site/resources/tags/if.html struts/struts2/trunk/core/src/site/resources/tags/include.html struts/struts2/trunk/core/src/site/resources/tags/inputtransferselect.html struts/struts2/trunk/core/src/site/resources/tags/iterator.html struts/struts2/trunk/core/src/site/resources/tags/label.html struts/struts2/trunk/core/src/site/resources/tags/merge.html struts/struts2/trunk/core/src/site/resources/tags/optgroup.html struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html struts/struts2/trunk/core/src/site/resources/tags/param.html struts/struts2/trunk/core/src/site/resources/tags/password.html struts/struts2/trunk/core/src/site/resources/tags/property.html struts/struts2/trunk/core/src/site/resources/tags/push.html struts/struts2/trunk/core/src/site/resources/tags/radio.html struts/struts2/trunk/core/src/site/resources/tags/reset.html struts/struts2/trunk/core/src/site/resources/tags/select.html struts/struts2/trunk/core/src/site/resources/tags/set.html struts/struts2/trunk/core/src/site/resources/tags/sort.html struts/struts2/trunk/core/src/site/resources/tags/submit.html struts/struts2/trunk/core/src/site/resources/tags/subset.html struts/struts2/trunk/core/src/site/resources/tags/text.html struts/struts2/trunk/core/src/site/resources/tags/textarea.html struts/struts2/trunk/core/src/site/resources/tags/textfield.html struts/struts2/trunk/core/src/site/resources/tags/token.html struts/struts2/trunk/core/src/site/resources/tags/updownselect.html struts/struts2/trunk/core/src/site/resources/tags/url.html struts/struts2/trunk/pom.xml Modified: struts/struts2/trunk/core/src/site/resources/tags/a.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/a.html?rev=680693&r1=680692&r2=680693&view=diff == --- struts/struts2/trunk/core/src/site/resources/tags/a.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/a.html Tue Jul 29 06:38:35 2008 @@ -20,6 +20,12 @@ + Dynamic Attributes Allowed: true + + + + + Name Required Default Modified: struts/struts2/trunk/core/src/site/resources/tags/action.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/action.html?rev=680693&r1=680692&r2=680693&view=diff == --- struts/struts2/trunk/core/src/site/resources/tags/action.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/action.html Tue Jul 29 06:38:35 2008 @@ -20,6 +20,12 @@ + Dynamic Attributes Allowed: false + +
svn commit: r680707 - in /struts/struts2/trunk/apps: ./ rest-showcase/ rest-showcase/src/test/ rest-showcase/src/test/java/ rest-showcase/src/test/java/it/ rest-showcase/src/test/java/it/org/ rest-sho
Author: mrdon
Date: Tue Jul 29 07:17:17 2008
New Revision: 680707
URL: http://svn.apache.org/viewvc?rev=680707&view=rev
Log:
Adding a few functional tests and test runs against multiple servers using my
new maven-itblast-plugin
WW-2471
Added:
struts/struts2/trunk/apps/rest-showcase/src/test/
struts/struts2/trunk/apps/rest-showcase/src/test/java/
struts/struts2/trunk/apps/rest-showcase/src/test/java/it/
struts/struts2/trunk/apps/rest-showcase/src/test/java/it/org/
struts/struts2/trunk/apps/rest-showcase/src/test/java/it/org/apache/
struts/struts2/trunk/apps/rest-showcase/src/test/java/it/org/apache/struts2/
struts/struts2/trunk/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/
struts/struts2/trunk/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/
struts/struts2/trunk/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/GetOrdersTest.java
struts/struts2/trunk/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/ListOrdersTest.java
struts/struts2/trunk/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/PostOrderTest.java
Modified:
struts/struts2/trunk/apps/pom.xml
struts/struts2/trunk/apps/rest-showcase/pom.xml
Modified: struts/struts2/trunk/apps/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/pom.xml?rev=680707&r1=680706&r2=680707&view=diff
==
--- struts/struts2/trunk/apps/pom.xml (original)
+++ struts/struts2/trunk/apps/pom.xml Tue Jul 29 07:17:17 2008
@@ -169,22 +169,6 @@
-
-org.codehaus.cargo
-cargo-maven2-plugin
-0.3.1
-
-
-tomcat5x
-${cargo.tomcat5x.home}
-${project.build.directory}/tomcat5x.log
-
${project.build.directory}/tomcat5x.out
-
-
-${project.build.directory}/tomcat5x
-
-
-
maven-antrun-plugin
@@ -247,4 +231,4 @@
-
\ No newline at end of file
+
Modified: struts/struts2/trunk/apps/rest-showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/rest-showcase/pom.xml?rev=680707&r1=680706&r2=680707&view=diff
==
--- struts/struts2/trunk/apps/rest-showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/rest-showcase/pom.xml Tue Jul 29 07:17:17 2008
@@ -54,6 +54,33 @@
test
+
+net.sourceforge.jwebunit
+jwebunit-core
+1.4.1
+test
+
+
+commons-httpclient
+commons-httpclient
+3.1
+test
+
+
+
+
+net.sourceforge.jwebunit
+jwebunit-htmlunit-plugin
+1.4.1
+test
+
+
+xom
+xom
+
+
+
+
@@ -75,6 +102,39 @@
10
+
+org.twdata.maven
+maven-itblast-plugin
+0.3
+
+
+integration-test
+
+execute
+
+
+
tomcat5x,jetty6x,jboss42x,resin3x
+
+
+
+
+
+maven-surefire-plugin
+
+
+it/**
+**/*$*
+
+
+
+
+
+
+twdata-m2-repository
+twdata.org Maven Repository
+http://twdata-m2-repository.googlecode.com/svn/
+
+
Added:
struts/struts2/trunk/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/GetOrdersTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/GetOrdersTest.java?rev=680707&view=auto
==
---
struts/struts2/trunk/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/GetOrdersTest.java
(added)
+++
struts/struts2/trunk/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/GetOrdersTest.java
Tue Jul 29 07:17:17 2008
@@ -0,0 +1,32 @@
+package it.org.apache.struts2.rest.example;
+
+import net.sourceforge.jwebunit.junit.WebTestCase;
+
+public class GetOrdersTest extend
svn commit: r680739 - /struts/struts2/trunk/core/src/main/resources/template/simple/submit-close.ftl
Author: musachy
Date: Tue Jul 29 08:39:34 2008
New Revision: 680739
URL: http://svn.apache.org/viewvc?rev=680739&view=rev
Log:
WW-1677 http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/submit-close.ftl?rev=680739&r1=680738&r2=680739&view=diff
==
---
struts/struts2/trunk/core/src/main/resources/template/simple/submit-close.ftl
(original)
+++
struts/struts2/trunk/core/src/main/resources/template/simple/submit-close.ftl
Tue Jul 29 08:39:34 2008
@@ -1,4 +1,4 @@
<#if parameters.type?exists && parameters.type=="button">
-<#if (parameters.body)?default("")?length gt 0><@s.property
value="parameters.body"/><#elseif parameters.label?exists><@s.property
value="parameters.label"/><#rt/>
+<#if (parameters.body)?default("")?length gt 0>${parameters.body}<#elseif
parameters.label?exists><@s.property value="parameters.label"/><#rt/>
