jstrachan 02/04/26 05:28:56
Modified: jelly/src/java/org/apache/commons/jelly/impl StaticTag.java
jelly/src/java/org/apache/commons/jelly/parser
XMLParser.java
Log:
Fixed namespace problem with static XML. The SOAP scripting example now works fine
now; just need the HTTP taglib and it'll work fine.
Revision Changes Path
1.2 +7 -7
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/StaticTag.java
Index: StaticTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/StaticTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StaticTag.java 24 Apr 2002 11:59:12 -0000 1.1
+++ StaticTag.java 26 Apr 2002 12:28:56 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/StaticTag.java,v
1.1 2002/04/24 11:59:12 jstrachan Exp $
- * $Revision: 1.1 $
- * $Date: 2002/04/24 11:59:12 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/StaticTag.java,v
1.2 2002/04/26 12:28:56 jstrachan Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/04/26 12:28:56 $
*
* ====================================================================
*
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id: StaticTag.java,v 1.1 2002/04/24 11:59:12 jstrachan Exp $
+ * $Id: StaticTag.java,v 1.2 2002/04/26 12:28:56 jstrachan Exp $
*/
package org.apache.commons.jelly.impl;
@@ -74,7 +74,7 @@
* which echos itself to XMLOutput when it is invoked.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class StaticTag extends TagSupport implements DynaTag {
@@ -90,10 +90,10 @@
public StaticTag() {
}
- public StaticTag(String uri, String localName) {
+ public StaticTag(String uri, String localName, String qname) {
this.uri = uri;
this.localName = localName;
- this.qname = localName;
+ this.qname = qname;
}
public String toString() {
1.13 +8 -8
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/parser/XMLParser.java
Index: XMLParser.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/parser/XMLParser.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XMLParser.java 25 Apr 2002 19:25:08 -0000 1.12
+++ XMLParser.java 26 Apr 2002 12:28:56 -0000 1.13
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/parser/XMLParser.java,v
1.12 2002/04/25 19:25:08 jstrachan Exp $
- * $Revision: 1.12 $
- * $Date: 2002/04/25 19:25:08 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/parser/XMLParser.java,v
1.13 2002/04/26 12:28:56 jstrachan Exp $
+ * $Revision: 1.13 $
+ * $Date: 2002/04/26 12:28:56 $
*
* ====================================================================
*
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id: XMLParser.java,v 1.12 2002/04/25 19:25:08 jstrachan Exp $
+ * $Id: XMLParser.java,v 1.13 2002/04/26 12:28:56 jstrachan Exp $
*/
package org.apache.commons.jelly.parser;
@@ -118,7 +118,7 @@
* The SAXParser and XMLReader portions of this code come from Digester.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*/
public class XMLParser extends DefaultHandler {
@@ -604,7 +604,7 @@
// otherwise pass the text to the current body
tagScript = createTag( namespaceURI, localName, list );
if ( tagScript == null ) {
- tagScript = createStaticTag( namespaceURI, localName, list );
+ tagScript = createStaticTag( namespaceURI, localName, qName, list );
}
tagScriptStack.add( tagScript );
@@ -997,9 +997,9 @@
/**
* Factory method to create a static Tag that represents some static content.
*/
- protected TagScript createStaticTag( String namespaceURI, String localName,
Attributes list ) throws SAXException {
+ protected TagScript createStaticTag( String namespaceURI, String localName,
String qName, Attributes list ) throws SAXException {
try {
- StaticTag tag = new StaticTag( namespaceURI, localName );
+ StaticTag tag = new StaticTag( namespaceURI, localName, qName );
DynaTagScript script = new DynaTagScript( tag );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
