gatein SVN: r7097 - in components/wci/trunk: test/servers/tomcat7/src/integration-tests and 1 other directories.
by do-not-reply＠jboss.org
Author: alain_defrance
Date: 2011-08-14 05:10:20 -0400 (Sun, 14 Aug 2011)
New Revision: 7097
Modified:
components/wci/trunk/test/servers/tomcat7/pom.xml
components/wci/trunk/test/servers/tomcat7/src/integration-tests/build.xml
components/wci/trunk/tomcat/tomcat7/pom.xml
Log:
Fix test classpath for tomcat 7.0.20
Modified: components/wci/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/pom.xml 2011-08-14 05:06:11 UTC (rev 7096)
+++ components/wci/trunk/test/servers/tomcat7/pom.xml 2011-08-14 09:10:20 UTC (rev 7097)
@@ -367,6 +367,7 @@
<property name="dependency.gatein-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat7.jar.path}" />
<property name="dependency.gatein-wci-exo.jar" value="${maven.dependency.org.gatein.wci.wci-exo.jar.path}" />
<property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}" />
+ <property name="dependency.tomcat.jar" value="${maven.dependency.org.apache.tomcat.tomcat-catalina.jar.path}" />
<!-- locations of archives to use -->
<property name="test.archives.directory" value="${project.build.directory}/test-archives" />
Modified: components/wci/trunk/test/servers/tomcat7/src/integration-tests/build.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/integration-tests/build.xml 2011-08-14 05:06:11 UTC (rev 7096)
+++ components/wci/trunk/test/servers/tomcat7/src/integration-tests/build.xml 2011-08-14 09:10:20 UTC (rev 7097)
@@ -32,6 +32,7 @@
<path path="${dependency.gatein-wci-tomcat.jar}"/>
<path path="${dependency.gatein-wci-exo.jar}"/>
<path path="${dependency.jboss-serialization.jar}"/>
+ <path path="${dependency.tomcat.jar}"/>
</path>
<target name="cargo.start" depends="cargo.setup">
Modified: components/wci/trunk/tomcat/tomcat7/pom.xml
===================================================================
--- components/wci/trunk/tomcat/tomcat7/pom.xml 2011-08-14 05:06:11 UTC (rev 7096)
+++ components/wci/trunk/tomcat/tomcat7/pom.xml 2011-08-14 09:10:20 UTC (rev 7097)
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
- <version>7.0.2</version>
+ <version>7.0.19</version>
</dependency>
</dependencies>
</project>
13 years, 4 months
gatein SVN: r7096 - portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-08-14 01:06:11 -0400 (Sun, 14 Aug 2011)
New Revision: 7096
Added:
portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Calculator.gif
portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Calendar.gif
portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Todo.gif
Removed:
portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Calculator.png
portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Calendar.png
portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Todo.png
Log:
GTNPORTAL-2013 Default gadget thumbnais have incorrect extension
Added: portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Calculator.gif
===================================================================
(Binary files differ)
Property changes on: portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Calculator.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Calculator.png
===================================================================
(Binary files differ)
Added: portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Calendar.gif
===================================================================
(Binary files differ)
Property changes on: portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Calendar.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Calendar.png
===================================================================
(Binary files differ)
Added: portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Todo.gif
===================================================================
(Binary files differ)
Property changes on: portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Todo.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: portal/trunk/gadgets/eXoGadgets/src/main/webapp/skin/DefaultSkin/portletIcons/Todo.png
===================================================================
(Binary files differ)
13 years, 4 months
gatein SVN: r7095 - portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-08-14 01:02:32 -0400 (Sun, 14 Aug 2011)
New Revision: 7095
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml
Log:
GTNPORTAL-2012 it's missing label in Edit Node form
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2011-08-14 04:58:44 UTC (rev 7094)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2011-08-14 05:02:32 UTC (rev 7095)
@@ -1029,7 +1029,7 @@
</action>
<label>
<name> إسم العقدة </name>
- <uri> #{word.uri}:</uri>
+ <URI> #{word.uri}:</URI>
<pageReference> مرجع صفحة</pageReference>
<description> #{word.description}</description>
<type>نوع الصفحة </type>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties 2011-08-14 04:58:44 UTC (rev 7094)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties 2011-08-14 05:02:32 UTC (rev 7095)
@@ -500,7 +500,7 @@
UIPageNodeForm.action.Back=#{word.back}
UIPageNodeForm.action.Close=#{word.cancel}
UIPageNodeForm.label.name=Knotenname:
-UIPageNodeForm.label.uri=#{word.uri}:
+UIPageNodeForm.label.URI=#{word.uri}:
UIPageNodeForm.label.pageReference=Seiten-Referenz
UIPageNodeForm.label.description=#{word.description}
UIPageNodeForm.label.type=Seitentyp
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-08-14 04:58:44 UTC (rev 7094)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-08-14 05:02:32 UTC (rev 7095)
@@ -530,7 +530,7 @@
UIPageNodeForm.action.Back=#{word.back}
UIPageNodeForm.action.Close=#{word.cancel}
UIPageNodeForm.label.name=Node Name:
-UIPageNodeForm.label.uri=#{word.uri}:
+UIPageNodeForm.label.URI=#{word.uri}:
UIPageNodeForm.label.pageReference=Page Reference
UIPageNodeForm.label.description=#{word.description}
UIPageNodeForm.label.type=Page Type
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2011-08-14 04:58:44 UTC (rev 7094)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2011-08-14 05:02:32 UTC (rev 7095)
@@ -498,7 +498,7 @@
UIPageNodeForm.action.Back=#{word.back}
UIPageNodeForm.action.Close=#{word.cancel}
UIPageNodeForm.label.name=Nombre de Nodo:
-UIPageNodeForm.label.uri=#{word.uri}:
+UIPageNodeForm.label.URI=#{word.uri}:
UIPageNodeForm.label.pageReference=Referencia a P\u00e1gina
UIPageNodeForm.label.description=#{word.description}
UIPageNodeForm.label.type=Tipo de P\u00e1gina
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2011-08-14 04:58:44 UTC (rev 7094)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2011-08-14 05:02:32 UTC (rev 7095)
@@ -487,7 +487,7 @@
UIPageNodeForm.action.Back=#{word.back}
UIPageNodeForm.action.Close=Fermer
UIPageNodeForm.label.name=Nom du noeud :
-UIPageNodeForm.label.uri=#{word.uri} :
+UIPageNodeForm.label.URI=#{word.uri} :
UIPageNodeForm.label.pageReference=Référence de la page
UIPageNodeForm.label.description=#{word.description}
UIPageNodeForm.label.type=Type de page
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2011-08-14 04:58:44 UTC (rev 7094)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2011-08-14 05:02:32 UTC (rev 7095)
@@ -527,7 +527,7 @@
UIPageNodeForm.action.Back=#{word.back}
UIPageNodeForm.action.Close=#{word.cancel}
UIPageNodeForm.label.name=Nome del Nodo:
-UIPageNodeForm.label.uri=#{word.uri}:
+UIPageNodeForm.label.URI=#{word.uri}:
UIPageNodeForm.label.pageReference=Collegamento alla Pagina
UIPageNodeForm.label.description=#{word.description}
UIPageNodeForm.label.type=Tipo della Pagina
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2011-08-14 04:58:44 UTC (rev 7094)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2011-08-14 05:02:32 UTC (rev 7095)
@@ -501,7 +501,7 @@
UIPageNodeForm.action.Back=#{word.back}
UIPageNodeForm.action.Close=#{word.cancel}
UIPageNodeForm.label.name=\u30ce\u30fc\u30c9\u540d:
-UIPageNodeForm.label.uri=#{word.uri}:
+UIPageNodeForm.label.URI=#{word.uri}:
UIPageNodeForm.label.pageReference=\u30da\u30fc\u30b8\u53c2\u7167
UIPageNodeForm.label.description=#{word.description}
UIPageNodeForm.label.type=\u30da\u30fc\u30b8\u30bf\u30a4\u30d7
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml 2011-08-14 04:58:44 UTC (rev 7094)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml 2011-08-14 05:02:32 UTC (rev 7095)
@@ -791,7 +791,7 @@
</action>
<label>
<name>노드 이름:</name>
- <uri>#{word.uri}:</uri>
+ <URI>#{word.uri}:</URI>
<pageReference>페이지 레퍼런스</pageReference>
<description>#{word.description}</description>
<type>페이지 유형</type>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties 2011-08-14 04:58:44 UTC (rev 7094)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties 2011-08-14 05:02:32 UTC (rev 7095)
@@ -500,7 +500,7 @@
UIPageNodeForm.action.Back=#{word.back}
UIPageNodeForm.action.Close=#{word.cancel}
UIPageNodeForm.label.name=\u0928\u094b\u0921\u0915\u094b \u0928\u093e\u092e:
-UIPageNodeForm.label.uri=#{word.uri}:
+UIPageNodeForm.label.URI=#{word.uri}:
UIPageNodeForm.label.pageReference=\u092a\u0947\u091c \u0930\u093f\u092b\u0947\u0930\u0947\u0928\u094d\u0938
UIPageNodeForm.label.description=#{word.description}
UIPageNodeForm.label.type=\u092a\u0947\u091c\u0915\u094b \u0915\u093f\u0938\u093f\u092e
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties 2011-08-14 04:58:44 UTC (rev 7094)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties 2011-08-14 05:02:32 UTC (rev 7095)
@@ -500,7 +500,7 @@
UIPageNodeForm.action.Back=#{word.back}
UIPageNodeForm.action.Close=#{word.cancel}
UIPageNodeForm.label.name=Node naam:
-UIPageNodeForm.label.uri=#{word.uri}:
+UIPageNodeForm.label.URI=#{word.uri}:
UIPageNodeForm.label.pageReference=Pagina referentie
UIPageNodeForm.label.description=#{word.description}
UIPageNodeForm.label.type=Pagina type
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties 2011-08-14 04:58:44 UTC (rev 7094)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties 2011-08-14 05:02:32 UTC (rev 7095)
@@ -496,7 +496,7 @@
UIPageNodeForm.action.Back=#{word.back}
UIPageNodeForm.action.Close=#{word.cancel}
UIPageNodeForm.label.name=Nome:
-UIPageNodeForm.label.uri=#{word.uri}:
+UIPageNodeForm.label.URI=#{word.uri}:
UIPageNodeForm.label.pageReference=Página
UIPageNodeForm.label.description=#{word.description}
UIPageNodeForm.label.type=Tipo de Página
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2011-08-14 04:58:44 UTC (rev 7094)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2011-08-14 05:02:32 UTC (rev 7095)
@@ -484,7 +484,7 @@
UIPageNodeForm.action.Back=#{word.back}
UIPageNodeForm.action.Close=#{word.cancel}
UIPageNodeForm.label.name=Название узла:
-UIPageNodeForm.label.uri=#{word.uri}:
+UIPageNodeForm.label.URI=#{word.uri}:
UIPageNodeForm.label.pageReference=Cноска страницы
UIPageNodeForm.label.description=#{word.description}
UIPageNodeForm.label.type=Тип страницы
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2011-08-14 04:58:44 UTC (rev 7094)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2011-08-14 05:02:32 UTC (rev 7095)
@@ -475,7 +475,7 @@
UIPageNodeForm.action.Back=#{word.back}
UIPageNodeForm.action.Close=#{word.cancel}
UIPageNodeForm.label.name=Назва вузла:
-UIPageNodeForm.label.uri=#{word.uri}:
+UIPageNodeForm.label.URI=#{word.uri}:
UIPageNodeForm.label.pageReference=Початкова сторінка
UIPageNodeForm.label.description=#{word.description}
UIPageNodeForm.label.type=Тип сторінки
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2011-08-14 04:58:44 UTC (rev 7094)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2011-08-14 05:02:32 UTC (rev 7095)
@@ -489,7 +489,7 @@
UIPageNodeForm.action.Back=#{word.back}
UIPageNodeForm.action.Close=#{word.cancel}
UIPageNodeForm.label.name=Tên node :
-UIPageNodeForm.label.uri=#{word.uri}:
+UIPageNodeForm.label.URI=#{word.uri}:
UIPageNodeForm.label.pageReference=Trang liên quan
UIPageNodeForm.label.description=#{word.description}
UIPageNodeForm.label.type=Kiểu trang
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml 2011-08-14 04:58:44 UTC (rev 7094)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml 2011-08-14 05:02:32 UTC (rev 7095)
@@ -747,7 +747,7 @@
</action>
<label>
<name>节点名：</name>
- <uri>#{word.uri}:</uri>
+ <URI>#{word.uri}:</URI>
<pageReference>页面选项</pageReference>
<description>#{word.description}</description>
<type>页面类型</type>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml 2011-08-14 04:58:44 UTC (rev 7094)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml 2011-08-14 05:02:32 UTC (rev 7095)
@@ -892,7 +892,7 @@
</action>
<label>
<name>節點名：</name>
- <uri>#{word.uri}:</uri>
+ <URI>#{word.uri}:</URI>
<pageReference>頁面選項</pageReference>
<description>#{word.description}</description>
<type>頁面類型</type>
13 years, 4 months
gatein SVN: r7094 - in portal/trunk/examples: portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal and 1 other directory.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-08-14 00:58:44 -0400 (Sun, 14 Aug 2011)
New Revision: 7094
Modified:
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal-configuration.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal-configuration.xml
Log:
GTNPORTAL-2011 Import mode should be defined in sample extension and sample portal
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal-configuration.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal-configuration.xml 2011-08-14 04:56:45 UTC (rev 7093)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal-configuration.xml 2011-08-14 04:58:44 UTC (rev 7094)
@@ -52,6 +52,9 @@
<field name="templateLocation">
<string>war:/conf/sample-ext/portal</string>
</field>
+ <field name="importMode">
+ <string>merge</string>
+ </field>
</object>
</object-param>
<object-param>
@@ -71,6 +74,9 @@
<field name="templateLocation">
<string>war:/conf/sample-ext/portal</string>
</field>
+ <field name="importMode">
+ <string>merge</string>
+ </field>
</object>
</object-param>
<object-param>
@@ -90,6 +96,9 @@
<field name="templateLocation">
<string>war:/conf/sample-ext/portal</string>
</field>
+ <field name="importMode">
+ <string>merge</string>
+ </field>
</object>
</object-param>
</init-params>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal-configuration.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal-configuration.xml 2011-08-14 04:56:45 UTC (rev 7093)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal-configuration.xml 2011-08-14 04:58:44 UTC (rev 7094)
@@ -52,6 +52,9 @@
<field name="templateLocation">
<string>war:/conf/sample-portal/portal</string>
</field>
+ <field name="importMode">
+ <string>merge</string>
+ </field>
</object>
</object-param>
<object-param>
@@ -71,6 +74,9 @@
<field name="templateLocation">
<string>war:/conf/sample-portal/portal</string>
</field>
+ <field name="importMode">
+ <string>merge</string>
+ </field>
</object>
</object-param>
<object-param>
@@ -90,6 +96,9 @@
<field name="templateLocation">
<string>war:/conf/sample-portal/portal</string>
</field>
+ <field name="importMode">
+ <string>merge</string>
+ </field>
</object>
</object-param>
</init-params>
13 years, 4 months
gatein SVN: r7093 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-08-14 00:56:45 -0400 (Sun, 14 Aug 2011)
New Revision: 7093
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
Log:
GTNPORTAL-2010 NPE in the case there is no UserNode returned during changing page node
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2011-08-14 04:52:21 UTC (rev 7092)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2011-08-14 04:56:45 UTC (rev 7093)
@@ -67,6 +67,14 @@
UserNodeFilterConfig.Builder builder = UserNodeFilterConfig.builder();
builder.withAuthorizationCheck();
UserNode naviPath = userPortal.resolvePath(builder.build(), uri);
+
+ if (naviPath == null)
+ {
+ UIPageBody uiPageBody = showedUIPortal.findFirstComponentOfType(UIPageBody.class);
+ uiPageBody.setUIComponent(null);
+ return;
+ }
+
UserNavigation targetNav = naviPath.getNavigation();
UserNode currentNavPath = showedUIPortal.getNavPath();
13 years, 4 months
gatein SVN: r7092 - portal/trunk/web/eXoResources/src/main/webapp/javascript.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-08-14 00:52:21 -0400 (Sun, 14 Aug 2011)
New Revision: 7092
Modified:
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo.js
Log:
GTNPORTAL-1964 Improve Javascript lazy loading machanism
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo.js 2011-08-14 04:49:01 UTC (rev 7091)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo.js 2011-08-14 04:52:21 UTC (rev 7092)
@@ -69,34 +69,37 @@
* 3) Cache the script on the client
*
*/
-eXo.require = function(module, jsLocation) {
+eXo.require = function(module, jsLocation, callback, context, params) {
try {
- if(eval(module + ' != null')) return ;
+ if(eval(module + ' != null')) {
+ if (callback) {
+ var ctx = context ? context : {};
+ if(params && typeof(params) != "string" && params.length) callback.apply(ctx, params);
+ else callback.call(ctx, params) ;
+ }
+ return ;
+ }
} catch(err) {
//alert(err + " : " + module);
}
window.status = "Loading Javascript Module " + module ;
if(jsLocation == null) jsLocation = '/eXoResources/javascript/' ;
var path = jsLocation + module.replace(/\./g, '/') + '.js' ;
- eXo.loadJS(path);
+ eXo.loadJS(path, module, callback, context, params);
} ;
-eXo.loadJS = function(path) {
- var request = eXo.core.Browser.createHttpRequest() ;
- request.open('GET', path, false) ;
- request.setRequestHeader("Cache-Control", "max-age=86400") ;
-
- request.send(null) ;
+eXo.loadJS = function(path, module, callback, context, params) {
+ if (!module) module = path;
+
+ eXo.core.Loader.register(module, path);
+ eXo.core.Loader.init(module, callback, context, params);
+
eXo.session.itvDestroy() ;
if(eXo.session.canKeepState && eXo.session.isOpen && eXo.env.portal.accessMode == 'private') {
eXo.session.itvInit() ;
}
- try {
- eval(request.responseText) ;
- } catch(err) {
- alert(err + " : " + request.responseText) ;
- }
} ;
+
/**
* Make url portal request with parameters
*
13 years, 4 months
gatein SVN: r7091 - in portal/trunk/portlet: exoadmin/src/main/webapp/groovy/admintoolbar/webui/component and 1 other directory.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-08-14 00:49:01 -0400 (Sun, 14 Aug 2011)
New Revision: 7091
Modified:
portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl
Log:
GTNPORTAL-2009 NPE when add new dashboard page having label is null
Modified: portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl
===================================================================
--- portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl 2011-08-14 04:45:02 UTC (rev 7090)
+++ portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl 2011-08-14 04:49:01 UTC (rev 7091)
@@ -27,10 +27,10 @@
<%
int i = 0;
for(UserNode node : nodes){
- def tabLabel = node.getLabel();
+ def tabLabel = node.getResolvedLabel();
if ("Tab_Default".equals(node.getName()))
{
- tabLabel = _ctx.appRes("UIUserToolBarDashboard.page." + node.getLabel());
+ tabLabel = _ctx.appRes("UIUserToolBarDashboard.page." + tabLabel);
}
EntityEncoder encoder = EntityEncoder.FULL;
tabLabel = encoder.encode(tabLabel);
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-08-14 04:45:02 UTC (rev 7090)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-08-14 04:49:01 UTC (rev 7091)
@@ -43,10 +43,10 @@
String href = Util.getPortalRequestContext().getPortalURI() + node.getURI();
String icon = node.getIcon();
if(icon == null) icon = "DefaultPageIcon";
- def resolvedLabel = node.getLabel();
+ def resolvedLabel = node.getResolvedLabel();
if ("Tab_Default".equals(node.getName()))
{
- resolvedLabel = _ctx.appRes("UIUserToolBarDashboard.page." + node.getLabel());
+ resolvedLabel = _ctx.appRes("UIUserToolBarDashboard.page." + resolvedLabel);
}
boolean toolong = (resolvedLabel.length() > 60);
13 years, 4 months
gatein SVN: r7090 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-08-14 00:45:02 -0400 (Sun, 14 Aug 2011)
New Revision: 7090
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIWizardPageSetInfo.java
Log:
GTNPORTAL-1916 Move to use UICheckBoxInput instead of UIFormCheckBoxInput
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2011-08-14 04:11:45 UTC (rev 7089)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2011-08-14 04:45:02 UTC (rev 7090)
@@ -216,7 +216,7 @@
return;
}
- if (((UIFormCheckBoxInput)uiPageSetInfo.getUIInput(UIWizardPageSetInfo.SHOW_PUBLICATION_DATE)).isChecked())
+ if (uiPageSetInfo.getUICheckBoxInput(UIWizardPageSetInfo.SHOW_PUBLICATION_DATE).isChecked())
{
Calendar currentCalendar = Calendar.getInstance();
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIWizardPageSetInfo.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIWizardPageSetInfo.java 2011-08-14 04:11:45 UTC (rev 7089)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIWizardPageSetInfo.java 2011-08-14 04:45:02 UTC (rev 7090)
@@ -45,7 +45,7 @@
import org.exoplatform.webui.form.UIFormInputBase;
import org.exoplatform.webui.form.UIFormSelectBox;
import org.exoplatform.webui.form.UIFormStringInput;
-import org.exoplatform.webui.form.UIFormCheckBoxInput;
+import org.exoplatform.webui.form.input.UICheckBoxInput;
import org.exoplatform.webui.form.validator.DateTimeValidator;
import org.exoplatform.webui.form.validator.IdentifierValidator;
import org.exoplatform.webui.form.validator.MandatoryValidator;
@@ -112,10 +112,10 @@
public UIWizardPageSetInfo() throws Exception
{
- UIFormCheckBoxInput uiDateInputCheck =
- new UIFormCheckBoxInput(SHOW_PUBLICATION_DATE, null, false);
- UIFormCheckBoxInput uiVisibleCheck = new UIFormCheckBoxInput(VISIBLE, null, false);
- UIFormCheckBoxInput uiSwitchLabelMode = new UIFormCheckBoxInput(SWITCH_MODE, null, true);
+ UICheckBoxInput uiDateInputCheck =
+ new UICheckBoxInput(SHOW_PUBLICATION_DATE, null, false);
+ UICheckBoxInput uiVisibleCheck = new UICheckBoxInput(VISIBLE, null, false);
+ UICheckBoxInput uiSwitchLabelMode = new UICheckBoxInput(SWITCH_MODE, null, true);
uiDateInputCheck.setOnChange("SwitchPublicationDate");
uiVisibleCheck.setOnChange("SwitchVisible");
uiSwitchLabelMode.setOnChange(SWITCH_MODE_ONCHANGE);
@@ -186,7 +186,7 @@
UserNode node = (UserNode)bean;
- if (((UIFormCheckBoxInput)getUIInput(SWITCH_MODE)).isChecked())
+ if (getUICheckBoxInput(SWITCH_MODE).isChecked())
{
node.setLabel(null);
}
@@ -196,9 +196,9 @@
}
Visibility visibility;
- if (((UIFormCheckBoxInput)getUIInput(VISIBLE)).isChecked())
+ if (getUICheckBoxInput(VISIBLE).isChecked())
{
- UIFormCheckBoxInput showPubDate = getUIInput(SHOW_PUBLICATION_DATE);
+ UICheckBoxInput showPubDate = getUICheckBoxInput(SHOW_PUBLICATION_DATE);
visibility = showPubDate.isChecked() ? Visibility.TEMPORAL : Visibility.DISPLAYED;
}
else
@@ -227,8 +227,8 @@
public void setShowCheckPublicationDate(boolean show)
{
- ((UIFormCheckBoxInput)getUIInput(VISIBLE)).setChecked(show);
- UIFormCheckBoxInput uiForm = getUIInput(SHOW_PUBLICATION_DATE);
+ getUICheckBoxInput(VISIBLE).setChecked(show);
+ UICheckBoxInput uiForm = getUICheckBoxInput(SHOW_PUBLICATION_DATE);
uiForm.setRendered(show);
setShowPublicationDate(show && uiForm.isChecked());
}
@@ -405,7 +405,7 @@
public void execute(Event<UIWizardPageSetInfo> event) throws Exception
{
UIWizardPageSetInfo uiForm = event.getSource();
- boolean isCheck = ((UIFormCheckBoxInput)uiForm.getUIInput(SHOW_PUBLICATION_DATE)).isChecked();
+ boolean isCheck = uiForm.getUICheckBoxInput(SHOW_PUBLICATION_DATE).isChecked();
uiForm.getUIFormDateTimeInput(START_PUBLICATION_DATE).setRendered(isCheck);
uiForm.getUIFormDateTimeInput(END_PUBLICATION_DATE).setRendered(isCheck);
UIWizard uiWizard = uiForm.getAncestorOfType(UIWizard.class);
@@ -420,7 +420,7 @@
public void execute(Event<UIWizardPageSetInfo> event) throws Exception
{
UIWizardPageSetInfo uiForm = event.getSource();
- boolean isCheck = ((UIFormCheckBoxInput)uiForm.getUIInput(VISIBLE)).isChecked();
+ boolean isCheck = uiForm.getUICheckBoxInput(VISIBLE).isChecked();
uiForm.setShowCheckPublicationDate(isCheck);
event.getRequestContext().addUIComponentToUpdateByAjax(uiForm);
}
@@ -454,7 +454,7 @@
public void execute(Event<UIWizardPageSetInfo> event) throws Exception
{
UIWizardPageSetInfo uiForm = event.getSource();
- boolean isExtendedMode = ((UIFormCheckBoxInput)uiForm.getUIInput(SWITCH_MODE)).isChecked();
+ boolean isExtendedMode = uiForm.getUICheckBoxInput(SWITCH_MODE).isChecked();
uiForm.switchLabelMode(isExtendedMode);
event.getRequestContext().addUIComponentToUpdateByAjax(uiForm);
}
13 years, 4 months
gatein SVN: r7089 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-08-14 00:11:45 -0400 (Sun, 14 Aug 2011)
New Revision: 7089
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java
Log:
GTNPORTAL-2008 Don't allow create user page from Page Management Portlet
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2011-08-14 03:50:44 UTC (rev 7088)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2011-08-14 04:11:45 UTC (rev 7089)
@@ -23,6 +23,8 @@
import java.util.List;
import java.util.ResourceBundle;
+import javassist.bytecode.analysis.Type;
+
import javax.portlet.ActionResponse;
import javax.xml.namespace.QName;
@@ -404,12 +406,25 @@
UIPageForm uiPageForm = uiMaskWS.createUIComponent(UIPageForm.class, "UIBrowserPageForm", "UIPageForm");
uiMaskWS.setUIComponent(uiPageForm);
uiMaskWS.setShow(true);
- uiPageForm.getUIStringInput("ownerType").setValue(PortalConfig.USER_TYPE);
- uiPageForm.getUIStringInput("ownerId").setValue(prContext.getRemoteUser());
- uiPageForm.removeChildById("PermissionSetting");
+
uiPageForm.removeChild(UIFormInputItemSelector.class);
UIPageTemplateOptions uiTemplateConfig = uiPageForm.createUIComponent(UIPageTemplateOptions.class, null, null);
uiPageForm.addUIFormInput(uiTemplateConfig);
+
+ UIFormSelectBox slcOwnerType = uiPageForm.getUIFormSelectBox(UIPageForm.OWNER_TYPE);
+ List<SelectItemOption<String>> types = slcOwnerType.getOptions();
+ for (int i = 0; i < types.size(); i++)
+ {
+ if (PortalConfig.USER_TYPE.equals(types.get(i).getValue()))
+ {
+ types.remove(types.get(i));
+ break;
+ }
+ }
+ slcOwnerType.setOptions(types);
+ Event<UIComponent> slcEvent = uiPageForm.createEvent("ChangeOwnerType", Phase.DECODE, event.getRequestContext());
+ slcEvent.broadcast();
+
prContext.addUIComponentToUpdateByAjax(uiMaskWS);
}
}
13 years, 4 months
gatein SVN: r7088 - in portal/trunk/component/web/resources/src: test/java/org/exoplatform/portal/resource and 1 other directory.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-08-13 23:50:44 -0400 (Sat, 13 Aug 2011)
New Revision: 7088
Modified:
portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java
portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestJavascriptConfigService.java
Log:
GTNPORTAL-2007 Wrong merged JS after undeploy JS module in JavascriptConfigService
Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java
===================================================================
--- portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2011-08-14 03:46:19 UTC (rev 7087)
+++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2011-08-14 03:50:44 UTC (rev 7088)
@@ -156,6 +156,7 @@
availableScripts_.clear();
availableScriptsPaths_.clear();
object_view_of_merged_JS.clear();
+ jsBytes = null;
//
for (Javascript script : availableScriptsKey_) {
@@ -261,6 +262,7 @@
public void refreshMergedJavascript()
{
mergedJavascript = "";
+ jsBytes = null;
StringBuffer buffer = new StringBuffer();
for (String webApp : object_view_of_merged_JS.keySet())
{
Modified: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestJavascriptConfigService.java
===================================================================
--- portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestJavascriptConfigService.java 2011-08-14 03:46:19 UTC (rev 7087)
+++ portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestJavascriptConfigService.java 2011-08-14 03:50:44 UTC (rev 7088)
@@ -124,9 +124,8 @@
assertEquals(0, jsService.getAvailableScriptsPaths().size());
assertTrue(jsService.getMergedJavascript().length > 0);
- jsService.refreshMergedJavascript();
- //bug of service
-// assertTrue(jsService.getMergedJavascript().length == 0);
+ jsService.refreshMergedJavascript();
+ assertTrue(jsService.getMergedJavascript().length == 0);
}
@Override
13 years, 4 months