Author: tuyen.nguyenthe Date: 2010-11-29 22:27:34 -0500 (Mon, 29 Nov 2010) New Revision: 5367 Modified: portal/branches/branch-GTNPORTAL-1700/examples/extension/war/src/main/resources/tomcat/sample-ext.xml portal/branches/branch-GTNPORTAL-1700/examples/portal/war/src/main/resources/tomcat/sample-portal.xml portal/branches/branch-GTNPORTAL-1700/examples/skins/simpleskin/src/main/resources/tomcat/simpleDeployableSkin.xml portal/branches/branch-GTNPORTAL-1700/gadgets/eXoGadgets/src/main/resources/tomcat/eXoGadgets.xml portal/branches/branch-GTNPORTAL-1700/portlet/dashboard/src/main/resources/tomcat/dashboard.xml portal/branches/branch-GTNPORTAL-1700/portlet/exoadmin/src/main/resources/tomcat/exoadmin.xml portal/branches/branch-GTNPORTAL-1700/portlet/web/src/main/resources/tomcat/web.xml portal/branches/branch-GTNPORTAL-1700/testsuite/webuibasedsamples/src/main/resources/tomcat/portlets.xml portal/branches/branch-GTNPORTAL-1700/web/eXoResources/src/main/resources/tomcat/eXoResources.xml portal/branches/branch-GTNPORTAL-1700/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIUserProfileInputSet.java Log: GTNPORTAL-1644 Edit docbase in some tomcat resources after tomcat packaging has been changed Modified: portal/branches/branch-GTNPORTAL-1700/examples/extension/war/src/main/resources/tomcat/sample-ext.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1700/examples/extension/war/src/main/resources/tomcat/sample-ext.xml 2010-11-30 03:21:29 UTC (rev 5366) +++ portal/branches/branch-GTNPORTAL-1700/examples/extension/war/src/main/resources/tomcat/sample-ext.xml 2010-11-30 03:27:34 UTC (rev 5367) @@ -1 +1 @@ -<Context path="/sample-ext" docBase="../../../../../examples/extension/war/src/main/webapp/" debug="0" reloadable="true" crossContext="true"/> +<Context path="/sample-ext" docBase="../../../../../../examples/extension/war/src/main/webapp/" debug="0" reloadable="true" crossContext="true"/> Modified: portal/branches/branch-GTNPORTAL-1700/examples/portal/war/src/main/resources/tomcat/sample-portal.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1700/examples/portal/war/src/main/resources/tomcat/sample-portal.xml 2010-11-30 03:21:29 UTC (rev 5366) +++ portal/branches/branch-GTNPORTAL-1700/examples/portal/war/src/main/resources/tomcat/sample-portal.xml 2010-11-30 03:27:34 UTC (rev 5367) @@ -1 +1 @@ -<Context path="/sample-portal" docBase="../../../../../examples/portal/war/src/main/webapp/" debug="0" reloadable="true" crossContext="true"/> +<Context path="/sample-portal" docBase="../../../../../../examples/portal/war/src/main/webapp/" debug="0" reloadable="true" crossContext="true"/> Modified: portal/branches/branch-GTNPORTAL-1700/examples/skins/simpleskin/src/main/resources/tomcat/simpleDeployableSkin.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1700/examples/skins/simpleskin/src/main/resources/tomcat/simpleDeployableSkin.xml 2010-11-30 03:21:29 UTC (rev 5366) +++ portal/branches/branch-GTNPORTAL-1700/examples/skins/simpleskin/src/main/resources/tomcat/simpleDeployableSkin.xml 2010-11-30 03:27:34 UTC (rev 5367) @@ -1 +1 @@ -<Context path="/simpleDeployableSkin" docBase="../../../../../examples/skins/simpleskin/src/main/webapp/" debug="0" reloadable="true" crossContext="true"/> +<Context path="/simpleDeployableSkin" docBase="../../../../../../examples/skins/simpleskin/src/main/webapp/" debug="0" reloadable="true" crossContext="true"/> Modified: portal/branches/branch-GTNPORTAL-1700/gadgets/eXoGadgets/src/main/resources/tomcat/eXoGadgets.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1700/gadgets/eXoGadgets/src/main/resources/tomcat/eXoGadgets.xml 2010-11-30 03:21:29 UTC (rev 5366) +++ portal/branches/branch-GTNPORTAL-1700/gadgets/eXoGadgets/src/main/resources/tomcat/eXoGadgets.xml 2010-11-30 03:27:34 UTC (rev 5367) @@ -19,5 +19,5 @@ --> -<Context path="/eXoGadgetWeb" docBase="../../../eXoProjects/portal/trunk/gadgets/eXoGadgets/src/main/webapp" +<Context path="/eXoGadgetWeb" docBase="../../../../../../gadgets/eXoGadgets/src/main/webapp" debug="0" reloadable="true" /> Modified: portal/branches/branch-GTNPORTAL-1700/portlet/dashboard/src/main/resources/tomcat/dashboard.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1700/portlet/dashboard/src/main/resources/tomcat/dashboard.xml 2010-11-30 03:21:29 UTC (rev 5366) +++ portal/branches/branch-GTNPORTAL-1700/portlet/dashboard/src/main/resources/tomcat/dashboard.xml 2010-11-30 03:27:34 UTC (rev 5367) @@ -19,5 +19,5 @@ --> -<Context path="/dashboard" docBase="../../../eXoProjects/portal/trunk/portlet/dashboard/src/main/webapp" +<Context path="/dashboard" docBase="../../../../../../portlet/dashboard/src/main/webapp" debug="0" reloadable="true" /> \ No newline at end of file Modified: portal/branches/branch-GTNPORTAL-1700/portlet/exoadmin/src/main/resources/tomcat/exoadmin.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1700/portlet/exoadmin/src/main/resources/tomcat/exoadmin.xml 2010-11-30 03:21:29 UTC (rev 5366) +++ portal/branches/branch-GTNPORTAL-1700/portlet/exoadmin/src/main/resources/tomcat/exoadmin.xml 2010-11-30 03:27:34 UTC (rev 5367) @@ -19,5 +19,5 @@ --> -<Context path="/exoadmin" docBase="../../../eXoProjects/portal/trunk/portlet/exoadmin/src/main/webapp" +<Context path="/exoadmin" docBase="../../../../../../portlet/exoadmin/src/main/webapp" debug="0" reloadable="true" /> Modified: portal/branches/branch-GTNPORTAL-1700/portlet/web/src/main/resources/tomcat/web.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1700/portlet/web/src/main/resources/tomcat/web.xml 2010-11-30 03:21:29 UTC (rev 5366) +++ portal/branches/branch-GTNPORTAL-1700/portlet/web/src/main/resources/tomcat/web.xml 2010-11-30 03:27:34 UTC (rev 5367) @@ -19,5 +19,5 @@ --> -<Context path="/web" docBase="../../../eXoProjects/portal/trunk/portlet/web/src/main/webapp" +<Context path="/web" docBase="../../../../../../portlet/web/src/main/webapp" debug="0" reloadable="true" /> Modified: portal/branches/branch-GTNPORTAL-1700/testsuite/webuibasedsamples/src/main/resources/tomcat/portlets.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1700/testsuite/webuibasedsamples/src/main/resources/tomcat/portlets.xml 2010-11-30 03:21:29 UTC (rev 5366) +++ portal/branches/branch-GTNPORTAL-1700/testsuite/webuibasedsamples/src/main/resources/tomcat/portlets.xml 2010-11-30 03:27:34 UTC (rev 5367) @@ -1,2 +1,2 @@ -<Context path="/portlets" docBase="../../../eXoProjects/portal/trunk/sample/portlets/src/main/webapp" +<Context path="/portlets" docBase="../../../../../../sample/portlets/src/main/webapp" debug="0" reloadable="true" /> Modified: portal/branches/branch-GTNPORTAL-1700/web/eXoResources/src/main/resources/tomcat/eXoResources.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1700/web/eXoResources/src/main/resources/tomcat/eXoResources.xml 2010-11-30 03:21:29 UTC (rev 5366) +++ portal/branches/branch-GTNPORTAL-1700/web/eXoResources/src/main/resources/tomcat/eXoResources.xml 2010-11-30 03:27:34 UTC (rev 5367) @@ -19,5 +19,5 @@ --> -<Context path="/eXoResources" docBase="../../../../../web/eXoResources/src/main/webapp" +<Context path="/eXoResources" docBase="../../../../../../web/eXoResources/src/main/webapp" debug="0" reloadable="true" /> Modified: portal/branches/branch-GTNPORTAL-1700/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIUserProfileInputSet.java =================================================================== --- portal/branches/branch-GTNPORTAL-1700/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIUserProfileInputSet.java 2010-11-30 03:21:29 UTC (rev 5366) +++ portal/branches/branch-GTNPORTAL-1700/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIUserProfileInputSet.java 2010-11-30 03:27:34 UTC (rev 5367) @@ -121,6 +121,7 @@ initLanguageCombo(langSelectBox); continue; } + set.addUIFormInput(new UIFormStringInput(key, null, null)); } }