gatein SVN: r8311 - sandbox/as7_support/tags/AS7-Beta02/wci/jboss/jboss7.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2012-01-26 08:21:05 -0500 (Thu, 26 Jan 2012)
New Revision: 8311
Modified:
sandbox/as7_support/tags/AS7-Beta02/wci/jboss/jboss7/pom.xml
Log:
Broken wci-wci dependency version
Modified: sandbox/as7_support/tags/AS7-Beta02/wci/jboss/jboss7/pom.xml
===================================================================
--- sandbox/as7_support/tags/AS7-Beta02/wci/jboss/jboss7/pom.xml 2012-01-25 17:47:38 UTC (rev 8310)
+++ sandbox/as7_support/tags/AS7-Beta02/wci/jboss/jboss7/pom.xml 2012-01-26 13:21:05 UTC (rev 8311)
@@ -14,6 +14,7 @@
<dependency>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-wci</artifactId>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.web</groupId>
12 years, 11 months
- 1
- 0
gatein SVN: r8310 - portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/exception.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2012-01-25 12:47:38 -0500 (Wed, 25 Jan 2012)
New Revision: 8310
Modified:
portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/exception/MessageException.java
Log:
- Removed unused code.
Modified: portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/exception/MessageException.java
===================================================================
--- portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/exception/MessageException.java 2012-01-25 17:15:54 UTC (rev 8309)
+++ portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/exception/MessageException.java 2012-01-25 17:47:38 UTC (rev 8310)
@@ -40,11 +40,6 @@
this.message = message;
}
- /*public MessageException(ApplicationMessage message)
- {
- this.message = message;
- }*/
-
public AbstractApplicationMessage getDetailMessage()
{
return message;
12 years, 11 months
- 1
- 0
gatein SVN: r8309 - in portal/trunk: webui/core/src/main/java/org/exoplatform/webui/form/validator and 2 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2012-01-25 12:15:54 -0500 (Wed, 25 Jan 2012)
New Revision: 8309
Added:
portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/application/AbstractApplicationMessage.java
portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/application/CompoundApplicationMessage.java
Modified:
portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/application/ApplicationMessage.java
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/UsernameValidator.java
portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/core/UIApplication.java
portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/core/UIPopupMessages.java
portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/exception/MessageException.java
Log:
- Added CompoundApplicationMessage and AbstractApplicationMessage to be able to collect all messages (in case there might be several) before reporting the errors.
Added: portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/application/AbstractApplicationMessage.java
===================================================================
--- portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/application/AbstractApplicationMessage.java (rev 0)
+++ portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/application/AbstractApplicationMessage.java 2012-01-25 17:15:54 UTC (rev 8309)
@@ -0,0 +1,98 @@
+/**
+ * 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.web.application;
+
+import org.exoplatform.commons.utils.PropertyManager;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+
+import java.io.Serializable;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * Created by The eXo Platform SARL
+ * Author : Dang Van Minh
+ * minhdv81(a)yahoo.com
+ * Jun 7, 2006
+ */
+public abstract class AbstractApplicationMessage implements Serializable
+{
+ private static Log log = ExoLogger.getLogger(ApplicationMessage.class);
+
+ final public static int ERROR = 0, WARNING = 1, INFO = 2;
+
+ private int type_ = INFO;
+
+ private transient ResourceBundle resourceBundle;
+
+ private boolean argsLocalized = true;
+
+
+ public abstract String getMessage();
+
+ public void setResourceBundle(ResourceBundle resourceBundle)
+ {
+ this.resourceBundle = resourceBundle;
+ }
+
+ public int getType()
+ {
+ return type_;
+ }
+
+ public void setType(int type)
+ {
+ this.type_ = type;
+ }
+
+ public void setArgsLocalized(boolean argsLocalized)
+ {
+ this.argsLocalized = argsLocalized;
+ }
+
+ public boolean isArgsLocalized()
+ {
+ return argsLocalized;
+ }
+
+ protected String resolveMessage(String key)
+ {
+ if (key == null && resourceBundle == null)
+ {
+ return key;
+ }
+
+ String value;
+ try
+ {
+ value = resourceBundle.getString(key);
+ }
+ catch (MissingResourceException ex)
+ {
+ if (PropertyManager.isDevelopping())
+ {
+ log.warn("Can not find resource bundle for key : " + key);
+ }
+ value = key.substring(key.lastIndexOf('.') + 1);
+ }
+ return value;
+ }
+}
Modified: portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/application/ApplicationMessage.java
===================================================================
--- portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/application/ApplicationMessage.java 2012-01-24 02:52:00 UTC (rev 8308)
+++ portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/application/ApplicationMessage.java 2012-01-25 17:15:54 UTC (rev 8309)
@@ -1,64 +1,46 @@
-/**
- * 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.
- */
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* 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.web.application;
-import org.exoplatform.commons.utils.PropertyManager;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-
import java.io.Serializable;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-/**
- * Created by The eXo Platform SARL
- * Author : Dang Van Minh
- * minhdv81(a)yahoo.com
- * Jun 7, 2006
- */
-public class ApplicationMessage implements Serializable
+/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */
+public class ApplicationMessage extends AbstractApplicationMessage implements Serializable
{
- private static Log log = ExoLogger.getLogger(ApplicationMessage.class);
-
- final public static int ERROR = 0, WARNING = 1, INFO = 2;
+ private final String messageKey_;
+ private final Object[] messageArgs_;
- private int type_ = INFO;
-
- private String messageKey_;
-
- private ResourceBundle resourceBundle;
-
- private Object[] messageArgs_;
-
- private boolean argsLocalized = true;
-
public ApplicationMessage(String key, Object[] args)
{
- messageKey_ = key;
- messageArgs_ = args;
+ this.messageKey_ = key;
+ this.messageArgs_ = args;
}
public ApplicationMessage(String key, Object[] args, int type)
{
- this(key, args);
- type_ = type;
+ this.messageKey_ = key;
+ this.messageArgs_ = args;
+ setType(type);
}
public String getMessage()
@@ -66,75 +48,17 @@
String msg = resolveMessage(messageKey_);
if (msg != null && messageArgs_ != null)
{
- for(int i = 0; i < messageArgs_.length; i++)
+ for (int i = 0; i < messageArgs_.length; i++)
{
- String arg = messageArgs_ [i].toString();
- if (isArgsLocalized())
+ String arg = messageArgs_[i].toString();
+ if (isArgsLocalized())
{
arg = resolveMessage(arg);
}
- msg = msg.replace("{" + i + "}", arg);
- }
- }
-
- return msg;
- }
-
- public void setResourceBundle(ResourceBundle resourceBundle)
- {
- this.resourceBundle = resourceBundle;
- }
-
- public String getMessageKey()
- {
- return messageKey_;
- }
-
- public Object[] getMessageAruments()
- {
- return messageArgs_;
- }
-
- public int getType()
- {
- return type_;
- }
-
- public void setType(int type)
- {
- this.type_ = type;
- }
-
- public void setArgsLocalized(boolean argsLocalized)
- {
- this.argsLocalized = argsLocalized;
- }
-
- public boolean isArgsLocalized()
- {
- return argsLocalized;
- }
-
- private String resolveMessage(String key)
- {
- if (key == null && resourceBundle == null)
- {
- return key;
- }
-
- String value;
- try
- {
- value = resourceBundle.getString(key);
- }
- catch (MissingResourceException ex)
- {
- if (PropertyManager.isDevelopping())
- {
- log.warn("Can not find resource bundle for key : " + key);
+ msg = msg.replace("{" + i + "}", arg);
}
- value = key.substring(key.lastIndexOf('.') + 1);
}
- return value;
+
+ return msg;
}
}
Added: portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/application/CompoundApplicationMessage.java
===================================================================
--- portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/application/CompoundApplicationMessage.java (rev 0)
+++ portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/application/CompoundApplicationMessage.java 2012-01-25 17:15:54 UTC (rev 8309)
@@ -0,0 +1,68 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* 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.web.application;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */
+public class CompoundApplicationMessage extends AbstractApplicationMessage implements Serializable
+{
+ private List<AbstractApplicationMessage> messages = new ArrayList<AbstractApplicationMessage>(5);
+
+ public CompoundApplicationMessage()
+ {
+ this(null);
+ }
+
+ public CompoundApplicationMessage(AbstractApplicationMessage initialMessage)
+ {
+ if(initialMessage != null)
+ {
+ messages.add(initialMessage);
+ }
+ }
+
+ @Override
+ public String getMessage()
+ {
+ StringBuilder sb = new StringBuilder(255);
+ for (AbstractApplicationMessage message : messages)
+ {
+ sb.append(message.getMessage()).append('\n');
+ }
+
+ return sb.toString();
+ }
+
+ public void addMessage(String messageKey, Object[] args, int type)
+ {
+ messages.add(new ApplicationMessage(messageKey, args, type));
+ }
+
+ public boolean isEmpty()
+ {
+ return messages.isEmpty();
+ }
+}
Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/UsernameValidator.java
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/UsernameValidator.java 2012-01-24 02:52:00 UTC (rev 8308)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/UsernameValidator.java 2012-01-25 17:15:54 UTC (rev 8309)
@@ -18,6 +18,7 @@
import org.exoplatform.commons.serialization.api.annotations.Serialized;
import org.exoplatform.web.application.ApplicationMessage;
+import org.exoplatform.web.application.CompoundApplicationMessage;
import org.exoplatform.webui.core.UIComponent;
import org.exoplatform.webui.exception.MessageException;
import org.exoplatform.webui.form.UIForm;
@@ -43,46 +44,39 @@
this.min = min;
this.max = max;
}
-
- @Override
+
public void validate(UIFormInput uiInput) throws Exception
{
- if (uiInput.getValue() == null || ((String)uiInput.getValue()).trim().length() == 0)
+ String value = (String)uiInput.getValue();
+ if (value == null || value.trim().length() == 0)
{
return;
}
+
UIComponent uiComponent = (UIComponent)uiInput;
UIForm uiForm = uiComponent.getAncestorOfType(UIForm.class);
- String label;
- try
+ String label = uiInput.getName();
+ if(uiForm != null)
{
- label = uiForm.getId() + ".label." + uiInput.getName();
+ label = uiForm.getLabel(label);
}
- catch (Exception e)
- {
- label = uiInput.getName();
- }
-
- char[] buff = ((String)uiInput.getValue()).toCharArray();
+
+ CompoundApplicationMessage messages = new CompoundApplicationMessage();
+
+ char[] buff = value.toCharArray();
if(buff.length < min || buff.length > max)
{
- Object[] args = {label, min.toString(), max.toString()};
- throw new MessageException(new ApplicationMessage("StringLengthValidator.msg.length-invalid", args,
- ApplicationMessage.WARNING));
+ messages.addMessage("StringLengthValidator.msg.length-invalid", new Object[]{label, min.toString(), max.toString()}, ApplicationMessage.WARNING);
}
if(!isAlphabet(buff[0]))
{
- Object[] args = {label};
- throw new MessageException(new ApplicationMessage("FirstCharacterNameValidator.msg", args,
- ApplicationMessage.WARNING));
+ messages.addMessage("FirstCharacterNameValidator.msg", new Object[]{label}, ApplicationMessage.WARNING);
}
if(!isAlphabetOrDigit(buff[buff.length - 1]))
{
- Object[] args = {label, buff[buff.length - 1]};
- throw new MessageException(new ApplicationMessage("LastCharacterUsernameValidator.msg", args,
- ApplicationMessage.WARNING));
+ messages.addMessage("LastCharacterUsernameValidator.msg", new Object[]{label, buff[buff.length - 1]}, ApplicationMessage.WARNING);
}
for(int i = 1; i < buff.length -1; i++)
@@ -99,22 +93,23 @@
char next = buff[i + 1];
if (isSymbol(next))
{
- Object[] args = {label, buff[i], buff[i + 1]};
- throw new MessageException(new ApplicationMessage("ConsecutiveSymbolValidator.msg", args,
- ApplicationMessage.WARNING));
+ messages.addMessage("ConsecutiveSymbolValidator.msg", new Object[]{label, buff[i], buff[i + 1]}, ApplicationMessage.WARNING);
}
else if (!isAlphabetOrDigit(next))
{
- Object[] args = {label};
- throw new MessageException(new ApplicationMessage("UsernameValidator.msg.Invalid-char", args, ApplicationMessage.WARNING));
+ messages.addMessage("UsernameValidator.msg.Invalid-char", new Object[]{label}, ApplicationMessage.WARNING);
}
}
else
{
- Object[] args = {label};
- throw new MessageException(new ApplicationMessage("UsernameValidator.msg.Invalid-char", args, ApplicationMessage.WARNING));
+ messages.addMessage("UsernameValidator.msg.Invalid-char", new Object[]{label}, ApplicationMessage.WARNING);
}
}
+
+ if(!messages.isEmpty())
+ {
+ throw new MessageException(messages);
+ }
}
private boolean isAlphabet(char c)
Modified: portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/core/UIApplication.java
===================================================================
--- portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/core/UIApplication.java 2012-01-24 02:52:00 UTC (rev 8308)
+++ portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/core/UIApplication.java 2012-01-25 17:15:54 UTC (rev 8309)
@@ -21,6 +21,7 @@
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
+import org.exoplatform.web.application.AbstractApplicationMessage;
import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.commons.serialization.api.annotations.Serialized;
@@ -82,7 +83,7 @@
return uiPopupMessages_;
}
- public void addMessage(ApplicationMessage message)
+ public void addMessage(AbstractApplicationMessage message)
{
getUIPopupMessages().addMessage(message);
}
Modified: portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/core/UIPopupMessages.java
===================================================================
--- portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/core/UIPopupMessages.java 2012-01-24 02:52:00 UTC (rev 8308)
+++ portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/core/UIPopupMessages.java 2012-01-25 17:15:54 UTC (rev 8309)
@@ -19,6 +19,7 @@
package org.exoplatform.webui.core;
+import org.exoplatform.web.application.AbstractApplicationMessage;
import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.web.application.RequestContext;
import org.exoplatform.webui.application.WebuiRequestContext;
@@ -48,53 +49,53 @@
/**
* The error messages
*/
- private List<ApplicationMessage> errors_;
+ private List<AbstractApplicationMessage> errors_;
/**
* The warning messages
*/
- private List<ApplicationMessage> warnings_;
+ private List<AbstractApplicationMessage> warnings_;
/**
* The info messages
*/
- private List<ApplicationMessage> infos_;
+ private List<AbstractApplicationMessage> infos_;
public UIPopupMessages()
{
- errors_ = new ArrayList<ApplicationMessage>();
- warnings_ = new ArrayList<ApplicationMessage>();
- infos_ = new ArrayList<ApplicationMessage>();
+ errors_ = new ArrayList<AbstractApplicationMessage>();
+ warnings_ = new ArrayList<AbstractApplicationMessage>();
+ infos_ = new ArrayList<AbstractApplicationMessage>();
setShowMask(true);
setShow(true);
}
- public List<ApplicationMessage> getErrors()
+ public List<AbstractApplicationMessage> getErrors()
{
return errors_;
}
- public void setErrors(List<ApplicationMessage> errors_)
+ public void setErrors(List<AbstractApplicationMessage> errors_)
{
this.errors_ = errors_;
}
- public List<ApplicationMessage> getInfos()
+ public List<AbstractApplicationMessage> getInfos()
{
return infos_;
}
- public void setInfos(List<ApplicationMessage> infos_)
+ public void setInfos(List<AbstractApplicationMessage> infos_)
{
this.infos_ = infos_;
}
- public List<ApplicationMessage> getWarnings()
+ public List<AbstractApplicationMessage> getWarnings()
{
return warnings_;
}
- public void setWarnings(List<ApplicationMessage> warnings_)
+ public void setWarnings(List<AbstractApplicationMessage> warnings_)
{
this.warnings_ = warnings_;
}
@@ -104,7 +105,7 @@
super.processRender(context);
}
- public void addMessage(ApplicationMessage msg)
+ public void addMessage(AbstractApplicationMessage msg)
{
msg.setResourceBundle(getResourceBundle());
switch (msg.getType())
Modified: portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/exception/MessageException.java
===================================================================
--- portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/exception/MessageException.java 2012-01-24 02:52:00 UTC (rev 8308)
+++ portal/trunk/webui/framework/src/main/java/org/exoplatform/webui/exception/MessageException.java 2012-01-25 17:15:54 UTC (rev 8309)
@@ -19,6 +19,7 @@
package org.exoplatform.webui.exception;
+import org.exoplatform.web.application.AbstractApplicationMessage;
import org.exoplatform.web.application.ApplicationMessage;
/**
@@ -32,15 +33,20 @@
public class MessageException extends Exception
{
- private ApplicationMessage message;
+ private AbstractApplicationMessage message;
- public MessageException(ApplicationMessage message)
+ public MessageException(AbstractApplicationMessage message)
{
this.message = message;
}
- public ApplicationMessage getDetailMessage()
+ /*public MessageException(ApplicationMessage message)
{
+ this.message = message;
+ }*/
+
+ public AbstractApplicationMessage getDetailMessage()
+ {
return message;
}
12 years, 11 months
- 1
- 0
gatein SVN: r8308 - in epp/portal/branches/EPP_5_2_Branch: web/portal/src/main/webapp/WEB-INF/classes/locale/portal and 1 other directory.
by do-not-reply＠jboss.org
Author: nscavell
Date: 2012-01-23 21:52:00 -0500 (Mon, 23 Jan 2012)
New Revision: 8308
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/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
Log:
JBEPP-1402: possible to clone or copy system nodes in edit navigation
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 2012-01-24 02:48:02 UTC (rev 8307)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UINavigationNodeSelector.java 2012-01-24 02:52:00 UTC (rev 8308)
@@ -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: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2012-01-24 02:48:02 UTC (rev 8307)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2012-01-24 02:52:00 UTC (rev 8308)
@@ -1063,6 +1063,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: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2012-01-24 02:48:02 UTC (rev 8307)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2012-01-24 02:52:00 UTC (rev 8308)
@@ -1001,6 +1001,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
12 years, 11 months
- 1
- 0
gatein SVN: r8307 - in epp/portal/branches/EPP_5_2_Branch/component/portal/src: test/java/org/exoplatform/portal/mop/navigation and 1 other directory.
by do-not-reply＠jboss.org
Author: nscavell
Date: 2012-01-23 21:48:02 -0500 (Mon, 23 Jan 2012)
New Revision: 8307
Modified:
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NavigationServiceImpl.java
epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/navigation/Node.java
epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/navigation/TestNavigationServiceSave.java
Log:
JBEPP-1440: Deleting created subnode populates NPE and parent node is not properly deleted
Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NavigationServiceImpl.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NavigationServiceImpl.java 2012-01-23 20:36:44 UTC (rev 8306)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NavigationServiceImpl.java 2012-01-24 02:48:02 UTC (rev 8307)
@@ -611,26 +611,37 @@
Navigation sourceNav = session.findObjectById(ObjectType.NAVIGATION, target.data.id);
//
- String objectId = sourceNav.getObjectId();
-
- //
- toEvict.add(objectId);
toEvict.add(parentNav.getObjectId());
sourceNav.destroy();
//
parent.data = new NodeData(parentNav);
+ toUpdate.add(parent.handle);
//
- toUpdate.add(parent.handle);
+ destroy(target);
+ }
+ private void destroy(NodeContext<N> ctx)
+ {
+ toPersist.values().remove(ctx.handle);
+
//
- if (toPersist.values().contains(objectId))
+ toUpdate.remove(ctx.handle);
+
+ //
+ toEvict.add(ctx.handle);
+
+ // Recurse
+ if (ctx.isExpanded())
{
- toPersist.values().remove(objectId);
+ for (NodeContext<N> child = ctx.getFirst();child != null;child = child.getNext())
+ {
+ destroy(child);
+ }
}
- toUpdate.remove(objectId);
}
+
@Override
public void onUpdate(NodeContext<N> source, NodeState state) throws NavigationServiceException
{
Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/navigation/Node.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/navigation/Node.java 2012-01-23 20:36:44 UTC (rev 8306)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/navigation/Node.java 2012-01-24 02:48:02 UTC (rev 8307)
@@ -63,6 +63,11 @@
return context.getId();
}
+ public String getHandle()
+ {
+ return context.handle;
+ }
+
public String getName()
{
return context.getName();
Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/navigation/TestNavigationServiceSave.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/navigation/TestNavigationServiceSave.java 2012-01-23 20:36:44 UTC (rev 8306)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/navigation/TestNavigationServiceSave.java 2012-01-24 02:48:02 UTC (rev 8307)
@@ -1071,6 +1071,33 @@
assertEquals(0, root.getChildren().size());
}
+ public void testTransitiveRemoveTransient() throws Exception
+ {
+ MOPService mop = mgr.getPOMService();
+ Site portal = mop.getModel().getWorkspace().addSite(ObjectType.PORTAL_SITE, "transitive_remove_transient");
+ portal.getRootNavigation().addChild("default");
+
+ //
+ sync(true);
+
+ //
+ NavigationContext navigation = service.loadNavigation(SiteKey.portal("transitive_remove_transient"));
+ Node root = service.loadNode(Node.MODEL, navigation, Scope.GRANDCHILDREN, null).getNode();
+ root.addChild("foo").addChild("bar");
+ root.removeChild("foo");
+ service.saveNode(root.context, null);
+
+ //
+ root.assertConsistent();
+
+ //
+ sync(true);
+
+ //
+ root = service.loadNode(Node.MODEL, navigation, Scope.GRANDCHILDREN, null).getNode();
+ assertEquals(0, root.getChildren().size());
+ }
+
public void testRenameCreatedNode() throws Exception
{
MOPService mop = mgr.getPOMService();
12 years, 11 months
- 1
- 0
gatein SVN: r8306 - epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2012-01-23 15:36:44 -0500 (Mon, 23 Jan 2012)
New Revision: 8306
Modified:
epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java
Log:
JBEPP-1393: update class to the latest from GateIn to fix an issue with applications appearing twice in the application registry on import all applications.
Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2012-01-23 10:06:39 UTC (rev 8305)
+++ epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2012-01-23 20:36:44 UTC (rev 8306)
@@ -524,11 +524,25 @@
contentId = info.getApplicationName() + "/" + info.getName();
}
- //
- app = category.createContent(portletName, contentType, contentId);
- app.setDisplayName(displayName);
- app.setDescription(getLocalizedStringValue(descriptionLS, portletName));
- app.setAccessPermissions(permissions);
+ // Check if the portlet has already existed in this category
+ List<Application> applications = load(category).getApplications();
+ boolean isExist = false;
+ for (Application application : applications)
+ {
+ if (application.getContentId().equals(contentId))
+ {
+ isExist = true;
+ break;
+ }
+ }
+
+ if (!isExist)
+ {
+ app = category.createContent(portletName, contentType, contentId);
+ app.setDisplayName(displayName);
+ app.setDescription(getLocalizedStringValue(descriptionLS, portletName));
+ app.setAccessPermissions(permissions);
+ }
}
}
}
12 years, 11 months
- 1
- 0
gatein SVN: r8305 - in epp/portal/branches/EPP_5_2_Branch: component and 109 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-01-23 05:06:39 -0500 (Mon, 23 Jan 2012)
New Revision: 8305
Modified:
epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/gatein-management/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-core/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-doc/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-jcr/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-junit/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-kernel/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-parent/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-ws/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-common/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-dep/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-examples/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-management/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-mop/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-parent/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-pc/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-portal/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-shindig/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-simplecaptcha/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-sso/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wci/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wsrp/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-eppsp/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-portletbridge/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/mead.parent/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/pom.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml
epp/portal/branches/EPP_5_2_Branch/pom.xml
epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml
epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml
epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml
epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml
epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml
epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml
epp/portal/branches/EPP_5_2_Branch/server/pom.xml
epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml
epp/portal/branches/EPP_5_2_Branch/starter/pom.xml
epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml
epp/portal/branches/EPP_5_2_Branch/testsuite/htmlunit-tests/pom.xml
epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml
epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml
epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml
epp/portal/branches/EPP_5_2_Branch/web/pom.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml
epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml
epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml
epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml
epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml
epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml
epp/portal/branches/EPP_5_2_Branch/webui/pom.xml
epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml
epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml
Log:
Next development version
Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>exo.portal.component.common</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.component</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/gatein-management/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/gatein-management/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/gatein-management/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<groupId>org.jboss.portal</groupId>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>gatein</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>integration</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-core/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-core/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-doc/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-doc/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-doc/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-jcr/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-jcr/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-jcr/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-junit/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-junit/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-junit/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-kernel/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-kernel/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-kernel/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-parent/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-parent/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-parent/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-ws/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-ws/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-ws/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-common/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-common/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-common/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-dep/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-dep/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-dep/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-examples/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-examples/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-examples/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-management/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-management/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-management/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-mop/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-mop/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-mop/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-parent/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-parent/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-parent/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-pc/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-pc/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-pc/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-portal/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-portal/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-shindig/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-shindig/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-shindig/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-simplecaptcha/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-simplecaptcha/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-simplecaptcha/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-sso/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-sso/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-sso/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wci/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wci/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wci/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wsrp/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wsrp/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wsrp/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-eppsp/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-eppsp/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-eppsp/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-portletbridge/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-portletbridge/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-portletbridge/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/mead.parent/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/mead.parent/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/mead.parent/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<artifactId>mead-tools</artifactId>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<groupId>org.exoplatform.portal.mead</groupId>
@@ -55,7 +55,7 @@
</build>
<properties>
- <gatein.tag>EPP_5.2.0.GA-SNAPSHOT</gatein.tag>
+ <gatein.tag>EPP_5.2.1.DR01</gatein.tag>
<!--<gatein-portal.svnpath>epp/portal/tags/${gatein.tag}</gatein-portal.svnpath>-->
<!-- Ant properties -->
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>distribution.parent</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
@@ -38,23 +38,23 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.config</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.jar</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.war</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/examples/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
@@ -38,29 +38,29 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.config</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.jar</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.war</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.rest-war</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>gatein-api</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>gatein-jsf-hellouser</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>gatein-jsp-hellouser</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>gatein-simplest-helloworld</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>struts-jpetstore</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.portal.examples.skins</groupId>
<artifactId>skins-parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>gatein-sample-skin</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -14,7 +14,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-core</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gwtGadgets</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-server</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -31,7 +31,7 @@
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<packaging>pom</packaging>
<name>EPP GateIn - Portal - ${project.version}</name>
@@ -75,9 +75,9 @@
</properties>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/epp/portal/tags/EPP_5.2.0.G...</connection>
- <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/epp/portal/tags/EPP_5.2.0.GA-SN...</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/epp/portal/tags/EPP_5.2.0.GA-SNAPSHOT</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/epp/portal/tags/EPP_5.2.1.DR01</connection>
+ <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/epp/portal/tags/EPP_5.2.1.DR01</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/epp/portal/tags/EPP_5.2.1.DR01</url>
</scm>
<modules>
@@ -464,74 +464,74 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.common</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.controller</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.security</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.server</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.resources</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.pc</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.identity</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.identity</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.resources</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.application-registry</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
@@ -541,85 +541,85 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.scripting</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.management</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.framework</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portlet</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.eXo</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.core</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.dashboard</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets-core</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss.plugin</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
<!-- Chromattic -->
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.portlet</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
</parent>
<artifactId>exo.portal.packaging.jboss-as.integration</artifactId>
<packaging>war</packaging>
Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server.jboss</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/server/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.starter.war</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/starter/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/starter/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/starter/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.starter.root</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.starter.jar</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/htmlunit-tests/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/testsuite/htmlunit-tests/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/testsuite/htmlunit-tests/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01</version>
</parent>
<groupId>org.jboss.gatein</groupId>
Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.testsuite</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.selenium.snifftests</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>exo.webui.based.samples</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/web/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/web/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.web</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/webui/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/webui/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.webui</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -26,7 +26,7 @@
<parent>
<artifactId>gatein-wsrp-integration-parent</artifactId>
<groupId>org.gatein.integration</groupId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -26,7 +26,7 @@
<parent>
<artifactId>gatein-wsrp-integration-parent</artifactId>
<groupId>org.gatein.integration</groupId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>extension-config</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -28,7 +28,7 @@
<parent>
<artifactId>gatein-wsrp-integration-parent</artifactId>
<groupId>org.gatein.integration</groupId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>extension-ear</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.gatein.integration</groupId>
<artifactId>gatein-wsrp-integration-parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>extension-ear-as5</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -27,7 +27,7 @@
<parent>
<artifactId>gatein-wsrp-integration-parent</artifactId>
<groupId>org.gatein.integration</groupId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<artifactId>extension-war</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2012-01-20 23:15:57 UTC (rev 8304)
+++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2012-01-23 10:06:39 UTC (rev 8305)
@@ -34,7 +34,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0.GA-SNAPSHOT</version>
+ <version>5.2.1.DR01-SNAPSHOT</version>
</parent>
<description>GateIn WSRP Integration extension parent</description>
12 years, 11 months
- 1
- 0
gatein SVN: r8304 - in components/sso/trunk/agent/src/main/java/org/gatein/sso/agent: filter and 1 other directories.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2012-01-20 18:15:57 -0500 (Fri, 20 Jan 2012)
New Revision: 8304
Added:
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/SAML2LogoutFilter.java
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/saml/
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/saml/PortalSAML2LogOutHandler.java
Modified:
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/AbstractLogoutFilter.java
Log:
GTNSSO-4 Support for SAML2 global logout
Modified: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/AbstractLogoutFilter.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/AbstractLogoutFilter.java 2012-01-18 19:32:20 UTC (rev 8303)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/AbstractLogoutFilter.java 2012-01-20 23:15:57 UTC (rev 8304)
@@ -64,8 +64,10 @@
if (httpRequest.getSession().getAttribute("SSO_LOGOUT_FLAG") == null)
{
httpRequest.getSession().setAttribute("SSO_LOGOUT_FLAG", Boolean.TRUE);
-
- httpResponse.sendRedirect(this.getRedirectUrl(httpRequest));
+
+ String redirectUrl = this.getRedirectUrl(httpRequest);
+ redirectUrl = httpResponse.encodeRedirectURL(redirectUrl);
+ httpResponse.sendRedirect(redirectUrl);
return;
}
else
Added: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/SAML2LogoutFilter.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/SAML2LogoutFilter.java (rev 0)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/SAML2LogoutFilter.java 2012-01-20 23:15:57 UTC (rev 8304)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, Red Hat Middleware, LLC, and individual
+ * contributors as indicated by the @authors tag. See the
+ * copyright.txt in the distribution for a full listing of
+ * individual contributors.
+ *
+ * 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.gatein.sso.agent.filter;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Filter for redirecting GateIn logout request (triggered from GateIn UI by user) to SAML2 global logout request.
+ * Filter is usable only if we want to enable SAML2 global logout.
+ *
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ */
+public class SAML2LogoutFilter extends AbstractLogoutFilter
+{
+
+ @Override
+ protected String getRedirectUrl(HttpServletRequest httpRequest)
+ {
+ String logoutURL = this.logoutUrl;
+
+ // URL from filter init parameter has priority, but if not provided, we will use SAML global logout.
+ if (logoutURL == null)
+ {
+ logoutURL = httpRequest.getContextPath() + "/dologin?GLO=true";
+ }
+
+ return logoutURL;
+ }
+}
Added: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/saml/PortalSAML2LogOutHandler.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/saml/PortalSAML2LogOutHandler.java (rev 0)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/saml/PortalSAML2LogOutHandler.java 2012-01-20 23:15:57 UTC (rev 8304)
@@ -0,0 +1,142 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, Red Hat Middleware, LLC, and individual
+ * contributors as indicated by the @authors tag. See the
+ * copyright.txt in the distribution for a full listing of
+ * individual contributors.
+ *
+ * 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.gatein.sso.agent.saml;
+
+import org.apache.catalina.Session;
+import org.apache.catalina.connector.Request;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
+import org.gatein.wci.impl.DefaultServletContainerFactory;
+import org.picketlink.identity.federation.core.exceptions.ProcessingException;
+import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerRequest;
+import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerResponse;
+import org.picketlink.identity.federation.saml.v2.protocol.LogoutRequestType;
+import org.picketlink.identity.federation.saml.v2.protocol.ResponseType;
+import org.picketlink.identity.federation.saml.v2.protocol.StatusResponseType;
+import org.picketlink.identity.federation.web.core.HTTPContext;
+import org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Extension of {@link SAML2LogOutHandler} because we need to enforce WCI (crossContext) logout in portal environment.
+ *
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ */
+public class PortalSAML2LogOutHandler extends SAML2LogOutHandler
+{
+ private static Logger log = LoggerFactory.getLogger(PortalSAML2LogOutHandler.class);
+
+ @Override
+ public void handleRequestType(SAML2HandlerRequest request, SAML2HandlerResponse response) throws ProcessingException
+ {
+ if (request.getSAML2Object() instanceof LogoutRequestType == false)
+ {
+ return;
+ }
+
+ HTTPContext httpContext = (HTTPContext) request.getContext();
+ HttpServletRequest servletRequest = httpContext.getRequest();
+ HttpServletResponse servletResponse = httpContext.getResponse();
+
+ Session catalinaSession = getCatalinaSession(servletRequest);
+
+ // Handle SAML logout request by superclass
+ super.handleRequestType(request, response);
+
+ // Check if session has been invalidated by superclass. If yes,we need to perform "full" logout at portal level by call WCI logout.
+ if (!catalinaSession.isValid())
+ {
+ portalLogout(servletRequest, servletResponse);
+ }
+ }
+
+ @Override
+ public void handleStatusResponseType(SAML2HandlerRequest request, SAML2HandlerResponse response)
+ throws ProcessingException
+ {
+ //We do not handle any ResponseType (authentication etc)
+ if (request.getSAML2Object() instanceof ResponseType)
+ return;
+
+ if (request.getSAML2Object() instanceof StatusResponseType == false)
+ return;
+
+
+ HTTPContext httpContext = (HTTPContext) request.getContext();
+ HttpServletRequest servletRequest = httpContext.getRequest();
+ HttpServletResponse servletResponse = httpContext.getResponse();
+
+ Session catalinaSession = getCatalinaSession(servletRequest);
+
+ // Handle SAML logout response by superclass
+ super.handleStatusResponseType(request, response);
+
+ // Check if session has been invalidated by superclass. If yes,we need to perform "full" logout at portal level by call WCI logout.
+ if (!catalinaSession.isValid())
+ {
+ portalLogout(servletRequest, servletResponse);
+ }
+
+ }
+
+ /**
+ * Performs portal logout by calling WCI logout.
+ *
+ * @param request
+ * @param response
+ */
+ protected void portalLogout(HttpServletRequest request, HttpServletResponse response)
+ {
+ // Workaround: we need to temporary "restore" session to enforce crossContext logout at WCI layer
+ request.getSession(true);
+
+ try
+ {
+ DefaultServletContainerFactory.getInstance().getServletContainer().logout(request, response);
+ }
+ catch (Exception e)
+ {
+ String message = "Session has been invalidated but WCI logout failed.";
+ log.warn(message);
+ if (log.isTraceEnabled())
+ {
+ log.trace(message, e);
+ }
+ }
+ }
+
+ private Session getCatalinaSession(HttpServletRequest servletRequest)
+ {
+ if (!(servletRequest instanceof Request))
+ {
+ throw new IllegalStateException("servletRequest is of class " + servletRequest.getClass() + ", which is not instanceof " + Request.class);
+ }
+
+ Request catalinaRequest = (Request)servletRequest;
+ return catalinaRequest.getSessionInternal(false);
+ }
+
+}
12 years, 11 months
- 1
- 0
gatein SVN: r8303 - in components/wci/trunk/test: portlets and 10 other directories.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2012-01-18 14:32:20 -0500 (Wed, 18 Jan 2012)
New Revision: 8303
Added:
components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi/SPINativeSkipTestCase.java
components/wci/trunk/test/portlets/native-skipped-portlet/
components/wci/trunk/test/portlets/native-skipped-portlet/pom.xml
components/wci/trunk/test/portlets/native-skipped-portlet/src/
components/wci/trunk/test/portlets/native-skipped-portlet/src/main/
components/wci/trunk/test/portlets/native-skipped-portlet/src/main/webapp/
components/wci/trunk/test/portlets/native-skipped-portlet/src/main/webapp/WEB-INF/
components/wci/trunk/test/portlets/native-skipped-portlet/src/main/webapp/WEB-INF/web.xml
components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/
components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/.settings/
components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/pom.xml
components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/src/
components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/src/main/
components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/src/main/webapp/
components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/src/main/webapp/WEB-INF/
components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/src/main/webapp/WEB-INF/web.xml
Log:
GTNPC-76: committing tests for issue
Added: components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi/SPINativeSkipTestCase.java
===================================================================
--- components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi/SPINativeSkipTestCase.java (rev 0)
+++ components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi/SPINativeSkipTestCase.java 2012-01-18 19:32:20 UTC (rev 8303)
@@ -0,0 +1,205 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2011, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * 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.gatein.wci.spi;
+
+import static org.jboss.unit.api.Assert.fail;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+
+import org.gatein.wci.ServletContainer;
+import org.gatein.wci.ServletContextDispatcher;
+import org.gatein.wci.ServletTestCase;
+import org.gatein.wci.TestServlet;
+import org.gatein.wci.WebApp;
+import org.gatein.wci.WebAppRegistry;
+import org.gatein.wci.WebRequest;
+import org.gatein.wci.WebResponse;
+import org.gatein.wci.impl.DefaultServletContainerFactory;
+import org.gatein.wci.spi.callbacks.ExceptionCallback;
+import org.gatein.wci.spi.callbacks.NormalCallback;
+import org.jboss.unit.Failure;
+import org.jboss.unit.FailureType;
+import org.jboss.unit.driver.DriverCommand;
+import org.jboss.unit.driver.DriverResponse;
+import org.jboss.unit.driver.response.EndTestResponse;
+import org.jboss.unit.driver.response.FailureResponse;
+import org.jboss.unit.remote.driver.handler.deployer.response.DeployResponse;
+import org.jboss.unit.remote.driver.handler.deployer.response.UndeployResponse;
+import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
+
+/**
+ * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a>
+ * @version $Revision$
+ */
+public class SPINativeSkipTestCase extends ServletTestCase
+{
+
+ /** . */
+ private WebAppRegistry registry;
+
+ /** . */
+ private Set<String> keys;
+
+ /** . */
+ private ServletContainer container;
+
+
+ @Override
+ public DriverResponse service(TestServlet testServlet, WebRequest req, WebResponse resp) throws ServletException,
+ IOException
+ {
+ System.out.println("SERVICE GETREQUESTCOUNT : " + getRequestCount());
+ if (getRequestCount() == 2)
+ {
+ // Check that this web app is here
+ String key = req.getContextPath();
+ if (!keys.contains(key))
+ {
+ fail("The current test web app with key " + key + " is not seen as deployed among " + keys);
+ }
+
+ // Should try
+ ServletContext appContext = testServlet.getServletContext().getContext("/test-native-skip-with-gateinservlet-app");
+
+ //
+ if (appContext == null)
+ {
+ fail("Cannot get access to the /test-native-skip-with-gateinservlet-app context");
+ }
+
+ //
+ WebApp webApp = registry.getWebApp("/test-native-skip-with-gateinservlet-app");
+ NormalCallback cb1 = new NormalCallback(appContext, webApp.getClassLoader());
+ Exception ex = new Exception();
+ ExceptionCallback cb2 = new ExceptionCallback(appContext, ex, ex);
+ Error err = new Error();
+ ExceptionCallback cb3 = new ExceptionCallback(appContext, err, err);
+ RuntimeException rex = new RuntimeException();
+ ExceptionCallback cb4 = new ExceptionCallback(appContext, rex, rex);
+ IOException ioe = new IOException();
+ ExceptionCallback cb5 = new ExceptionCallback(appContext, ioe, ioe);
+
+ //
+ ServletContextDispatcher dispatcher = new ServletContextDispatcher(req, resp, container);
+ DriverResponse response = cb1.test(null, dispatcher);
+ response = cb2.test(response, dispatcher);
+ response = cb3.test(response, dispatcher);
+ response = cb4.test(response, dispatcher);
+ response = cb5.test(response, dispatcher);
+
+ return new UndeployResponse("test-native-skip-with-gateinservlet-app.war");
+ }
+
+ else if (getRequestCount() == 3)
+ {
+ return new UndeployResponse("test-native-skip-app.war");
+ }
+ else if (getRequestCount() == 4)
+ {
+ return new EndTestResponse();
+ }
+ else
+ {
+ return new FailureResponse(Failure.createAssertionFailure("Test not expected to reach RequestCount of " + getRequestCount()));
+ }
+ }
+
+ @Override
+ public DriverResponse invoke(TestServlet testServlet, DriverCommand driverCommand)
+ {
+ System.out.println("INVOKE GETREQUESTCOUNT : " + getRequestCount());
+ if (getRequestCount() == -1)
+ {
+ container = DefaultServletContainerFactory.getInstance().getServletContainer();
+ if (container == null)
+ {
+ return new FailureResponse(Failure.createAssertionFailure("No servlet container present"));
+ }
+
+ // Register and save the deployed web apps
+ registry = new WebAppRegistry();
+ container.addWebAppListener(registry);
+ keys = new HashSet<String>(registry.getKeys());
+
+ // Deploy the web app with init param of gatein.wci.native.DisableRegistration set to true
+ return new DeployResponse("test-native-skip-app.war");
+ }
+ else if (getRequestCount() == 0)
+ {
+ //make sure the test-native-skip-app.war is actually skipped
+ if (registry.getWebApp("/test-native-skip-app") != null)
+ {
+ return new FailureResponse(Failure.createAssertionFailure("The test-native-skip-app.war should not be seen by the native implemetentation."));
+ }
+
+ // Compute the difference with the previous deployed web apps
+ Set diff = new HashSet<String>(registry.getKeys());
+ diff.removeAll(keys);
+
+ // It should be 0, since the test-native-skip-app.war should not get registered by the native implementation
+ if (diff.size() != 0)
+ {
+ return new FailureResponse(Failure.createAssertionFailure("The size of the new web application deployed should be 0, it is " + diff.size() + " instead." +
+ "The previous set was " + keys + " and the new set is " + registry.getKeys()));
+ }
+
+ return new DeployResponse("test-native-skip-with-gateinservlet-app.war");
+ }
+ else if (getRequestCount() == 1)
+ {
+ // Compute the difference with the previous deployed web apps
+ Set diff = new HashSet<String>(registry.getKeys());
+ diff.removeAll(keys);
+
+ // It should be 1
+ if (diff.size() != 1)
+ {
+ return new FailureResponse(Failure.createAssertionFailure("The size of the new web application deployed should be 1, it is " + diff.size() + " instead." +
+ "The previous set was " + keys + " and the new set is " + registry.getKeys()));
+ }
+
+ WebApp webapp = registry.getWebApp("/test-native-skip-with-gateinservlet-app");
+ //make sure the test-native-skip-with-gateinservlet-app.war is picked up
+ if (webapp== null)
+ {
+ return new FailureResponse(Failure.createAssertionFailure("The test-native-skip-with-gateinservler-app.war should be seen."));
+ }
+ if (!webapp.getContextPath().equals("/test-native-skip-with-gateinservlet-app"))
+ {
+ return new FailureResponse(Failure.createAssertionFailure("The web app context is not equals to the expected value but has the value " + webapp.getContextPath()));
+ }
+ return new InvokeGetResponse("/test-spi-server");
+ }
+ else
+ {
+ return new FailureResponse(new Failure("Test not expected to reach RequestCount of " + getRequestCount(), FailureType.ERROR));
+ }
+ }
+
+}
+
Property changes on: components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi/SPINativeSkipTestCase.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: components/wci/trunk/test/portlets/native-skipped-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/native-skipped-portlet/pom.xml (rev 0)
+++ components/wci/trunk/test/portlets/native-skipped-portlet/pom.xml 2012-01-18 19:32:20 UTC (rev 8303)
@@ -0,0 +1,12 @@
+<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.wci</groupId>
+ <artifactId>wci-test-portlets</artifactId>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>wci-test-native-skipped-portlet</artifactId>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <name>GateIn - WCI Native Skip Test Portlet</name>
+</project>
Added: components/wci/trunk/test/portlets/native-skipped-portlet/src/main/webapp/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/test/portlets/native-skipped-portlet/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ components/wci/trunk/test/portlets/native-skipped-portlet/src/main/webapp/WEB-INF/web.xml 2012-01-18 19:32:20 UTC (rev 8303)
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <!-- Disable the Native Application Registration -->
+ <context-param>
+ <param-name>gatein.wci.native.DisableRegistration</param-name>
+ <param-value>true</param-value>
+ </context-param>
+</web-app>
+
Added: components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/pom.xml (rev 0)
+++ components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/pom.xml 2012-01-18 19:32:20 UTC (rev 8303)
@@ -0,0 +1,12 @@
+<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.wci</groupId>
+ <artifactId>wci-test-portlets</artifactId>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId>
+ <version>2.1.1-Beta01-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <name>GateIn - WCI Native Skip Test Portlet With GateInServlet Registration</name>
+</project>
Added: components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/src/main/webapp/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/src/main/webapp/WEB-INF/web.xml 2012-01-18 19:32:20 UTC (rev 8303)
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+
+ <!-- Disable the Native Application Registration -->
+ <context-param>
+ <param-name>gatein.wci.native.DisableRegistration</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
+ <!-- Register Using the Generic Method -->
+ <servlet>
+ <servlet-name>GateInServlet</servlet-name>
+ <servlet-class>org.gatein.wci.api.GateInServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>GateInServlet</servlet-name>
+ <url-pattern>/gateinservlet</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
12 years, 11 months
- 1
- 0
gatein SVN: r8302 - in components/wci/trunk/test: core/src/main/java/org/gatein/wci/container and 8 other directories.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2012-01-18 14:28:13 -0500 (Wed, 18 Jan 2012)
New Revision: 8302
Removed:
components/wci/trunk/test/src/
Modified:
components/wci/trunk/test/core/src/main/java/org/gatein/wci/container/ServletContainerContextImpl.java
components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/native/server-beans.xml
components/wci/trunk/test/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/src/common/resources/common.xml
components/wci/trunk/test/servers/tomcat6/pom.xml
components/wci/trunk/test/servers/tomcat7/pom.xml
Log:
GTNPC-76: Updating tests, removing old test directory which has not been used for a while (tests were transfered over to other directories a while ago)
Modified: components/wci/trunk/test/core/src/main/java/org/gatein/wci/container/ServletContainerContextImpl.java
===================================================================
--- components/wci/trunk/test/core/src/main/java/org/gatein/wci/container/ServletContainerContextImpl.java 2012-01-18 19:19:09 UTC (rev 8301)
+++ components/wci/trunk/test/core/src/main/java/org/gatein/wci/container/ServletContainerContextImpl.java 2012-01-18 19:28:13 UTC (rev 8302)
@@ -24,6 +24,7 @@
import org.gatein.wci.security.Credentials;
import org.gatein.wci.spi.ServletContainerContext;
+import org.gatein.wci.spi.WebAppContext;
import org.gatein.wci.RequestDispatchCallback;
import javax.servlet.ServletContext;
@@ -80,4 +81,18 @@
{
return "Impl";
}
+
+ @Override
+ public void registerWebApp(WebAppContext webappContext, String dispatchPath)
+ {
+ // FIXME registerWebApp
+
+ }
+
+ @Override
+ public void unregisterWebApp(ServletContext servletContext)
+ {
+ // FIXME unregisterWebApp
+
+ }
}
Modified: components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/native/server-beans.xml
===================================================================
--- components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/native/server-beans.xml 2012-01-18 19:19:09 UTC (rev 8301)
+++ components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/native/server-beans.xml 2012-01-18 19:28:13 UTC (rev 8302)
@@ -93,4 +93,13 @@
</uninstall>
</bean>
+ <bean name="SPINativeSkipTestCase" class="org.gatein.wci.spi.SPINativeSkipTestCase">
+ <install bean="TestSuite" method="mount">
+ <parameter><this/></parameter>
+ </install>
+ <uninstall bean="TestSuite" method="unmount">
+ <parameter><this/></parameter>
+ </uninstall>
+ </bean>
+
</deployment>
Modified: components/wci/trunk/test/pom.xml
===================================================================
--- components/wci/trunk/test/pom.xml 2012-01-18 19:19:09 UTC (rev 8301)
+++ components/wci/trunk/test/pom.xml 2012-01-18 19:28:13 UTC (rev 8302)
@@ -32,6 +32,18 @@
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-portlet</artifactId>
+ <type>war</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId>
+ <type>war</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
<artifactId>wci-test-gatein-portlet</artifactId>
<type>war</type>
<version>${project.version}</version>
Modified: components/wci/trunk/test/portlets/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/pom.xml 2012-01-18 19:19:09 UTC (rev 8301)
+++ components/wci/trunk/test/portlets/pom.xml 2012-01-18 19:28:13 UTC (rev 8302)
@@ -13,5 +13,7 @@
<module>exo-portlet</module>
<module>gatein-portlet</module>
<module>native-portlet</module>
+ <module>native-skipped-portlet</module>
+ <module>native-skipped-with-gateinservlet-portlet</module>
</modules>
</project>
Modified: components/wci/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss51/pom.xml 2012-01-18 19:19:09 UTC (rev 8301)
+++ components/wci/trunk/test/servers/jboss51/pom.xml 2012-01-18 19:28:13 UTC (rev 8302)
@@ -38,6 +38,18 @@
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
<artifactId>wci-test-gatein-portlet</artifactId>
<scope>test</scope>
<type>war</type>
@@ -375,6 +387,8 @@
<property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" />
<property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" />
+ <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}"/>
+ <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}"/>
<property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />
<!-- location of common.xml shared between the different server's build.xml -->
Modified: components/wci/trunk/test/servers/jboss6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/pom.xml 2012-01-18 19:19:09 UTC (rev 8301)
+++ components/wci/trunk/test/servers/jboss6/pom.xml 2012-01-18 19:28:13 UTC (rev 8302)
@@ -34,15 +34,33 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-core</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
<artifactId>wci-test-native-portlet</artifactId>
<scope>test</scope>
<type>war</type>
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
<artifactId>wci-test-gatein-portlet</artifactId>
<scope>test</scope>
<type>war</type>
@@ -397,6 +415,8 @@
<property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" />
<property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" />
+ <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}"/>
+ <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}"/>
<property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />
<!-- location of common.xml shared between the different server's build.xml -->
Modified: components/wci/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jetty6/pom.xml 2012-01-18 19:19:09 UTC (rev 8301)
+++ components/wci/trunk/test/servers/jetty6/pom.xml 2012-01-18 19:28:13 UTC (rev 8302)
@@ -38,6 +38,18 @@
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
<artifactId>wci-test-gatein-portlet</artifactId>
<scope>test</scope>
<type>war</type>
@@ -392,6 +404,9 @@
<property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" />
<property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" />
<property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />
+ <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}"/>
+ <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}"/>
+ <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />
<!-- location of common.xml shared between the different server's build.xml -->
<property name="common.xml.file" value="${test.common.xml}" />
Modified: components/wci/trunk/test/servers/src/common/resources/common.xml
===================================================================
--- components/wci/trunk/test/servers/src/common/resources/common.xml 2012-01-18 19:19:09 UTC (rev 8301)
+++ components/wci/trunk/test/servers/src/common/resources/common.xml 2012-01-18 19:28:13 UTC (rev 8302)
@@ -64,14 +64,15 @@
<target name="test-native" if="test.native.enable">
<property name="test.archive.path" value="${test.apps.dir}/${test.server.name}-${test.server.version}-native"/>
- <!-- setup the generic tests -->
+ <!-- setup the native tests -->
<mkdir dir="${test.archive.path}"/>
<copy file="${test.native.portlet.war}" tofile="${test.archive.path}/test-spi-app.war"/>
<copy file="${test.native.server.war}" tofile="${test.archive.path}/test-spi-server.war"/>
<copy file="${test.generic.portlet.war}" tofile="${test.archive.path}/test-generic-app.war"/>
<copy file="${test.exo.portlet.war}" tofile="${test.archive.path}/test-exo-app.war"/>
+ <copy file="${test.native-skip.portlet.war}" tofile="${test.archive.path}/test-native-skip-app.war"/>
+ <copy file="${test.native-skip-with-gateinservlet.portlet.war}" tofile="${test.archive.path}/test-native-skip-with-gateinservlet-app.war"/>
-
<antcall target="tests.execute">
<param name="test.id" value="${test.remote.server.name}-spi-native"/>
<param name="test.war" value="${test.native.server.war}"/>
Modified: components/wci/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat6/pom.xml 2012-01-18 19:19:09 UTC (rev 8301)
+++ components/wci/trunk/test/servers/tomcat6/pom.xml 2012-01-18 19:28:13 UTC (rev 8302)
@@ -38,6 +38,18 @@
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
<artifactId>wci-test-gatein-portlet</artifactId>
<scope>test</scope>
<type>war</type>
@@ -387,6 +399,8 @@
<property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" />
<property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" />
+ <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}"/>
+ <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}"/>
<property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />
<!-- location of common.xml shared between the different server's build.xml -->
Modified: components/wci/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/pom.xml 2012-01-18 19:19:09 UTC (rev 8301)
+++ components/wci/trunk/test/servers/tomcat7/pom.xml 2012-01-18 19:28:13 UTC (rev 8302)
@@ -38,6 +38,18 @@
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
<artifactId>wci-test-gatein-portlet</artifactId>
<scope>test</scope>
<type>war</type>
@@ -381,6 +393,8 @@
<property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" />
<property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" />
+ <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}"/>
+ <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}"/>
<property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />
<!-- location of common.xml shared between the different server's build.xml -->
12 years, 11 months
- 1
- 0