gatein SVN: r7794 - in portal/trunk: web/portal/src/main/webapp/WEB-INF/classes/locale/portal and 1 other directory.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-10-19 22:34:43 -0400 (Wed, 19 Oct 2011)
New Revision: 7794
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UINavigationNodeSelector.java
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
Log:
GTNPORTAL-2185 should not accept for copy or clone system node
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UINavigationNodeSelector.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UINavigationNodeSelector.java 2011-10-20 02:10:20 UTC (rev 7793)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UINavigationNodeSelector.java 2011-10-20 02:34:43 UTC (rev 7794)
@@ -595,6 +595,12 @@
String nodeID = context.getRequestParameter(UIComponent.OBJECTID);
TreeNode node = uiNodeSelector.findNode(nodeID);
+ if (Visibility.SYSTEM.equals(node.getVisibility()))
+ {
+ UIApplication uiApp = context.getUIApplication();
+ uiApp.addMessage(new ApplicationMessage("UINavigationNodeSelector.msg.systemnode-copyclone", null));
+ return;
+ }
try
{
node = rebaseNode(node, Scope.ALL, uiNodeSelector);
@@ -662,7 +668,9 @@
UINavigationNodeSelector uiNodeSelector = event.getSource().getAncestorOfType(UINavigationNodeSelector.class);
TreeNode currNode = uiNodeSelector.getCopyNode();
String nodeID = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID);
- if (currNode != null && currNode.getId().equals(nodeID))
+ if (currNode == null)
+ return;
+ else if (currNode.getId().equals(nodeID))
currNode.setCloneNode(true);
if (currNode.getI18nizedLabels() == null)
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-10-20 02:10:20 UTC (rev 7793)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-10-20 02:34:43 UTC (rev 7794)
@@ -1107,6 +1107,7 @@
###############################################################################
# org.exoplatform.portal.webui.navigation.UINavigationNodeSelector #
###############################################################################
+UINavigationNodeSelector.msg.systemnode-copyclone=Cannot copy or clone a system node.
UINavigationNodeSelector.msg.systemnode-delete=Cannot delete a system node
UINavigationNodeSelector.msg.systemnode-move=Cannot cut a system node
UINavigationNodeSelector.msg.copiedNode.deleted=Bufferred node has been deleted
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2011-10-20 02:10:20 UTC (rev 7793)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2011-10-20 02:34:43 UTC (rev 7794)
@@ -1045,6 +1045,7 @@
###############################################################################
# org.exoplatform.portal.webui.navigation.UINavigationNodeSelector #
###############################################################################
+UINavigationNodeSelector.msg.systemnode-copyclone=Không thể sao chép hoặc nhân bản một node hệ thống
UINavigationNodeSelector.msg.systemnode-delete=Không thể xóa một node hệ thống
UINavigationNodeSelector.msg.systemnode-move=Không thể di chuyển một node hệ thống
13 years, 2 months
gatein SVN: r7793 - in epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main: webapp/WEB-INF and 1 other directory.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-10-19 22:10:20 -0400 (Wed, 19 Oct 2011)
New Revision: 7793
Modified:
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationPortlet.java
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UINavigationNodeSelector.java
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIPortalNavigationPortlet.java
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml
Log:
JBEPP-1238: use portlet preferences of 'level' on UIPortalNavigationPortlet and UIGroupNavigationPortlet to set the level of nodes used in UINavigationNodeSelector.
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2011-10-19 18:36:52 UTC (rev 7792)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2011-10-20 02:10:20 UTC (rev 7793)
@@ -27,6 +27,7 @@
import org.exoplatform.portal.mop.SiteType;
import org.exoplatform.portal.mop.navigation.NavigationContext;
import org.exoplatform.portal.mop.navigation.NavigationService;
+import org.exoplatform.portal.mop.navigation.Scope;
import org.exoplatform.portal.mop.user.UserNavigation;
import org.exoplatform.portal.mop.user.UserPortal;
import org.exoplatform.portal.webui.navigation.UIAddGroupNavigation;
@@ -84,6 +85,9 @@
{
private UINavigationManagement naviManager;
+
+ //set navigationScope to GrandChildren for default value
+ private Scope navigationScope = Scope.GRANDCHILDREN;
public UIGroupNavigationManagement() throws Exception
{
@@ -113,6 +117,16 @@
virtualList.dataBind(new ObjectPageList<UserNavigation>(groupNav, groupNav.size()));
}
+ public void setScope(Scope scope)
+ {
+ this.navigationScope = scope;
+ }
+
+ public Scope getScope()
+ {
+ return this.navigationScope;
+ }
+
/**
* User has right to add navigation to a group in below cases
*
@@ -205,6 +219,7 @@
UINavigationNodeSelector selector = naviManager.getChild(UINavigationNodeSelector.class);
selector.setEdittedNavigation(nav);
selector.setUserPortal(userPortal);
+ selector.setScope(uicomp.getScope());
selector.initTreeData();
popUp.setUIComponent(naviManager);
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationPortlet.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationPortlet.java 2011-10-19 18:36:52 UTC (rev 7792)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationPortlet.java 2011-10-20 02:10:20 UTC (rev 7793)
@@ -19,6 +19,13 @@
package org.exoplatform.navigation.webui.component;
+import javax.portlet.PortletPreferences;
+import javax.portlet.PortletRequest;
+
+import org.exoplatform.portal.mop.navigation.GenericScope;
+import org.exoplatform.portal.mop.navigation.Scope;
+import org.exoplatform.webui.application.WebuiRequestContext;
+import org.exoplatform.webui.application.portlet.PortletRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
import org.exoplatform.webui.core.UIPortletApplication;
import org.exoplatform.webui.core.lifecycle.UIApplicationLifecycle;
@@ -26,8 +33,31 @@
@ComponentConfig(lifecycle = UIApplicationLifecycle.class)
public class UIGroupNavigationPortlet extends UIPortletApplication
{
+ public static final int DEFAULT_LEVEL = 2;
+
public UIGroupNavigationPortlet() throws Exception
{
- addChild(UIGroupNavigationManagement.class, null, null);
+ PortletRequestContext context = (PortletRequestContext)WebuiRequestContext.getCurrentInstance();
+ PortletRequest prequest = context.getRequest();
+ PortletPreferences prefers = prequest.getPreferences();
+ int level = DEFAULT_LEVEL;
+ try
+ {
+ level = Integer.valueOf(prefers.getValue("level", String.valueOf(DEFAULT_LEVEL)));
+ }
+ catch (Exception ex)
+ {
+ log.warn("Preference for navigation level can only be integer");
+ }
+
+ UIGroupNavigationManagement groupNavigationManagement = addChild(UIGroupNavigationManagement.class, null, null);
+ if (level <= 0)
+ {
+ groupNavigationManagement.setScope(Scope.ALL);
+ }
+ else
+ {
+ groupNavigationManagement.setScope(GenericScope.treeShape(level));
+ }
}
}
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UINavigationNodeSelector.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UINavigationNodeSelector.java 2011-10-19 18:36:52 UTC (rev 7792)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UINavigationNodeSelector.java 2011-10-20 02:10:20 UTC (rev 7793)
@@ -44,6 +44,8 @@
import org.exoplatform.portal.webui.workspace.UIPortalApplication;
import org.exoplatform.portal.webui.workspace.UIPortalToolPanel;
import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
@@ -102,7 +104,8 @@
private Map<String, Map<Locale, State>> userNodeLabels;
- private static final Scope NODE_SCOPE = Scope.GRANDCHILDREN;
+ private static final Scope DEFAULT_SCOPE = Scope.GRANDCHILDREN;
+ private Scope navigationScope = DEFAULT_SCOPE;
public UINavigationNodeSelector() throws Exception
{
@@ -152,12 +155,12 @@
try
{
this.rootNode =
- new TreeNode(edittedNavigation, userPortal.getNode(edittedNavigation, NODE_SCOPE, filterConfig, null));
+ new TreeNode(edittedNavigation, userPortal.getNode(edittedNavigation, navigationScope, filterConfig, null));
TreeNode node = this.rootNode;
if (this.rootNode.getChildren().size() > 0)
{
- node = rebaseNode(this.rootNode.getChild(0), NODE_SCOPE);
+ node = rebaseNode(this.rootNode.getChild(0), navigationScope);
if (node == null)
{
initTreeData();
@@ -305,6 +308,16 @@
return getRootNode().findNode(nodeID);
}
+ public void setScope(Scope scope)
+ {
+ this.navigationScope = scope;
+ }
+
+ public Scope getScope()
+ {
+ return this.navigationScope;
+ }
+
private void invokeI18NizedLabels(TreeNode node)
{
DescriptionService descriptionService = this.getApplicationComponent(DescriptionService.class);
@@ -324,7 +337,7 @@
{
protected TreeNode rebaseNode(TreeNode node, UINavigationNodeSelector selector) throws Exception
{
- return rebaseNode(node, UINavigationNodeSelector.NODE_SCOPE, selector);
+ return rebaseNode(node, selector.getScope(), selector);
}
protected TreeNode rebaseNode(TreeNode node, Scope scope, UINavigationNodeSelector selector) throws Exception
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIPortalNavigationPortlet.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIPortalNavigationPortlet.java 2011-10-19 18:36:52 UTC (rev 7792)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIPortalNavigationPortlet.java 2011-10-20 02:10:20 UTC (rev 7793)
@@ -19,6 +19,13 @@
package org.exoplatform.navigation.webui.component;
+import javax.portlet.PortletPreferences;
+import javax.portlet.PortletRequest;
+
+import org.exoplatform.portal.mop.navigation.GenericScope;
+import org.exoplatform.portal.mop.navigation.Scope;
+import org.exoplatform.webui.application.WebuiRequestContext;
+import org.exoplatform.webui.application.portlet.PortletRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
import org.exoplatform.webui.core.UIPortletApplication;
import org.exoplatform.webui.core.lifecycle.UIApplicationLifecycle;
@@ -26,8 +33,31 @@
@ComponentConfig(lifecycle = UIApplicationLifecycle.class)
public class UIPortalNavigationPortlet extends UIPortletApplication
{
+ public static final int DEFAULT_LEVEL = 2;
+
public UIPortalNavigationPortlet() throws Exception
{
- addChild(UISiteManagement.class, null, null);
+ PortletRequestContext context = (PortletRequestContext)WebuiRequestContext.getCurrentInstance();
+ PortletRequest prequest = context.getRequest();
+ PortletPreferences prefers = prequest.getPreferences();
+ int level = DEFAULT_LEVEL;
+ try
+ {
+ level = Integer.valueOf(prefers.getValue("level", String.valueOf(DEFAULT_LEVEL)));
+ }
+ catch (Exception ex)
+ {
+ log.warn("Preference for navigation level can only be integer");
+ }
+
+ UISiteManagement siteManagement = addChild(UISiteManagement.class, null, null);
+ if (level <= 0)
+ {
+ siteManagement.setScope(Scope.ALL);
+ }
+ else
+ {
+ siteManagement.setScope(GenericScope.treeShape(level));
+ }
}
}
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2011-10-19 18:36:52 UTC (rev 7792)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2011-10-20 02:10:20 UTC (rev 7793)
@@ -30,6 +30,7 @@
import org.exoplatform.portal.config.UserPortalConfigService;
import org.exoplatform.portal.config.model.PortalConfig;
import org.exoplatform.portal.mop.SiteKey;
+import org.exoplatform.portal.mop.navigation.Scope;
import org.exoplatform.portal.mop.user.UserNavigation;
import org.exoplatform.portal.mop.user.UserPortal;
import org.exoplatform.portal.webui.page.UISiteBody;
@@ -88,6 +89,9 @@
private LazyPageList<PortalConfig> pageList;
private UINavigationManagement naviManager;
+
+ //set navigationScope to GrandChildren for default value
+ private Scope navigationScope = Scope.GRANDCHILDREN;
public UISiteManagement() throws Exception
{
@@ -184,6 +188,16 @@
}, 10);
}
+
+ public void setScope(Scope scope)
+ {
+ this.navigationScope = scope;
+ }
+
+ public Scope getScope()
+ {
+ return this.navigationScope;
+ }
private boolean stillKeptInPageList(String portalName) throws Exception {
List<PortalConfig> portals = this.getPortalConfigs();
@@ -387,6 +401,7 @@
UserNavigation edittedNavigation = userPortal.getNavigation(SiteKey.portal(portalName));
UINavigationNodeSelector selector = naviManager.getChild(UINavigationNodeSelector.class);
+ selector.setScope(uicomp.getScope());
selector.setEdittedNavigation(edittedNavigation);
selector.setUserPortal(userPortal);
selector.initTreeData();
@@ -408,6 +423,7 @@
UINavigationNodeSelector selector = navigationManager.getChild(UINavigationNodeSelector.class);
TreeNode selectedParent = (TreeNode)uiPageNodeForm.getSelectedParent();
+ selector.setScope(uiSiteManagement.getScope());
selector.selectNode(selectedParent);
WebuiRequestContext context = event.getRequestContext();
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2011-10-19 18:36:52 UTC (rev 7792)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2011-10-20 02:10:20 UTC (rev 7793)
@@ -140,6 +140,12 @@
<short-title>Group Navigation Portlet</short-title>
<keywords>Administration</keywords>
</portlet-info>
+ <portlet-preferences>
+ <preference>
+ <name>level</name>
+ <value>2</value>
+ </preference>
+ </portlet-preferences>
<supported-publishing-event>
<name>NavigationChange</name>
</supported-publishing-event>
@@ -169,6 +175,14 @@
<short-title>Portal Navigation Portlet</short-title>
<keywords>System</keywords>
</portlet-info>
+
+ <portlet-preferences>
+ <preference>
+ <name>level</name>
+ <value>2</value>
+ </preference>
+ </portlet-preferences>
+
</portlet>
<portlet>
13 years, 2 months
gatein SVN: r7791 - components/pc/trunk.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-10-19 09:06:49 -0400 (Wed, 19 Oct 2011)
New Revision: 7791
Modified:
components/pc/trunk/pom.xml
Log:
- Updated to use WCI 2.1.0-GA.
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2011-10-19 12:09:02 UTC (rev 7790)
+++ components/pc/trunk/pom.xml 2011-10-19 13:06:49 UTC (rev 7791)
@@ -56,7 +56,7 @@
<properties>
<version.gatein.common>2.0.4-GA</version.gatein.common>
- <version.gatein.wci>2.1.0-Beta06</version.gatein.wci>
+ <version.gatein.wci>2.1.0-GA</version.gatein.wci>
<version.apache.portals.bridges>1.0.4</version.apache.portals.bridges>
<version.apache.taglibs>1.1.2</version.apache.taglibs>
<version.apache.log4j>1.2.14</version.apache.log4j>
13 years, 2 months
gatein SVN: r7790 - epp/portal/branches/EPP_5_2_Branch.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-10-19 08:09:02 -0400 (Wed, 19 Oct 2011)
New Revision: 7790
Modified:
epp/portal/branches/EPP_5_2_Branch/pom.xml
Log:
JBEPP-1296 Upgrade WCI to 2.1.0-GA
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-19 11:28:34 UTC (rev 7789)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-19 12:09:02 UTC (rev 7790)
@@ -50,7 +50,7 @@
<org.gatein.parent.version>1.1.0-GA</org.gatein.parent.version>
<org.gatein.common.version>2.0.4-GA</org.gatein.common.version>
<org.gatein.dep.version>1.1.0-GA</org.gatein.dep.version>
- <org.gatein.wci.version>2.1.0-Beta06</org.gatein.wci.version>
+ <org.gatein.wci.version>2.1.0-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.3.0-Beta06</org.gatein.pc.version>
<org.picketlink.idm>1.3.0.Alpha08</org.picketlink.idm>
<org.gatein.wsrp.version>2.1.0-Beta07-EPP520</org.gatein.wsrp.version>
13 years, 2 months
gatein SVN: r7789 - portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-10-19 07:28:34 -0400 (Wed, 19 Oct 2011)
New Revision: 7789
Modified:
portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java
Log:
GTNPORTAL-2176 Wrong usage of String.intern() in UIUserSelector
Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java
===================================================================
--- portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java 2011-10-19 11:22:31 UTC (rev 7788)
+++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java 2011-10-19 11:28:34 UTC (rev 7789)
@@ -78,11 +78,11 @@
@Serialized
public class UIUserSelector extends UIForm implements UIPopupComponent
{
- final public static String FIELD_KEYWORD = "Quick Search".intern();
+ final public static String FIELD_KEYWORD = "Quick Search";
- final public static String FIELD_FILTER = "filter".intern();
+ final public static String FIELD_FILTER = "filter";
- final public static String FIELD_GROUP = "group".intern();
+ final public static String FIELD_GROUP = "group";
public static String USER_NAME = "userName";
13 years, 2 months
gatein SVN: r7788 - portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/url/navigation.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-10-19 07:22:31 -0400 (Wed, 19 Oct 2011)
New Revision: 7788
Modified:
portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/url/navigation/NavigationResource.java
Log:
GTNPORTAL-2179 NavigationResource Constructor have to init SiteType attribute
Modified: portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/url/navigation/NavigationResource.java
===================================================================
--- portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/url/navigation/NavigationResource.java 2011-10-19 11:16:19 UTC (rev 7787)
+++ portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/url/navigation/NavigationResource.java 2011-10-19 11:22:31 UTC (rev 7788)
@@ -40,12 +40,7 @@
/** . */
private final String nodeURI;
-
- public NavigationResource(String siteName)
- {
- this(null, siteName, null);
- }
-
+
public NavigationResource(UserNode node)
{
this(node.getNavigation().getKey().getType(), node.getNavigation().getKey().getName(), node.getURI());
13 years, 2 months
gatein SVN: r7787 - portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-10-19 07:16:19 -0400 (Wed, 19 Oct 2011)
New Revision: 7787
Modified:
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIVirtualList.js
Log:
GTNPORTAL-2177 JS bug of UIVirtualList: wrong height in initialization phase
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIVirtualList.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIVirtualList.js 2011-10-19 10:16:49 UTC (rev 7786)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIVirtualList.js 2011-10-19 11:16:19 UTC (rev 7787)
@@ -23,13 +23,27 @@
var uiVirtualList = document.getElementById(componentId);
if (uiVirtualList == null) return;
uiVirtualList.style.height = "300px";
- var children = eXo.core.DOMUtil.getChildrenByTagName(uiVirtualList,"div");
+
+ //If parent of virtualList have style.display = none --> can't get virtualList's height
+ var tmp = uiVirtualList;
+ if (uiVirtualList.offsetHeight == 0) {
+ tmp = uiVirtualList.cloneNode(true);
+ tmp.style.visibility = "hidden";
+ document.body.appendChild(tmp);
+ }
+ var virtualHeight = tmp.offsetHeight;
+
+ var children = eXo.core.DOMUtil.getChildrenByTagName(tmp,"div");
var childrenHeight = 0;
for (var i=0; i<children.length;i++) {
childrenHeight += children[i].offsetHeight;
}
- if (!uiVirtualList.isFinished && childrenHeight <= uiVirtualList.offsetHeight && childrenHeight != 0) {
+ if (tmp !== uiVirtualList) {
+ document.body.removeChild(tmp);
+ }
+
+ if (!uiVirtualList.isFinished && childrenHeight <= virtualHeight && childrenHeight != 0) {
uiVirtualList.onscroll();
} else {
uiVirtualList.isInitiated = true;
13 years, 2 months
gatein SVN: r7786 - portal/trunk.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-10-19 06:16:49 -0400 (Wed, 19 Oct 2011)
New Revision: 7786
Modified:
portal/trunk/pom.xml
Log:
GTNPORTAL-2190 Upgrade WCI dependency to 2.1.0-GA
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2011-10-19 07:31:45 UTC (rev 7785)
+++ portal/trunk/pom.xml 2011-10-19 10:16:49 UTC (rev 7786)
@@ -44,7 +44,7 @@
<org.shindig.version>2.0.2-Beta03</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.4-GA</org.gatein.common.version>
- <org.gatein.wci.version>2.1.0-Beta06</org.gatein.wci.version>
+ <org.gatein.wci.version>2.1.0-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.3.0-Beta06</org.gatein.pc.version>
<org.picketlink.idm>1.3.0.Alpha08</org.picketlink.idm>
<org.gatein.wsrp.version>2.1.0-Beta07</org.gatein.wsrp.version>
13 years, 2 months
gatein SVN: r7785 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-10-19 03:31:45 -0400 (Wed, 19 Oct 2011)
New Revision: 7785
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/LegacyRequestHandler.java
Log:
GTNPORTAL-2187 Should not indicate node path in the URL if a legacy request is used
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/LegacyRequestHandler.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/LegacyRequestHandler.java 2011-10-19 07:15:03 UTC (rev 7784)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/LegacyRequestHandler.java 2011-10-19 07:31:45 UTC (rev 7785)
@@ -19,11 +19,8 @@
package org.exoplatform.portal.application;
-import org.exoplatform.container.PortalContainer;
-import org.exoplatform.portal.config.DataStorage;
import org.exoplatform.portal.config.UserPortalConfig;
import org.exoplatform.portal.config.UserPortalConfigService;
-import org.exoplatform.portal.config.model.PortalConfig;
import org.exoplatform.portal.mop.SiteKey;
import org.exoplatform.portal.mop.user.UserNavigation;
import org.exoplatform.portal.mop.user.UserNode;
@@ -91,55 +88,32 @@
{
String requestSiteName = context.getParameter(PortalRequestHandler.REQUEST_SITE_NAME);
String requestPath = context.getParameter(PortalRequestHandler.REQUEST_PATH);
-
- // Resolve the user node
- UserPortalConfig cfg = userPortalService.getUserPortalConfig(requestSiteName, context.getRequest().getRemoteUser(), userPortalContext);
- if (cfg == null)
- {
- HttpServletRequest req = context.getRequest();
- DataStorage storage = (DataStorage)PortalContainer.getComponent(DataStorage.class);
- PortalConfig persistentPortalConfig = storage.getPortalConfig(requestSiteName);
- if (persistentPortalConfig == null)
- {
- return false;
- }
- if(req.getRemoteUser() == null)
- {
- String doLoginPath = req.getContextPath() + "/" + "dologin" + "?initialURI=" + req.getRequestURI();
- context.getResponse().sendRedirect(doLoginPath);
- }
- else
- {
- context.getResponse().sendError(HttpServletResponse.SC_FORBIDDEN);
- }
- return true;
- }
-
-
- UserPortal userPortal = cfg.getUserPortal();
- UserNodeFilterConfig.Builder builder = UserNodeFilterConfig.builder().withAuthMode(UserNodeFilterConfig.AUTH_READ);
- UserNode userNode = userPortal.resolvePath(builder.build(), requestPath);
+ SiteKey siteKey = SiteKey.portal(requestSiteName);
+ String uri = requestPath;
- //
- SiteKey siteKey;
- String uri;
- if (userNode != null)
+ // Resolve the user node if node path is indicated
+ if (!requestPath.equals(""))
{
- siteKey = userNode.getNavigation().getKey();
- uri = userNode.getURI();
+ UserPortalConfig cfg = userPortalService.getUserPortalConfig(requestSiteName, context.getRequest().getRemoteUser(), userPortalContext);
+ if (cfg != null)
+ {
+ UserPortal userPortal = cfg.getUserPortal();
+ UserNodeFilterConfig.Builder builder = UserNodeFilterConfig.builder().withAuthMode(UserNodeFilterConfig.AUTH_READ);
+ UserNode userNode = userPortal.resolvePath(builder.build(), requestPath);
+
+ if (userNode != null)
+ {
+ siteKey = userNode.getNavigation().getKey();
+ uri = userNode.getURI();
+ }
+ }
}
- else
- {
- siteKey = SiteKey.portal("classic");
- uri = "";
- }
- //
+ //
PortalURLContext urlContext = new PortalURLContext(context, siteKey);
NodeURL url = urlFactory.newURL(NodeURL.TYPE, urlContext);
- // For now we redirect on the default classic site
url.setResource(new NavigationResource(siteKey.getType(), siteKey.getName(), uri));
url.setMimeType(MimeType.PLAIN);
13 years, 2 months
gatein SVN: r7784 - in components/wci/trunk: exo and 19 other directories.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-10-19 03:15:03 -0400 (Wed, 19 Oct 2011)
New Revision: 7784
Modified:
components/wci/trunk/exo/pom.xml
components/wci/trunk/jboss/jboss6/pom.xml
components/wci/trunk/jboss/pom.xml
components/wci/trunk/jetty/pom.xml
components/wci/trunk/pom.xml
components/wci/trunk/test/core/pom.xml
components/wci/trunk/test/pom.xml
components/wci/trunk/test/portlets/exo-portlet/pom.xml
components/wci/trunk/test/portlets/gatein-portlet/pom.xml
components/wci/trunk/test/portlets/native-portlet/pom.xml
components/wci/trunk/test/portlets/pom.xml
components/wci/trunk/test/servers/jboss51/pom.xml
components/wci/trunk/test/servers/jboss6/pom.xml
components/wci/trunk/test/servers/jetty6/pom.xml
components/wci/trunk/test/servers/pom.xml
components/wci/trunk/test/servers/tomcat6/pom.xml
components/wci/trunk/test/servers/tomcat7/pom.xml
components/wci/trunk/tomcat/pom.xml
components/wci/trunk/tomcat/tomcat6/pom.xml
components/wci/trunk/tomcat/tomcat7/pom.xml
components/wci/trunk/wci/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/wci/trunk/exo/pom.xml
===================================================================
--- components/wci/trunk/exo/pom.xml 2011-10-19 07:14:46 UTC (rev 7783)
+++ components/wci/trunk/exo/pom.xml 2011-10-19 07:15:03 UTC (rev 7784)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-exo</artifactId>
Modified: components/wci/trunk/jboss/jboss6/pom.xml
===================================================================
--- components/wci/trunk/jboss/jboss6/pom.xml 2011-10-19 07:14:46 UTC (rev 7783)
+++ components/wci/trunk/jboss/jboss6/pom.xml 2011-10-19 07:15:03 UTC (rev 7784)
@@ -2,11 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-jboss</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss6</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GateIn - WCI JBoss 6 compatibility component</name>
Modified: components/wci/trunk/jboss/pom.xml
===================================================================
--- components/wci/trunk/jboss/pom.xml 2011-10-19 07:14:46 UTC (rev 7783)
+++ components/wci/trunk/jboss/pom.xml 2011-10-19 07:15:03 UTC (rev 7784)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss</artifactId>
Modified: components/wci/trunk/jetty/pom.xml
===================================================================
--- components/wci/trunk/jetty/pom.xml 2011-10-19 07:14:46 UTC (rev 7783)
+++ components/wci/trunk/jetty/pom.xml 2011-10-19 07:15:03 UTC (rev 7784)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jetty</artifactId>
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2011-10-19 07:14:46 UTC (rev 7783)
+++ components/wci/trunk/pom.xml 2011-10-19 07:15:03 UTC (rev 7784)
@@ -6,7 +6,7 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
@@ -16,9 +16,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wci/tags/2.1.0-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/tags/2.1.0-GA</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wci/tags/2.1.0-GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wci/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wci/trunk/</url>
</scm>
<properties>
Modified: components/wci/trunk/test/core/pom.xml
===================================================================
--- components/wci/trunk/test/core/pom.xml 2011-10-19 07:14:46 UTC (rev 7783)
+++ components/wci/trunk/test/core/pom.xml 2011-10-19 07:15:03 UTC (rev 7784)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-core</artifactId>
Modified: components/wci/trunk/test/pom.xml
===================================================================
--- components/wci/trunk/test/pom.xml 2011-10-19 07:14:46 UTC (rev 7783)
+++ components/wci/trunk/test/pom.xml 2011-10-19 07:15:03 UTC (rev 7784)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-parent</artifactId>
Modified: components/wci/trunk/test/portlets/exo-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/exo-portlet/pom.xml 2011-10-19 07:14:46 UTC (rev 7783)
+++ components/wci/trunk/test/portlets/exo-portlet/pom.xml 2011-10-19 07:15:03 UTC (rev 7784)
@@ -2,11 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-exo-portlet</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
<packaging>war</packaging>
<name>GateIn - WCI eXo Backwards Compatibility Test Portlet</name>
</project>
Modified: components/wci/trunk/test/portlets/gatein-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2011-10-19 07:14:46 UTC (rev 7783)
+++ components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2011-10-19 07:15:03 UTC (rev 7784)
@@ -2,11 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-gatein-portlet</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
<packaging>war</packaging>
<name>GateIn - WCI Gatein Test Portlet</name>
</project>
Modified: components/wci/trunk/test/portlets/native-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/native-portlet/pom.xml 2011-10-19 07:14:46 UTC (rev 7783)
+++ components/wci/trunk/test/portlets/native-portlet/pom.xml 2011-10-19 07:15:03 UTC (rev 7784)
@@ -2,11 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-native-portlet</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
<packaging>war</packaging>
<name>GateIn - WCI Native Test Portlet</name>
</project>
Modified: components/wci/trunk/test/portlets/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/pom.xml 2011-10-19 07:14:46 UTC (rev 7783)
+++ components/wci/trunk/test/portlets/pom.xml 2011-10-19 07:15:03 UTC (rev 7784)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-portlets</artifactId>
Modified: components/wci/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss51/pom.xml 2011-10-19 07:14:46 UTC (rev 7783)
+++ components/wci/trunk/test/servers/jboss51/pom.xml 2011-10-19 07:15:03 UTC (rev 7784)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss51</artifactId>
Modified: components/wci/trunk/test/servers/jboss6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/pom.xml 2011-10-19 07:14:46 UTC (rev 7783)
+++ components/wci/trunk/test/servers/jboss6/pom.xml 2011-10-19 07:15:03 UTC (rev 7784)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss6</artifactId>
Modified: components/wci/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jetty6/pom.xml 2011-10-19 07:14:46 UTC (rev 7783)
+++ components/wci/trunk/test/servers/jetty6/pom.xml 2011-10-19 07:15:03 UTC (rev 7784)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jetty6</artifactId>
Modified: components/wci/trunk/test/servers/pom.xml
===================================================================
--- components/wci/trunk/test/servers/pom.xml 2011-10-19 07:14:46 UTC (rev 7783)
+++ components/wci/trunk/test/servers/pom.xml 2011-10-19 07:15:03 UTC (rev 7784)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-server-parent</artifactId>
Modified: components/wci/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat6/pom.xml 2011-10-19 07:14:46 UTC (rev 7783)
+++ components/wci/trunk/test/servers/tomcat6/pom.xml 2011-10-19 07:15:03 UTC (rev 7784)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat6</artifactId>
Modified: components/wci/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/pom.xml 2011-10-19 07:14:46 UTC (rev 7783)
+++ components/wci/trunk/test/servers/tomcat7/pom.xml 2011-10-19 07:15:03 UTC (rev 7784)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat7</artifactId>
Modified: components/wci/trunk/tomcat/pom.xml
===================================================================
--- components/wci/trunk/tomcat/pom.xml 2011-10-19 07:14:46 UTC (rev 7783)
+++ components/wci/trunk/tomcat/pom.xml 2011-10-19 07:15:03 UTC (rev 7784)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat</artifactId>
Modified: components/wci/trunk/tomcat/tomcat6/pom.xml
===================================================================
--- components/wci/trunk/tomcat/tomcat6/pom.xml 2011-10-19 07:14:46 UTC (rev 7783)
+++ components/wci/trunk/tomcat/tomcat6/pom.xml 2011-10-19 07:15:03 UTC (rev 7784)
@@ -2,11 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat6</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GateIn - WCI Tomcat 6 compatibility component</name>
Modified: components/wci/trunk/tomcat/tomcat7/pom.xml
===================================================================
--- components/wci/trunk/tomcat/tomcat7/pom.xml 2011-10-19 07:14:46 UTC (rev 7783)
+++ components/wci/trunk/tomcat/tomcat7/pom.xml 2011-10-19 07:15:03 UTC (rev 7784)
@@ -2,11 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat7</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GateIn - WCI Tomcat 7 compatibility component</name>
Modified: components/wci/trunk/wci/pom.xml
===================================================================
--- components/wci/trunk/wci/pom.xml 2011-10-19 07:14:46 UTC (rev 7783)
+++ components/wci/trunk/wci/pom.xml 2011-10-19 07:15:03 UTC (rev 7784)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-GA</version>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-wci</artifactId>
13 years, 2 months