cziegeler 01/07/12 06:11:19
Modified: src/org/apache/cocoon/components/browser Tag:
cocoon_20_branch BrowserImpl.xsl
src/org/apache/cocoon/environment/wrapper Tag:
cocoon_20_branch RequestWrapper.java
Log:
- Fixed namespace handling in Browser
- Fixed query string handling for wrapped requests
Revision Changes Path
No revision
No revision
1.1.1.1.2.4 +6 -1
xml-cocoon2/src/org/apache/cocoon/components/browser/BrowserImpl.xsl
Index: BrowserImpl.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/browser/BrowserImpl.xsl,v
retrieving revision 1.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- BrowserImpl.xsl 2001/07/12 07:38:05 1.1.1.1.2.3
+++ BrowserImpl.xsl 2001/07/12 13:11:08 1.1.1.1.2.4
@@ -228,7 +228,12 @@
continue;
String nodeValue = (String)entry.getValue();
- node = document.createElementNS(null, nodeName);
+ if (nodeName.indexOf(":") < 0) {
+ node = document.createElementNS(null, nodeName);
+ } else {
+ node =
document.createElementNS("http://www.wapforum.org/UAPROF/ccppschema-20000405";,
+ nodeName);
+ }
text = document.createTextNode(nodeValue);
node.appendChild(text);
element.appendChild(node);
No revision
No revision
1.1.2.3 +9 -3
xml-cocoon2/src/org/apache/cocoon/environment/wrapper/RequestWrapper.java
Index: RequestWrapper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/wrapper/RequestWrapper.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RequestWrapper.java 2001/07/12 12:39:00 1.1.2.2
+++ RequestWrapper.java 2001/07/12 13:11:15 1.1.2.3
@@ -23,7 +23,7 @@
* are different.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version $Id: RequestWrapper.java,v 1.1.2.2 2001/07/12 12:39:00 cziegeler Exp $
+ * @version $Id: RequestWrapper.java,v 1.1.2.3 2001/07/12 13:11:15 cziegeler Exp $
*/
public final class RequestWrapper implements Request {
@@ -49,6 +49,12 @@
this.requestURI = requestURI;
this.queryString = queryString;
this.parameters = new RequestParameters(queryString);
+ if (this.req.getQueryString() != null) {
+ if (this.queryString == null)
+ this.queryString = this.req.getQueryString();
+ else
+ this.queryString += '&' + this.req.getQueryString();
+ }
}
public Object get(String name) {
@@ -89,7 +95,7 @@
Enumeration names = this.parameters.getParameterNames();
while (names.hasMoreElements() == true) {
parameterNames.add(names.nextElement());
- }
+ }
names = this.req.getParameterNames();
while (names.hasMoreElements() == true) {
parameterNames.add(names.nextElement());
@@ -259,4 +265,4 @@
return this.req.isUserInRole(role);
}
-}
+}
\ No newline at end of file
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
