Author: hoang_to Date: 2011-09-14 05:45:02 -0400 (Wed, 14 Sep 2011) New Revision: 7412 Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/web.xml portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/controller.xml portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/conf/gatein/controller.xml portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/controller.xml portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/controller.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java Log: GTNPORTAL-2098: Change route prefix from groups--> g and users--> u Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/web.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/web.xml 2011-09-14 09:28:18 UTC (rev 7411) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/web.xml 2011-09-14 09:45:02 UTC (rev 7412) @@ -270,8 +270,8 @@ <web-resource-name>user authentication</web-resource-name> <url-pattern>/dologin</url-pattern> <url-pattern>/private/*</url-pattern> - <url-pattern>/groups/*</url-pattern> - <url-pattern>/users/*</url-pattern> + <url-pattern>/g/*</url-pattern> + <url-pattern>/u/*</url-pattern> <http-method>POST</http-method> <http-method>GET</http-method> </web-resource-collection> Modified: portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/controller.xml =================================================================== --- portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/controller.xml 2011-09-14 09:28:18 UTC (rev 7411) +++ portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/controller.xml 2011-09-14 09:45:02 UTC (rev 7412) @@ -89,7 +89,7 @@ <request-param qname="gtn:objectid" name="objectId"/> <!-- The group access --> - <route path="/groups/{gtn:sitename}/{gtn:path}"> + <route path="/g/{gtn:sitename}/{gtn:path}"> <request-param qname="gtn:lang" name="lang" value-mapping="never-empty"> <pattern>([A-Za-z]{2}(-[A-Za-z]{2})?)?</pattern> </request-param> @@ -102,7 +102,7 @@ </route> <!-- The user access --> - <route path="/users/{gtn:sitename}/{gtn:path}"> + <route path="/u/{gtn:sitename}/{gtn:path}"> <request-param qname="gtn:lang" name="lang" value-mapping="never-empty"> <pattern>([A-Za-z]{2}(-[A-Za-z]{2})?)?</pattern> </request-param> Modified: portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/conf/gatein/controller.xml =================================================================== --- portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/conf/gatein/controller.xml 2011-09-14 09:28:18 UTC (rev 7411) +++ portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/conf/gatein/controller.xml 2011-09-14 09:45:02 UTC (rev 7412) @@ -89,7 +89,7 @@ <request-param qname="gtn:objectid" name="objectId"/> <!-- The group access --> - <route path="/groups/{gtn:sitename}/{gtn:path}"> + <route path="/g/{gtn:sitename}/{gtn:path}"> <request-param qname="gtn:lang" name="lang" value-mapping="never-empty"> <pattern>([A-Za-z]{2}(-[A-Za-z]{2})?)?</pattern> </request-param> @@ -102,7 +102,7 @@ </route> <!-- The user access --> - <route path="/users/{gtn:sitename}/{gtn:path}"> + <route path="/u/{gtn:sitename}/{gtn:path}"> <request-param qname="gtn:lang" name="lang" value-mapping="never-empty"> <pattern>([A-Za-z]{2}(-[A-Za-z]{2})?)?</pattern> </request-param> Modified: portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/controller.xml =================================================================== --- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/controller.xml 2011-09-14 09:28:18 UTC (rev 7411) +++ portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/controller.xml 2011-09-14 09:45:02 UTC (rev 7412) @@ -89,7 +89,7 @@ <request-param qname="gtn:objectid" name="objectId"/> <!-- The group access --> - <route path="/groups/{gtn:sitename}/{gtn:path}"> + <route path="/g/{gtn:sitename}/{gtn:path}"> <request-param qname="gtn:lang" name="lang" value-mapping="never-empty"> <pattern>([A-Za-z]{2}(-[A-Za-z]{2})?)?</pattern> </request-param> @@ -102,7 +102,7 @@ </route> <!-- The user access --> - <route path="/users/{gtn:sitename}/{gtn:path}"> + <route path="/u/{gtn:sitename}/{gtn:path}"> <request-param qname="gtn:lang" name="lang" value-mapping="never-empty"> <pattern>([A-Za-z]{2}(-[A-Za-z]{2})?)?</pattern> </request-param> Modified: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/controller.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/controller.xml 2011-09-14 09:28:18 UTC (rev 7411) +++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/controller.xml 2011-09-14 09:45:02 UTC (rev 7412) @@ -89,7 +89,7 @@ <request-param qname="gtn:objectid" name="objectId"/> <!-- The group access --> - <route path="/groups/{gtn:sitename}/{gtn:path}"> + <route path="/g/{gtn:sitename}/{gtn:path}"> <request-param qname="gtn:lang" name="lang" value-mapping="never-empty"> <pattern>([A-Za-z]{2}(-[A-Za-z]{2})?)?</pattern> </request-param> @@ -102,7 +102,7 @@ </route> <!-- The user access --> - <route path="/users/{gtn:sitename}/{gtn:path}"> + <route path="/u/{gtn:sitename}/{gtn:path}"> <request-param qname="gtn:lang" name="lang" value-mapping="never-empty"> <pattern>([A-Za-z]{2}(-[A-Za-z]{2})?)?</pattern> </request-param> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml 2011-09-14 09:28:18 UTC (rev 7411) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml 2011-09-14 09:45:02 UTC (rev 7412) @@ -283,8 +283,8 @@ <web-resource-name>user authentication</web-resource-name> <url-pattern>/dologin</url-pattern> <url-pattern>/private/*</url-pattern> - <url-pattern>/groups/*</url-pattern> - <url-pattern>/users/*</url-pattern> + <url-pattern>/g/*</url-pattern> + <url-pattern>/u/*</url-pattern> <http-method>POST</http-method> <http-method>GET</http-method> </web-resource-collection> Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2011-09-14 09:28:18 UTC (rev 7411) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2011-09-14 09:45:02 UTC (rev 7412) @@ -801,7 +801,7 @@ * and used for JS based portal url generation. * * <p>The portal url template are calculated base on the current request and site state. - * Something like : <code>"/portal/groups/:platform:administrators/administration/registry?portal:componentId={portal:uicomponentId}&portal:action={portal:action}" ;</code> + * Something like : <code>"/portal/g/:platform:administrators/administration/registry?portal:componentId={portal:uicomponentId}&portal:action={portal:action}" ;</code> * * @return return portal url template * @throws UnsupportedEncodingException