Author: julien_viet Date: 2010-11-04 11:14:38 -0400 (Thu, 04 Nov 2010) New Revision: 4945 Modified: portal/branches/navcontroller/component/web/controller/src/main/java/gatein_router_1_0.xsd portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/DescriptorBuilder.java portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/router.xml portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/proto-router-1.xml Log: improve XML schema Modified: portal/branches/navcontroller/component/web/controller/src/main/java/gatein_router_1_0.xsd =================================================================== --- portal/branches/navcontroller/component/web/controller/src/main/java/gatein_router_1_0.xsd 2010-11-04 14:58:12 UTC (rev 4944) +++ portal/branches/navcontroller/component/web/controller/src/main/java/gatein_router_1_0.xsd 2010-11-04 15:14:38 UTC (rev 4945) @@ -38,15 +38,17 @@ <xs:complexType name="routeType"> <xs:sequence> - <xs:element name="param" type="paramType" minOccurs="0" maxOccurs="unbounded"/> - <xs:element name="path-param" type="pathParamType" minOccurs="0" maxOccurs="unbounded"/> - <xs:element name="request-param" type="requestParamType" minOccurs="0" maxOccurs="unbounded"/> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element name="route-param" type="routeParamType" minOccurs="1" maxOccurs="1"/> + <xs:element name="path-param" type="pathParamType" minOccurs="1" maxOccurs="1"/> + <xs:element name="request-param" type="requestParamType" minOccurs="1" maxOccurs="1"/> + </xs:choice> <xs:element name="route" type="routeType" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> <xs:attribute name="path" type="xs:string" use="required"/> </xs:complexType> - <xs:complexType name="paramType"> + <xs:complexType name="routeParamType"> <xs:attribute name="name" type="xs:string" use="required"/> <xs:attribute name="value" type="xs:string" use="required"/> </xs:complexType> Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/DescriptorBuilder.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/DescriptorBuilder.java 2010-11-04 14:58:12 UTC (rev 4944) +++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/DescriptorBuilder.java 2010-11-04 15:14:38 UTC (rev 4945) @@ -39,7 +39,7 @@ private static final QName routeQN = new QName("http://www.gatein.org/xml/ns/gatein_router_1_0";, "route"); /** . */ - private static final QName paramQN = new QName("http://www.gatein.org/xml/ns/gatein_router_1_0";, "param"); + private static final QName paramQN = new QName("http://www.gatein.org/xml/ns/gatein_router_1_0";, "route-param"); /** . */ private static final QName requestParamQN = new QName("http://www.gatein.org/xml/ns/gatein_router_1_0";, "request-param"); Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/router.xml =================================================================== --- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/router.xml 2010-11-04 14:58:12 UTC (rev 4944) +++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/router.xml 2010-11-04 15:14:38 UTC (rev 4945) @@ -4,27 +4,27 @@ xmlns="http://www.gatein.org/xml/ns/gatein_router_1_0"> <route path="/public/{gtn:sitetype}/{gtn:sitename}{gtn:path}"> - <param name="gtn:handler" value="portal"/> + <route-param name="gtn:handler" value="portal"/> <path-param name="gtn:path" pattern=".*"/> </route> <route path="/private/{gtn:sitetype}/{gtn:sitename}{gtn:path}"> - <param name="gtn:handler" value="portal"/> + <route-param name="gtn:handler" value="portal"/> <path-param name="gtn:path" pattern=".*" encoding="preserve-path"/> </route> <route path="/upload"> - <param name="gtn:handler" value="upload"/> + <route-param name="gtn:handler" value="upload"/> </route> <route path="/download"> - <param name="gtn:handler" value="download"/> + <route-param name="gtn:handler" value="download"/> </route> <route path="/a"> - <param name="a" value="a_value"/> + <route-param name="a" value="a_value"/> <route path="/b"> - <param name="b" value="b_value"/> + <route-param name="b" value="b_value"/> </route> </route> Modified: portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml =================================================================== --- portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml 2010-11-04 14:58:12 UTC (rev 4944) +++ portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml 2010-11-04 15:14:38 UTC (rev 4945) @@ -6,7 +6,7 @@ <route path="/"> <!-- Use the portal handler --> - <param name="gtn:handler" value="portal"/> + <route-param name="gtn:handler" value="portal"/> <!-- Webui parameters --> <request-param name="gtn:componentid" matchName="portal:componentId" required="false"/> @@ -24,24 +24,24 @@ <!-- The public access --> <route path="/public/{gtn:sitetype}/{gtn:sitename}{gtn:path}"> - <param name="gtn:access" value="public"/> + <route-param name="gtn:access" value="public"/> <path-param name="gtn:path" pattern=".*" encoding="preserve-path"/> </route> <!-- The private access --> <route path="/private/{gtn:sitetype}/{gtn:sitename}{gtn:path}"> - <param name="gtn:access" value="private"/> + <route-param name="gtn:access" value="private"/> <path-param name="gtn:path" pattern=".*" encoding="preserve-path"/> </route> </route> <route path="/upload"> - <param name="gtn:handler" value="upload"/> + <route-param name="gtn:handler" value="upload"/> </route> <route path="/download"> - <param name="gtn:handler" value="download"/> + <route-param name="gtn:handler" value="download"/> </route> </router> \ No newline at end of file Modified: portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/proto-router-1.xml =================================================================== --- portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/proto-router-1.xml 2010-11-04 14:58:12 UTC (rev 4944) +++ portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/proto-router-1.xml 2010-11-04 15:14:38 UTC (rev 4945) @@ -8,7 +8,7 @@ <route path="/"> <!-- Use the portal handler --> - <param name="gtn:handler" value="portal"/> + <route-param name="gtn:handler" value="portal"/> <!-- Webui parameters --> <request-param name="gtn:componentid" matchName="portal:componentId" required="false"/> @@ -17,24 +17,24 @@ <!-- The public access --> <route path="/public/{gtn:sitename}{gtn:path}.html"> - <param name="gtn:access" value="public"/> + <route-param name="gtn:access" value="public"/> <path-param name="gtn:path" pattern=".*" encoding="preserve-path"/> </route> <!-- The private access --> <route path="/private/{gtn:sitename}{gtn:path}.html"> - <param name="gtn:access" value="private"/> + <route-param name="gtn:access" value="private"/> <path-param name="gtn:path" pattern=".*" encoding="preserve-path"/> </route> </route> <route path="/upload"> - <param name="gtn:handler" value="upload"/> + <route-param name="gtn:handler" value="upload"/> </route> <route path="/download"> - <param name="gtn:handler" value="download"/> + <route-param name="gtn:handler" value="download"/> </route> </router> \ No newline at end of file