Author: theute Date: 2011-10-27 04:11:13 -0400 (Thu, 27 Oct 2011) New Revision: 7897 Modified: epp/portal/branches/EPP_5_2_Branch/ epp/portal/branches/EPP_5_2_Branch/component/ epp/portal/branches/EPP_5_2_Branch/component/portal/ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/conf/gatein/controller.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/web.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/web.xml epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java epp/portal/branches/EPP_5_2_Branch/wsrp-integration/ Log: JBEPP-1314: Change route prefix from groups--> g and users--> u Property changes on: epp/portal/branches/EPP_5_2_Branch ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1592:4868,4894 /portal/branches/branch-GTNPORTAL-1643:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745:5765 /portal/branches/branch-GTNPORTAL-1790:5871 /portal/branches/branch-GTNPORTAL-1822:5943,5952 /portal/branches/branch-GTNPORTAL-1832:6030,6063 /portal/branches/branch-GTNPORTAL-1872:6400,6551 /portal/branches/branch-GTNPORTAL-1921:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963:6904,6915-6916 /portal/branches/decoupled-webos:6214-6243 /portal/branches/gatein-management:6920-6958 /portal/branches/global-portlet-metadata:6298-6384 /portal/branches/site-describability:6171-6235 /portal/branches/xss:7377-7595,7597 /portal/branches/xss-issues:7350-7351,7358 /portal/trunk:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7433,7450,7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7741,7780 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1592:4868,4894 /portal/branches/branch-GTNPORTAL-1643:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745:5765 /portal/branches/branch-GTNPORTAL-1790:5871 /portal/branches/branch-GTNPORTAL-1822:5943,5952 /portal/branches/branch-GTNPORTAL-1832:6030,6063 /portal/branches/branch-GTNPORTAL-1872:6400,6551 /portal/branches/branch-GTNPORTAL-1921:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963:6904,6915-6916 /portal/branches/decoupled-webos:6214-6243 /portal/branches/gatein-management:6920-6958 /portal/branches/global-portlet-metadata:6298-6384 /portal/branches/site-describability:6171-6235 /portal/branches/xss:7377-7595,7597 /portal/branches/xss-issues:7350-7351,7358 /portal/trunk:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450,7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7741,7748,7780 Property changes on: epp/portal/branches/EPP_5_2_Branch/component ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868 /portal/branches/branch-GTNPORTAL-1592/component:4868,4894 /portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/component:5765 /portal/branches/branch-GTNPORTAL-1790/component:5871 /portal/branches/branch-GTNPORTAL-1822/component:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916 /portal/trunk/component:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7780 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868 /portal/branches/branch-GTNPORTAL-1592/component:4868,4894 /portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/component:5765 /portal/branches/branch-GTNPORTAL-1790/component:5871 /portal/branches/branch-GTNPORTAL-1822/component:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916 /portal/trunk/component:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7748,7780 Property changes on: epp/portal/branches/EPP_5_2_Branch/component/portal ___________________________________________________________________ Modified: svn:mergeinfo - /portal/branches/branch-GTNPORTAL-1592/component/portal:4868 /portal/trunk:7451 /portal/trunk/component/portal:7085,7451,7500,7570-7571,7573,7577,7614-7615,7780 + /portal/branches/branch-GTNPORTAL-1592/component/portal:4868 /portal/trunk:7451 /portal/trunk/component/portal:7085,7412,7451,7500,7570-7571,7573,7577,7614-7615,7748,7780 Property changes on: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868 /portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4868,4894 /portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765 /portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871 /portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916 /portal/trunk/component/portal/src/main/java/org:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7741,7780 /portal/trunk/src/main/java/org:7451 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868 /portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4868,4894 /portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765 /portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871 /portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916 /portal/trunk/component/portal/src/main/java/org:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7741,7748,7780 /portal/trunk/src/main/java/org:7451 Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/conf/gatein/controller.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/conf/gatein/controller.xml 2011-10-27 06:56:09 UTC (rev 7896) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/conf/gatein/controller.xml 2011-10-27 08:11:13 UTC (rev 7897) @@ -94,7 +94,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> @@ -107,7 +107,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: epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/web.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/web.xml 2011-10-27 06:56:09 UTC (rev 7896) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/web.xml 2011-10-27 08:11:13 UTC (rev 7897) @@ -271,8 +271,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: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/web.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/web.xml 2011-10-27 06:56:09 UTC (rev 7896) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/web.xml 2011-10-27 08:11:13 UTC (rev 7897) @@ -302,8 +302,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: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2011-10-27 06:56:09 UTC (rev 7896) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2011-10-27 08:11:13 UTC (rev 7897) @@ -795,7 +795,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 Property changes on: epp/portal/branches/EPP_5_2_Branch/wsrp-integration ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/wsrp-integration:5868 /portal/branches/branch-GTNPORTAL-1592/wsrp-integration:4868,4894 /portal/branches/branch-GTNPORTAL-1643/wsrp-integration:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/wsrp-integration:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/wsrp-integration:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/wsrp-integration:5765 /portal/branches/branch-GTNPORTAL-1790/wsrp-integration:5871 /portal/branches/branch-GTNPORTAL-1822/wsrp-integration:5943,5952 /portal/branches/branch-GTNPORTAL-1832/wsrp-integration:6030,6063 /portal/branches/branch-GTNPORTAL-1872/wsrp-integration:6400,6551 /portal/branches/branch-GTNPORTAL-1921/wsrp-integration:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/wsrp-integration:6904,6915-6916 /portal/branches/decoupled-webos/wsrp-integration:6214-6243 /portal/branches/gatein-management/wsrp-integration:6920-6958 /portal/branches/global-portlet-metadata/wsrp-integration:6298-6384 /portal/branches/site-describability/wsrp-integration:6171-6235 /portal/trunk/wsrp-integration:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7780 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/wsrp-integration:5868 /portal/branches/branch-GTNPORTAL-1592/wsrp-integration:4868,4894 /portal/branches/branch-GTNPORTAL-1643/wsrp-integration:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/wsrp-integration:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/wsrp-integration:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/wsrp-integration:5765 /portal/branches/branch-GTNPORTAL-1790/wsrp-integration:5871 /portal/branches/branch-GTNPORTAL-1822/wsrp-integration:5943,5952 /portal/branches/branch-GTNPORTAL-1832/wsrp-integration:6030,6063 /portal/branches/branch-GTNPORTAL-1872/wsrp-integration:6400,6551 /portal/branches/branch-GTNPORTAL-1921/wsrp-integration:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/wsrp-integration:6904,6915-6916 /portal/branches/decoupled-webos/wsrp-integration:6214-6243 /portal/branches/gatein-management/wsrp-integration:6920-6958 /portal/branches/global-portlet-metadata/wsrp-integration:6298-6384 /portal/branches/site-describability/wsrp-integration:6171-6235 /portal/trunk/wsrp-integration:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7748,7780