gatein SVN: r7087 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-08-13 23:46:19 -0400 (Sat, 13 Aug 2011)
New Revision: 7087
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/BasePartialUpdateToolbar.java
Log:
GTNPORTAL-2006 Should not allow to click to a node if it doesn't point to a page
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/BasePartialUpdateToolbar.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/BasePartialUpdateToolbar.java 2011-08-14 03:41:06 UTC (rev 7086)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/BasePartialUpdateToolbar.java 2011-08-14 03:46:19 UTC (rev 7087)
@@ -170,9 +170,13 @@
ResourceURL rsURL = res.createResourceURL();
rsURL.setResourceID(res.encodeURL(getResourceIdFromNode(node, navId)));
- json.put("getNodeURL", rsURL.toString());
- json.put("actionLink", Util.getPortalRequestContext().getPortalURI() + node.getURI());
+ json.put("getNodeURL", rsURL.toString());
+ if (node.getPageRef() != null)
+ {
+ json.put("actionLink", Util.getPortalRequestContext().getPortalURI() + node.getURI());
+ }
+
JSONArray childs = new JSONArray();
for (UserNode child : node.getChildren())
{
13 years, 5 months
gatein SVN: r7086 - in portal/trunk: web/eXoResources/src/main/webapp/javascript/eXo/webui and 1 other directories.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-08-13 23:41:06 -0400 (Sat, 13 Aug 2011)
New Revision: 7086
Modified:
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_en.js
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_fr.js
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_vi.js
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java
Log:
GTNPORTAL-1177 The day of the month in the calendar pop-up is not translated to French
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_en.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_en.js 2011-08-14 03:19:26 UTC (rev 7085)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_en.js 2011-08-14 03:41:06 UTC (rev 7086)
@@ -20,4 +20,9 @@
eXo.i18n.I18NMessage.SessionTimeout = "Session timeout ! Refresh your browser.";
eXo.i18n.I18NMessage.TargetBlockNotFound = "The target blockId to update is not found : {0}";
eXo.i18n.I18NMessage.BlockUpdateNotFound = "The blockId to update is not found : {0}";
-eXo.i18n.I18NMessage.DefaultTheme = "Default Theme";
\ No newline at end of file
+eXo.i18n.I18NMessage.DefaultTheme = "Default Theme";
+eXo.i18n.I18NMessage.PreviousMonth="Previous Month";
+eXo.i18n.I18NMessage.NextMonth="Next Month";
+eXo.i18n.I18NMessage.PreviousYear="Previous Year";
+eXo.i18n.I18NMessage.NextYear="Next Year";
+eXo.i18n.I18NMessage.weekdays=["S", "M", "T", "W", "T", "F", "S"];
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_fr.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_fr.js 2011-08-14 03:19:26 UTC (rev 7085)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_fr.js 2011-08-14 03:41:06 UTC (rev 7086)
@@ -20,4 +20,9 @@
eXo.i18n.I18NMessage.SessionTimeout = "La session a expir\u00e9 ! Veuillez recharger la page.";
eXo.i18n.I18NMessage.TargetBlockNotFound = "The target blockId to update is not found : {0}";
eXo.i18n.I18NMessage.BlockUpdateNotFound = "The blockId to update is not found : {0}";
-eXo.i18n.I18NMessage.DefaultTheme = "Style par Défaut";
\ No newline at end of file
+eXo.i18n.I18NMessage.DefaultTheme = "Style par Défaut";
+eXo.i18n.I18NMessage.PreviousMonth="Mois précédent";
+eXo.i18n.I18NMessage.NextMonth="Mois prochain";
+eXo.i18n.I18NMessage.PreviousYear="Année précédente";
+eXo.i18n.I18NMessage.NextYear="Année suivante";
+eXo.i18n.I18NMessage.weekdays=["D", "L", "M", "M", "J", "V", "S"];
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_vi.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_vi.js 2011-08-14 03:19:26 UTC (rev 7085)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_vi.js 2011-08-14 03:41:06 UTC (rev 7086)
@@ -20,4 +20,9 @@
eXo.i18n.I18NMessage.SessionTimeout = "Phiên làm việc hết hạn! Tải lại trang này.";
eXo.i18n.I18NMessage.TargetBlockNotFound = "Không tìm thấy vùng đích với ID là : {0}";
eXo.i18n.I18NMessage.BlockUpdateNotFound = "Không tìm thấy vùng cần cập nhật : {0}";
-eXo.i18n.I18NMessage.DefaultTheme = "Mặc định";
\ No newline at end of file
+eXo.i18n.I18NMessage.DefaultTheme = "Mặc định";
+eXo.i18n.I18NMessage.PreviousMonth="Tháng trước";
+eXo.i18n.I18NMessage.NextMonth="Tháng sau";
+eXo.i18n.I18NMessage.PreviousYear="Năm trước";
+eXo.i18n.I18NMessage.NextYear="Năm sau";
+eXo.i18n.I18NMessage.weekdays=["CN", "T2", "T3", "T4", "T5", "T6", "T7"];
\ No newline at end of file
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js 2011-08-14 03:19:26 UTC (rev 7085)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js 2011-08-14 03:41:06 UTC (rev 7086)
@@ -26,6 +26,9 @@
// if selectedDate is invalid, currentDate deals with system time;
this.selectedDate = null ; //Datetime value of input date&time field
this.months ;
+
+ this.firstDayOfWeek = 1;// Indecates what the first day of the week is; e.g., SUNDAY (1) in the U.S, MONDAY (2) in France, TUESDAY (3), etc
+ this.weekdays = null;
}
UICalendar.prototype.init = function(field, isDisplayTime, datePattern, value, monthNames) {
@@ -42,6 +45,11 @@
this.months = monthNames.split(',');
this.months.pop();
+ var weekdays = eXo.i18n.I18NMessage.getMessage("weekdays");
+ if(weekdays != null && typeof(weekdays) == "object") {
+ this.weekdays = weekdays;
+ }
+
if (!document.getElementById(this.calendarId)) this.create();
this.show() ;
@@ -192,26 +200,36 @@
table += '<div class="UICalendar" onmousedown="event.cancelBubble = true">' ;
table += ' <table class="MonthYearBox">' ;
table += ' <tr>' ;
- table += ' <td class="MonthButton"><a class="PreviousMonth" href="javascript:eXo.webui.UICalendar.changeMonth(-1);" title="Previous Month"></a></td>' ;
- table += ' <td class="YearButton"><a class="PreviousYear" href="javascript:eXo.webui.UICalendar.changeYear(-1);" title="Previous Year"></a></td>' ;
+ table += ' <td class="MonthButton"><a class="PreviousMonth" href="javascript:eXo.webui.UICalendar.changeMonth(-1);" title="' + eXo.i18n.I18NMessage.getMessage("PreviousMonth") + '"></a></td>' ;
+ table += ' <td class="YearButton"><a class="PreviousYear" href="javascript:eXo.webui.UICalendar.changeYear(-1);" title="' + eXo.i18n.I18NMessage.getMessage("PreviousYear") + '"></a></td>' ;
table += ' <td><font color="#f89302">' + this.months[this.currentDate.getMonth()] + '</font> - ' + this.currentDate.getFullYear() + '</td>' ;
- table += ' <td class="YearButton"><a class="NextYear" href="javascript:eXo.webui.UICalendar.changeYear(1);" title="Next Year"></a></td>' ;
- table += ' <td class="MonthButton"><a class="NextMonth" href="javascript:eXo.webui.UICalendar.changeMonth(1);" title="Next Month"></a></td>' ;
+ table += ' <td class="YearButton"><a class="NextYear" href="javascript:eXo.webui.UICalendar.changeYear(1);" title="' + eXo.i18n.I18NMessage.getMessage("NextYear") + '"></a></td>' ;
+ table += ' <td class="MonthButton"><a class="NextMonth" href="javascript:eXo.webui.UICalendar.changeMonth(1);" title="' + eXo.i18n.I18NMessage.getMessage("NextMonth") + '"></a></td>' ;
table += ' </tr>' ;
table += ' </table>' ;
table += ' <div style="margin-top: 6px;padding: 0px 5px;">' ;
table += ' <table>' ;
table += ' <tr>' ;
- table += ' <td><font color="red">S</font></td><td>M</td><td>T</td><td>W</td><td>T</td><td>F</td><td>S</td>' ;
+ if(this.weekdays == null) {
+ this.weekdays = new Array("S", "M", "T", "W", "T", "F", "S");
+ }
+ for (var i = 0; i < 7; i++) {
+ if(i == (8-this.firstDayOfWeek)%7) {
+ table += ' <td><font color="red">' + this.weekdays[(i + this.firstDayOfWeek - 1)%7] + '</font></td>';
+ } else {
+ table += ' <td>' + this.weekdays[(i + this.firstDayOfWeek - 1)%7] + '</td>';
+ }
+ }
table += ' </tr>' ;
table += ' </table>' ;
table += ' </div>' ;
table += ' <div class="CalendarGrid">' ;
table += ' <table>' ;
+
for (var week=0; week < 6; week++) {
table += "<tr>";
- for (var dayOfWeek=0; dayOfWeek < 7; dayOfWeek++) {
- if (week == 0 && startDayOfWeek == dayOfWeek) {
+ for (var dayOfWeek=0; dayOfWeek <= 6; dayOfWeek++) {
+ if (week == 0 && dayOfWeek == (startDayOfWeek + ((8-this.firstDayOfWeek)%7))%7) {
validDay = 1;
} else if (validDay == 1 && dayOfMonth > daysInMonth) {
validDay = 0;
@@ -431,4 +449,12 @@
return [31, ((!(year % 4 ) && ( (year % 100 ) || !( year % 400 ) ))? 29:28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month];
}
+UICalendar.prototype.getFirstDayOfWeek = function() {
+ return this.firstDayOfWeek;
+}
+
+UICalendar.prototype.setFirstDayOfWeek = function(dayOfWeek) {
+ this.firstDayOfWeek = dayOfWeek;
+}
+
eXo.webui.UICalendar = new UICalendar('UICalendarControl') ;
\ No newline at end of file
Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java 2011-08-14 03:19:26 UTC (rev 7085)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java 2011-08-14 03:41:06 UTC (rev 7086)
@@ -19,6 +19,7 @@
package org.exoplatform.webui.form;
+import org.exoplatform.web.application.JavascriptManager;
import org.exoplatform.webui.application.WebuiRequestContext;
import java.io.Writer;
@@ -211,7 +212,9 @@
value_ = "";
}
- context.getJavascriptManager().importJavascript("eXo.webui.UICalendar");
+ JavascriptManager jsManager = context.getJavascriptManager();
+ jsManager.importJavascript("eXo.webui.UICalendar");
+ jsManager.addJavascript("eXo.webui.UICalendar.setFirstDayOfWeek(" + Calendar.getInstance(context.getLocale()).getFirstDayOfWeek() + ");");
Writer w = context.getWriter();
w.write("<input type='text' onfocus='eXo.webui.UICalendar.init(this,");
13 years, 5 months
gatein SVN: r7085 - in portal/trunk/component/web/resources/src: test/java/org/exoplatform/portal/resource and 2 other directories.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-08-13 23:19:26 -0400 (Sat, 13 Aug 2011)
New Revision: 7085
Added:
portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestJavascriptConfigService.java
portal/trunk/component/web/resources/src/test/resources/conf/js-service-configuration.xml
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/AbstractWebResourceTest.java
portal/trunk/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml
Log:
GTNPORTAL-2005 JUnit Tests for 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 02:48:49 UTC (rev 7084)
+++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2011-08-14 03:19:26 UTC (rev 7085)
@@ -23,7 +23,6 @@
import org.exoplatform.container.ExoContainerContext;
import org.exoplatform.portal.resource.compressor.ResourceCompressor;
import org.exoplatform.portal.resource.compressor.ResourceType;
-import org.exoplatform.portal.resource.compressor.impl.ResourceCompressorService;
import org.gatein.common.logging.Logger;
import org.gatein.common.logging.LoggerFactory;
import org.gatein.wci.impl.DefaultServletContainerFactory;
@@ -369,6 +368,8 @@
extendedJavascripts.remove(path);
jsBytes = null;
}
+
+
/**
* Start service.
Modified: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java
===================================================================
--- portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java 2011-08-14 02:48:49 UTC (rev 7084)
+++ portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java 2011-08-14 03:19:26 UTC (rev 7085)
@@ -29,6 +29,7 @@
*/
@ConfiguredBy({
@ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/resource-compressor-service-configuration.xml"),
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/js-service-configuration.xml"),
@ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/skin-service-configuration.xml")
})
public abstract class AbstractWebResourceTest extends AbstractKernelTest
Added: 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 (rev 0)
+++ portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestJavascriptConfigService.java 2011-08-14 03:19:26 UTC (rev 7085)
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2011 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.portal.resource;
+
+import org.exoplatform.container.PortalContainer;
+import org.exoplatform.test.mocks.servlet.MockServletContext;
+import org.exoplatform.web.application.javascript.JavascriptConfigParser;
+import org.exoplatform.web.application.javascript.JavascriptConfigService;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
+/**
+ * @author <a href="mailto:phuong.vu@exoplatform.com">Vu Viet Phuong</a>
+ * @version $Id$
+ *
+ */
+public class TestJavascriptConfigService extends AbstractWebResourceTest
+{
+ private JavascriptConfigService jsService;
+
+ private ServletContext mockServletContext;
+
+ private static final String exModule = "extended.js.test";
+
+ private static final String exPath = "/extended/js/test.js";
+
+ private static final ServletContext exContext = new MockJSServletContext("extendedWebApp", null);
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ final PortalContainer portalContainer = getContainer();
+ jsService = (JavascriptConfigService)portalContainer.getComponentInstanceOfType(JavascriptConfigService.class);
+
+ Map<String, String> resources = new HashMap<String, String>(4);
+ resources.put("/js/test1.js", "aaa;");
+ resources.put("/js/test2.js", "bbb;");
+ resources.put("/js/test3.js", "ccc;");
+ resources.put("/js/test4.js", "ddd;");
+ mockServletContext = new MockJSServletContext("mockwebapp", resources);
+
+ URL url = portalContainer.getPortalClassLoader().getResource("mockwebapp/gatein-resources.xml");
+ JavascriptConfigParser.processConfigResource(url.openStream(), jsService, mockServletContext);
+ }
+
+ public void testAvailableScripts()
+ {
+ assertEquals(4, jsService.getAvailableScripts().size());
+ assertTrue(jsService.isModuleLoaded("js.test1"));
+ assertTrue(jsService.isModuleLoaded("js.test2"));
+ assertTrue(jsService.isModuleLoaded("js.test3"));
+ assertTrue(jsService.isModuleLoaded("js.test4"));
+ assertFalse(jsService.isModuleLoaded("js.test5"));
+ }
+
+ public void testPriority()
+ {
+ Iterator<String> availPaths = jsService.getAvailableScriptsPaths().iterator();
+ assertEquals(mockServletContext.getContextPath() + "/js/test2.js", availPaths.next());
+ assertEquals(mockServletContext.getContextPath() + "/js/test4.js", availPaths.next());
+ assertEquals(mockServletContext.getContextPath() + "/js/test1.js", availPaths.next());
+ assertEquals(mockServletContext.getContextPath() + "/js/test3.js", availPaths.next());
+ assertFalse(availPaths.hasNext());
+ }
+
+ public void testExtendedJS() throws Exception
+ {
+ jsService.addExtendedJavascript(exModule, exPath, exContext, "extendedJS;");
+ assertTrue(jsService.isModuleLoaded(exModule));
+ assertTrue(jsService.getAvailableScriptsPaths().contains(exContext.getContextPath() + exPath));
+ assertEquals("\nbbb;ddd;aaa;ccc;extendedJS;", new String(jsService.getMergedJavascript()));
+
+ long first = jsService.getLastModified();
+ assertTrue(first < System.currentTimeMillis());
+
+ jsService.removeExtendedJavascript(exModule, exPath, exContext);
+
+ assertFalse(jsService.isModuleLoaded(exModule));
+ assertFalse(jsService.getAvailableScriptsPaths().contains(exContext.getContextPath() + exPath));
+ Thread.sleep(1000); //Wait to make sure we can compare lastModified properly
+ assertEquals("\nbbb;ddd;aaa;ccc;", new String(jsService.getMergedJavascript()));
+
+ long second = jsService.getLastModified();
+ assertTrue(first < second);
+ assertTrue(second < System.currentTimeMillis());
+ }
+
+ public void testMergedJS()
+ {
+ String mergedJS = new String(jsService.getMergedJavascript());
+ assertEquals("\nbbb;ddd;aaa;ccc;", mergedJS);
+ assertTrue(jsService.getLastModified() < System.currentTimeMillis());
+ }
+
+ public void testRemoveJS()
+ {
+ assertEquals(4, jsService.getAvailableScripts().size());
+ assertEquals(4, jsService.getAvailableScriptsPaths().size());
+ jsService.remove(mockServletContext);
+ assertEquals(0, jsService.getAvailableScripts().size());
+ assertEquals(0, jsService.getAvailableScriptsPaths().size());
+
+ assertTrue(jsService.getMergedJavascript().length > 0);
+ jsService.refreshMergedJavascript();
+ //bug of service
+// assertTrue(jsService.getMergedJavascript().length == 0);
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ jsService.remove(mockServletContext);
+ jsService.removeExtendedJavascript(exModule, exPath, exContext);
+ }
+
+ private static class MockJSServletContext extends MockServletContext
+ {
+ private Map<String, String> resources;
+
+ public MockJSServletContext(String contextName, Map<String, String> resources)
+ {
+ super(contextName);
+ this.resources = resources;
+ }
+
+ @Override
+ public String getContextPath()
+ {
+ return "/" + getServletContextName();
+ }
+
+ @Override
+ public InputStream getResourceAsStream(String s)
+ {
+ return new ByteArrayInputStream(resources.get(s).getBytes());
+ }
+ }
+}
Added: portal/trunk/component/web/resources/src/test/resources/conf/js-service-configuration.xml
===================================================================
--- portal/trunk/component/web/resources/src/test/resources/conf/js-service-configuration.xml (rev 0)
+++ portal/trunk/component/web/resources/src/test/resources/conf/js-service-configuration.xml 2011-08-14 03:19:26 UTC (rev 7085)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<configuration
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
+ <component>
+ <key>org.exoplatform.web.application.javascript.JavascriptConfigService</key>
+ <type>org.exoplatform.web.application.javascript.JavascriptConfigService</type>
+ </component>
+</configuration>
Modified: portal/trunk/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml
===================================================================
--- portal/trunk/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml 2011-08-14 02:48:49 UTC (rev 7084)
+++ portal/trunk/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml 2011-08-14 03:19:26 UTC (rev 7085)
@@ -118,4 +118,31 @@
</style-theme>
</window-style>
+ <javascript>
+ <param>
+ <js-module>js.test1</js-module>
+ <js-path>/js/test1.js</js-path>
+ <js-priority>-1</js-priority>
+ </param>
+ </javascript>
+ <javascript>
+ <param>
+ <js-module>js.test2</js-module>
+ <js-path>/js/test2.js</js-path>
+ <js-priority>1</js-priority>
+ </param>
+ </javascript>
+ <javascript>
+ <param>
+ <js-module>js.test3</js-module>
+ <js-path>/js/test3.js</js-path>
+ </param>
+ </javascript>
+ <javascript>
+ <param>
+ <js-module>js.test4</js-module>
+ <js-path>/js/test4.js</js-path>
+ <js-priority>2</js-priority>
+ </param>
+ </javascript>
</gatein-resources>
13 years, 5 months
gatein SVN: r7084 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-08-13 22:48:49 -0400 (Sat, 13 Aug 2011)
New Revision: 7084
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java
Log:
GTNPORTAL-2004 UIPage is not cached properly in UIPortal
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2011-08-13 23:45:43 UTC (rev 7083)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2011-08-14 02:48:49 UTC (rev 7084)
@@ -146,7 +146,7 @@
uiPage = clazz.createUIPage(context);
PortalDataMapper.toUIPage(uiPage, page);
- uiPortal.setUIPage(page.getId(), uiPage);
+ uiPortal.setUIPage(pageReference, uiPage);
return uiPage;
}
13 years, 5 months
gatein SVN: r7083 - components/pc/trunk/test/servers/tomcat7.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-08-13 19:45:43 -0400 (Sat, 13 Aug 2011)
New Revision: 7083
Modified:
components/pc/trunk/test/servers/tomcat7/pom.xml
Log:
activate tomcat 7 tests again
Modified: components/pc/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/pom.xml 2011-08-13 23:21:41 UTC (rev 7082)
+++ components/pc/trunk/test/servers/tomcat7/pom.xml 2011-08-13 23:45:43 UTC (rev 7083)
@@ -18,4 +18,12 @@
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
13 years, 5 months
gatein SVN: r7082 - in components/pc/trunk: controller and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-08-13 19:21:41 -0400 (Sat, 13 Aug 2011)
New Revision: 7082
Modified:
components/pc/trunk/api/pom.xml
components/pc/trunk/controller/pom.xml
components/pc/trunk/jsr168api/pom.xml
components/pc/trunk/management/pom.xml
Log:
some more build cleanup
Modified: components/pc/trunk/api/pom.xml
===================================================================
--- components/pc/trunk/api/pom.xml 2011-08-13 23:15:30 UTC (rev 7081)
+++ components/pc/trunk/api/pom.xml 2011-08-13 23:21:41 UTC (rev 7082)
@@ -52,15 +52,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: components/pc/trunk/controller/pom.xml
===================================================================
--- components/pc/trunk/controller/pom.xml 2011-08-13 23:15:30 UTC (rev 7081)
+++ components/pc/trunk/controller/pom.xml 2011-08-13 23:21:41 UTC (rev 7082)
@@ -32,16 +32,4 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
Modified: components/pc/trunk/jsr168api/pom.xml
===================================================================
--- components/pc/trunk/jsr168api/pom.xml 2011-08-13 23:15:30 UTC (rev 7081)
+++ components/pc/trunk/jsr168api/pom.xml 2011-08-13 23:21:41 UTC (rev 7082)
@@ -9,9 +9,4 @@
<packaging>jar</packaging>
<name>GateIn - Portlet Container (JSR 168 API)</name>
- <dependencies>
-
- </dependencies>
-
-
</project>
Modified: components/pc/trunk/management/pom.xml
===================================================================
--- components/pc/trunk/management/pom.xml 2011-08-13 23:15:30 UTC (rev 7081)
+++ components/pc/trunk/management/pom.xml 2011-08-13 23:21:41 UTC (rev 7082)
@@ -16,5 +16,4 @@
</dependency>
</dependencies>
-
</project>
13 years, 5 months
gatein SVN: r7081 - in components/pc/trunk: controller and 4 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-08-13 19:15:30 -0400 (Sat, 13 Aug 2011)
New Revision: 7081
Modified:
components/pc/trunk/controller/pom.xml
components/pc/trunk/federation/pom.xml
components/pc/trunk/pom.xml
components/pc/trunk/portlet/pom.xml
components/pc/trunk/test/core/pom.xml
components/pc/trunk/test/servers/pom.xml
Log:
slf4j-simple was actually already bound in the parent pom on the test scope, no need to redeclare it elsewhere
Modified: components/pc/trunk/controller/pom.xml
===================================================================
--- components/pc/trunk/controller/pom.xml 2011-08-13 23:07:30 UTC (rev 7080)
+++ components/pc/trunk/controller/pom.xml 2011-08-13 23:15:30 UTC (rev 7081)
@@ -14,7 +14,6 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-portlet</artifactId>
- <type>jar</type>
</dependency>
<!-- Dependencies for tests -->
@@ -31,14 +30,6 @@
<scope>test</scope>
</dependency>
- <!--TEST SCOPE-->
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
Modified: components/pc/trunk/federation/pom.xml
===================================================================
--- components/pc/trunk/federation/pom.xml 2011-08-13 23:07:30 UTC (rev 7080)
+++ components/pc/trunk/federation/pom.xml 2011-08-13 23:15:30 UTC (rev 7081)
@@ -23,12 +23,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2011-08-13 23:07:30 UTC (rev 7080)
+++ components/pc/trunk/pom.xml 2011-08-13 23:15:30 UTC (rev 7081)
@@ -249,12 +249,13 @@
</dependencyManagement>
<dependencies>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <!--<version>${org.slf4j.version}</version>-->
<scope>test</scope>
</dependency>
+
</dependencies>
<build>
Modified: components/pc/trunk/portlet/pom.xml
===================================================================
--- components/pc/trunk/portlet/pom.xml 2011-08-13 23:07:30 UTC (rev 7080)
+++ components/pc/trunk/portlet/pom.xml 2011-08-13 23:15:30 UTC (rev 7081)
@@ -44,11 +44,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
Modified: components/pc/trunk/test/core/pom.xml
===================================================================
--- components/pc/trunk/test/core/pom.xml 2011-08-13 23:07:30 UTC (rev 7080)
+++ components/pc/trunk/test/core/pom.xml 2011-08-13 23:15:30 UTC (rev 7081)
@@ -66,11 +66,6 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </dependency>
-
- <dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
<scope>test</scope>
Modified: components/pc/trunk/test/servers/pom.xml
===================================================================
--- components/pc/trunk/test/servers/pom.xml 2011-08-13 23:07:30 UTC (rev 7080)
+++ components/pc/trunk/test/servers/pom.xml 2011-08-13 23:15:30 UTC (rev 7081)
@@ -66,11 +66,6 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </dependency>
-
- <dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
<scope>test</scope>
13 years, 5 months
gatein SVN: r7080 - components/pc/trunk/test/servers.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-08-13 19:07:30 -0400 (Sat, 13 Aug 2011)
New Revision: 7080
Modified:
components/pc/trunk/test/servers/pom.xml
Log:
minor
Modified: components/pc/trunk/test/servers/pom.xml
===================================================================
--- components/pc/trunk/test/servers/pom.xml 2011-08-13 23:06:05 UTC (rev 7079)
+++ components/pc/trunk/test/servers/pom.xml 2011-08-13 23:07:30 UTC (rev 7080)
@@ -143,7 +143,6 @@
<dependency>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
- <version>${version.cargo}</version>
</dependency>
<dependency>
13 years, 5 months
gatein SVN: r7079 - in components/pc/trunk: test/servers and 1 other directory.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-08-13 19:06:05 -0400 (Sat, 13 Aug 2011)
New Revision: 7079
Modified:
components/pc/trunk/pom.xml
components/pc/trunk/test/servers/pom.xml
Log:
more build improvements
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2011-08-13 23:05:37 UTC (rev 7078)
+++ components/pc/trunk/pom.xml 2011-08-13 23:06:05 UTC (rev 7079)
@@ -131,6 +131,18 @@
<artifactId>pc-test-core</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-test-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-test-core</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ </dependency>
<dependency>
@@ -196,6 +208,11 @@
<artifactId>jboss-profileservice-spi</artifactId>
<version>${version.cargo.jboss5.deployer}</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>${version.cargo}</version>
+ </dependency>
<dependency>
<groupId>commons-discovery</groupId>
Modified: components/pc/trunk/test/servers/pom.xml
===================================================================
--- components/pc/trunk/test/servers/pom.xml 2011-08-13 23:05:37 UTC (rev 7078)
+++ components/pc/trunk/test/servers/pom.xml 2011-08-13 23:06:05 UTC (rev 7079)
@@ -39,7 +39,6 @@
<artifactId>log4j</artifactId>
</dependency>
-
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit</artifactId>
@@ -114,19 +113,15 @@
<artifactId>pc-test-core</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-core</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-core</artifactId>
- <version>${project.version}</version>
<type>xml</type>
</dependency>
@@ -149,13 +144,11 @@
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
<version>${version.cargo}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-ant-tasks</artifactId>
- <version>2.1.1</version>
</dependency>
</dependencies>
13 years, 5 months
gatein SVN: r7078 - components/pc/trunk/federation/src/test/java/org/gatein/pc/federation.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-08-13 19:05:37 -0400 (Sat, 13 Aug 2011)
New Revision: 7078
Modified:
components/pc/trunk/federation/src/test/java/org/gatein/pc/federation/FederatingPortletInvokerTestCase.java
Log:
fix CNFE due to previous commit
Modified: components/pc/trunk/federation/src/test/java/org/gatein/pc/federation/FederatingPortletInvokerTestCase.java
===================================================================
--- components/pc/trunk/federation/src/test/java/org/gatein/pc/federation/FederatingPortletInvokerTestCase.java 2011-08-13 22:57:57 UTC (rev 7077)
+++ components/pc/trunk/federation/src/test/java/org/gatein/pc/federation/FederatingPortletInvokerTestCase.java 2011-08-13 23:05:37 UTC (rev 7078)
@@ -40,8 +40,6 @@
import java.util.Locale;
import java.util.Set;
-import static org.jboss.unit.api.Assert.*;
-
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
13 years, 5 months