Author: rich
Date: Tue Apr 26 14:42:25 2005
New Revision: 164894
URL: http://svn.apache.org/viewcvs?rev=164894&view=rev
Log:
This is a contribution from Carlin Rogers to fix
http://issues.apache.org/jira/browse/BEEHIVE-547 : self consistency... modify
url-template-config.xsd to use elements, not attributes
tests: bvt in netui (WinXP)
BB: self (linux)
Modified:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplatesFactory.java
incubator/beehive/trunk/netui/src/util/schema/netui-config/netui-config.xsd
incubator/beehive/trunk/netui/src/util/schema/url-template-config/config.xsdconfig
incubator/beehive/trunk/netui/src/util/schema/url-template-config/url-template-config.xsd
incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/url-template-config.xml
Modified:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplatesFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplatesFactory.java?rev=164894&r1=164893&r2=164894&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplatesFactory.java
(original)
+++
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplatesFactory.java
Tue Apr 26 14:42:25 2005
@@ -44,10 +44,10 @@
private static URLTemplateFileParser _parser = new
DefaultURLTemplateFileParser();
// The set of known tokens in a valid template.
- private static Collection/*< String >*/ _knownTokens = null;
+ private static Collection _knownTokens = null;
// The set of required tokens in a valid template.
- private static Collection/*< String >*/ _requiredTokens = null;
+ private static Collection _requiredTokens = null;
/**
* Allow clients to set their own parser.
@@ -78,7 +78,7 @@
*
* @param knownTokens The set of known tokens for a valid template.
*/
- public static void setKnownTokens( Collection/*< String >*/ knownTokens )
+ public static void setKnownTokens( Collection knownTokens )
{
_knownTokens = knownTokens;
}
@@ -93,7 +93,7 @@
*
* @param requiredTokens The set of required tokens in a valid template.
*/
- public static void setRequiredTokens( Collection/*< String >*/
requiredTokens )
+ public static void setRequiredTokens( Collection requiredTokens )
{
_requiredTokens = requiredTokens;
}
@@ -165,9 +165,7 @@
for ( int i = 0; i < templates.length; i++ )
{
String name = templates[i].getName().trim();
- XmlCursor cursor = templates[i].newCursor();
- cursor.toFirstChild();
- String value = cursor.getTextValue();
+ String value = templates[i].getValue().trim();
if ( value != null )
{
value = value.trim();
@@ -185,8 +183,8 @@
UrlTemplateRefGroupDocument.UrlTemplateRefGroup[] templateRefGroups =
urlTemplateConfig.getUrlTemplateRefGroupArray ();
for ( int i = 0; i < templateRefGroups.length; i++ )
{
- HashMap/*< String, String >*/ refGroup = new HashMap/*< String,
String >*/();
- String refGroupName =
templateRefGroups[i].getName().toString().trim();
+ HashMap refGroup = new HashMap();
+ String refGroupName = templateRefGroups[i].getName().trim();
UrlTemplateRefDocument.UrlTemplateRef[] templateRefs =
templateRefGroups[i].getUrlTemplateRefArray();
for ( int j = 0; j < templateRefs.length; j++ )
{
Modified:
incubator/beehive/trunk/netui/src/util/schema/netui-config/netui-config.xsd
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/schema/netui-config/netui-config.xsd?rev=164894&r1=164893&r2=164894&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/util/schema/netui-config/netui-config.xsd
(original)
+++ incubator/beehive/trunk/netui/src/util/schema/netui-config/netui-config.xsd
Tue Apr 26 14:42:25 2005
@@ -191,8 +191,8 @@
<xsd:complexType name="url-config">
<xsd:sequence>
- <xsd:element name="url-encode-urls" type="xsd:boolean"
minOccurs="0" maxOccurs="1" default="false"/>
- <xsd:element name="html-amp-entity" type="xsd:boolean"
minOccurs="0" maxOccurs="1" default="false"/>
+ <xsd:element name="url-encode-urls" type="xsd:boolean"
minOccurs="0" maxOccurs="1" default="true"/>
+ <xsd:element name="html-amp-entity" type="xsd:boolean"
minOccurs="0" maxOccurs="1" default="true"/>
</xsd:sequence>
</xsd:complexType>
Modified:
incubator/beehive/trunk/netui/src/util/schema/url-template-config/config.xsdconfig
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/schema/url-template-config/config.xsdconfig?rev=164894&r1=164893&r2=164894&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/util/schema/url-template-config/config.xsdconfig
(original)
+++
incubator/beehive/trunk/netui/src/util/schema/url-template-config/config.xsdconfig
Tue Apr 26 14:42:25 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config"; >
- <xb:namespace>
+ <xb:namespace
uri="http://beehive.apache.org/netui/2004/server/url-template-config";>
<xb:package>org.apache.beehive.netui.core.urltemplates.schema</xb:package>
</xb:namespace>
</xb:config>
Modified:
incubator/beehive/trunk/netui/src/util/schema/url-template-config/url-template-config.xsd
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/schema/url-template-config/url-template-config.xsd?rev=164894&r1=164893&r2=164894&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/util/schema/url-template-config/url-template-config.xsd
(original)
+++
incubator/beehive/trunk/netui/src/util/schema/url-template-config/url-template-config.xsd
Tue Apr 26 14:42:25 2005
@@ -1,11 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
+
targetNamespace="http://beehive.apache.org/netui/2004/server/url-template-config";
+
xmlns:netui="http://beehive.apache.org/netui/2004/server/url-template-config";
+ elementFormDefault="qualified">
+
<xs:element name="url-template-config">
<xs:complexType>
<xs:sequence>
- <xs:element ref="url-template"
maxOccurs="unbounded"/>
- <xs:element ref="url-template-ref-group"
maxOccurs="unbounded"/>
+ <xs:element ref="netui:url-template"
maxOccurs="unbounded"/>
+ <xs:element ref="netui:url-template-ref-group"
maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -16,8 +20,11 @@
The url-template element specifies URL templates.
</xs:documentation>
</xs:annotation>
- <xs:complexType mixed="true">
- <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="1"
maxOccurs="1"/>
+ <xs:element name="value" type="xs:string" minOccurs="1"
maxOccurs="1"/>
+ </xs:sequence>
</xs:complexType>
</xs:element>
@@ -29,9 +36,9 @@
</xs:annotation>
<xs:complexType>
<xs:sequence>
- <xs:element ref="url-template-ref"
maxOccurs="unbounded"/>
+ <xs:element name="name" type="xs:string" minOccurs="1"
maxOccurs="1"/>
+ <xs:element ref="netui:url-template-ref"
maxOccurs="unbounded"/>
</xs:sequence>
- <xs:attribute name="name" type="xs:string"
use="required"/>
</xs:complexType>
</xs:element>
@@ -42,19 +49,21 @@
</xs:documentation>
</xs:annotation>
<xs:complexType>
- <xs:attribute name="key" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="action"/>
- <xs:enumeration value="secure-action"/>
- <xs:enumeration value="resource"/>
- <xs:enumeration value="secure-resource"/>
- <xs:enumeration value="render"/>
- <xs:enumeration value="secure-render"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="template-name" type="xs:string"
use="required"/>
+ <xs:sequence>
+ <xs:element name="key" minOccurs="1" maxOccurs="1">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="action"/>
+ <xs:enumeration value="secure-action"/>
+ <xs:enumeration value="resource"/>
+ <xs:enumeration value="secure-resource"/>
+ <xs:enumeration value="render"/>
+ <xs:enumeration value="secure-render"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="template-name" type="xs:string"
minOccurs="1" maxOccurs="1"/>
+ </xs:sequence>
</xs:complexType>
</xs:element>
Modified:
incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/url-template-config.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/url-template-config.xml?rev=164894&r1=164893&r2=164894&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/url-template-config.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/url-template-config.xml
Tue Apr 26 14:42:25 2005
@@ -1,25 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
-<url-template-config>
+<url-template-config
xmlns="http://beehive.apache.org/netui/2004/server/url-template-config";>
<!-- URL templates -->
- <url-template name="default">
-
{url:scheme}://{url:domain}:{url:port}/{url:prefix}/{url:path}?{url:queryString}
+ <url-template>
+ <name>default</name>
+ <value>
+
{url:scheme}://{url:domain}:{url:port}/{url:prefix}/{url:path}?{url:queryString}
+ </value>
</url-template>
- <url-template name="jpf-action">
-
http://{url:domain}:{url:port}/{url:path}?URLTEMPLATE=action&{url:queryString}
+ <url-template>
+ <name>jpf-action</name>
+ <value>
+
http://{url:domain}:{url:port}/{url:path}?URLTEMPLATE=action&{url:queryString}
+ </value>
</url-template>
- <url-template name="jpf-secure-action">
-
https://{url:domain}:8443/{url:path}?URLTEMPLATE=secure-action&{url:queryString}
+ <url-template>
+ <name>jpf-secure-action</name>
+ <value>
+
https://{url:domain}:8443/{url:path}?URLTEMPLATE=secure-action&{url:queryString}
+ </value>
</url-template>
- <url-template name="jpf-resource">
-
http://{url:domain}:{url:port}/{url:path}?URLTEMPLATE=resource&{url:queryString}
+ <url-template>
+ <name>jpf-resource</name>
+ <value>
+
http://{url:domain}:{url:port}/{url:path}?URLTEMPLATE=resource&{url:queryString}
+ </value>
</url-template>
- <url-template name="jpf-secure-resource">
-
https://{url:domain}:8443/{url:path}?URLTEMPLATE=secure-resource&{url:queryString}
+ <url-template>
+ <name>jpf-secure-resource</name>
+ <value>
+
https://{url:domain}:8443/{url:path}?URLTEMPLATE=secure-resource&{url:queryString}
+ </value>
</url-template>
- <url-template-ref-group name="default-url-templates">
- <url-template-ref key="action" template-name="jpf-action"/>
- <url-template-ref key="secure-action"
template-name="jpf-secure-action"/>
- <url-template-ref key="resource" template-name="jpf-resource"/>
- <url-template-ref key="secure-resource"
template-name="jpf-secure-resource"/>
+ <url-template-ref-group>
+ <name>default-url-templates</name>
+ <url-template-ref>
+ <key>action</key>
+ <template-name>jpf-action</template-name>
+ </url-template-ref>
+ <url-template-ref>
+ <key>secure-action</key>
+ <template-name>jpf-secure-action</template-name>
+ </url-template-ref>
+ <url-template-ref>
+ <key>resource</key>
+ <template-name>jpf-resource</template-name>
+ </url-template-ref>
+ <url-template-ref>
+ <key>secure-resource</key>
+ <template-name>jpf-secure-resource</template-name>
+ </url-template-ref>
</url-template-ref-group>
</url-template-config>
