gatein SVN: r5726 - exo/portal/branches/3.1.x/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-01-11 04:48:07 -0500 (Tue, 11 Jan 2011)
New Revision: 5726
Modified:
exo/portal/branches/3.1.x/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java
Log:
EXOGTN-235 Don't update priority for group navigation after change on menu item
Modified: exo/portal/branches/3.1.x/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java
===================================================================
--- exo/portal/branches/3.1.x/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java 2011-01-11 09:13:59 UTC (rev 5725)
+++ exo/portal/branches/3.1.x/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java 2011-01-11 09:48:07 UTC (rev 5726)
@@ -42,6 +42,8 @@
import org.exoplatform.webui.form.UIFormStringInput;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
/*
@@ -158,60 +160,48 @@
}
WebuiRequestContext pcontext = event.getRequestContext();
-
- // if edit navigation
- if (pageNav != null)
- {
- uiForm.invokeSetBindingBean(pageNav);
- UIFormSelectBox uiSelectBox = uiForm.findComponentById("priority");
- int priority = Integer.parseInt(uiSelectBox.getValue());
- pageNav.setPriority(priority);
-
- // update navigation
- dataService.save(pageNav);
-
- UIPopupWindow uiPopup = uiForm.getParent();
- uiPopup.setShow(false);
- UIComponent opener = uiPopup.getParent();
- pcontext.addUIComponentToUpdateByAjax(opener);
- return;
- }
-
- // if add navigation
- pageNav = new PageNavigation();
- // set properties for navigation
uiForm.invokeSetBindingBean(pageNav);
- UIFormStringInput uiOwnerId = uiForm.findComponentById("ownerId");
- UIFormStringInput uiOwnerType = uiForm.findComponentById("ownerType");
UIFormSelectBox uiSelectBox = uiForm.findComponentById("priority");
int priority = Integer.parseInt(uiSelectBox.getValue());
pageNav.setPriority(priority);
- pageNav.setModifiable(true);
- pageNav.setOwnerId(uiOwnerId.getValue());
- pageNav.setOwnerType(uiOwnerType.getValue());
- //UIPortalApplication uiPortalApp = uiForm.getAncestorOfType(UIPortalApplication.class);
- UIPortalApplication uiPortalApp = Util.getUIPortal().getAncestorOfType(UIPortalApplication.class);
- // ensure this navigation is not exist
- if (dataService.getPageNavigation(pageNav.getOwnerType(), pageNav.getOwnerId()) != null)
- {
- uiPortalApp.addMessage(new ApplicationMessage("UIPageNavigationForm.msg.existPageNavigation",
- new String[]{pageNav.getOwnerId()}));;
- return;
- }
+ // update navigation
+ dataService.save(pageNav);
- // create navigation for group
- dataService.create(pageNav);
+ pageNav = dataService.getPageNavigation(pageNav.getOwnerType(), pageNav.getOwnerId());
- // close popup window, update popup window
+ UIPortalApplication uiPortalApp = Util.getUIPortalApplication();
+ updateNavPriority(uiPortalApp.getNavigations(), pageNav);
+
+ uiPortalApp.localizeNavigations();
+
UIPopupWindow uiPopup = uiForm.getParent();
uiPopup.setShow(false);
UIComponent opener = uiPopup.getParent();
+ UIWorkingWorkspace uiWorkingWS =
+ Util.getUIPortal().getAncestorOfType(UIPortalApplication.class).getChild(UIWorkingWorkspace.class);
+ uiWorkingWS.updatePortletsByName("UserToolbarGroupPortlet");
pcontext.addUIComponentToUpdateByAjax(opener);
+ }
+
+ private void updateNavPriority(List<PageNavigation> navs, PageNavigation nav)
+ {
+ for (int i = 0; i < navs.size(); i++)
+ {
+ if (navs.get(i).getId() == nav.getId())
+ {
+ navs.set(i, nav);
+ break;
+ }
+ }
- UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChild(UIWorkingWorkspace.class);
- uiWorkingWS.updatePortletsByName("GroupNavigationPortlet");
-
+ Collections.sort(navs, new Comparator<PageNavigation>()
+ {
+ public int compare(PageNavigation nav1, PageNavigation nav2)
+ {
+ return nav1.getPriority() - nav2.getPriority();
+ }
+ });
}
}
14 years, 8 months
- 1
- 0
gatein SVN: r5725 - in exo/portal/branches/3.1.x/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap: DefaultSkin/background and 1 other directory.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-01-11 04:13:59 -0500 (Tue, 11 Jan 2011)
New Revision: 5725
Modified:
exo/portal/branches/3.1.x/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultSkin/background/Dotted.gif
exo/portal/branches/3.1.x/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultSkin/background/LastNode.gif
exo/portal/branches/3.1.x/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultStylesheet.css
Log:
EXOGTN-232 IE7: Error UI in Sitemap page when change language to Arabic
Modified: exo/portal/branches/3.1.x/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultSkin/background/Dotted.gif
===================================================================
(Binary files differ)
Modified: exo/portal/branches/3.1.x/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultSkin/background/LastNode.gif
===================================================================
(Binary files differ)
Modified: exo/portal/branches/3.1.x/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultStylesheet.css
===================================================================
--- exo/portal/branches/3.1.x/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultStylesheet.css 2011-01-11 09:01:13 UTC (rev 5724)
+++ exo/portal/branches/3.1.x/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultStylesheet.css 2011-01-11 09:13:59 UTC (rev 5725)
@@ -93,36 +93,36 @@
.UISitemap .UISiteTree .Node {
line-height: 24px;
- background: url('DefaultSkin/background/Dotted.gif') repeat-y 4px top; /* orientation=lt */
- background: url('DefaultSkin/background/Dotted-rt.gif') repeat-y 99.6% top; /* orientation=rt */
+ background: url('DefaultSkin/background/Dotted.gif') repeat-y left top; /* orientation=lt */
+ background: url('DefaultSkin/background/Dotted.gif') repeat-y right top; /* orientation=rt */
}
.UISitemap .UISiteTree .LastNode {
line-height: 24px;
- background: url('DefaultSkin/background/LastNode.gif') no-repeat 4px top; /* orientation=lt */
- background: url('DefaultSkin/background/LastNode-rt.gif') no-repeat 99.6% top; /* orientation=rt */
+ background: url('DefaultSkin/background/LastNode.gif') no-repeat left top; /* orientation=lt */
+ background: url('DefaultSkin/background/LastNode.gif') no-repeat right top; /* orientation=rt */
}
.UISitemap .CollapseIcon {
background: url('DefaultSkin/background/CollapseIcon.gif') no-repeat left center; /* orientation=lt */
background: url('DefaultSkin/background/CollapseIcon-rt.gif') no-repeat right center; /* orientation=rt */
- padding: 0px 5px 0px 35px; /* orientation=lt */
- padding: 0px 35px 0px 5px; /* orientation=rt */
+ padding: 0px 5px 0px 30px; /* orientation=lt */
+ padding: 0px 30px 0px 5px; /* orientation=rt */
cursor: pointer;
}
.UISitemap .ExpandIcon {
background: url('DefaultSkin/background/ExpandIcon.gif') no-repeat left center; /* orientation=lt */
background: url('DefaultSkin/background/ExpandIcon-rt.gif') no-repeat right center; /* orientation=rt */
- padding: 0px 5px 0px 35px; /* orientation=lt */
- padding: 0px 35px 0px 5px; /* orientation=rt */
+ padding: 0px 5px 0px 30px; /* orientation=lt */
+ padding: 0px 30px 0px 5px; /* orientation=rt */
cursor: pointer;
}
.UISitemap .NullItem {
background: url('DefaultSkin/background/NullItem.gif') no-repeat left center; /* orientation=lt */
background: url('DefaultSkin/background/NullItem-rt.gif') no-repeat right center; /* orientation=rt */
- padding: 0px 35px;
+ padding: 0px 30px;
}
.UISitemap .DefaultPageIcon {
14 years, 8 months
- 1
- 0
gatein SVN: r5724 - in exo/portal/branches/3.1.x: webui/core/src/main/java/org/exoplatform/webui/form and 1 other directory.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-01-11 04:01:13 -0500 (Tue, 11 Jan 2011)
New Revision: 5724
Modified:
exo/portal/branches/3.1.x/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js
exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java
Log:
EXOGTN-234 Calendar appearing even on non-focus
Modified: exo/portal/branches/3.1.x/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js
===================================================================
--- exo/portal/branches/3.1.x/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js 2011-01-11 07:07:59 UTC (rev 5723)
+++ exo/portal/branches/3.1.x/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js 2011-01-11 09:01:13 UTC (rev 5724)
@@ -162,6 +162,15 @@
}
}
+UICalendar.prototype.onTabOut = function(event) {
+ var keyCode = event.keyCode;
+
+ // identify the tab key
+ if (keyCode == 9) {
+ eXo.webui.UICalendar.hide();
+ }
+};
+
UICalendar.prototype.hide = function() {
if (this.dateField) {
document.getElementById(this.calendarId).firstChild.style.display = 'none' ;
Modified: exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java
===================================================================
--- exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java 2011-01-11 07:07:59 UTC (rev 5723)
+++ exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java 2011-01-11 09:01:13 UTC (rev 5724)
@@ -234,6 +234,6 @@
w.write(value_.toString());
w.write('\'');
}
- w.write(" onclick='event.cancelBubble = true'/>");
+ w.write(" onclick='event.cancelBubble = true' onkeydown='eXo.webui.UICalendar.onTabOut(event)'/>");
}
}
14 years, 8 months
- 1
- 0
gatein SVN: r5723 - portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/application.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-01-11 02:07:59 -0500 (Tue, 11 Jan 2011)
New Revision: 5723
Modified:
portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
Log:
GTNPORTAL-1667 XSS issues passed in URL
Modified: portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2011-01-11 06:50:46 UTC (rev 5722)
+++ portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2011-01-11 07:07:59 UTC (rev 5723)
@@ -161,7 +161,8 @@
cacheLevel_ = cache;
}
- requestURI_ = URLDecoder.decode(req.getRequestURI(), "UTF-8");
+ requestURI_ = req.getRequestURI();
+ String decodedURI = URLDecoder.decode(requestURI_, "UTF-8");
// req.getPathInfo will already have the encoding set from the server.
// We need to use the UTF-8 value since this is how we store the portal name.
@@ -170,7 +171,7 @@
String contextPath = URLDecoder.decode(req.getContextPath(), "UTF-8");
String pathInfo = "/";
if (requestURI_.length() > servletPath.length() + contextPath.length())
- pathInfo = requestURI_.substring(servletPath.length() + contextPath.length());
+ pathInfo = decodedURI.substring(servletPath.length() + contextPath.length());
int colonIndex = pathInfo.indexOf("/", 1);
if (colonIndex < 0)
@@ -180,13 +181,13 @@
portalOwner_ = pathInfo.substring(1, colonIndex);
nodePath_ = pathInfo.substring(colonIndex, pathInfo.length());
- portalURI = requestURI_.substring(0, requestURI_.lastIndexOf(nodePath_)) + "/";
+ portalURI = decodedURI.substring(0, decodedURI.lastIndexOf(nodePath_)) + "/";
- if (requestURI_.indexOf("/public/") >= 0)
+ if (decodedURI.indexOf("/public/") >= 0)
{
accessPath = PUBLIC_ACCESS;
}
- else if (requestURI_.indexOf("/private/") >= 0)
+ else if (decodedURI.indexOf("/private/") >= 0)
{
accessPath = PRIVATE_ACCESS;
}
14 years, 8 months
- 1
- 0
gatein SVN: r5722 - in portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui: portal and 1 other directory.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-01-11 01:50:46 -0500 (Tue, 11 Jan 2011)
New Revision: 5722
Modified:
portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java
portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
Log:
GTNPORTAL-1743 Multi-panguage navigation nodes failed for the language having particular country
Modified: portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java 2011-01-11 02:33:36 UTC (rev 5721)
+++ portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java 2011-01-11 06:50:46 UTC (rev 5722)
@@ -414,7 +414,7 @@
if (nav.getOwnerType().equals(PortalConfig.USER_TYPE))
return;
ResourceBundle res =
- i18nManager.getNavigationResourceBundle(locale.getLanguage(), nav.getOwnerType(), nav.getOwnerId());
+ i18nManager.getNavigationResourceBundle(locale.toString(), nav.getOwnerType(), nav.getOwnerId());
for (PageNode node : nav.getNodes())
{
resolveLabel(res, node);
Modified: portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2011-01-11 02:33:36 UTC (rev 5721)
+++ portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2011-01-11 06:50:46 UTC (rev 5722)
@@ -382,7 +382,7 @@
ResourceBundleManager mgr = getApplicationComponent(ResourceBundleManager.class);
if (nav.getOwnerType().equals(PortalConfig.USER_TYPE))
return;
- ResourceBundle res = mgr.getNavigationResourceBundle(locale.getLanguage(), nav.getOwnerType(), nav.getOwnerId());
+ ResourceBundle res = mgr.getNavigationResourceBundle(locale.toString(), nav.getOwnerType(), nav.getOwnerId());
for (PageNode node : nav.getNodes())
{
resolveLabel(res, node);
14 years, 8 months
- 1
- 0
gatein SVN: r5720 - portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2011-01-10 20:55:39 -0500 (Mon, 10 Jan 2011)
New Revision: 5720
Modified:
portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInJsonContainerConfig.java
Log:
GTNPORTAL-1712: Add copyright section and remove redundant log
Modified: portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInJsonContainerConfig.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInJsonContainerConfig.java 2011-01-10 15:41:09 UTC (rev 5719)
+++ portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInJsonContainerConfig.java 2011-01-11 01:55:39 UTC (rev 5720)
@@ -1,3 +1,23 @@
+/**
+ * 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.
+ */
+
+
package org.exoplatform.portal.gadget.core;
import org.apache.commons.io.IOUtils;
@@ -220,7 +240,6 @@
for (String entry : files) {
LOG.info("Reading container config: " + entry);
final ClassLoader contextCl = Thread.currentThread().getContextClassLoader();
- LOG.info("Current context class loader " + contextCl.toString() + " type : " + contextCl.getClass());
InputStream resourceInputStream = contextCl.getResourceAsStream(entry);
String content = IOUtils.toString(resourceInputStream, "UTF-8");
loadFromString(content, all);
14 years, 8 months
- 1
- 0
gatein SVN: r5719 - in components/pc/trunk/test/servers: jboss42/src/test and 12 other directories.
by do-not-reply＠jboss.org
Author: alain_defrance
Date: 2011-01-10 10:41:09 -0500 (Mon, 10 Jan 2011)
New Revision: 5719
Added:
components/pc/trunk/test/servers/src/common/resources/common.xml
Removed:
components/pc/trunk/test/servers/jboss42/src/test/resources/ha/
components/pc/trunk/test/servers/jboss42/src/test/resources/info/
components/pc/trunk/test/servers/jboss42/src/test/resources/jsr168/
components/pc/trunk/test/servers/jboss42/src/test/resources/jsr286/
components/pc/trunk/test/servers/jboss51/src/test/resources/ha/
components/pc/trunk/test/servers/jboss51/src/test/resources/info/
components/pc/trunk/test/servers/jboss51/src/test/resources/jsr168/
components/pc/trunk/test/servers/jboss51/src/test/resources/jsr286/
components/pc/trunk/test/servers/jetty6/src/test/resources/ha/
components/pc/trunk/test/servers/jetty6/src/test/resources/info/
components/pc/trunk/test/servers/jetty6/src/test/resources/jsr168/
components/pc/trunk/test/servers/jetty6/src/test/resources/jsr286/
components/pc/trunk/test/servers/src/common/resources/common.xml
components/pc/trunk/test/servers/src/common/resources/common2.xml
components/pc/trunk/test/servers/tomcat7/src/test/resources/ha/
components/pc/trunk/test/servers/tomcat7/src/test/resources/info/
components/pc/trunk/test/servers/tomcat7/src/test/resources/jsr168/
components/pc/trunk/test/servers/tomcat7/src/test/resources/jsr286/
Modified:
components/pc/trunk/test/servers/jboss42/pom.xml
components/pc/trunk/test/servers/jboss42/src/test/build.xml
components/pc/trunk/test/servers/jboss51/pom.xml
components/pc/trunk/test/servers/jboss51/src/test/build.xml
components/pc/trunk/test/servers/jetty6/pom.xml
components/pc/trunk/test/servers/jetty6/src/test/build.xml
components/pc/trunk/test/servers/tomcat6/pom.xml
components/pc/trunk/test/servers/tomcat7/pom.xml
components/pc/trunk/test/servers/tomcat7/src/test/build.xml
Log:
GTNPC-46
Modified: components/pc/trunk/test/servers/jboss42/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss42/pom.xml 2011-01-10 13:57:06 UTC (rev 5718)
+++ components/pc/trunk/test/servers/jboss42/pom.xml 2011-01-10 15:41:09 UTC (rev 5719)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
@@ -10,10 +11,6 @@
<name>GateIn - Portlet Container (test - servers - JBoss 4.2)</name>
<dependencies>
- <dependency>
- <groupId>org.gatein.common</groupId>
- <artifactId>common-mc</artifactId>
- </dependency>
<dependency>
<groupId>org.gatein.common</groupId>
@@ -134,6 +131,14 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-test-core</artifactId>
+ <version>2.3.0-Alpha01-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
<!-- JSTL for Tomcat -->
<dependency>
<groupId>apache-taglibs</groupId>
@@ -144,6 +149,7 @@
<artifactId>standard</artifactId>
</dependency>
+
<dependency>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat6</artifactId>
@@ -160,6 +166,13 @@
<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>
<profiles>
@@ -277,7 +290,7 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
+ <version>1.5</version>
<dependencies>
@@ -337,57 +350,14 @@
<isset property="test.cargo.debug"/>
</condition>
<condition property="cargo.debug" value="">
- <not>
- <isset property="test.cargo.debug"/>
- </not>
+ <not>
+ <isset property="test.cargo.debug"/>
+ </not>
</condition>
- <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/>
- <property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
- <property name="dependency.commons-httpclient.jar" value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/>
- <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}"/>
- <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}"/>
- <property name="dependency.jsr168api.jar" value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
- <property name="dependency.ccpp.jar" value="${maven.dependency.javax.ccpp.ccpp.jar.path}"/>
- <property name="dependency.jaxb.jar" value="${maven.dependency.sun-jaxb.jaxb-api.jar.path}"/>
-
- <property name="dependency.portal-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
- <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
- <property name="dependency.portal-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
- <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
- <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
-
- <property name="dependency.portal-wci-wci.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
- <property name="dependency.portal-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}"/>
-
- <property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
- <property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
- <property name="dependency.portal-portlet-mc.jar" value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
- <property name="dependency.portal-portlet-api.jar" value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
-
- <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
- <property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
- <property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
- <property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
- <property name="dependency.jboss-remoting.jar" value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
-
- <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/>
- <property name="dependency.trove.jar" value="${maven.dependency.trove.trove.jar.path}"/>
- <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
- <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
- <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
- <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
- <property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
- <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
- <property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
- <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
-
- <property name="dependency.apache-jstl.jar" value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
- <property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
-
<!-- location of common.xml shared between the different server's build.xml -->
- <property name="common.xml.file" value="${test.common.xml}"/>
+ <!-- for now hardcode like that, it should be probably moved to the test-core package -->
+ <property name="common.xml.file" value="${project.basedir}/../src/common/resources/common.xml"/>
<ant antfile="${basedir}/src/test/build.xml" inheritRefs="true">
<target name="tests"/>
Modified: components/pc/trunk/test/servers/jboss42/src/test/build.xml
===================================================================
--- components/pc/trunk/test/servers/jboss42/src/test/build.xml 2011-01-10 13:57:06 UTC (rev 5718)
+++ components/pc/trunk/test/servers/jboss42/src/test/build.xml 2011-01-10 15:41:09 UTC (rev 5719)
@@ -14,7 +14,47 @@
<property name="test.remote.server.name" value="RemoteJBoss_4_2"/>
<property name="cargo.container.id" value="jboss42x"/>
+ <path id="JBoss-4.2">
+ <path refid="portal-common"/>
+ <path refid="portal-web"/>
+ <path refid="portal-portlet"/>
+ <path refid="jboss-xb"/>
+ <path location="${org.jboss:jboss-common-core:jar}"/>
+ </path>
+
+ <path id="JBoss-4.2-shared">
+ <path refid="portal-common-shared"/>
+ <path refid="portal-web-shared"/>
+ <path refid="portal-portlet-shared"/>
+ <path refid="jboss-unit-shared"/>
+ <path location="${javax.ccpp:ccpp:jar}"/>
+ <path location="${org.gatein.wci:wci-tomcat6:jar}"/>
+ </path>
+
<target name="tests" unless="maven.test.skip">
+
+ <property environment="env"/>
+
+ <!--If properties are not in command line check if they are set in env-->
+ <condition property="JBOSS_4_2_HOME" value="${env.JBOSS_4_2_HOME}">
+ <and>
+ <isset property="env.JBOSS_4_2_HOME"/>
+ <not>
+ <isset property="JBOSS_4_2_HOME"/>
+ </not>
+ </and>
+ </condition>
+ <echo message="JBOSS_4_2_HOME: ${JBOSS_4_2_HOME}"/>
+ <fail message="Please set the environment variable JBOSS_4_2_HOME">
+ <condition>
+ <and>
+ <not>
+ <isset property="JBOSS_4_2_HOME"/>
+ </not>
+ </and>
+ </condition>
+ </fail>
+
<antcall target="tests.common"/>
</target>
Modified: components/pc/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss51/pom.xml 2011-01-10 13:57:06 UTC (rev 5718)
+++ components/pc/trunk/test/servers/jboss51/pom.xml 2011-01-10 15:41:09 UTC (rev 5719)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
@@ -10,10 +11,6 @@
<name>GateIn - Portlet Container (test - servers - JBoss 5.1)</name>
<dependencies>
- <dependency>
- <groupId>org.gatein.common</groupId>
- <artifactId>common-mc</artifactId>
- </dependency>
<dependency>
<groupId>org.gatein.common</groupId>
@@ -134,6 +131,14 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-test-core</artifactId>
+ <version>2.3.0-Alpha01-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
<!-- JSTL for Tomcat -->
<dependency>
<groupId>apache-taglibs</groupId>
@@ -144,12 +149,12 @@
<artifactId>standard</artifactId>
</dependency>
+
<dependency>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat6</artifactId>
</dependency>
- <!-- JBoss Deployer -->
<dependency>
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-profileservice-spi</artifactId>
@@ -167,6 +172,13 @@
<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>
<profiles>
@@ -284,7 +296,7 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
+ <version>1.5</version>
<dependencies>
@@ -344,61 +356,14 @@
<isset property="test.cargo.debug"/>
</condition>
<condition property="cargo.debug" value="">
- <not>
- <isset property="test.cargo.debug"/>
- </not>
+ <not>
+ <isset property="test.cargo.debug"/>
+ </not>
</condition>
- <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/>
- <property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
- <property name="dependency.commons-httpclient.jar" value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/>
- <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}"/>
- <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}"/>
- <property name="dependency.jsr168api.jar" value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
- <property name="dependency.ccpp.jar" value="${maven.dependency.javax.ccpp.ccpp.jar.path}"/>
- <property name="dependency.jaxb.jar" value="${maven.dependency.sun-jaxb.jaxb-api.jar.path}"/>
-
- <property name="dependency.portal-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
- <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
- <property name="dependency.portal-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
- <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
- <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
-
- <property name="dependency.portal-wci-wci.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
- <property name="dependency.portal-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}"/>
-
- <property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
- <property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
- <property name="dependency.portal-portlet-mc.jar" value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
- <property name="dependency.portal-portlet-api.jar" value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
-
- <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
- <property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
- <property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
- <property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
- <property name="dependency.jboss-remoting.jar" value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
-
- <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/>
- <property name="dependency.trove.jar" value="${maven.dependency.trove.trove.jar.path}"/>
- <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
- <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
- <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
- <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
- <property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
- <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
- <property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
- <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
-
- <property name="dependency.cargo-jboss-deployer.jar" value="${maven.dependency.org.codehaus.cargo.cargo-core-tools-jboss-deployer-5.1-and-onwards.jar.path}" />
- <property name="dependency.jboss-profile-service.jar" value="${maven.dependency.org.jboss.integration.jboss-profileservice-spi.jar.path}" />
- <property name="dependency.cargo-core-container-jboss.jar" value="${maven.dependency.org.codehaus.cargo.cargo-core-container-jboss.jar.path}" />
-
- <property name="dependency.apache-jstl.jar" value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
- <property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
-
<!-- location of common.xml shared between the different server's build.xml -->
- <property name="common.xml.file" value="${test.common.xml}"/>
+ <!-- for now hardcode like that, it should be probably moved to the test-core package -->
+ <property name="common.xml.file" value="${project.basedir}/../src/common/resources/common.xml"/>
<ant antfile="${basedir}/src/test/build.xml" inheritRefs="true">
<target name="tests"/>
Modified: components/pc/trunk/test/servers/jboss51/src/test/build.xml
===================================================================
--- components/pc/trunk/test/servers/jboss51/src/test/build.xml 2011-01-10 13:57:06 UTC (rev 5718)
+++ components/pc/trunk/test/servers/jboss51/src/test/build.xml 2011-01-10 15:41:09 UTC (rev 5719)
@@ -14,7 +14,52 @@
<property name="test.remote.server.name" value="RemoteJBoss_5_1"/>
<property name="cargo.container.id" value="jboss51x"/>
+ <path id="JBoss-5.1">
+ <path refid="portal-common"/>
+ <path refid="portal-web"/>
+ <path refid="portal-portlet"/>
+ <path refid="jboss-xb"/>
+ <path location="${org.jboss:jboss-common-core:jar}"/>
+ </path>
+
+ <path id="JBoss-5.1-shared">
+ <path refid="portal-common-shared"/>
+ <path refid="portal-web-shared"/>
+ <path refid="portal-portlet-shared"/>
+ <path refid="jboss-unit-shared"/>
+ <path location="${javax.ccpp:ccpp:jar}"/>
+ <path location="${org.gatein.wci:wci-tomcat6:jar}"/>
+
+ <!-- paths needed for remote jboss deployment -->
+ <path location="${org.codehaus.cargo:cargo-core-tools-jboss-deployer-5.1-and-onwards:jar}"/>
+ <path location="${org.jboss.integration:jboss-profileservice-spi:jar}"/>
+ <path location="${org.codehaus.cargo:cargo-core-container-jboss:jar}"/>
+ </path>
+
<target name="tests" unless="maven.test.skip">
+
+ <property environment="env"/>
+
+ <!--If properties are not in command line check if they are set in env-->
+ <condition property="JBOSS_5_1_HOME" value="${env.JBOSS_5_1_HOME}">
+ <and>
+ <isset property="env.JBOSS_5_1_HOME"/>
+ <not>
+ <isset property="JBOSS_5_1_HOME"/>
+ </not>
+ </and>
+ </condition>
+ <echo message="JBOSS_5_1_HOME: ${JBOSS_5_1_HOME}"/>
+ <fail message="Please set the environment variable JBOSS_5_1_HOME">
+ <condition>
+ <and>
+ <not>
+ <isset property="JBOSS_5_1_HOME"/>
+ </not>
+ </and>
+ </condition>
+ </fail>
+
<antcall target="tests.common"/>
</target>
Modified: components/pc/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jetty6/pom.xml 2011-01-10 13:57:06 UTC (rev 5718)
+++ components/pc/trunk/test/servers/jetty6/pom.xml 2011-01-10 15:41:09 UTC (rev 5719)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
@@ -9,12 +10,7 @@
<packaging>jar</packaging>
<name>GateIn - Portlet Container (test - servers - Jetty 6)</name>
-
<dependencies>
- <dependency>
- <groupId>org.gatein.common</groupId>
- <artifactId>common-mc</artifactId>
- </dependency>
<dependency>
<groupId>org.gatein.common</groupId>
@@ -141,6 +137,14 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-test-core</artifactId>
+ <version>2.3.0-Alpha01-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
<!-- JSTL for Tomcat -->
<dependency>
<groupId>apache-taglibs</groupId>
@@ -168,6 +172,13 @@
<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>
<profiles>
@@ -285,7 +296,7 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
+ <version>1.5</version>
<dependencies>
@@ -345,58 +356,14 @@
<isset property="test.cargo.debug"/>
</condition>
<condition property="cargo.debug" value="">
- <not>
- <isset property="test.cargo.debug"/>
- </not>
+ <not>
+ <isset property="test.cargo.debug"/>
+ </not>
</condition>
- <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/>
- <property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
- <property name="dependency.commons-httpclient.jar" value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/>
- <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}"/>
- <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}"/>
- <property name="dependency.jsr168api.jar" value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
- <property name="dependency.ccpp.jar" value="${maven.dependency.javax.ccpp.ccpp.jar.path}"/>
- <property name="dependency.jaxb.jar" value="${maven.dependency.sun-jaxb.jaxb-api.jar.path}"/>
-
- <property name="dependency.portal-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
- <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
- <property name="dependency.portal-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
- <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
- <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
-
- <property name="dependency.portal-wci-wci.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
- <property name="dependency.portal-wci-jetty.jar" value="${maven.dependency.org.gatein.wci.wci-jetty.jar.path}"/>
-
- <property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
- <property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
- <property name="dependency.portal-portlet-mc.jar" value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
- <property name="dependency.portal-portlet-api.jar" value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
-
- <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
- <property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
- <property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
- <property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
- <property name="dependency.jboss-remoting.jar" value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
-
- <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/>
- <property name="dependency.trove.jar" value="${maven.dependency.trove.trove.jar.path}"/>
- <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
- <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
- <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
- <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
- <property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
- <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
- <property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
- <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
-
- <property name="dependency.apache-jstl.jar" value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
- <property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
- <property name="dependency.cargo.jetty-deployer" value="${maven.dependency.org.codehaus.cargo.cargo-jetty-deployer.war.path}"/>
-
<!-- location of common.xml shared between the different server's build.xml -->
- <property name="common.xml.file" value="${test.common.xml}"/>
+ <!-- for now hardcode like that, it should be probably moved to the test-core package -->
+ <property name="common.xml.file" value="${project.basedir}/../src/common/resources/common.xml"/>
<ant antfile="${basedir}/src/test/build.xml" inheritRefs="true">
<target name="tests"/>
Modified: components/pc/trunk/test/servers/jetty6/src/test/build.xml
===================================================================
--- components/pc/trunk/test/servers/jetty6/src/test/build.xml 2011-01-10 13:57:06 UTC (rev 5718)
+++ components/pc/trunk/test/servers/jetty6/src/test/build.xml 2011-01-10 15:41:09 UTC (rev 5719)
@@ -14,7 +14,58 @@
<property name="test.remote.server.name" value="RemoteJetty_6_1"/>
<property name="cargo.container.id" value="jetty6x"/>
+ <path id="Jetty-6.1">
+ <path refid="portal-common"/>
+ <path refid="portal-web"/>
+ <path refid="portal-portlet"/>
+ <path refid="jboss-unit"/>
+ <path refid="jboss-xb"/>
+ <pathelement path="${apache-xerces:xercesImpl:jar}"/>
+ <pathelement path="${apache-xerces:resolver:jar}"/>
+ <pathelement path="${apache-xerces.xml-apis:jar}"/>
+ <pathelement path="${trove:trove:jar}"/>
+ </path>
+
+ <path id="Jetty-6.1-shared">
+ <path refid="portal-common-shared"/>
+ <path refid="portal-web-shared"/>
+ <path refid="portal-portlet-shared"/>
+ <path refid="jboss-unit-shared"/>
+ <path refid="jboss-logging"/>
+ <path location="${org.jboss:jboss-common-core:jar}"/>
+ <path location="${apache-log4j:log4j:jar}"/>
+ <path location="${concurrent:concurrent:jar}"/>
+ <path location="${javax.activation:activation:jar}"/>
+ <path location="${sun-jaxb:jaxb-api:jar}"/>
+ <path location="${javax.ccpp:ccpp:jar}"/>
+ <path location="${jboss:jboss-serialization:jar}"/>
+ <path location="${org.gatein.wci:wci-jetty:jar}"/>
+ </path>
+
<target name="tests" unless="maven.test.skip">
+
+ <property environment="env"/>
+
+ <!--If properties are not in command line check if they are set in env-->
+ <condition property="JETTY_6_1_HOME" value="${env.JETTY_6_1_HOME}">
+ <and>
+ <isset property="env.JETTY_6_1_HOME"/>
+ <not>
+ <isset property="JETTY_6_1_HOME"/>
+ </not>
+ </and>
+ </condition>
+ <echo message="JETTY_6_1_HOME: ${JETTY_6_1_HOME}"/>
+ <fail message="Please set the environment variable JETTY_6_1_HOME">
+ <condition>
+ <and>
+ <not>
+ <isset property="JETTY_6_1_HOME"/>
+ </not>
+ </and>
+ </condition>
+ </fail>
+
<antcall target="tests.common"/>
</target>
@@ -42,7 +93,7 @@
<property name="cargo.jvmargs" value="-Duser.language=en ${cargo.debug}"/>
<configfile file="${basedir}/src/test/resources/config/jetty/jetty.xml" todir="etc"/>
<configfile file="${basedir}/src/test/resources/config/jetty/realm.properties" todir="etc"/>
- <deployable type="war" file="${dependency.cargo.jetty-deployer}">
+ <deployable type="war" file="${org.codehaus.cargo:cargo-jetty-deployer:war}">
<property name="context" value="cargo-jetty-deployer"/>
</deployable>
<deployable type="war" file="${test.temp.lib}/Jetty-6.1/portlet-test.war"/>
Deleted: components/pc/trunk/test/servers/src/common/resources/common.xml
===================================================================
--- components/pc/trunk/test/servers/src/common/resources/common.xml 2011-01-10 13:57:06 UTC (rev 5718)
+++ components/pc/trunk/test/servers/src/common/resources/common.xml 2011-01-10 15:41:09 UTC (rev 5719)
@@ -1,592 +0,0 @@
-<?xml version="1.0"?>
-<project name="portlet-integration-test">
-
- <property name="target.dir" value="${basedir}/target"/>
- <property name="test.dir" value="${target.dir}/integration-tests"/>
- <property name="test.cargo.dir" value="${test.dir}/cargo/"/>
-
- <target name="tests.common" depends="prepare_env, evaluate_properties.init" >
-
- <echo message="compile classpath: ${compile_classpath}"/>
- <echo message="runtime classpath: ${runtime_classpath}"/>
- <echo message="test classpath: ${test_classpath}"/>
- <echo message="plugin classpath: ${plugin_classpath}"/>
- <echo message="base directory: ${basedir}"/>
-
- <echo message="You can run small subset of tests using -Pjboss42, -Pjboss51, -Ptomcat6, -Ptomcat7"/>
-
- <antcall target="package-tests"/>
-
- <antcall target="evaluate_properties.all"/>
- <antcall target="test.container-servlet"/>
-
- </target>
-
- <target name="prepare_env">
-
- <!--Relative path to target dir-->
- <property name="target" value="${basedir}/target"/>
- <property name="test.temp.dir" value="${target}/integration-tests/test-apps"/>
- <property name="test.temp.portlet" value="${test.temp.dir}/portlet-test"/>
- <property name="test.temp.lib" value="${test.temp.dir}/lib"/>
-
- <mkdir dir="${test.temp.dir}"/>
- <mkdir dir="${test.temp.lib}"/>
- <mkdir dir="${target}/jboss-unit"/>
-
- <echo message="Preparing environment"/>
-
- <path id="jboss-logging">
- <pathelement path="${dependency.jboss-logging-spi.jar}"/>
- <pathelement path="${dependency.jboss-logging-jdk.jar}"/>
- <pathelement path="${dependency.jboss-logging-log4j.jar}"/>
- </path>
-
- <path id="jboss-microcontainer">
- <pathelement path="${dependency.jbossxb.jar}"/>
- </path>
-
- <path id="portal-common">
- <pathelement path="${dependency.portal-common-mc.jar}"/>
- </path>
-
- <path id="portal-common-shared">
- <pathelement path="${dependency.portal-common-common.jar}"/>
- <pathelement path="${dependency.portal-common-logging.jar}"/>
- <pathelement path="${dependency.slf4j-simple.jar}"/>
- <pathelement path="${dependency.slf4j-api.jar}"/>
- </path>
-
- <path id="portal-web">
- </path>
-
- <path id="portal-web-shared">
- <pathelement path="${dependency.portal-wci-wci.jar}"/>
- </path>
-
- <path id="portal-portlet">
- <pathelement path="${dependency.portal-portlet-controller.jar}"/>
- <pathelement path="${dependency.portal-portlet-mc.jar}"/>
- <pathelement path="${dependency.portal-portlet-tests.jar}"/>
- </path>
-
- <path id="portal-portlet-shared">
- <path location="${dependency.portal-portlet-portlet.jar}"/>
- <path location="${dependency.portal-portlet-api.jar}"/>
- <path location="${dependency.jsr168api.jar}"/>
- </path>
-
- <path id="jboss-unit">
- </path>
-
- <path id="jboss-unit-shared">
- <pathelement path="${dependency.jboss-unit.jar}"/>
- <pathelement path="${dependency.jboss-unit-remote.jar}"/>
- <pathelement path="${dependency.portal-test-generic.jar}"/>
- <pathelement path="${dependency.portal-test.jar}"/>
- <pathelement path="${dependency.jboss-remoting.jar}"/>
- </path>
-
- <path id="JBoss-4.2">
- <path refid="portal-common"/>
- <path refid="portal-web"/>
- <path refid="portal-portlet"/>
- <path refid="jboss-microcontainer"/>
- <path location="${dependency.jboss-common-core.jar}"/>
- </path>
-
- <path id="JBoss-4.2-shared">
- <path refid="portal-common-shared"/>
- <path refid="portal-web-shared"/>
- <path refid="portal-portlet-shared"/>
- <path refid="jboss-unit-shared"/>
- <path location="${dependency.ccpp.jar}"/>
- <path location="${dependency.portal-wci-tomcat.jar}"/>
- </path>
-
- <path id="JBoss-5.1">
- <path refid="portal-common"/>
- <path refid="portal-web"/>
- <path refid="portal-portlet"/>
- <path refid="jboss-microcontainer"/>
- <path location="${dependency.jboss-common-core.jar}"/>
- </path>
-
- <path id="JBoss-5.1-shared">
- <path refid="portal-common-shared"/>
- <path refid="portal-web-shared"/>
- <path refid="portal-portlet-shared"/>
- <path refid="jboss-unit-shared"/>
- <path location="${dependency.ccpp.jar}"/>
- <path location="${dependency.portal-wci-tomcat.jar}"/>
-
- <!-- paths needed for remote jboss deployment -->
- <path location="${dependency.cargo-jboss-deployer.jar}"/>
- <path location="${dependency.jboss-profile-service.jar}"/>
- <path location="${dependency.cargo-core-container-jboss.jar}"/>
- </path>
-
- <path id="Tomcat-6.0">
- <path refid="portal-common"/>
- <path refid="portal-web"/>
- <path refid="portal-portlet"/>
- <path refid="jboss-unit"/>
- <path refid="jboss-microcontainer"/>
- <pathelement path="${dependency.xercesImpl.jar}"/>
- <pathelement path="${dependency.resolver.jar}"/>
- <pathelement path="${dependency.xml-apis.jar}"/>
- <pathelement path="${dependency.trove.jar}"/>
- </path>
-
- <path id="Tomcat-6.0-shared">
- <path refid="portal-common-shared"/>
- <path refid="portal-web-shared"/>
- <path refid="portal-portlet-shared"/>
- <path refid="jboss-unit-shared"/>
- <path refid="jboss-logging"/>
- <path location="${dependency.jboss-common-core.jar}"/>
- <path location="${dependency.log4j.jar}"/>
- <path location="${dependency.concurrent.jar}"/>
- <path location="${dependency.activation.jar}"/>
- <path location="${dependency.jaxb.jar}"/>
- <path location="${dependency.ccpp.jar}"/>
- <path location="${dependency.jboss-serialization.jar}"/>
- <path location="${dependency.portal-wci-tomcat.jar}"/>
- </path>
-
- <path id="Tomcat-7.0">
- <path refid="portal-common"/>
- <path refid="portal-web"/>
- <path refid="portal-portlet"/>
- <path refid="jboss-unit"/>
- <path refid="jboss-microcontainer"/>
- <pathelement path="${dependency.xercesImpl.jar}"/>
- <pathelement path="${dependency.resolver.jar}"/>
- <pathelement path="${dependency.xml-apis.jar}"/>
- <pathelement path="${dependency.trove.jar}"/>
- </path>
-
- <path id="Tomcat-7.0-shared">
- <path refid="portal-common-shared"/>
- <path refid="portal-web-shared"/>
- <path refid="portal-portlet-shared"/>
- <path refid="jboss-unit-shared"/>
- <path refid="jboss-logging"/>
- <path location="${dependency.jboss-common-core.jar}"/>
- <path location="${dependency.log4j.jar}"/>
- <path location="${dependency.concurrent.jar}"/>
- <path location="${dependency.activation.jar}"/>
- <path location="${dependency.jaxb.jar}"/>
- <path location="${dependency.ccpp.jar}"/>
- <path location="${dependency.jboss-serialization.jar}"/>
- <path location="${dependency.portal-wci-tomcat.jar}"/>
- </path>
-
- <path id="Jetty-6.1">
- <path refid="portal-common"/>
- <path refid="portal-web"/>
- <path refid="portal-portlet"/>
- <path refid="jboss-unit"/>
- <path refid="jboss-microcontainer"/>
- <pathelement path="${dependency.xercesImpl.jar}"/>
- <pathelement path="${dependency.resolver.jar}"/>
- <pathelement path="${dependency.xml-apis.jar}"/>
- <pathelement path="${dependency.trove.jar}"/>
- </path>
-
- <path id="Jetty-6.1-shared">
- <path refid="portal-common-shared"/>
- <path refid="portal-web-shared"/>
- <path refid="portal-portlet-shared"/>
- <path refid="jboss-unit-shared"/>
- <path refid="jboss-logging"/>
- <path location="${dependency.jboss-common-core.jar}"/>
- <path location="${dependency.log4j.jar}"/>
- <path location="${dependency.concurrent.jar}"/>
- <path location="${dependency.activation.jar}"/>
- <path location="${dependency.jaxb.jar}"/>
- <path location="${dependency.ccpp.jar}"/>
- <path location="${dependency.jboss-serialization.jar}"/>
- <path location="${dependency.portal-wci-jetty.jar}"/>
- </path>
-
- </target>
-
- <!-- Check which servlet containers are known -->
- <target name="evaluate_properties.init">
-
- <property environment="env"/>
-
- <!--If properties are not in command line check if they are set in env-->
- <condition property="JBOSS_4_2_HOME" value="${env.JBOSS_4_2_HOME}">
- <and>
- <isset property="env.JBOSS_4_2_HOME"/>
- <not>
- <isset property="JBOSS_4_2_HOME"/>
- </not>
- </and>
- </condition>
- <condition property="JBOSS_5_1_HOME" value="${env.JBOSS_5_1_HOME}">
- <and>
- <isset property="env.JBOSS_5_1_HOME"/>
- <not>
- <isset property="JBOSS_5_1_HOME"/>
- </not>
- </and>
- </condition>
- <condition property="TOMCAT_6_0_HOME" value="${env.TOMCAT_6_0_HOME}">
- <and>
- <isset property="env.TOMCAT_6_0_HOME"/>
- <not>
- <isset property="TOMCAT_6_0_HOME"/>
- </not>
- </and>
- </condition>
- <condition property="TOMCAT_7_0_HOME" value="${env.TOMCAT_7_0_HOME}">
- <and>
- <isset property="env.TOMCAT_7_0_HOME"/>
- <not>
- <isset property="TOMCAT_7_0_HOME"/>
- </not>
- </and>
- </condition>
- <condition property="JETTY_6_1_HOME" value="${env.JETTY_6_1_HOME}">
- <and>
- <isset property="env.JETTY_6_1_HOME"/>
- <not>
- <isset property="JETTY_6_1_HOME"/>
- </not>
- </and>
- </condition>
-
- <echo message="JBOSS_4_2_HOME: ${JBOSS_4_2_HOME}"/>
- <echo message="JBOSS_5_1_HOME: ${JBOSS_5_1_HOME}"/>
- <echo message="TOMCAT_6_0_HOME: ${TOMCAT_6_0_HOME}"/>
- <echo message="TOMCAT_7_0_HOME: ${TOMCAT_7_0_HOME}"/>
- <echo message="JETTY_6_1_HOME: ${JETTY_6_1_HOME}"/>
- </target>
-
- <target name="evaluate_properties.tomcat">
- <fail message="Please set the environment variable TOMCAT_6_0_HOME">
- <condition>
- <and>
- <not>
- <isset property="TOMCAT_6_0_HOME"/>
- </not>
- </and>
- </condition>
- </fail>
- </target>
-
- <target name="evaluate_properties.jetty">
- <fail message="Please set the environment variable JETTY_6_1_HOME">
- <condition>
- <and>
- <not>
- <isset property="JETTY_6_1_HOME"/>
- </not>
- </and>
- </condition>
- </fail>
- </target>
-
- <target name="evaluate_properties.jboss">
- <fail message="Please set the environment variables JBOSS_4_2_HOME">
- <condition>
- <and>
- <not>
- <isset property="JBOSS_4_2_HOME"/>
- </not>
- </and>
- </condition>
- </fail>
- <fail message="Please set the environment variable JBOSS_5_1_HOME">
- <condition>
- <and>
- <not>
- <isset property="JBOSS_5_1_HOME"/>
- </not>
- </and>
- </condition>
- </fail>
- </target>
-
- <target name="evaluate_properties.all">
- <antcall target="evaluate_properties.jboss"/>
- <antcall target="evaluate_properties.jetty"/>
- <antcall target="evaluate_properties.tomcat"/>
- </target>
-
- <macrodef name="package-ext-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr168" testsuitetype="ext" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-tck-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr168" testsuitetype="tck" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-api-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr168" testsuitetype="api" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-jsr286-tck-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr286" testsuitetype="tck" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-jsr286-api-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr286" testsuitetype="api" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-jsr286-ext-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr286" testsuitetype="ext" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-testsuite">
- <attribute name="testsuiteversion"/>
- <attribute name="testsuitetype"/>
- <attribute name="testsuitename"/>
- <sequential>
-
- <mkdir dir="${test.temp.dir}/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war/WEB-INF/classes"/>
- <copy todir="${test.temp.dir}/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war/WEB-INF/classes">
- <fileset
- dir="${target}/test-classes"
- includes="org/gatein/pc/test/portlet/@{testsuiteversion}/@{testsuitetype}/common/**"/>
- <fileset
- dir="${target}/test-classes"
- includes="org/gatein/pc/test/portlet/@{testsuiteversion}/common/**"/>
- <fileset
- dir="${target}/test-classes"
- includes="org/gatein/pc/test/portlet/common/**"/>
- <fileset
- dir="${target}/test-classes"
- includes="org/gatein/pc/test/portlet/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}/**"/>
- <fileset
- dir="${target}/classes"
- includes="org/gatein/pc/test/portlet/framework/**"/>
- </copy>
- <copy todir="${test.temp.dir}/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war/WEB-INF/lib">
- <fileset
- dir="${test.temp.lib}"
- includes="portal-portlet-test-framework-lib.jar"/>
- </copy>
- <copy todir="${test.temp.dir}/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war">
- <fileset
- dir="${target}/test-classes/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war"/>
- </copy>
- <jar jarfile="${test.temp.lib}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}.war">
- <fileset dir="${test.temp.dir}/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war"/>
- </jar>
- </sequential>
- </macrodef>
-
- <target name="package-tests">
-
- <copy todir="${target}/classes">
- <fileset dir="${basedir}/../../core/target/classes" includes="**/*"/>
- </copy>
- <copy todir="${target}/test-classes">
- <fileset dir="${basedir}/../../core/target/test-classes" includes="**/*"/>
- </copy>
-
- <!--Portlet test framework lib jar-->
- <jar jarfile="${test.temp.lib}/portal-portlet-test-framework-lib.jar">
-
- <!-- -->
- <fileset dir="${target}/classes" includes="org/gatein/pc/test/unit/**"/>
-
- <!-- JSR 168 TLD -->
- <zipfileset
- src="${dependency.portal-portlet-portlet.jar}"
- includes="META-INF/portlet.tld"
- fullpath="META-INF/portlet.tld"/>
- <zipfileset
- src="${dependency.portal-portlet-portlet.jar}"
- includes="META-INF/portlet_2_0.tld"
- fullpath="META-INF/portlet_2_0.tld"/>
- </jar>
-
- <package-tck-test test="portletinterface"/>
- <package-tck-test test="dispatcher"/>
- <package-tck-test test="portletrequests"/>
- <package-tck-test test="portletmode"/>
- <package-tck-test test="portletconfig"/>
- <package-tck-test test="portletresponses"/>
- <package-tck-test test="preferences"/>
- <package-tck-test test="portletsession"/>
- <package-tck-test test="portleturl"/>
- <package-tck-test test="windowstates"/>
- <package-tck-test test="portletcontext"/>
- <package-api-test test="portletconfig"/>
- <package-api-test test="portletmode"/>
- <package-api-test test="windowstate"/>
- <package-api-test test="portletsessionutil"/>
- <package-api-test test="portalcontext"/>
- <package-api-test test="portletcontext"/>
- <package-api-test test="portleturl"/>
- <package-api-test test="portletpreferences"/>
- <package-api-test test="portletsession"/>
- <package-api-test test="actionrequest"/>
- <package-api-test test="renderrequest"/>
- <package-api-test test="actionresponse"/>
- <package-api-test test="renderresponse"/>
- <package-ext-test test="nocache"/>
- <package-ext-test test="expiringcache"/>
- <package-ext-test test="neverexpiringcache"/>
- <package-ext-test test="preferences"/>
- <package-ext-test test="session"/>
- <package-ext-test test="portletresponses"/>
- <package-ext-test test="portletrequests"/>
- <package-ext-test test="portletmode"/>
- <package-ext-test test="portletconfig"/>
- <package-ext-test test="taglib"/>
- <package-jsr286-tck-test test="dispatcher"/>
- <package-jsr286-tck-test test="portletconfig"/>
- <package-jsr286-tck-test test="portletconfignonamespace"/>
- <package-jsr286-tck-test test="event"/>
- <package-jsr286-tck-test test="eventnonamespace"/>
- <package-jsr286-tck-test test="stateawareresponse"/>
- <package-jsr286-tck-test test="portletrequests"/>
- <package-jsr286-tck-test test="resourceserving"/>
- <package-jsr286-tck-test test="portleturl"/>
- <package-jsr286-tck-test test="portletfilter"/>
- <package-jsr286-tck-test test="taglib"/>
- <package-jsr286-tck-test test="userinformation"/>
- <package-jsr286-api-test test="event"/>
- <package-jsr286-api-test test="portleturl"/>
- <package-jsr286-ext-test test="portletrequests"/>
- <package-jsr286-ext-test test="portletfilter"/>
- <package-jsr286-ext-test test="portletresponses"/>
- <package-jsr286-ext-test test="dispatcher"/>
- <package-jsr286-ext-test test="portletcontext"/>
- <package-jsr286-ext-test test="portletinterface"/>
- <package-jsr286-ext-test test="event"/>
- <package-jsr286-ext-test test="eventsupport"/>
- <package-jsr286-ext-test test="portletmode"/>
-
- <!-- -->
- <jar jarfile="${test.temp.lib}/portlet-test-lib.jar">
- <fileset dir="${target}/test-classes"/>
- <fileset dir="${target}/classes"/>
- </jar>
-
- <copy todir="${test.temp.dir}/${test.server.name}-${test.server.version}/portlet-test-war">
- <fileset dir="${target}/test-classes/portlet-test-war"/>
- </copy>
- <copy todir="${test.temp.dir}/${test.server.name}-${test.server.version}/portlet-test-war/WEB-INF/lib" flatten="true">
- <fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/>
- <path refid="${test.server.name}-${test.server.version}"/>
- </copy>
- <mkdir dir="${test.temp.lib}/${test.server.name}-${test.server.version}"/>
- <jar jarfile="${test.temp.lib}/${test.server.name}-${test.server.version}/portlet-test.war">
- <fileset dir="${test.temp.dir}/${test.server.name}-${test.server.version}/portlet-test-war"/>
- </jar>
-
- </target>
-
- <target name="cargo.setup">
- <property name="cargo.log.dir" value="${target}/integration-tests/cargo-logs"/>
- <mkdir dir="${cargo.log.dir}"/>
- <taskdef resource="cargo.tasks">
- <classpath>
- <pathelement path="${plugin_classpath}"/>
- </classpath>
- </taskdef>
- </target>
-
- <target name="test.container-servlet">
- <echo message="Starting ${test.server.name} ${test.server.version} with ${test.remote.server.name} to execute ${test.server.name} tests"/>
- <antcall target="cargo.start">
- <param name="cargo.wait" value="false"/>
- </antcall>
- <antcall target="tests.remote">
- <param name="test.server.name" value="${test.remote.server.name}"/>
- </antcall>
- <antcall target="cargo.stop"/>
- </target>
-
- <target name="tests.remote">
-
- <taskdef name="jboss-unit" classname="org.jboss.unit.tooling.ant.JBossUnitTask" classpath="${plugin_classpath}"/>
-
- <jboss-unit jpda="false" jpdaPort="9000" jpdaSuspend="true" failOnError="true">
-
- <tests config="${target}/test-classes/test/remote-jboss-unit.xml">
- <property name="archivePath" value="${test.temp.lib}"/>
- <property name="serverName" value="${test.server.name}"/>
- </tests>
-
- <reports>
- <xml toDir="${target}/tests/reports/xml/${test.server.name}"/>
- <html toDir="${target}/tests/reports/html/${test.server.name}"/>
- </reports>
-
- <classpath>
- <pathelement location="${target}/classes"/>
- <pathelement location="${test.temp.lib}"/>
- <pathelement location="${target}/classes/test"/>
- <pathelement location="${target}/test-classes/test"/>
- <pathelement path="${test_classpath}"/>
- </classpath>
-
- </jboss-unit>
-
- </target>
-
- <target name="package-tck-portal" depends="prepare_env">
-
- <property name="tck" value="${target}/tck"/>
- <property name="tck-server" value="${tck}/${test.server.name}-${test.server.version}"/>
-
- <mkdir dir="${tck}"/>
- <mkdir dir="${tck-server}"/>
-
- <jar jarfile="${target}/portlet-test-lib.jar">
- <fileset dir="${target}/classes" excludes="org/gatein/pc/portal/samples/**"/>
- </jar>
-
- <copy todir="${tck-server}/portlet-tck-war">
- <fileset dir="${target}/classes/portlet-tck-war"/>
- </copy>
- <copy todir="${tck-server}/portlet-tck-war">
- <fileset dir="${target}/classes/${test.server.name}-${test.server.version}/portlet-tck-war"/>
- </copy>
-
- <copy todir="${tck-server}/portlet-tck-war/WEB-INF/lib" flatten="true">
- <fileset dir="${target}" includes="portlet-test-lib.jar"/>
- <path refid="${test.server.name}-${test.server.version}"/>
- </copy>
-
- <mkdir dir="${tck-server}/tck-portal"/>
-
- <jar jarfile="${tck-server}/tck-portal/portlet-tck.war">
- <fileset dir="${tck-server}/portlet-tck-war"/>
- </jar>
-
- <copy todir="${tck-server}/tck-portal" flatten="true">
- <path refid="${test.server.name}-${test.server.version}-shared"/>
- </copy>
-
- <delete file="${target}/portlet-test-lib.jar"/>
-
- </target>
-
-</project>
Copied: components/pc/trunk/test/servers/src/common/resources/common.xml (from rev 5717, components/pc/trunk/test/servers/src/common/resources/common2.xml)
===================================================================
--- components/pc/trunk/test/servers/src/common/resources/common.xml (rev 0)
+++ components/pc/trunk/test/servers/src/common/resources/common.xml 2011-01-10 15:41:09 UTC (rev 5719)
@@ -0,0 +1,281 @@
+<?xml version="1.0"?>
+<project name="portlet-integration-test" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+
+ <path id="maven-ant-tasks.classpath" path="${maven.dependency.org.apache.maven.maven-ant-tasks.jar.path}"/>
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="antlib:org.apache.maven.artifact.ant"
+ classpathref="maven-ant-tasks.classpath" />
+
+ <property name="target.dir" value="${basedir}/target"/>
+ <property name="test.dir" value="${target.dir}/integration-tests"/>
+ <property name="test.cargo.dir" value="${test.dir}/cargo/"/>
+
+ <target name="tests.common" depends="prepare_env" >
+
+ <echo message="compile classpath: ${compile_classpath}"/>
+ <echo message="runtime classpath: ${runtime_classpath}"/>
+ <echo message="test classpath: ${test_classpath}"/>
+ <echo message="plugin classpath: ${plugin_classpath}"/>
+ <echo message="base directory: ${basedir}"/>
+
+ <echo message="You can run small subset of tests using -Pjboss42, -Pjboss51, -Ptomcat6, -Ptomcat7"/>
+
+ <antcall target="package-tests"/>
+
+ <antcall target="test.container-servlet"/>
+
+ </target>
+
+ <target name="prepare_env">
+
+ <!--Relative path to target dir-->
+ <property name="target" value="${basedir}/target"/>
+ <property name="test.temp.dir" value="${target}/integration-tests/test-apps"/>
+ <property name="test.temp.portlet" value="${test.temp.dir}/portlet-test"/>
+ <property name="test.temp.lib" value="${test.temp.dir}/lib"/>
+
+ <mkdir dir="${test.temp.dir}"/>
+ <mkdir dir="${test.temp.lib}"/>
+ <mkdir dir="${target}/jboss-unit"/>
+
+ <echo message="Preparing environment"/>
+
+ <path id="jboss-logging">
+ <pathelement location="${jboss:jboss-common-logging-spi:jar}"/>
+ <pathelement location="${jboss:jboss-common-logging-jdk:jar}"/>
+ <pathelement location="${jboss:jboss-common-logging-log4j:jar}"/>
+ </path>
+
+ <path id="jboss-xb">
+ <pathelement location="${org.jboss:jbossxb:jar}"/>
+ </path>
+
+ <path id="portal-common">
+ </path>
+
+ <path id="portal-common-shared">
+ <pathelement location="${org.gatein.common:common-common:jar}"/>
+ <pathelement location="${org.gatein.common:common-logging:jar}"/>
+ <pathelement location="${org.slf4j:slf4j-simple:jar}"/>
+ <pathelement location="${org.slf4j:slf4j-api:jar}"/>
+ </path>
+
+ <path id="portal-web">
+ </path>
+
+ <path id="portal-web-shared">
+ <pathelement location="${org.gatein.wci:wci-wci:jar}"/>
+ </path>
+
+ <path id="portal-portlet">
+ <pathelement location="${org.gatein.pc:pc-controller:jar}"/>
+ <pathelement location="${org.gatein.pc:pc-mc:jar}"/>
+ </path>
+
+ <path id="portal-portlet-shared">
+ <pathelement location="${org.gatein.pc:pc-portlet:jar}"/>
+ <pathelement location="${org.gatein.pc:pc-api:jar}"/>
+ <pathelement location="${javax.portlet:portlet-api:jar}"/>
+ </path>
+
+ <path id="jboss-unit">
+ </path>
+
+ <path id="jboss-unit-shared">
+ <pathelement location="${org.jboss.unit:jboss-unit:jar}"/>
+ <pathelement location="${org.jboss.unit:jboss-unit-remote:jar}"/>
+ <pathelement location="${org.jboss.unit:portal-test-generic:jar}"/>
+ <pathelement location="${org.jboss.unit:portal-test:jar}"/>
+ <pathelement location="${org.jboss.remoting:jboss-remoting:jar}"/>
+ </path>
+
+ </target>
+
+ <macrodef name="package-ext-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr168" testsuitetype="ext" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-tck-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr168" testsuitetype="tck" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-api-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr168" testsuitetype="api" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-jsr286-tck-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr286" testsuitetype="tck" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-jsr286-api-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr286" testsuitetype="api" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-jsr286-ext-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr286" testsuitetype="ext" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-testsuite">
+ <attribute name="testsuiteversion"/>
+ <attribute name="testsuitetype"/>
+ <attribute name="testsuitename"/>
+ <sequential>
+
+ <artifact:dependencies pathId="dependency.classpath">
+ <dependency
+ groupId="org.gatein.pc"
+ artifactId="pc-test-core-@{testsuiteversion}-@{testsuitetype}-@{testsuitename}"
+ version="${project.version}"
+ type="war"/>
+ </artifact:dependencies>
+
+ <copy tofile="${test.temp.lib}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}.war">
+ <path refid="dependency.classpath"/>
+ </copy>
+
+ </sequential>
+ </macrodef>
+
+ <target name="package-tests" depends="prepare_env">
+
+ <package-tck-test test="portletinterface"/>
+ <package-tck-test test="dispatcher"/>
+ <package-tck-test test="portletrequests"/>
+ <package-tck-test test="portletmode"/>
+ <package-tck-test test="portletconfig"/>
+ <package-tck-test test="portletresponses"/>
+ <package-tck-test test="preferences"/>
+ <package-tck-test test="portletsession"/>
+ <package-tck-test test="portleturl"/>
+ <package-tck-test test="windowstates"/>
+ <package-tck-test test="portletcontext"/>
+ <package-api-test test="portletconfig"/>
+ <package-api-test test="portletmode"/>
+ <package-api-test test="windowstate"/>
+ <package-api-test test="portletsessionutil"/>
+ <package-api-test test="portalcontext"/>
+ <package-api-test test="portletcontext"/>
+ <package-api-test test="portleturl"/>
+ <package-api-test test="portletpreferences"/>
+ <package-api-test test="portletsession"/>
+ <package-api-test test="actionrequest"/>
+ <package-api-test test="renderrequest"/>
+ <package-api-test test="actionresponse"/>
+ <package-api-test test="renderresponse"/>
+ <package-ext-test test="nocache"/>
+ <package-ext-test test="expiringcache"/>
+ <package-ext-test test="neverexpiringcache"/>
+ <package-ext-test test="preferences"/>
+ <package-ext-test test="session"/>
+ <package-ext-test test="portletresponses"/>
+ <package-ext-test test="portletrequests"/>
+ <package-ext-test test="portletmode"/>
+ <package-ext-test test="portletconfig"/>
+ <package-ext-test test="taglib"/>
+ <package-jsr286-tck-test test="dispatcher"/>
+ <package-jsr286-tck-test test="portletconfig"/>
+ <package-jsr286-tck-test test="portletconfignonamespace"/>
+ <package-jsr286-tck-test test="event"/>
+ <package-jsr286-tck-test test="eventnonamespace"/>
+ <package-jsr286-tck-test test="stateawareresponse"/>
+ <package-jsr286-tck-test test="portletrequests"/>
+ <package-jsr286-tck-test test="resourceserving"/>
+ <package-jsr286-tck-test test="portleturl"/>
+ <package-jsr286-tck-test test="portletfilter"/>
+ <package-jsr286-tck-test test="taglib"/>
+ <package-jsr286-tck-test test="userinformation"/>
+ <package-jsr286-api-test test="event"/>
+ <package-jsr286-api-test test="portleturl"/>
+ <package-jsr286-ext-test test="portletrequests"/>
+ <package-jsr286-ext-test test="portletfilter"/>
+ <package-jsr286-ext-test test="portletresponses"/>
+ <package-jsr286-ext-test test="dispatcher"/>
+ <package-jsr286-ext-test test="portletcontext"/>
+ <package-jsr286-ext-test test="portletinterface"/>
+ <package-jsr286-ext-test test="event"/>
+ <package-jsr286-ext-test test="eventsupport"/>
+ <package-jsr286-ext-test test="portletmode"/>
+
+ <!-- -->
+ <copy todir="${target}/test-classes/portlet-test-war/WEB-INF/lib" flatten="true">
+ <path refid="${test.server.name}-${test.server.version}"/>
+ <path>
+ <pathelement location="${org.gatein.pc:pc-test-core:jar}"/>
+ <pathelement location="${org.gatein.pc:pc-test-core:test-jar:tests}"/>
+ </path>
+ </copy>
+ <mkdir dir="${test.temp.lib}/${test.server.name}-${test.server.version}"/>
+ <war
+ destfile="${test.temp.lib}/${test.server.name}-${test.server.version}/portlet-test.war"
+ needxmlfile="false">
+ <fileset dir="${target}/test-classes/portlet-test-war"/>
+ </war>
+
+ </target>
+
+ <target name="cargo.setup">
+ <property name="cargo.log.dir" value="${target}/integration-tests/cargo-logs"/>
+ <mkdir dir="${cargo.log.dir}"/>
+ <taskdef resource="cargo.tasks">
+ <classpath>
+ <pathelement path="${plugin_classpath}"/>
+ </classpath>
+ </taskdef>
+ </target>
+
+ <target name="test.container-servlet">
+ <echo message="Starting ${test.server.name} ${test.server.version} with ${test.remote.server.name} to execute ${test.server.name} tests"/>
+ <antcall target="cargo.start">
+ <param name="cargo.wait" value="false"/>
+ </antcall>
+ <antcall target="tests.remote">
+ <param name="test.server.name" value="${test.remote.server.name}"/>
+ </antcall>
+ <antcall target="cargo.stop"/>
+ </target>
+
+ <target name="tests.remote">
+
+ <taskdef name="jboss-unit" classname="org.jboss.unit.tooling.ant.JBossUnitTask" classpath="${plugin_classpath}"/>
+
+ <jboss-unit jpda="false" jpdaPort="9000" jpdaSuspend="true" failOnError="true">
+
+ <tests config="${target}/test-classes/test/remote-jboss-unit.xml">
+ <property name="archivePath" value="${test.temp.lib}"/>
+ <property name="serverName" value="${test.server.name}"/>
+ </tests>
+
+ <reports>
+ <xml toDir="${target}/tests/reports/xml/${test.server.name}"/>
+ <html toDir="${target}/tests/reports/html/${test.server.name}"/>
+ </reports>
+
+ <classpath>
+ <pathelement location="${test.temp.lib}"/>
+ <pathelement location="${target}/test-classes/test"/>
+ <pathelement path="${test_classpath}"/>
+ </classpath>
+
+ </jboss-unit>
+
+ </target>
+
+</project>
Deleted: components/pc/trunk/test/servers/src/common/resources/common2.xml
===================================================================
--- components/pc/trunk/test/servers/src/common/resources/common2.xml 2011-01-10 13:57:06 UTC (rev 5718)
+++ components/pc/trunk/test/servers/src/common/resources/common2.xml 2011-01-10 15:41:09 UTC (rev 5719)
@@ -1,281 +0,0 @@
-<?xml version="1.0"?>
-<project name="portlet-integration-test" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
- <path id="maven-ant-tasks.classpath" path="${maven.dependency.org.apache.maven.maven-ant-tasks.jar.path}"/>
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
- uri="antlib:org.apache.maven.artifact.ant"
- classpathref="maven-ant-tasks.classpath" />
-
- <property name="target.dir" value="${basedir}/target"/>
- <property name="test.dir" value="${target.dir}/integration-tests"/>
- <property name="test.cargo.dir" value="${test.dir}/cargo/"/>
-
- <target name="tests.common" depends="prepare_env" >
-
- <echo message="compile classpath: ${compile_classpath}"/>
- <echo message="runtime classpath: ${runtime_classpath}"/>
- <echo message="test classpath: ${test_classpath}"/>
- <echo message="plugin classpath: ${plugin_classpath}"/>
- <echo message="base directory: ${basedir}"/>
-
- <echo message="You can run small subset of tests using -Pjboss42, -Pjboss51, -Ptomcat6, -Ptomcat7"/>
-
- <antcall target="package-tests"/>
-
- <antcall target="test.container-servlet"/>
-
- </target>
-
- <target name="prepare_env">
-
- <!--Relative path to target dir-->
- <property name="target" value="${basedir}/target"/>
- <property name="test.temp.dir" value="${target}/integration-tests/test-apps"/>
- <property name="test.temp.portlet" value="${test.temp.dir}/portlet-test"/>
- <property name="test.temp.lib" value="${test.temp.dir}/lib"/>
-
- <mkdir dir="${test.temp.dir}"/>
- <mkdir dir="${test.temp.lib}"/>
- <mkdir dir="${target}/jboss-unit"/>
-
- <echo message="Preparing environment"/>
-
- <path id="jboss-logging">
- <pathelement location="${jboss:jboss-common-logging-spi:jar}"/>
- <pathelement location="${jboss:jboss-common-logging-jdk:jar}"/>
- <pathelement location="${jboss:jboss-common-logging-log4j:jar}"/>
- </path>
-
- <path id="jboss-xb">
- <pathelement location="${org.jboss:jbossxb:jar}"/>
- </path>
-
- <path id="portal-common">
- </path>
-
- <path id="portal-common-shared">
- <pathelement location="${org.gatein.common:common-common:jar}"/>
- <pathelement location="${org.gatein.common:common-logging:jar}"/>
- <pathelement location="${org.slf4j:slf4j-simple:jar}"/>
- <pathelement location="${org.slf4j:slf4j-api:jar}"/>
- </path>
-
- <path id="portal-web">
- </path>
-
- <path id="portal-web-shared">
- <pathelement location="${org.gatein.wci:wci-wci:jar}"/>
- </path>
-
- <path id="portal-portlet">
- <pathelement location="${org.gatein.pc:pc-controller:jar}"/>
- <pathelement location="${org.gatein.pc:pc-mc:jar}"/>
- </path>
-
- <path id="portal-portlet-shared">
- <pathelement location="${org.gatein.pc:pc-portlet:jar}"/>
- <pathelement location="${org.gatein.pc:pc-api:jar}"/>
- <pathelement location="${javax.portlet:portlet-api:jar}"/>
- </path>
-
- <path id="jboss-unit">
- </path>
-
- <path id="jboss-unit-shared">
- <pathelement location="${org.jboss.unit:jboss-unit:jar}"/>
- <pathelement location="${org.jboss.unit:jboss-unit-remote:jar}"/>
- <pathelement location="${org.jboss.unit:portal-test-generic:jar}"/>
- <pathelement location="${org.jboss.unit:portal-test:jar}"/>
- <pathelement location="${org.jboss.remoting:jboss-remoting:jar}"/>
- </path>
-
- </target>
-
- <macrodef name="package-ext-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr168" testsuitetype="ext" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-tck-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr168" testsuitetype="tck" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-api-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr168" testsuitetype="api" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-jsr286-tck-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr286" testsuitetype="tck" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-jsr286-api-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr286" testsuitetype="api" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-jsr286-ext-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr286" testsuitetype="ext" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-testsuite">
- <attribute name="testsuiteversion"/>
- <attribute name="testsuitetype"/>
- <attribute name="testsuitename"/>
- <sequential>
-
- <artifact:dependencies pathId="dependency.classpath">
- <dependency
- groupId="org.gatein.pc"
- artifactId="pc-test-core-@{testsuiteversion}-@{testsuitetype}-@{testsuitename}"
- version="${project.version}"
- type="war"/>
- </artifact:dependencies>
-
- <copy tofile="${test.temp.lib}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}.war">
- <path refid="dependency.classpath"/>
- </copy>
-
- </sequential>
- </macrodef>
-
- <target name="package-tests" depends="prepare_env">
-
- <package-tck-test test="portletinterface"/>
- <package-tck-test test="dispatcher"/>
- <package-tck-test test="portletrequests"/>
- <package-tck-test test="portletmode"/>
- <package-tck-test test="portletconfig"/>
- <package-tck-test test="portletresponses"/>
- <package-tck-test test="preferences"/>
- <package-tck-test test="portletsession"/>
- <package-tck-test test="portleturl"/>
- <package-tck-test test="windowstates"/>
- <package-tck-test test="portletcontext"/>
- <package-api-test test="portletconfig"/>
- <package-api-test test="portletmode"/>
- <package-api-test test="windowstate"/>
- <package-api-test test="portletsessionutil"/>
- <package-api-test test="portalcontext"/>
- <package-api-test test="portletcontext"/>
- <package-api-test test="portleturl"/>
- <package-api-test test="portletpreferences"/>
- <package-api-test test="portletsession"/>
- <package-api-test test="actionrequest"/>
- <package-api-test test="renderrequest"/>
- <package-api-test test="actionresponse"/>
- <package-api-test test="renderresponse"/>
- <package-ext-test test="nocache"/>
- <package-ext-test test="expiringcache"/>
- <package-ext-test test="neverexpiringcache"/>
- <package-ext-test test="preferences"/>
- <package-ext-test test="session"/>
- <package-ext-test test="portletresponses"/>
- <package-ext-test test="portletrequests"/>
- <package-ext-test test="portletmode"/>
- <package-ext-test test="portletconfig"/>
- <package-ext-test test="taglib"/>
- <package-jsr286-tck-test test="dispatcher"/>
- <package-jsr286-tck-test test="portletconfig"/>
- <package-jsr286-tck-test test="portletconfignonamespace"/>
- <package-jsr286-tck-test test="event"/>
- <package-jsr286-tck-test test="eventnonamespace"/>
- <package-jsr286-tck-test test="stateawareresponse"/>
- <package-jsr286-tck-test test="portletrequests"/>
- <package-jsr286-tck-test test="resourceserving"/>
- <package-jsr286-tck-test test="portleturl"/>
- <package-jsr286-tck-test test="portletfilter"/>
- <package-jsr286-tck-test test="taglib"/>
- <package-jsr286-tck-test test="userinformation"/>
- <package-jsr286-api-test test="event"/>
- <package-jsr286-api-test test="portleturl"/>
- <package-jsr286-ext-test test="portletrequests"/>
- <package-jsr286-ext-test test="portletfilter"/>
- <package-jsr286-ext-test test="portletresponses"/>
- <package-jsr286-ext-test test="dispatcher"/>
- <package-jsr286-ext-test test="portletcontext"/>
- <package-jsr286-ext-test test="portletinterface"/>
- <package-jsr286-ext-test test="event"/>
- <package-jsr286-ext-test test="eventsupport"/>
- <package-jsr286-ext-test test="portletmode"/>
-
- <!-- -->
- <copy todir="${target}/test-classes/portlet-test-war/WEB-INF/lib" flatten="true">
- <path refid="${test.server.name}-${test.server.version}"/>
- <path>
- <pathelement location="${org.gatein.pc:pc-test-core:jar}"/>
- <pathelement location="${org.gatein.pc:pc-test-core:test-jar:tests}"/>
- </path>
- </copy>
- <mkdir dir="${test.temp.lib}/${test.server.name}-${test.server.version}"/>
- <war
- destfile="${test.temp.lib}/${test.server.name}-${test.server.version}/portlet-test.war"
- needxmlfile="false">
- <fileset dir="${target}/test-classes/portlet-test-war"/>
- </war>
-
- </target>
-
- <target name="cargo.setup">
- <property name="cargo.log.dir" value="${target}/integration-tests/cargo-logs"/>
- <mkdir dir="${cargo.log.dir}"/>
- <taskdef resource="cargo.tasks">
- <classpath>
- <pathelement path="${plugin_classpath}"/>
- </classpath>
- </taskdef>
- </target>
-
- <target name="test.container-servlet">
- <echo message="Starting ${test.server.name} ${test.server.version} with ${test.remote.server.name} to execute ${test.server.name} tests"/>
- <antcall target="cargo.start">
- <param name="cargo.wait" value="false"/>
- </antcall>
- <antcall target="tests.remote">
- <param name="test.server.name" value="${test.remote.server.name}"/>
- </antcall>
- <antcall target="cargo.stop"/>
- </target>
-
- <target name="tests.remote">
-
- <taskdef name="jboss-unit" classname="org.jboss.unit.tooling.ant.JBossUnitTask" classpath="${plugin_classpath}"/>
-
- <jboss-unit jpda="false" jpdaPort="9000" jpdaSuspend="true" failOnError="true">
-
- <tests config="${target}/test-classes/test/remote-jboss-unit.xml">
- <property name="archivePath" value="${test.temp.lib}"/>
- <property name="serverName" value="${test.server.name}"/>
- </tests>
-
- <reports>
- <xml toDir="${target}/tests/reports/xml/${test.server.name}"/>
- <html toDir="${target}/tests/reports/html/${test.server.name}"/>
- </reports>
-
- <classpath>
- <pathelement location="${test.temp.lib}"/>
- <pathelement location="${target}/test-classes/test"/>
- <pathelement path="${test_classpath}"/>
- </classpath>
-
- </jboss-unit>
-
- </target>
-
-</project>
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-10 13:57:06 UTC (rev 5718)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-10 15:41:09 UTC (rev 5719)
@@ -357,7 +357,7 @@
<!-- location of common.xml shared between the different server's build.xml -->
<!-- for now hardcode like that, it should be probably moved to the test-core package -->
- <property name="common.xml.file" value="${project.basedir}/../src/common/resources/common2.xml"/>
+ <property name="common.xml.file" value="${project.basedir}/../src/common/resources/common.xml"/>
<ant antfile="${basedir}/src/test/build.xml" inheritRefs="true">
<target name="tests"/>
Modified: components/pc/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/pom.xml 2011-01-10 13:57:06 UTC (rev 5718)
+++ components/pc/trunk/test/servers/tomcat7/pom.xml 2011-01-10 15:41:09 UTC (rev 5719)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
@@ -10,10 +11,6 @@
<name>GateIn - Portlet Container (test - servers - Tomcat 7)</name>
<dependencies>
- <dependency>
- <groupId>org.gatein.common</groupId>
- <artifactId>common-mc</artifactId>
- </dependency>
<dependency>
<groupId>org.gatein.common</groupId>
@@ -47,49 +44,37 @@
<artifactId>log4j</artifactId>
</dependency>
- <!-- JBOSS UNIT DEPENDENCIES -->
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit</artifactId>
- <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>cargo</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-remote</artifactId>
- <scope>test</scope>
<exclusions>
<exclusion>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
+ <groupId>cargo</groupId>
+ <artifactId>core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-tooling-ant</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test-generic</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -107,7 +92,6 @@
<artifactId>concurrent</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-serialization</artifactId>
@@ -147,6 +131,14 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-test-core</artifactId>
+ <version>2.3.0-Alpha01-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
<!-- JSTL for Tomcat -->
<dependency>
<groupId>apache-taglibs</groupId>
@@ -174,6 +166,13 @@
<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>
<profiles>
@@ -291,7 +290,7 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
+ <version>1.5</version>
<dependencies>
@@ -356,52 +355,9 @@
</not>
</condition>
- <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/>
- <property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
- <property name="dependency.commons-httpclient.jar" value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/>
- <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}"/>
- <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}"/>
- <property name="dependency.jsr168api.jar" value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
- <property name="dependency.ccpp.jar" value="${maven.dependency.javax.ccpp.ccpp.jar.path}"/>
- <property name="dependency.jaxb.jar" value="${maven.dependency.sun-jaxb.jaxb-api.jar.path}"/>
-
- <property name="dependency.portal-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
- <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
- <property name="dependency.portal-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
- <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
- <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
-
- <property name="dependency.portal-wci-wci.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
- <property name="dependency.portal-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat7.jar.path}"/>
-
- <property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
- <property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
- <property name="dependency.portal-portlet-mc.jar" value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
- <property name="dependency.portal-portlet-api.jar" value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
-
- <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
- <property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
- <property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
- <property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
- <property name="dependency.jboss-remoting.jar" value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
-
- <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/>
- <property name="dependency.trove.jar" value="${maven.dependency.trove.trove.jar.path}"/>
- <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
- <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
- <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
- <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
- <property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
- <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
- <property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
- <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
-
- <property name="dependency.apache-jstl.jar" value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
- <property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
-
<!-- location of common.xml shared between the different server's build.xml -->
- <property name="common.xml.file" value="${test.common.xml}"/>
+ <!-- for now hardcode like that, it should be probably moved to the test-core package -->
+ <property name="common.xml.file" value="${project.basedir}/../src/common/resources/common.xml"/>
<ant antfile="${basedir}/src/test/build.xml" inheritRefs="true">
<target name="tests"/>
Modified: components/pc/trunk/test/servers/tomcat7/src/test/build.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/src/test/build.xml 2011-01-10 13:57:06 UTC (rev 5718)
+++ components/pc/trunk/test/servers/tomcat7/src/test/build.xml 2011-01-10 15:41:09 UTC (rev 5719)
@@ -14,7 +14,58 @@
<property name="test.remote.server.name" value="RemoteTomcat_7_0"/>
<property name="cargo.container.id" value="tomcat7x"/>
+ <path id="Tomcat-7.0">
+ <path refid="portal-common"/>
+ <path refid="portal-web"/>
+ <path refid="portal-portlet"/>
+ <path refid="jboss-unit"/>
+ <path refid="jboss-xb"/>
+ <pathelement path="${apache-xerces:xercesImpl:jar}"/>
+ <pathelement path="${apache-xerces:resolver:jar}"/>
+ <pathelement path="${apache-xerces.xml-apis:jar}"/>
+ <pathelement path="${trove:trove:jar}"/>
+ </path>
+
+ <path id="Tomcat-7.0-shared">
+ <path refid="portal-common-shared"/>
+ <path refid="portal-web-shared"/>
+ <path refid="portal-portlet-shared"/>
+ <path refid="jboss-unit-shared"/>
+ <path refid="jboss-logging"/>
+ <path location="${org.jboss:jboss-common-core:jar}"/>
+ <path location="${apache-log4j:log4j:jar}"/>
+ <path location="${concurrent:concurrent:jar}"/>
+ <path location="${javax.activation:activation:jar}"/>
+ <path location="${sun-jaxb:jaxb-api:jar}"/>
+ <path location="${javax.ccpp:ccpp:jar}"/>
+ <path location="${jboss:jboss-serialization:jar}"/>
+ <path location="${org.gatein.wci:wci-tomcat7:jar}"/>
+ </path>
+
<target name="tests" unless="maven.test.skip">
+
+ <property environment="env"/>
+
+ <!--If properties are not in command line check if they are set in env-->
+ <condition property="TOMCAT_7_0_HOME" value="${env.TOMCAT_7_0_HOME}">
+ <and>
+ <isset property="env.TOMCAT_7_0_HOME"/>
+ <not>
+ <isset property="TOMCAT_7_0_HOME"/>
+ </not>
+ </and>
+ </condition>
+ <echo message="TOMCAT_7_0_HOME: ${TOMCAT_7_0_HOME}"/>
+ <fail message="Please set the environment variable TOMCAT_7_0_HOME">
+ <condition>
+ <and>
+ <not>
+ <isset property="TOMCAT_7_0_HOME"/>
+ </not>
+ </and>
+ </condition>
+ </fail>
+
<antcall target="tests.common"/>
</target>
14 years, 9 months
- 1
- 0
gatein SVN: r5718 - components/pc/trunk/test/servers/tomcat6.
by do-not-reply＠jboss.org
Author: alain_defrance
Date: 2011-01-10 08:57:06 -0500 (Mon, 10 Jan 2011)
New Revision: 5718
Modified:
components/pc/trunk/test/servers/tomcat6/pom.xml
Log:
GTNPC-46
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-10 13:04:26 UTC (rev 5717)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-10 13:57:06 UTC (rev 5718)
@@ -290,7 +290,7 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
+ <version>1.5</version>
<dependencies>
14 years, 9 months
- 1
- 0
gatein SVN: r5717 - in components/pc/trunk/test/servers: tomcat6/src/test and 1 other directory.
by do-not-reply＠jboss.org
Author: alain_defrance
Date: 2011-01-10 08:04:26 -0500 (Mon, 10 Jan 2011)
New Revision: 5717
Modified:
components/pc/trunk/test/servers/src/common/resources/common2.xml
components/pc/trunk/test/servers/tomcat6/src/test/build.xml
Log:
GTNPC-46
Modified: components/pc/trunk/test/servers/src/common/resources/common2.xml
===================================================================
--- components/pc/trunk/test/servers/src/common/resources/common2.xml 2011-01-10 12:53:02 UTC (rev 5716)
+++ components/pc/trunk/test/servers/src/common/resources/common2.xml 2011-01-10 13:04:26 UTC (rev 5717)
@@ -154,7 +154,7 @@
</sequential>
</macrodef>
- <target name="package-tests">
+ <target name="package-tests" depends="prepare_env">
<package-tck-test test="portletinterface"/>
<package-tck-test test="dispatcher"/>
Modified: components/pc/trunk/test/servers/tomcat6/src/test/build.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/src/test/build.xml 2011-01-10 12:53:02 UTC (rev 5716)
+++ components/pc/trunk/test/servers/tomcat6/src/test/build.xml 2011-01-10 13:04:26 UTC (rev 5717)
@@ -20,7 +20,7 @@
<path refid="portal-portlet"/>
<path refid="jboss-unit"/>
<path refid="jboss-xb"/>
- <pathelement location="${apache-xerces:xerces:jar}"/>
+ <pathelement location="${apache-xerces:xercesImpl:jar}"/>
<pathelement location="${apache-xerces:xml-apis:jar}"/>
<pathelement location="${apache-xerces:resolver:jar}"/>
</path>
14 years, 9 months
- 1
- 0
gatein SVN: r5716 - in portal/branches/branch-GTNPORTAL-1745: webui/portal/src/main/java/org/exoplatform/portal/webui/portal and 1 other directory.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-01-10 07:53:02 -0500 (Mon, 10 Jan 2011)
New Revision: 5716
Modified:
portal/branches/branch-GTNPORTAL-1745/web/portal/src/main/webapp/groovy/portal/webui/portal/UILanguageSelector.gtmpl
portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java
Log:
GTNPORTAL-1717 User can't change his user profile locale through UIUserLanguageSelector if current portal has same locale
Modified: portal/branches/branch-GTNPORTAL-1745/web/portal/src/main/webapp/groovy/portal/webui/portal/UILanguageSelector.gtmpl
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/web/portal/src/main/webapp/groovy/portal/webui/portal/UILanguageSelector.gtmpl 2011-01-10 11:31:22 UTC (rev 5715)
+++ portal/branches/branch-GTNPORTAL-1745/web/portal/src/main/webapp/groovy/portal/webui/portal/UILanguageSelector.gtmpl 2011-01-10 12:53:02 UTC (rev 5716)
@@ -48,7 +48,14 @@
<%
for(opt in options) {
String itemSelected = "NormalItem";
- if (opt.isSelected()) itemSelected = "SelectedItem";
+ if (opt.isSelected()) {
+ def setSelected = "eXo.webui.UIItemSelector.SelectedItem = new Object();";
+ setSelected += "eXo.webui.UIItemSelector.SelectedItem.component = '$selector.name';";
+ setSelected += "eXo.webui.UIItemSelector.SelectedItem.option = '$opt.value';";
+
+ rcontext.getJavascriptManager().addCustomizedOnLoadScript(setSelected);
+ itemSelected = "SelectedItem";
+ }
String onclickOption = "eXo.webui.UIItemSelector.onClickOption(this, '$uicomponent.name', '$selector.name', '$opt.value')";
%>
<div class="$itemSelected" onclick="$onclickOption">
@@ -102,4 +109,4 @@
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java 2011-01-10 11:31:22 UTC (rev 5715)
+++ portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java 2011-01-10 12:53:02 UTC (rev 5716)
@@ -21,12 +21,16 @@
import org.exoplatform.container.ExoContainer;
import org.exoplatform.container.ExoContainerContext;
+import org.exoplatform.portal.Constants;
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.portal.webui.workspace.UIMaskWorkspace;
import org.exoplatform.portal.webui.workspace.UIPortalApplication;
+import org.exoplatform.services.organization.OrganizationService;
+import org.exoplatform.services.organization.UserProfile;
import org.exoplatform.services.resources.LocaleConfig;
import org.exoplatform.services.resources.LocaleConfigService;
+import org.exoplatform.services.resources.LocaleContextInfo;
import org.exoplatform.services.resources.ResourceBundleService;
import org.exoplatform.webui.config.annotation.ComponentConfig;
import org.exoplatform.webui.config.annotation.EventConfig;
@@ -163,24 +167,54 @@
public void execute(Event<UILanguageSelector> event) throws Exception
{
String language = event.getRequestContext().getRequestParameter("language");
+ PortalRequestContext prqCtx = PortalRequestContext.getCurrentInstance();
UIPortalApplication uiApp = Util.getUIPortalApplication();
UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID);
uiMaskWS.setUIComponent(null);
// event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWS) ;
- Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(false);
- if (language == null || language.trim().length() < 1)
+ prqCtx.ignoreAJAXUpdateOnPortlets(false);
+
+ if (language == null || language.trim().equals(prqCtx.getLocale().getLanguage()))
+ {
+ //LocalizationLifecycle will save userProfile if locale is changed
+ //We need to handle case : locale is not changed, but user's locale setting has not been initialized
+ if (prqCtx.getRemoteUser() != null)
+ {
+ saveLocaleToUserProfile(prqCtx);
+ }
return;
+ }
// if(!uiPortal.isModifiable()) return;
LocaleConfigService localeConfigService = event.getSource().getApplicationComponent(LocaleConfigService.class);
LocaleConfig localeConfig = localeConfigService.getLocaleConfig(language);
if (localeConfig == null)
localeConfig = localeConfigService.getDefaultLocaleConfig();
- PortalRequestContext prqCtx = PortalRequestContext.getCurrentInstance();
prqCtx.setLocale(localeConfig.getLocale());
//uiApp.setOrientation(localeConfig.getOrientation());
//uiApp.localizeNavigations();
}
+
+ private void saveLocaleToUserProfile(PortalRequestContext context) throws Exception
+ {
+ ExoContainer container = context.getApplication().getApplicationServiceContainer();
+ OrganizationService svc = (OrganizationService)
+ container.getComponentInstanceOfType(OrganizationService.class);
+
+ // Don't rely on UserProfileLifecycle loaded UserProfile when doing
+ // an update to avoid a potential overwrite of other changes
+ UserProfile userProfile = svc.getUserProfileHandler().findUserProfileByName(context.getRemoteUser());
+ if (userProfile != null && userProfile.getUserInfoMap() != null)
+ {
+ //Only save if user's locale has not been set
+ String currLocale = userProfile.getUserInfoMap().get(Constants.USER_LANGUAGE);
+ if (currLocale == null || currLocale.trim().equals(""))
+ {
+ userProfile.getUserInfoMap().put(Constants.USER_LANGUAGE, LocaleContextInfo.getLocaleAsString(context.getLocale()));
+ svc.getUserProfileHandler().saveUserProfile(userProfile, false);
+ }
+ }
+ }
}
private String capitalizeFirstLetter(String word)
14 years, 9 months
- 1
- 0