gatein SVN: r8593 - epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2012-03-14 12:16:29 -0400 (Wed, 14 Mar 2012)
New Revision: 8593
Modified:
epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/IdentifierValidator.java
epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/ResourceValidator.java
epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/UsernameValidator.java
Log:
bz 801207 GTNPORTAL-2377:
+ Only output one message of each type in CompoundApplicationMessage
+ Fixed UsernameValidator and improved IdentifierValidator and ResourceValidator to fail fast when we have an error condition in a loop
+ Fixed improper/missing localization in EN and FR properties, would need to be done for other languages as well
Modified: epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/IdentifierValidator.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/IdentifierValidator.java 2012-03-14 16:16:17 UTC (rev 8592)
+++ epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/IdentifierValidator.java 2012-03-14 16:16:29 UTC (rev 8593)
@@ -46,11 +46,11 @@
for (int i = 0; i < value.length(); i++)
{
char c = value.charAt(i);
- if (Character.isLetter(c) || Character.isDigit(c) || c == '_' || c == '-')
+ if (!Character.isLetter(c) && !Character.isDigit(c) && c != '_' && c != '-')
{
- continue;
+ messages.addMessage("IdentifierValidator.msg.Invalid-char", new Object[]{label});
+ break;
}
- messages.addMessage("IdentifierValidator.msg.Invalid-char", new Object[]{label});
}
}
}
Modified: epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/ResourceValidator.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/ResourceValidator.java 2012-03-14 16:16:17 UTC (rev 8592)
+++ epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/ResourceValidator.java 2012-03-14 16:16:29 UTC (rev 8593)
@@ -38,7 +38,7 @@
protected void validate(String value, String label, CompoundApplicationMessage messages, UIFormInput uiInput)
{
char firstChar = value.charAt(0);
- if (Character.isDigit(firstChar) || firstChar == '-' || firstChar == '.' || firstChar == '_')
+ if (!Character.isLetter(firstChar))
{
Object[] args = {label, uiInput.getBindingField()};
messages.addMessage("FirstCharacterNameValidator.msg", args);
@@ -46,12 +46,12 @@
for (int i = 0; i < value.length(); i++)
{
char c = value.charAt(i);
- if (Character.isLetter(c) || Character.isDigit(c) || c == '_' || c == '-' || c == '.')
+ if (!Character.isLetter(c) && !Character.isDigit(c) && c != '_' && c != '-' && c != '.')
{
- continue;
+ Object[] args = {label};
+ messages.addMessage("ResourceValidator.msg.Invalid-char", args);
+ break;
}
- Object[] args = {label};
- messages.addMessage("ResourceValidator.msg.Invalid-char", args);
}
}
}
Modified: epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/UsernameValidator.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/UsernameValidator.java 2012-03-14 16:16:17 UTC (rev 8592)
+++ epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/UsernameValidator.java 2012-03-14 16:16:29 UTC (rev 8593)
@@ -35,6 +35,7 @@
protected static final int DEFAULT_MAX_LENGTH = 30;
protected Integer min = DEFAULT_MIN_LENGTH;
protected Integer max = DEFAULT_MAX_LENGTH;
+ public static final String ALLOWED_SYMBOLS = "'_', '.'";
// required by @Serialized
public UsernameValidator()
@@ -62,19 +63,22 @@
if (!Character.isLowerCase(buff[0]))
{
- messages.addMessage("FirstCharacterNameValidator.msg", new Object[]{label});
+ messages.addMessage("FirstCharacterUsernameValidator.msg", new Object[]{label});
}
- if (!Character.isLetterOrDigit(buff[buff.length - 1]))
+ char c = buff[buff.length - 1];
+ if (!isLowerCaseLetterOrDigit(c))
{
- messages.addMessage("LastCharacterUsernameValidator.msg", new Object[]{label, buff[buff.length - 1]});
+ messages.addMessage("LastCharacterUsernameValidator.msg", new Object[]{label, c});
}
+ boolean hasConsecutive = false;
+ boolean hasInvalid = false;
for (int i = 1; i < buff.length - 1; i++)
{
- char c = buff[i];
+ c = buff[i];
- if (Character.isLetterOrDigit(c))
+ if (isLowerCaseLetterOrDigit(c))
{
continue;
}
@@ -84,20 +88,43 @@
char next = buff[i + 1];
if (isSymbol(next))
{
- messages.addMessage("ConsecutiveSymbolValidator.msg", new Object[]{label, buff[i], buff[i + 1]});
+ if (!hasConsecutive)
+ {
+ messages.addMessage("ConsecutiveSymbolValidator.msg", new Object[]{label, ALLOWED_SYMBOLS});
+ hasConsecutive = true;
+ }
}
else if (!Character.isLetterOrDigit(next))
{
- messages.addMessage("UsernameValidator.msg.Invalid-char", new Object[]{label});
+ if (!hasInvalid)
+ {
+ messages.addMessage("UsernameValidator.msg.Invalid-char", new Object[]{label});
+ hasInvalid = true;
+ }
}
}
else
{
- messages.addMessage("UsernameValidator.msg.Invalid-char", new Object[]{label});
+ if (!hasInvalid)
+ {
+ messages.addMessage("UsernameValidator.msg.Invalid-char", new Object[]{label});
+ hasInvalid = true;
+ }
}
+
+ // if we have both error conditions, fail "fast" instead of going on
+ if (hasConsecutive && hasInvalid)
+ {
+ break;
+ }
}
}
+ private static boolean isLowerCaseLetterOrDigit(char character)
+ {
+ return Character.isDigit(character) || (character >= 'a' && character <= 'z');
+ }
+
private static boolean isSymbol(char c)
{
return c == '_' || c == '.';
12 years, 10 months
- 1
- 0
gatein SVN: r8592 - epp/portal/branches/EPP_5_2_Branch/component/web/controller/src/main/java/org/exoplatform/web/application.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2012-03-14 12:16:17 -0400 (Wed, 14 Mar 2012)
New Revision: 8592
Modified:
epp/portal/branches/EPP_5_2_Branch/component/web/controller/src/main/java/org/exoplatform/web/application/AbstractApplicationMessage.java
epp/portal/branches/EPP_5_2_Branch/component/web/controller/src/main/java/org/exoplatform/web/application/ApplicationMessage.java
epp/portal/branches/EPP_5_2_Branch/component/web/controller/src/main/java/org/exoplatform/web/application/CompoundApplicationMessage.java
Log:
bz 801207 GTNPORTAL-2377:
+ Only output one message of each type in CompoundApplicationMessage
+ Fixed UsernameValidator and improved IdentifierValidator and ResourceValidator to fail fast when we have an error condition in a loop
+ Fixed improper/missing localization in EN and FR properties, would need to be done for other languages as well
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/controller/src/main/java/org/exoplatform/web/application/AbstractApplicationMessage.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/controller/src/main/java/org/exoplatform/web/application/AbstractApplicationMessage.java 2012-03-14 15:32:03 UTC (rev 8591)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/controller/src/main/java/org/exoplatform/web/application/AbstractApplicationMessage.java 2012-03-14 16:16:17 UTC (rev 8592)
@@ -1,16 +1,16 @@
/**
* 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
@@ -30,23 +30,23 @@
/**
* Created by The eXo Platform SARL
* Author : Dang Van Minh
- * minhdv81(a)yahoo.com
+ * 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;
@@ -83,19 +83,19 @@
{
return key;
}
-
+
String value;
try
- {
- value = resourceBundle.getString(key);
+ {
+ value = resourceBundle.getString(key);
}
catch (MissingResourceException ex)
{
if (PropertyManager.isDevelopping())
{
- log.warn("Can not find resource bundle for key : " + key);
+ log.warn("Can not find resource bundle for key : " + key);
}
- value = key.substring(key.lastIndexOf('.') + 1);
+ value = key.substring(key.lastIndexOf('.') + 1);
}
return value;
}
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/controller/src/main/java/org/exoplatform/web/application/ApplicationMessage.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/controller/src/main/java/org/exoplatform/web/application/ApplicationMessage.java 2012-03-14 15:32:03 UTC (rev 8591)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/controller/src/main/java/org/exoplatform/web/application/ApplicationMessage.java 2012-03-14 16:16:17 UTC (rev 8592)
@@ -23,6 +23,7 @@
package org.exoplatform.web.application;
import java.io.Serializable;
+import java.util.Arrays;
/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */
public class ApplicationMessage extends AbstractApplicationMessage implements Serializable
@@ -36,6 +37,40 @@
this.messageArgs_ = args;
}
+ @Override
+ public boolean equals(Object o)
+ {
+ if (this == o)
+ {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass())
+ {
+ return false;
+ }
+
+ ApplicationMessage that = (ApplicationMessage)o;
+
+ if (!Arrays.equals(messageArgs_, that.messageArgs_))
+ {
+ return false;
+ }
+ if (!messageKey_.equals(that.messageKey_))
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ int result = messageKey_.hashCode();
+ result = 31 * result + (messageArgs_ != null ? Arrays.hashCode(messageArgs_) : 0);
+ return result;
+ }
+
public ApplicationMessage(String key, Object[] args, int type)
{
this.messageKey_ = key;
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/controller/src/main/java/org/exoplatform/web/application/CompoundApplicationMessage.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/controller/src/main/java/org/exoplatform/web/application/CompoundApplicationMessage.java 2012-03-14 15:32:03 UTC (rev 8591)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/controller/src/main/java/org/exoplatform/web/application/CompoundApplicationMessage.java 2012-03-14 16:16:17 UTC (rev 8592)
@@ -24,13 +24,15 @@
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
import java.util.ResourceBundle;
+import java.util.Set;
/** @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);
+ private Set<AbstractApplicationMessage> messages = new HashSet<AbstractApplicationMessage>(5);
public CompoundApplicationMessage()
{
@@ -70,7 +72,9 @@
public void addMessage(String messageKey, Object[] args)
{
- messages.add(new ApplicationMessage(messageKey, args, AbstractApplicationMessage.WARNING));
+ final ApplicationMessage message = new ApplicationMessage(messageKey, args, AbstractApplicationMessage.WARNING);
+ message.setArgsLocalized(false);
+ messages.add(message);
}
public boolean isEmpty()
12 years, 10 months
- 1
- 0
gatein SVN: r8591 - in portal/trunk: component/identity/src/test/java/org/exoplatform/services/organization and 6 other directories.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2012-03-14 11:32:03 -0400 (Wed, 14 Mar 2012)
New Revision: 8591
Added:
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserImpl.java
Modified:
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java
portal/trunk/component/identity/src/test/java/org/exoplatform/services/organization/TestOrganization.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_cs.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_de.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_en.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_es.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_fr.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_it.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ja.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ne.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_nl.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_pt_BR.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ru.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_uk.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_cs.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_cs.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_cs.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_cs.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java
Log:
GTNPORTAL-2358 Adding new field Display Name for user. Added changes in UI and in Picketlink IDM integration.
Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java 2012-03-14 15:32:03 UTC (rev 8591)
@@ -25,7 +25,6 @@
import org.exoplatform.services.organization.User;
import org.exoplatform.services.organization.UserEventListener;
import org.exoplatform.services.organization.UserHandler;
-import org.exoplatform.services.organization.impl.UserImpl;
import org.gatein.common.logging.LogLevel;
import org.gatein.common.logging.Logger;
import org.gatein.common.logging.LoggerFactory;
@@ -65,6 +64,8 @@
public static final String USER_LAST_NAME = "lastName";
+ public static final String USER_DISPLAY_NAME = "displayName";
+
public static final String USER_EMAIL = "email";
public static final String USER_CREATED_DATE = "createdDate";
@@ -85,6 +86,7 @@
keys.add(USER_PASSWORD);
keys.add(USER_FIRST_NAME);
keys.add(USER_LAST_NAME);
+ keys.add(USER_DISPLAY_NAME);
keys.add(USER_EMAIL);
keys.add(USER_CREATED_DATE);
keys.add(USER_LAST_LOGIN_TIME);
@@ -735,6 +737,25 @@
{
attributes.add(new SimpleAttribute(USER_LAST_NAME, user.getLastName()));
}
+
+ // TODO: GTNPORTAL-2358 Change once displayName will be available as part of Organization API
+ if (user instanceof UserImpl)
+ {
+ UserImpl userImpl = (UserImpl)user;
+ if (userImpl.getDisplayName() != null)
+ {
+ attributes.add(new SimpleAttribute(USER_DISPLAY_NAME, ((UserImpl)user).getDisplayName()));
+ }
+ else
+ {
+ removeDisplayNameIfNeeded(am, user);
+ }
+ }
+ else
+ {
+ log.warn("User is of class " + user.getClass() + " which is not instanceof " + UserImpl.class);
+ }
+
if (user.getOrganizationId() != null)
{
attributes.add(new SimpleAttribute(USER_ORGANIZATION_ID, user.getOrganizationId()));
@@ -891,6 +912,11 @@
{
user.setLastName(attrs.get(USER_LAST_NAME).getValue().toString());
}
+ if (attrs.containsKey(USER_DISPLAY_NAME))
+ {
+ // TODO: GTNPORTAL-2358 Change once displayName will be available as part of Organization API
+ user.setFullName(attrs.get(USER_DISPLAY_NAME).getValue().toString());
+ }
if (attrs.containsKey(USER_ORGANIZATION_ID))
{
user.setOrganizationId(attrs.get(USER_ORGANIZATION_ID).getValue().toString());
@@ -925,6 +951,24 @@
return ((PicketLinkIDMServiceImpl)service_).getRealmName();
}
+ // Field displayName is not mandatory. We need to handle situation when user deleted displayName, which had been set previously.
+ // We need to ask if current User has displayName set previously and if yes, it needs to be removed.
+ private void removeDisplayNameIfNeeded(AttributesManager am, User user)
+ {
+ try
+ {
+ Attribute attr = am.getAttribute(user.getUserName(), USER_DISPLAY_NAME);
+ if (attr != null)
+ {
+ am.removeAttributes(user.getUserName(), new String[] { USER_DISPLAY_NAME });
+ }
+ }
+ catch (IdentityException e)
+ {
+ log.error("Cannot remove displayName attribute of user: " + user.getUserName() + "; ", e);
+ }
+ }
+
private boolean countPaginatedUsers()
{
return orgService.getConfiguration().isCountPaginatedUsers();
Added: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserImpl.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserImpl.java (rev 0)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserImpl.java 2012-03-14 15:32:03 UTC (rev 8591)
@@ -0,0 +1,62 @@
+/*
+ * 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.exoplatform.services.organization.idm;
+
+/**
+ * TODO: This is temporary implementation, which should be removed after https://issues.jboss.org/browse/EXOJCR-1780 will be fixed
+ * and available in GateIn.
+ *
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ */
+public class UserImpl extends org.exoplatform.services.organization.impl.UserImpl
+{
+ private String displayName;
+
+ public UserImpl()
+ {
+ super();
+ }
+
+ public UserImpl(String username)
+ {
+ super(username);
+ }
+
+ @Override
+ public String getFullName()
+ {
+ return displayName != null ? displayName : getFirstName() + " " + getLastName();
+ }
+
+ @Override
+ public void setFullName(String fullName)
+ {
+ this.displayName = fullName;
+ }
+
+ String getDisplayName()
+ {
+ return this.displayName;
+ }
+}
Modified: portal/trunk/component/identity/src/test/java/org/exoplatform/services/organization/TestOrganization.java
===================================================================
--- portal/trunk/component/identity/src/test/java/org/exoplatform/services/organization/TestOrganization.java 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/component/identity/src/test/java/org/exoplatform/services/organization/TestOrganization.java 2012-03-14 15:32:03 UTC (rev 8591)
@@ -162,7 +162,46 @@
uHandler.saveUser(user, false);
}
+
+ public void testDisplayName() throws Exception
+ {
+ UserHandler uHandler = organizationService.getUserHandler();
+ User john = uHandler.findUserByName("john");
+ Assert.assertNotNull(john);
+
+ // Test that fullName is working correctly for "john"
+ Assert.assertEquals("John Anthony", john.getFullName());
+ john.setFullName("Johnny Something");
+ uHandler.saveUser(john, false);
+ john = uHandler.findUserByName("john");
+ Assert.assertEquals("Johnny Something", john.getFullName());
+
+ // Now delete fullName and assert that it's "firstName lastName"
+ john.setFullName(null);
+ uHandler.saveUser(john, false);
+ john = uHandler.findUserByName("john");
+ Assert.assertEquals("John Anthony", john.getFullName());
+
+// TODO: GTNPORTAL-2358 uncomment once displayName will be available
+// // Test that "root" and "john" have displayName but demo not.
+// Assert.assertEquals("Root Root", root.getDisplayName());
+// Assert.assertEquals("john@localhost", john.getDisplayName());
+// Assert.assertNull(demo.getDisplayName());
+//
+// // Change displayName of john and test that it's changed
+// john.setDisplayName("John Anthony");
+// uHandler.saveUser(john, false);
+// john = uHandler.findUserByName("john");
+// Assert.assertEquals("John Anthony", john.getDisplayName());
+//
+// // Assign displayName to demo and test that it's changed
+// demo.setDisplayName("Demo Demo");
+// uHandler.saveUser(demo, false);
+// demo = uHandler.findUserByName("demo");
+// Assert.assertEquals("Demo Demo", demo.getDisplayName());
+ }
+
private void createGroup(String parent, String name)
{
GroupHandler groupHandler = organizationService.getGroupHandler();
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java 2012-03-14 15:32:03 UTC (rev 8591)
@@ -53,6 +53,8 @@
protected static String FIRST_NAME = "firstName";
protected static String LAST_NAME = "lastName";
+
+ protected static String DISPLAY_NAME = "displayName";
protected static String EMAIL_ADDRESS = "emailAddress";
@@ -79,6 +81,9 @@
addUIFormInput(new UIFormStringInput(LAST_NAME, LAST_NAME, null).addValidator(StringLengthValidator.class, 1,
45).addValidator(MandatoryValidator.class).addValidator(NaturalLanguageValidator.class));
+
+ addUIFormInput(new UIFormStringInput(DISPLAY_NAME, DISPLAY_NAME, null).addValidator(StringLengthValidator.class, 0,
+ 90));
addUIFormInput(new UIFormStringInput(EMAIL_ADDRESS, EMAIL_ADDRESS, null).addValidator(MandatoryValidator.class).addValidator(
EmailAddressValidator.class));
@@ -123,6 +128,11 @@
private String getLastName(){
return getUIStringInput(LAST_NAME).getValue();
}
+
+ private String getDisplayName()
+ {
+ return getUIStringInput(DISPLAY_NAME).getValue();
+ }
/**
* Use this method instead of invokeSetBinding, to avoid abusing reflection
@@ -132,6 +142,8 @@
user.setPassword(getPassword());
user.setFirstName(getFirstName());
user.setLastName(getLastName());
+ // TODO: GTNPORTAL-2358 switch to setDisplayName once it will be available in Organization API
+ user.setFullName(getDisplayName());
user.setEmail(getEmail());
}
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java 2012-03-14 15:32:03 UTC (rev 8591)
@@ -69,6 +69,10 @@
StringLengthValidator.class, 1, 45).addValidator(MandatoryValidator.class));
addUIFormInput(new UIFormStringInput("lastName", "lastName", null).addValidator(
StringLengthValidator.class, 1, 45).addValidator(MandatoryValidator.class));
+
+ // TODO: GTNPORTAL-2358 switch bindingField fullName to displayName once displayName will be available in Organization API
+ addUIFormInput(new UIFormStringInput("displayName", "fullName", null).addValidator(
+ StringLengthValidator.class, 0, 90));
addUIFormInput(new UIFormStringInput("email", "email", null).addValidator(MandatoryValidator.class).addValidator(
EmailAddressValidator.class));
UIFormCheckBoxInput<Boolean> uiCheckbox = new UIFormCheckBoxInput<Boolean>(CHANGEPASS, null, false);
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_cs.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_cs.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_cs.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -32,6 +32,7 @@
UIAccountForm.label.email=E-mailov\u00E1 adresa:
UIAccountForm.label.firstName=#{word.firstName}:
UIAccountForm.label.lastName=#{word.lastName}:
+UIAccountForm.label.displayName=#{word.displayName}:
UIAccountForm.label.note=Pole ozna\u010Den\u00E1 hv\u011Bzdi\u010Dkou <span style="color: red">*</span> jsou povinn\u00E1
UIAccountForm.label.option.female=\u017Dena
UIAccountForm.label.option.male=Mu\u017E
@@ -111,6 +112,7 @@
UIAccountForm.label.email=E-mailov\u00e1 adresa:
UIAccountForm.label.firstName=#{word.firstName}:
UIAccountForm.label.lastName=#{word.lastName}:
+UIAccountForm.label.displayName=#{word.displayName}:
UIAccountForm.label.note=Pole ozna\u010den\u00e1 hv\u011bzdi\u010dkou <span style="color: red">*</span> jsou povinn\u00e1
UIAccountForm.label.option.female=\u017dena
UIAccountForm.label.option.male=Mu\u017e
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_de.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_de.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_de.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -1,56 +1,57 @@
-#
-# 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.
-#
-
+#
+# 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.
+#
+
##org.exoplatform.account.webui.component.UIAccountForm
-UIAccountForm.label.Profile=Benutzerprofil
+UIAccountForm.label.Profile=Benutzerprofil
UIAccountForm.title=Konto Hinzuf\u00fcgen/Bearbeiten
UIAccountForm.label.username=#{word.userName}:
UIAccountForm.label.SearchUser=Benutzer suchen
UIAccountForm.label.password1x=Passwort:
UIAccountForm.label.password2x=Passwort best\u00e4tigen:
UIAccountForm.label.password=Passwort:
-UIAccountForm.label.Confirmpassword=Passwort best\u00e4tigen:
+UIAccountForm.label.Confirmpassword=Passwort best\u00e4tigen:
UIAccountForm.action.Reset=Zur\u00fccksetzen
UIAccountForm.label.firstName=#{word.firstName}:
UIAccountForm.label.lastName=#{word.lastName}:
-UIAccountForm.label.email=Email-Adresse:
+UIAccountForm.label.displayName=#{word.displayName}:
+UIAccountForm.label.email=Email-Adresse:
UIAccountForm.label.note=Pflichtfelder sind mit einem Sternchen <span style="color: red">*</span> versehen.
UIAccountForm.action.Back=#{word.back}
UIAccountForm.action.Save=#{word.save}
UIAccountForm.label.action.SearchUser=Benutzer suchen
#{0} is the username that the remote user enter
-UIAccountForm.msg.user-exist=Der Benutzername '{0}' ist bereits vergeben.
-UIAccountForm.msg.incorrect-password=Die Passwortbest\u00e4tigung war nicht korrekt.
+UIAccountForm.msg.user-exist=Der Benutzername '{0}' ist bereits vergeben.
+UIAccountForm.msg.incorrect-password=Die Passwortbest\u00e4tigung war nicht korrekt.
UIAccountForm.msg.sucsesful.create.user=Der neue Benutzer ist hinzugef\u00fcgt.
UIAccountForm.tab.label.AccountTemplate=Kontovorlage
-UIAccountForm.tab.label.UIUserProfileInputSet=Benutzerprofil
-UIAccountForm.tab.label.AccountInputSet=Konto-Konfiguration
+UIAccountForm.tab.label.UIUserProfileInputSet=Benutzerprofil
+UIAccountForm.tab.label.AccountInputSet=Konto-Konfiguration
UIAccountForm.tab.label.UIUserMembershipSelector=Rollen des Benutzers
UIAccountForm.label.Membership=Rolle des Benutzers
-UIAccountForm.label.option.male=M\u00e4nnlich
-UIAccountForm.label.option.female=Weiblich
-
+UIAccountForm.label.option.male=M\u00e4nnlich
+UIAccountForm.label.option.female=Weiblich
+
UIAccountForm.label.HomeInfo=Private Daten
UIAccountForm.label.user.name.given=#{word.givenName}:
UIAccountForm.label.user.name.family=#{word.familyName}:
@@ -60,7 +61,7 @@
UIAccountForm.label.user.employer=#{word.employer}:
UIAccountForm.label.user.department=#{word.department}:
UIAccountForm.label.user.jobtitle=#{word.jobTitle}:
-UIAccountForm.label.user.language=Sprache
+UIAccountForm.label.user.language=Sprache
UIAccountForm.label.user.home-info.postal.name=#:
UIAccountForm.label.user.home-info.postal.street=#{word.street}:
UIAccountForm.label.user.home-info.postal.city=#{word.city}:
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_en.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_en.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_en.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -1,22 +1,22 @@
-#
-# 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.
-#
-
+#
+# 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.
+#
+
##org.exoplatform.account.webui.component.UIAccountForm
UIAccountForm.label.Profile=User Profile
@@ -30,6 +30,7 @@
UIAccountForm.action.Reset=Reset
UIAccountForm.label.firstName=#{word.firstName}:
UIAccountForm.label.lastName=#{word.lastName}:
+UIAccountForm.label.displayName=#{word.displayName}:
UIAccountForm.label.email=Email Address:
UIAccountForm.label.note=Fields marked with an asterisk<span style="color: red">*</span> are required
UIAccountForm.action.Back=#{word.back}
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_es.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_es.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_es.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -30,6 +30,7 @@
UIAccountForm.action.Reset=Resetear
UIAccountForm.label.firstName=#{word.firstName}:
UIAccountForm.label.lastName=#{word.lastName}:
+UIAccountForm.label.displayName=#{word.displayName}:
UIAccountForm.label.email=Direcci\u00f3n de correo electr\u00f3nico:
UIAccountForm.label.note=Los campos marcados con un asterisco<span style="color: red">*</span> son obligatorios
UIAccountForm.action.Back=#{word.back}
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_fr.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_fr.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_fr.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -30,13 +30,14 @@
UIAccountForm.action.Reset=R\u00e9initialiser
UIAccountForm.label.firstName=#{word.firstName}:
UIAccountForm.label.lastName=#{word.lastName}:
+UIAccountForm.label.displayName=#{word.displayName}:
UIAccountForm.label.email=Adresse Email:
UIAccountForm.label.note=Les champs marqu\u00e9s d'une asterisque <span style="color: red">*</span> sont obligatoires
UIAccountForm.action.Back=#{word.back}
UIAccountForm.action.Save=#{word.save}
UIAccountForm.label.action.SearchUser=Rechercher un utilisateur
#{0} is the username that the remote user enter
-UIAccountForm.msg.user-exist=L'utilisateur '{0}' existe d\u00e9j\u00e0�
+UIAccountForm.msg.user-exist=L'utilisateur '{0}' existe d\u00e9j\u00e0�
UIAccountForm.msg.incorrect-password=Mot de passe incorrect
UIAccountForm.msg.sucsesful.create.user=Utilisateur cr\u00e9\u00e9 avec succ\u00e8s
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_it.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_it.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_it.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -1,22 +1,22 @@
-#
-# 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.
-#
-
+#
+# 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.
+#
+
##org.exoplatform.account.webui.component.UIAccountForm
UIAccountForm.label.Profile=Profilo Utente
@@ -30,6 +30,7 @@
UIAccountForm.action.Reset=Annulla
UIAccountForm.label.firstName=#{word.firstName}:
UIAccountForm.label.lastName=#{word.lastName}:
+UIAccountForm.label.displayName=#{word.displayName}:
UIAccountForm.label.email=Email Address:
UIAccountForm.label.note=I campi segnati con l'asterisco<span style="color: red">*</span> sono obbligatori
UIAccountForm.action.Back=#{word.back}
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ja.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ja.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ja.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -30,6 +30,7 @@
UIAccountForm.action.Reset=\u30ea\u30bb\u30c3\u30c8
UIAccountForm.label.firstName=#{word.firstName}:
UIAccountForm.label.lastName=#{word.lastName}:
+UIAccountForm.label.displayName=#{word.displayName}:
UIAccountForm.label.email= E\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9:
UIAccountForm.label.note=Fields marked with an asterisk<span style="color: red">*</span> are required
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ne.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ne.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ne.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -30,6 +30,7 @@
UIAccountForm.action.Reset=\u092a\u0941\u0928: \u0928\u093f\u0930\u094d\u0927\u093e\u0930\u0923 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938\u094d
UIAccountForm.label.firstName=#{word.firstName}:
UIAccountForm.label.lastName=#{word.lastName}:
+UIAccountForm.label.displayName=#{word.displayName}:
UIAccountForm.label.email=\u0908\u092e\u0947\u0932 \u0920\u0947\u0917\u093e\u0928\u093e:
UIAccountForm.label.note=Asterisk<span style="color: red">*</span> \u0932\u0947 \u091a\u093f\u0928\u0941 \u0932\u0917\u093e\u090f\u0915\u094b \u0915\u094d\u0937\u0947\u0924\u094d\u0930 \u0905\u0928\u093f\u092c\u093e\u0930\u094d\u092f \u091b
UIAccountForm.action.Back=#{word.back}
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_nl.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_nl.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_nl.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -30,6 +30,7 @@
UIAccountForm.action.Reset=Reset
UIAccountForm.label.firstName=#{word.firstName}:
UIAccountForm.label.lastName=#{word.lastName}:
+UIAccountForm.label.displayName=#{word.displayName}:
UIAccountForm.label.email=E-mail adres:
UIAccountForm.label.note=Gemarkeerde velden met een ster<span style\="color: red">*</span> zijn vereist
UIAccountForm.action.Back=#{word.back}
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_pt_BR.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_pt_BR.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_pt_BR.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -1,22 +1,22 @@
-#
-# 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.
-#
-
+#
+# 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.
+#
+
##org.exoplatform.account.webui.component.UIAccountForm
UIAccountForm.label.Profile=Perfil do Usuário
@@ -30,6 +30,7 @@
UIAccountForm.action.Reset=Limpar
UIAccountForm.label.firstName=#{word.firstName}:
UIAccountForm.label.lastName=#{word.lastName}:
+UIAccountForm.label.displayName=#{word.displayName}:
UIAccountForm.label.email=Endereço Email:
UIAccountForm.label.note=Campos marcados com asterisco <span style="color: red">*</span> são obrigatórios
UIAccountForm.action.Back=#{word.back}
@@ -84,4 +85,4 @@
UIAccountForm.label.user.business-info.online.email=#{word.email}:
UIAccountForm.label.user.business-info.online.uri=#{word.website}:
-UIPopupWindow.title.UIGroupMembershipSelector=Selecionar Papeis
+UIPopupWindow.title.UIGroupMembershipSelector=Selecionar Papeis
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ru.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ru.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ru.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -1,22 +1,22 @@
-#
-# 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.
-#
-
+#
+# 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.
+#
+
##org.exoplatform.account.webui.component.UIAccountForm
UIAccountForm.label.Profile=Профиль пользователя
@@ -30,6 +30,7 @@
UIAccountForm.action.Reset=Очистить
UIAccountForm.label.firstName=#{word.firstName}:
UIAccountForm.label.lastName=#{word.lastName}:
+UIAccountForm.label.displayName=#{word.displayName}:
UIAccountForm.label.email=Адрес эл.почты:
UIAccountForm.label.note=Поля со звездочкой<span style="color: red">*</span> являются обязательными
UIAccountForm.action.Back=#{word.back}
@@ -84,4 +85,4 @@
UIAccountForm.label.user.business-info.online.email=#{word.email}:
UIAccountForm.label.user.business-info.online.uri=#{word.website}:
-UIPopupWindow.title.UIGroupMembershipSelector=Участие в группах
+UIPopupWindow.title.UIGroupMembershipSelector=Участие в группах
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_uk.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_uk.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_uk.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -1,22 +1,22 @@
-#
-# 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.
-#
-
+#
+# 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.
+#
+
##org.exoplatform.account.webui.component.UIAccountForm
UIAccountForm.label.Profile=Профіль користувача
@@ -30,6 +30,7 @@
UIAccountForm.action.Reset=Скинути
UIAccountForm.label.firstName=#{word.firstName}:
UIAccountForm.label.lastName=#{word.lastName}:
+UIAccountForm.label.displayName=#{word.displayName}:
UIAccountForm.label.email=Електронна пошта:
UIAccountForm.label.note=Поля позначені зірочкою<span style="color: red">*</span> обов'язкові для заповнення!
UIAccountForm.action.Back=#{word.back}
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_cs.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_cs.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_cs.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -196,6 +196,7 @@
UIUserInfo.label.email=E-mailov\u00E1 adresa:
UIUserInfo.label.firstName=#{word.firstName}:
UIUserInfo.label.lastName=#{word.lastName}:
+UIUserInfo.label.displayName=#{word.displayName}:
UIUserInfo.label.newPassword=Nov\u00E9 heslo:
UIUserInfo.label.option.ar=Arab\u0161tina
UIUserInfo.label.option.cs=\u010Ce\u0161tina
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -17,10 +17,10 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-##org.exoplatform.organization.webui.component.UIOrganizationPortlet
+##org.exoplatform.organization.webui.component.UIOrganizationPortlet
UIOrganizationPortlet.label.userManagement=Benutzermanagement
UIOrganizationPortlet.label.groupManagement=Gruppenmanagement
-UIOrganizationPortlet.label.membershipManagement=Rollenmanagement
+UIOrganizationPortlet.label.membershipManagement=Rollenmanagement
##org.exoplatform.organization.webui.component.UIMembershipTypeForm
UIMembershipTypeForm.title=Rolle hinzuf\u00fcgen/\u00e4ndern
@@ -99,6 +99,7 @@
UIUserInfo.label.Confirmpassword=Passwort best\u00e4tigen :
UIUserInfo.label.firstName=#{word.firstName}:
UIUserInfo.label.lastName=#{word.lastName}:
+UIUserInfo.label.displayName=#{word.displayName}:
UIUserInfo.label.email=E-mail-Adresse:
UIUserInfo.label.user.language: Language
UIUserInfo.action.Back=#{word.cancel}
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -1,22 +1,22 @@
-#
-# 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.
-#
-
+#
+# 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.
+#
+
##org.exoplatform.organization.webui.component.UIOrganizationPortlet
UIOrganizationPortlet.label.userManagement=User Management
UIOrganizationPortlet.label.groupManagement=Group Management
@@ -30,8 +30,8 @@
UIMembershipTypeForm.action.Save=#{word.save}
UIMembershipTypeForm.action.Back=#{word.back}
UIMembershipTypeForm.action.Reset=Reset
-UIMembershipTypeForm.msg.SameName=This membership already exists, please enter another one
-UIMembershipTypeForm.msg.MembershipNotExist= Membership [{0}] is not exist or has been deleted.
+UIMembershipTypeForm.msg.SameName=This membership already exists, please enter another one
+UIMembershipTypeForm.msg.MembershipNotExist= Membership [{0}] is not exist or has been deleted.
##org.exoplatform.organization.webui.component.UIGroupMembershipForm
UIGroupEditMembershipForm.label.username=User Name
@@ -79,8 +79,8 @@
UIListUsers.label.option.lastName=#{word.lastName}
UIListUsers.label.option.email=#{word.email}
UIListUsers.msg.DeleteSuperUser={0} is Super User, it can not be deleted
-UIListUsers.deleteUser=Are you sure you want to delete {0} user?
-UIListUsers.msg.user-is-deleted=This user may be deleted.
+UIListUsers.deleteUser=Are you sure you want to delete {0} user?
+UIListUsers.msg.user-is-deleted=This user may be deleted.
UIListMembershipType.deleteMemberShip=Are you sure you want to delete this membership?
@@ -101,6 +101,7 @@
UIUserInfo.label.Confirmpassword=Confirm Password :
UIUserInfo.label.firstName=#{word.firstName}:
UIUserInfo.label.lastName=#{word.lastName}:
+UIUserInfo.label.displayName=#{word.displayName}:
UIUserInfo.label.email=Email Address:
UIUserInfo.label.user.language: Language
UIUserInfo.action.Back=#{word.cancel}
@@ -173,7 +174,7 @@
UIMembershipList.header.description=#{word.description}
UIMembershipList.action.title.EditMembership=Edit Membership
UIMembershipList.action.title.DeleteMembership=Delete Membership
-UIMembershipList.msg.InUse=You can not delete this membership because it is in use
+UIMembershipList.msg.InUse=You can not delete this membership because it is in use
UIMembershipList.msg.DeleteMandatory=You can not delete this membership because it is mandatory
##org.exoplatform.organization.webui.component.UIGroupMembershipForm
@@ -198,7 +199,7 @@
EditGroup.action.Save=#{word.save}
EditGroup.action.Back=#{word.cancel}
-UIGroupForm.msg.group-exist=This group name already exists, please enter another one
+UIGroupForm.msg.group-exist=This group name already exists, please enter another one
UIGroupForm.msg.group-not-exist=Group "{0}" doesn't exist or has been deleted.
############################################################################
# org.exoplatform.portal.component.customization.UIShareNavigationForm #
@@ -255,4 +256,4 @@
UITabPane.title.UISharedNavigation=Group Page Navigation
UISharedNavigation.label.userNavigation=User Page Navigation Name
UISharedNavigation.label.priority=Priority
-UISharedNavigation.action.Save=Save
+UISharedNavigation.action.Save=Save
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -99,6 +99,7 @@
UIUserInfo.label.Confirmpassword=Confirmar Contrase\u00f1a :
UIUserInfo.label.firstName=#{word.firstName}:
UIUserInfo.label.lastName=#{word.lastName}:
+UIUserInfo.label.displayName=#{word.displayName}:
UIUserInfo.label.email=Direcci\u00f3n de Correo Electr\u00f3nico:
UIUserInfo.label.user.language: Idioma
UIUserInfo.action.Back=#{word.cancel}
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -100,6 +100,7 @@
UIUserInfo.label.Confirmpassword=Confirmation mot de passe :
UIUserInfo.label.firstName=#{word.firstName}:
UIUserInfo.label.lastName=#{word.lastName}:
+UIUserInfo.label.displayName=#{word.displayName}:
UIUserInfo.label.email=Adresse email:
UIUserInfo.action.Back=#{word.cancel}
UIUserInfo.action.Save=#{word.save}
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -1,22 +1,22 @@
-#
-# 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.
-#
-
+#
+# 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.
+#
+
##org.exoplatform.organization.webui.component.UIOrganizationPortlet
UIOrganizationPortlet.label.userManagement=Gestione Utenti
UIOrganizationPortlet.label.groupManagement=Gestione Gruppi
@@ -30,8 +30,8 @@
UIMembershipTypeForm.action.Save=#{word.save}
UIMembershipTypeForm.action.Back=#{word.back}
UIMembershipTypeForm.action.Reset=Azzera
-UIMembershipTypeForm.msg.SameName=Il membership esiste gi\u00E0, inseriscine un'altro
-UIMembershipTypeForm.msg.MembershipNotExist= Il membership [{0}] non esiste o \u00E8 stato cancellato.
+UIMembershipTypeForm.msg.SameName=Il membership esiste gi\u00E0, inseriscine un'altro
+UIMembershipTypeForm.msg.MembershipNotExist= Il membership [{0}] non esiste o \u00E8 stato cancellato.
##org.exoplatform.organization.webui.component.UIGroupMembershipForm
UIGroupEditMembershipForm.label.username=Nome Utente
@@ -79,7 +79,7 @@
UIListUsers.label.option.lastName=#{word.lastName}
UIListUsers.label.option.email=#{word.email}
UIListUsers.msg.DeleteSuperUser={0} \u00E8 un Super Utente, non pu\u00F2 essere cancellato
-UIListUsers.deleteUser=Sicuro di voler cancellare l'utente {0}?
+UIListUsers.deleteUser=Sicuro di voler cancellare l'utente {0}?
UIListUsers.msg.user-is-deleted=L'utente pu\u00F2 essere cancellato.
UIListMembershipType.deleteMemberShip=Sicuro di voler cancellare il membership?
@@ -101,6 +101,7 @@
UIUserInfo.label.Confirmpassword=Conferma Password :
UIUserInfo.label.firstName=#{word.firstName}:
UIUserInfo.label.lastName=#{word.lastName}:
+UIUserInfo.label.displayName=#{word.displayName}:
UIUserInfo.label.email=Indirizzo Email:
UIUserInfo.label.user.language: Lingua
UIUserInfo.action.Back=#{word.cancel}
@@ -173,7 +174,7 @@
UIMembershipList.header.description=#{word.description}
UIMembershipList.action.title.EditMembership=Modifica il Membership
UIMembershipList.action.title.DeleteMembership=Elimina il Membership
-UIMembershipList.msg.InUse=Non puoi eliminare il membership perch\u00E8 \u00E8 gi\u00E0 in uso
+UIMembershipList.msg.InUse=Non puoi eliminare il membership perch\u00E8 \u00E8 gi\u00E0 in uso
UIMembershipList.msg.DeleteMandatory=Non puoi eliminare il membership perch\u00E8 \u00E8 obbligatorio
##org.exoplatform.organization.webui.component.UIGroupMembershipForm
@@ -198,7 +199,7 @@
EditGroup.action.Save=#{word.save}
EditGroup.action.Back=#{word.cancel}
-UIGroupForm.msg.group-exist=Il gruppo esiste gi\u00E0, inseriscine un altro
+UIGroupForm.msg.group-exist=Il gruppo esiste gi\u00E0, inseriscine un altro
UIGroupForm.msg.group-not-exist=Il gruppo "{0}" non esiste o \u00E8 stato eliminato.
############################################################################
# org.exoplatform.portal.component.customization.UIShareNavigationForm #
@@ -255,4 +256,4 @@
UITabPane.title.UISharedNavigation=Navigazione della Pagina del Gruppo
UISharedNavigation.label.userNavigation=Nome della Navigazione della Pagina Utente
UISharedNavigation.label.priority=Priorit\u00E0
-UISharedNavigation.action.Save=Salva
+UISharedNavigation.action.Save=Salva
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -100,6 +100,7 @@
UIUserInfo.label.Confirmpassword=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u78ba\u8a8d :
UIUserInfo.label.firstName=#{word.firstName}:
UIUserInfo.label.lastName=#{word.lastName}:
+UIUserInfo.label.displayName=#{word.displayName}:
UIUserInfo.label.email=Email\u30a2\u30c9\u30ec\u30b9:
UIUserInfo.label.user.language: Language
UIUserInfo.action.Back=#{word.cancel}
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -100,6 +100,7 @@
UIUserInfo.label.Confirmpassword=\u092a\u0915\u094d\u0915\u093e \u092a\u093e\u0938\u094d\u0935\u094b\u0930\u094d\u0921 :
UIUserInfo.label.firstName=#{word.firstName}:
UIUserInfo.label.lastName=#{word.lastName}:
+UIUserInfo.label.displayName=#{word.displayName}:
UIUserInfo.label.email=\u0908\u092e\u0947\u0932 \u0920\u0947\u0917\u093e\u0928\u093e:
UIUserInfo.label.user.language=\u092d\u093e\u0937\u093e:
UIUserInfo.action.Back=#{word.cancel}
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -99,6 +99,7 @@
UIUserInfo.label.Confirmpassword=Bevestig paswoord :
UIUserInfo.label.firstName=#{word.firstName}:
UIUserInfo.label.lastName=#{word.lastName}:
+UIUserInfo.label.displayName=#{word.displayName}:
UIUserInfo.label.email=#{word.email} adres:
UIUserInfo.label.user.language=Language
UIUserInfo.action.Back=#{word.back}
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -1,22 +1,22 @@
-#
-# 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.
-#
-
+#
+# 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.
+#
+
##org.exoplatform.organization.webui.component.UIOrganizationPortlet
UIOrganizationPortlet.label.userManagement=Gerência de Usuários
UIOrganizationPortlet.label.groupManagement=Gerência de Grupos
@@ -30,8 +30,8 @@
UIMembershipTypeForm.action.Save=#{word.save}
UIMembershipTypeForm.action.Back=#{word.back}
UIMembershipTypeForm.action.Reset=Limpar
-UIMembershipTypeForm.msg.SameName=Papel já existente.
-UIMembershipTypeForm.msg.MembershipNotExist=papel [{0}] inexistente.
+UIMembershipTypeForm.msg.SameName=Papel já existente.
+UIMembershipTypeForm.msg.MembershipNotExist=papel [{0}] inexistente.
##org.exoplatform.organization.webui.component.UIGroupMembershipForm
UIGroupEditMembershipForm.label.username=Nome de Usuário
@@ -100,6 +100,7 @@
UIUserInfo.label.Confirmpassword=Confirmar Senha:
UIUserInfo.label.firstName=#{word.firstName}:
UIUserInfo.label.lastName=#{word.lastName}:
+UIUserInfo.label.displayName=#{word.displayName}:
UIUserInfo.label.email=Endereço Email:
UIUserInfo.label.user.language=Língua
UIUserInfo.action.Back=#{word.cancel}
@@ -172,7 +173,7 @@
UIMembershipList.header.description=#{word.description}
UIMembershipList.action.title.EditMembership=Editar Papel
UIMembershipList.action.title.DeleteMembership=Remover Papel
-UIMembershipList.msg.InUse=Papel em uso, não é possível removê-lo.
+UIMembershipList.msg.InUse=Papel em uso, não é possível removê-lo.
UIMembershipList.msg.DeleteMandatory=Papel obrigatório, não é possível removê-lo.
##org.exoplatform.organization.webui.component.UIGroupMembershipForm
@@ -197,7 +198,7 @@
EditGroup.action.Save=#{word.save}
EditGroup.action.Back=#{word.cancel}
-UIGroupForm.msg.group-exist=Grupo já existente.
+UIGroupForm.msg.group-exist=Grupo já existente.
UIGroupForm.msg.group-not-exist=Grupo "{0}" inexistente.
############################################################################
# org.exoplatform.portal.component.customization.UIShareNavigationForm #
@@ -254,4 +255,4 @@
UITabPane.title.UISharedNavigation=Navergação de Grupo
UISharedNavigation.label.userNavigation=Nome da Navegação do Usuário
UISharedNavigation.label.priority=Prioridade
-UISharedNavigation.action.Save=Salvar
+UISharedNavigation.action.Save=Salvar
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -1,22 +1,22 @@
-#
-# 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.
-#
-
+#
+# 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.
+#
+
##org.exoplatform.organization.webui.component.UIOrganizationPortlet
UIOrganizationPortlet.label.userManagement=Пользователи
UIOrganizationPortlet.label.groupManagement=Группы
@@ -99,6 +99,7 @@
UIUserInfo.label.Confirmpassword=Подтверждение пароля:
UIUserInfo.label.firstName=#{word.firstName}:
UIUserInfo.label.lastName=#{word.lastName}:
+UIUserInfo.label.displayName=#{word.displayName}:
UIUserInfo.label.email=Адрес эл.почты:
UIUserInfo.label.user.language=Язык
UIUserInfo.action.Back=#{word.cancel}
@@ -162,7 +163,7 @@
UIMembershipList.header.description=#{word.description}
UIMembershipList.action.title.EditMembership=Изменить участие
UIMembershipList.action.title.DeleteMembership=Отменить участие
-UIMembershipList.msg.InUse=Невозможно отменить участие.
+UIMembershipList.msg.InUse=Невозможно отменить участие.
UIMembershipList.msg.DeleteMandatory=\u0412\u044B \u043D\u0435 \u043C\u043E\u0436\u0435\u0442\u0435 \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u044D\u0442\u043E \u0447\u043B\u0435\u043D\u0441\u0442\u0432\u043E, \u043F\u043E\u0441\u043A\u043E\u043B\u044C\u043A\u0443 \u043E\u043D\u043E \u044F\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u043E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u044B\u043C
##org.exoplatform.organization.webui.component.UIGroupMembershipForm
@@ -243,4 +244,4 @@
UITabPane.title.UISharedNavigation=Навигация страниц группы
UISharedNavigation.label.userNavigation=Навигация страниц пользователя
UISharedNavigation.label.priority=Приоритет
-UISharedNavigation.action.Save=Сохранить
+UISharedNavigation.action.Save=Сохранить
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -1,22 +1,22 @@
-#
-# 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.
-#
-
+#
+# 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.
+#
+
##org.exoplatform.organization.webui.component.UIOrganizationPortlet
UIOrganizationPortlet.label.userManagement=Управління користувачами
UIOrganizationPortlet.label.groupManagement=Управління групами
@@ -99,6 +99,7 @@
UIUserInfo.label.Confirmpassword=Підтвердіть пароль:
UIUserInfo.label.firstName=#{word.firstName}:
UIUserInfo.label.lastName=#{word.lastName}:
+UIUserInfo.label.displayName=#{word.displayName}:
UIUserInfo.label.email=Електронна пошта:
UIUserInfo.action.Back=#{word.cancel}
UIUserInfo.action.Save=#{word.save}
@@ -161,7 +162,7 @@
UIMembershipList.header.description=#{word.description}
UIMembershipList.action.title.EditMembership=Редагувати клас
UIMembershipList.action.title.DeleteMembership=Видалити клас
-UIMembershipList.msg.InUse=Ви не можете видалити цей клас, бо він використовується.
+UIMembershipList.msg.InUse=Ви не можете видалити цей клас, бо він використовується.
UIMembershipList.msg.DeleteMandatory=\u0412\u0456\u0434 \u0442\u0430\u043A\u0438\u0445 \u043C\u043E\u0436\u043D\u0430 \u043D\u0456 \u0432\u0438\u043B\u0443\u0447\u0456\u0442\u044C \u0446\u0435 \u043F\u0440\u0438\u043D\u0430\u043B\u0435\u0436\u043D\u0456\u0441\u0442\u044C \u043E\u0441\u043A\u0456\u043B\u044C\u043A\u0438 \u0432\u0456\u043D \u043E\u0434\u0438\u043D \u043E\u0431\u043E\u0432'\u044F\u0437\u043A\u043E\u0432\u0438\u0439
##org.exoplatform.organization.webui.component.UIGroupMembershipForm
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_cs.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_cs.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_cs.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -27,6 +27,7 @@
UIRegisterForm.label.emailAddress=E-mailov\u00E1 adresa:
UIRegisterForm.label.firstName=K\u0159estn\u00ED jm\u00E9no:
UIRegisterForm.label.lastName=P\u0159\u00EDjmen\u00ED:
+UIRegisterForm.label.displayName=Zobrazovan\u00E9 jm\u00E9no:
UIRegisterForm.label.password=Heslo:
UIRegisterForm.label.username=U\u017Eivatelsk\u00E9 jm\u00E9no:
UIRegisterForm.registerWithSuccess.message=\u00DAsp\u011B\u0161n\u011B jste registroval nov\u00FD \u00FA\u010Det!
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -26,6 +26,7 @@
UIRegisterForm.label.confirmPassword=Confirm Password:
UIRegisterForm.label.firstName=First Name:
UIRegisterForm.label.lastName=Last Name:
+UIRegisterForm.label.displayName=Display Name:
UIRegisterForm.label.emailAddress=Email Address:
UIRegisterForm.label.captcha=Text validation:
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_cs.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_cs.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_cs.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -47,6 +47,7 @@
word.decorator=Dekor\u00E1tor
word.department=Odd\u011Blen\u00ED
word.description=Popis
+word.displayName=Zobrazovan\u00E9 jm\u00E9no
###################################################################
# EXPRESSION START WITH 'e' #
###################################################################
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -1,22 +1,22 @@
-#
-# 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.
-#
-
+#
+# 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.
+#
+
###################################################################
# EXPRESSION START WITH 'A' #
###################################################################
@@ -48,6 +48,7 @@
word.decorator=Decorator
word.department=Department
word.description=Description
+word.displayName=Display Name
###################################################################
# EXPRESSION START WITH 'e' #
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.xml 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.xml 2012-03-14 15:32:03 UTC (rev 8591)
@@ -59,6 +59,7 @@
<decorator>Decorator</decorator>
<department>Department</department>
<description>Description</description>
+ <displayName>Display Name</displayName>
<!--
###################################################################
# EXPRESSION START WITH 'e' #
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_cs.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_cs.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_cs.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -223,6 +223,7 @@
UIAccountProfiles.label.email=E-mail :
UIAccountProfiles.label.firstName=K\u0159estn\u00ED jm\u00E9no:
UIAccountProfiles.label.lastName=P\u0159\u00EDjmen\u00ED:
+UIAccountProfiles.label.displayName=Zobrazovan\u00E9 jm\u00E9no:
UIAccountProfiles.label.userName=U\u017Eivatelsk\u00E9 jm\u00E9no:
UIAccountProfiles.msg.NotExistingAccount=V\u00E1\u0161 \u00FA\u010Det neexistuje, mo\u017En\u00FD byl smaz\u00E1n jin\u00FDm u\u017Eivatelem!
UIAccountProfiles.msg.update.success=Informace o \u00FA\u010Dtu byly aktualizov\u00E1ny.
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2012-03-14 15:32:03 UTC (rev 8591)
@@ -1196,6 +1196,7 @@
UIAccountProfiles.label.userName=User Name :
UIAccountProfiles.label.firstName=First Name :
UIAccountProfiles.label.lastName=Last Name :
+UIAccountProfiles.label.displayName=Display Name :
UIAccountProfiles.label.email=Email :
UIAccountProfiles.msg.update.success=The account information has been updated.
UIAccountProfiles.msg.NotExistingAccount=Your account is not existing, maybe it was deleted by another user!
Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java
===================================================================
--- portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java 2012-03-14 15:32:03 UTC (rev 8591)
@@ -72,6 +72,10 @@
addUIFormInput(new UIFormStringInput("lastName", "lastName", null).addValidator(StringLengthValidator.class, 1,
45).addValidator(MandatoryValidator.class).addValidator(NaturalLanguageValidator.class));
+
+ // TODO: GTNPORTAL-2358 switch bindingField fullName to displayName once displayName will be available in Organization API
+ addUIFormInput(new UIFormStringInput("displayName", "fullName", null).addValidator(StringLengthValidator.class, 0,
+ 90));
addUIFormInput(new UIFormStringInput("email", "email", null).addValidator(MandatoryValidator.class).addValidator(
EmailAddressValidator.class));
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java 2012-03-14 15:18:37 UTC (rev 8590)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java 2012-03-14 15:32:03 UTC (rev 8591)
@@ -73,6 +73,10 @@
StringLengthValidator.class, 1, 45).addValidator(MandatoryValidator.class));
addUIFormInput(new UIFormStringInput("lastName", "lastName", useraccount.getLastName()).addValidator(
StringLengthValidator.class, 1, 45).addValidator(MandatoryValidator.class));
+
+ // TODO: GTNPORTAL-2358 switch to getDisplayName once it will be available in Organization API
+ addUIFormInput(new UIFormStringInput("displayName", "displayName", useraccount.getFullName()).addValidator(
+ StringLengthValidator.class, 0, 90));
addUIFormInput(new UIFormStringInput("email", "email", useraccount.getEmail()).addValidator(
MandatoryValidator.class).addValidator(EmailAddressValidator.class));
}
@@ -87,6 +91,8 @@
User user = service.getUserHandler().findUserByName(userName);
uiForm.getUIStringInput("firstName").setValue(user.getFirstName());
uiForm.getUIStringInput("lastName").setValue(user.getLastName());
+ // TODO: GTNPORTAL-2358 switch to getDisplayName once it will be available in Organization API
+ uiForm.getUIStringInput("displayName").setValue(user.getFullName());
uiForm.getUIStringInput("email").setValue(user.getEmail());
event.getRequestContext().addUIComponentToUpdateByAjax(uiForm);
}
@@ -119,6 +125,9 @@
}
user.setFirstName(uiForm.getUIStringInput("firstName").getValue());
user.setLastName(uiForm.getUIStringInput("lastName").getValue());
+
+ // TODO: GTNPORTAL-2358 switch to setDisplayName once it will be available in Organization API
+ user.setFullName(uiForm.getUIStringInput("displayName").getValue());
user.setEmail(newEmail);
uiApp.addMessage(new ApplicationMessage("UIAccountProfiles.msg.update.success", null));
service.getUserHandler().saveUser(user, true);
12 years, 10 months
- 1
- 0
gatein SVN: r8589 - portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2012-03-14 10:33:45 -0400 (Wed, 14 Mar 2012)
New Revision: 8589
Modified:
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java
Log:
GTNPORTAL-2376 JTA support improvements
Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java 2012-03-14 07:38:48 UTC (rev 8588)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java 2012-03-14 14:33:45 UTC (rev 8589)
@@ -28,6 +28,8 @@
import org.exoplatform.container.xml.ValueParam;
import org.exoplatform.services.cache.CacheService;
import org.exoplatform.services.organization.BaseOrganizationService;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.picocontainer.Startable;
import javax.naming.InitialContext;
@@ -51,6 +53,11 @@
private Config configuration = new Config();
+ private UserTransaction userTransaction;
+
+ private static final Logger log = LoggerFactory.getLogger(PicketLinkIDMOrganizationServiceImpl.class);
+ private static final boolean traceLoggingEnabled = log.isTraceEnabled();
+
public PicketLinkIDMOrganizationServiceImpl(InitParams params, PicketLinkIDMService idmService)
throws Exception
{
@@ -144,11 +151,11 @@
{
if (configuration.isUseJTA())
{
- UserTransaction tx = (UserTransaction)new InitialContext().lookup("java:comp/UserTransaction");
- if (tx.getStatus() == Status.STATUS_NO_TRANSACTION)
+ if (traceLoggingEnabled)
{
- tx.begin();
+ log.trace("Starting UserTransaction in method startRequest");
}
+ beginJTATransaction();
}
else
{
@@ -174,16 +181,16 @@
if (configuration.isUseJTA())
{
- UserTransaction tx = (UserTransaction)new InitialContext().lookup("java:comp/UserTransaction");
-
- if (tx.getStatus() != Status.STATUS_NO_TRANSACTION)
+ if (traceLoggingEnabled)
{
- tx.commit();
+ log.trace("Flushing UserTransaction in method flush");
}
-
- if (tx.getStatus() == Status.STATUS_NO_TRANSACTION)
+ // Complete restart of JTA transaction don't have good performance. So we will only sync identitySession (same as for non-jta environment)
+ // finishJTATransaction();
+ // beginJTATransaction();
+ if (getUserTransaction().getStatus() == Status.STATUS_ACTIVE)
{
- tx.begin();
+ idmService_.getIdentitySession().save();
}
}
else
@@ -209,19 +216,15 @@
{
if (configuration.isUseJTA())
{
- UserTransaction tx = (UserTransaction)new InitialContext().lookup("java:comp/UserTransaction");
- if(tx.getStatus() == Status.STATUS_ACTIVE)
+ if (traceLoggingEnabled)
{
- tx.commit();
+ log.trace("Finishing UserTransaction in method endRequest");
}
-
+ finishJTATransaction();
}
else
{
- if(idmService_.getIdentitySession().getTransaction().isActive())
- {
- idmService_.getIdentitySession().getTransaction().commit();
- }
+ idmService_.getIdentitySession().getTransaction().commit();
}
}
catch (Exception e)
@@ -240,4 +243,57 @@
{
this.configuration = configuration;
}
+
+
+ private void beginJTATransaction() throws Exception
+ {
+ UserTransaction tx = getUserTransaction();
+
+ if (tx.getStatus() == Status.STATUS_NO_TRANSACTION)
+ {
+ tx.begin();
+ }
+ else
+ {
+ log.warn("UserTransaction not started as it's in state " + tx.getStatus());
+ }
+ }
+
+
+ private void finishJTATransaction() throws Exception
+ {
+ UserTransaction tx = getUserTransaction();
+
+ int txStatus = tx.getStatus();
+ if (txStatus == Status.STATUS_NO_TRANSACTION)
+ {
+ log.warn("UserTransaction can't be finished as it wasn't started");
+ }
+ else if (txStatus == Status.STATUS_MARKED_ROLLBACK || txStatus == Status.STATUS_ROLLEDBACK || txStatus == Status.STATUS_ROLLING_BACK)
+ {
+ log.warn("Going to rollback UserTransaction as it's status is " + txStatus);
+ tx.rollback();
+ }
+ else
+ {
+ tx.commit();
+ }
+ }
+
+ // It's fine to reuse same instance of UserTransaction as UserTransaction is singleton in JBoss and most other AS.
+ // And new InitialContext().lookup("java:comp/UserTransaction") is quite expensive operation
+ private UserTransaction getUserTransaction() throws Exception
+ {
+ if (userTransaction == null)
+ {
+ synchronized (this)
+ {
+ if (userTransaction == null)
+ {
+ userTransaction = (UserTransaction)new InitialContext().lookup("java:comp/UserTransaction");
+ }
+ }
+ }
+ return userTransaction;
+ }
}
12 years, 10 months
- 1
- 0
gatein SVN: r8588 - epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2012-03-14 03:38:48 -0400 (Wed, 14 Mar 2012)
New Revision: 8588
Modified:
epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java
Log:
Bug 793816 - (JBEPP-891) JTA support
Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java 2012-03-13 23:08:33 UTC (rev 8587)
+++ epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java 2012-03-14 07:38:48 UTC (rev 8588)
@@ -28,6 +28,8 @@
import org.exoplatform.container.xml.ValueParam;
import org.exoplatform.services.cache.CacheService;
import org.exoplatform.services.organization.BaseOrganizationService;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.picocontainer.Startable;
import javax.naming.InitialContext;
@@ -51,6 +53,11 @@
private Config configuration = new Config();
+ private UserTransaction userTransaction;
+
+ private static final Logger log = LoggerFactory.getLogger(PicketLinkIDMOrganizationServiceImpl.class);
+ private static final boolean traceLoggingEnabled = log.isTraceEnabled();
+
public PicketLinkIDMOrganizationServiceImpl(InitParams params, PicketLinkIDMService idmService)
throws Exception
{
@@ -144,11 +151,11 @@
{
if (configuration.isUseJTA())
{
- UserTransaction tx = (UserTransaction)new InitialContext().lookup("java:comp/UserTransaction");
- if (tx.getStatus() == Status.STATUS_NO_TRANSACTION)
+ if (traceLoggingEnabled)
{
- tx.begin();
+ log.trace("Starting UserTransaction in method startRequest");
}
+ beginJTATransaction();
}
else
{
@@ -174,16 +181,16 @@
if (configuration.isUseJTA())
{
- UserTransaction tx = (UserTransaction)new InitialContext().lookup("java:comp/UserTransaction");
-
- if (tx.getStatus() != Status.STATUS_NO_TRANSACTION)
+ if (traceLoggingEnabled)
{
- tx.commit();
+ log.trace("Flushing UserTransaction in method flush");
}
-
- if (tx.getStatus() == Status.STATUS_NO_TRANSACTION)
+ // Complete restart of JTA transaction don't have good performance. So we will only sync identitySession (same as for non-jta environment)
+ // finishJTATransaction();
+ // beginJTATransaction();
+ if (getUserTransaction().getStatus() == Status.STATUS_ACTIVE)
{
- tx.begin();
+ idmService_.getIdentitySession().save();
}
}
else
@@ -209,8 +216,11 @@
{
if (configuration.isUseJTA())
{
- UserTransaction tx = (UserTransaction)new InitialContext().lookup("java:comp/UserTransaction");
- tx.commit();
+ if (traceLoggingEnabled)
+ {
+ log.trace("Finishing UserTransaction in method endRequest");
+ }
+ finishJTATransaction();
}
else
{
@@ -233,4 +243,57 @@
{
this.configuration = configuration;
}
+
+
+ private void beginJTATransaction() throws Exception
+ {
+ UserTransaction tx = getUserTransaction();
+
+ if (tx.getStatus() == Status.STATUS_NO_TRANSACTION)
+ {
+ tx.begin();
+ }
+ else
+ {
+ log.warn("UserTransaction not started as it's in state " + tx.getStatus());
+ }
+ }
+
+
+ private void finishJTATransaction() throws Exception
+ {
+ UserTransaction tx = getUserTransaction();
+
+ int txStatus = tx.getStatus();
+ if (txStatus == Status.STATUS_NO_TRANSACTION)
+ {
+ log.warn("UserTransaction can't be finished as it wasn't started");
+ }
+ else if (txStatus == Status.STATUS_MARKED_ROLLBACK || txStatus == Status.STATUS_ROLLEDBACK || txStatus == Status.STATUS_ROLLING_BACK)
+ {
+ log.warn("Going to rollback UserTransaction as it's status is " + txStatus);
+ tx.rollback();
+ }
+ else
+ {
+ tx.commit();
+ }
+ }
+
+ // It's fine to reuse same instance of UserTransaction as UserTransaction is singleton in JBoss and most other AS.
+ // And new InitialContext().lookup("java:comp/UserTransaction") is quite expensive operation
+ private UserTransaction getUserTransaction() throws Exception
+ {
+ if (userTransaction == null)
+ {
+ synchronized (this)
+ {
+ if (userTransaction == null)
+ {
+ userTransaction = (UserTransaction)new InitialContext().lookup("java:comp/UserTransaction");
+ }
+ }
+ }
+ return userTransaction;
+ }
}
12 years, 10 months
- 1
- 0
gatein SVN: r8587 - epp/docs/branches/5.2/Release_Notes/en-US.
by do-not-reply＠jboss.org
Author: jaredmorgs
Date: 2012-03-13 19:08:33 -0400 (Tue, 13 Mar 2012)
New Revision: 8587
Added:
epp/docs/branches/5.2/Release_Notes/en-US/5.2.1_Release_Notes.ent
epp/docs/branches/5.2/Release_Notes/en-US/5.2.1_Release_Notes.xml
epp/docs/branches/5.2/Release_Notes/en-US/known.xml
epp/docs/branches/5.2/Release_Notes/en-US/resolved.xml
Removed:
epp/docs/branches/5.2/Release_Notes/en-US/5.2.0_Release_Notes.ent
epp/docs/branches/5.2/Release_Notes/en-US/5.2.0_Release_Notes.xml
epp/docs/branches/5.2/Release_Notes/en-US/feature_requests.xml
epp/docs/branches/5.2/Release_Notes/en-US/known_issues.xml
epp/docs/branches/5.2/Release_Notes/en-US/not_documented.xml
epp/docs/branches/5.2/Release_Notes/en-US/resolved_issues.xml
Modified:
epp/docs/branches/5.2/Release_Notes/en-US/Book_Info.xml
epp/docs/branches/5.2/Release_Notes/en-US/Revision_History.xml
Log:
refactoring xml files for new BZ script and new RN book title
Deleted: epp/docs/branches/5.2/Release_Notes/en-US/5.2.0_Release_Notes.ent
===================================================================
--- epp/docs/branches/5.2/Release_Notes/en-US/5.2.0_Release_Notes.ent 2012-03-13 20:16:20 UTC (rev 8586)
+++ epp/docs/branches/5.2/Release_Notes/en-US/5.2.0_Release_Notes.ent 2012-03-13 23:08:33 UTC (rev 8587)
@@ -1,14 +0,0 @@
-<!-- Product Specifics: -->
-<!ENTITY PRODUCT "JBoss Site Publisher">
-
-<!-- Book specifics: -->
-<!ENTITY BOOKID "Site Publisher Release Notes">
-
-<!-- Corporate Specifics: -->
-<!ENTITY YEAR "2011">
-<!ENTITY HOLDER "Red Hat, Inc">
-
-<!-- Version Specifcs: -->
-<!ENTITY VX "5">
-<!ENTITY VY "5.2">
-<!ENTITY VZ "5.2.0">
Deleted: epp/docs/branches/5.2/Release_Notes/en-US/5.2.0_Release_Notes.xml
===================================================================
--- epp/docs/branches/5.2/Release_Notes/en-US/5.2.0_Release_Notes.xml 2012-03-13 20:16:20 UTC (rev 8586)
+++ epp/docs/branches/5.2/Release_Notes/en-US/5.2.0_Release_Notes.xml 2012-03-13 23:08:33 UTC (rev 8587)
@@ -1,248 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- This document was created with Syntext Serna Free. --><!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "5.2.0_Release_Notes.ent">
-%BOOK_ENTITIES;
-]>
-<book>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Book_Info.xml"/>
- <chapter id="Release_Notes-Introduction">
- <title>Introduction</title>
- <para>JBoss Enterprise Portal Platform offers an intuitive, easy to manage user interface and a proven core infrastructure to enable organizations to quickly build dynamic web sites in a highly reusable way. By bringing the principals of Open Choice to the presentation layer, JBoss Enterprise Portal Platform 5 maximizes existing skills and technology investments.
- </para>
- <para>By integrating open source frameworks such as JBoss Seam, Hibernate, Tomcat, and JBoss Cache, JBoss Enterprise Portal Platform takes advantage of innovations in the open source community. </para>
- <para>JBoss Enterprise Portal Platform &VZ; is fully tested and supported by Red Hat, and is certified to work on many leading enterprise hardware and software products.</para>
- </chapter>
- <chapter id="Release_Notes-Installation">
- <title>Installation</title>
- <para>
- The JBoss Enterprise Portal Platform <citetitle>Installation Guide</citetitle> contains detailed installation instructions as well as environment requirements.
- </para>
- <para>
- The Installation Guide is available in multiple formats from <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...." type="http"/>.
- </para>
- </chapter>
- <chapter id="Release_Notes-Component_Features">
- <title>Component Versions </title>
- <para><remark>Updated table from https://docspace.corp.redhat.com/docs/DOC-68705 (version 13)</remark></para>
- <table frame="all" pgwide="1">
- <title>Component Versions</title>
- <tgroup cols="2" colsep="1">
- <colspec colnum="1"/>
- <colspec colnum="2"/>
- <thead>
- <row>
- <entry>Component</entry>
- <entry>Version</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>EAP</entry>
- <entry>5.1.1-GA</entry>
- </row>
- <row>
- <entry>eXo junit</entry>
- <entry>1.2.1-GA</entry>
- </row>
- <row>
- <entry>eXo kernel</entry>
- <entry>2.3.3-GA</entry>
- </row>
- <row>
- <entry>eXo Core</entry>
- <entry>2.4.3-GA</entry>
- </row>
- <row>
- <entry>eXo WS</entry>
- <entry>2.2.3-GA</entry>
- </row>
- <row>
- <entry>eXo JCR</entry>
- <entry>1.14.3-GA</entry>
- </row>
- <row>
- <entry>Apache Shindig</entry>
- <entry>2.0.2-CP01</entry>
- </row>
- <row>
- <entry>Simple Captcha</entry>
- <entry>1.1.1-GA-Patch01</entry>
- </row>
- <row>
- <entry>GateIn Parent</entry>
- <entry>1.1.0-GA</entry>
- </row>
- <row>
- <entry>GateIn dep</entry>
- <entry>1.1.0-GA</entry>
- </row>
- <row>
- <entry>GateIn Common</entry>
- <entry>2.0.4-GA</entry>
- </row>
- <row>
- <entry>GateIn WCI</entry>
- <entry>2.1.0-GA</entry>
- </row>
- <row>
- <entry>GateIn PC</entry>
- <entry>2.3.0-GA</entry>
- </row>
- <row>
- <entry>GateIn WSRP</entry>
- <entry>2.1.0-EPP520-GA</entry>
- </row>
- <row>
- <entry>GateIn MOP</entry>
- <entry>1.1.0-GA</entry>
- </row>
- <row>
- <entry>GateIn SSO</entry>
- <entry>1.1.0-GA</entry>
- </row>
- <row>
- <entry>PicketLink IDM</entry>
- <entry>1.3.0.GA</entry>
- </row>
- <row>
- <entry>Chromattic</entry>
- <entry>1.1.1</entry>
- </row>
- <row>
- <entry>Portlet Bridge</entry>
- <entry>2.2.0.GA.EPP520</entry>
- </row>
- <row>
- <entry>Seam</entry>
- <entry>2.2.4.EAP5</entry>
- </row>
- <row>
- <entry>Richfaces</entry>
- <entry>3.3.1.SP3</entry>
- </row>
- <row>
- <entry>Groovy</entry>
- <entry>1.7.6</entry>
- </row>
- <row>
- <entry>Commons DBCP</entry>
- <entry>1.4</entry>
- </row>
- <row>
- <entry>Commons IO</entry>
- <entry>1.4</entry>
- </row>
- <row>
- <entry>Commons Lang</entry>
- <entry>2.6</entry>
- </row>
- <row>
- <entry>HSQLDB</entry>
- <entry>2.0.0</entry>
- </row>
- <row>
- <entry>JBoss Cache</entry>
- <entry>3.2.7</entry>
- </row>
- <row>
- <entry>GateIn Management</entry>
- <entry>1.0.0-GA</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </chapter>
- <chapter>
- <title>Upgraded Components</title>
- <formalpara>
- <title>New Components</title>
- <para>The following new components warrant special mention.</para>
- </formalpara>
- <variablelist>
- <varlistentry>
- <term>Site Migration Utilities</term>
- <listitem>
- <para>This new functionality is designed to improve the experience of managing unique sites or groups of pages as they progress from the development to production life cycle. The Migration utility has multiple administrative interfaces to support the requirements of different enterprises.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Site Management Utilities</term>
- <listitem>
- <para>The new functionality is provided to assist administrators in performing routine tasks. This includes the release of IDM cache, gathering of performance metrics and other processes related to managing the portal server. </para>
- </listitem>
- </varlistentry>
- </variablelist>
- <formalpara>
- <title>Updated Components</title>
- <para>The following updated components warrant special mention.</para>
- </formalpara>
- <variablelist>
- <varlistentry>
- <term>Java Content Respostory</term>
- <listitem>
- <para>This updated release of the eXo Java Content Repository (JCR) has been updated to a newer version designed to improve the performance and scalability of large portal sites. </para>
- </listitem>
- </varlistentry>
- </variablelist>
- <note>
- <para>For detailed information about component versions included in this release, refer to <xref linkend="Release_Notes-Component_Features"/></para>
- </note>
- </chapter>
- <chapter id="Release_Notes-Documentation">
- <title>Documentation</title>
- <para>
- An <citetitle>Installation Guide</citetitle> and a <citetitle>User Guide</citetitle> for JBoss Enterprise Portal Platform are available at <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...." type="http"/>. JBoss Enterprise Portal Platform specific documentation is also available from this location.
- </para>
- </chapter>
- <chapter id="Release_Notes-_Product_Support_and_License_Website_Links_">
- <title> Product Support Links </title>
- <formalpara id="form-Release_Notes-_Product_Support_and_License_Website_Links_-Support_Processes">
- <title>Product Update and Support Processes</title>
- <para>
- <ulink url="https://access.redhat.com/support/policy/updates/jboss_notes/">https://access.redhat.com/support/policy/updates/jboss_notes/</ulink>
- </para>
- </formalpara>
- <formalpara id="form-Release_Notes-_Product_Support_and_License_Website_Links_-_Developer_Support_Scope_of_Coverage_">
- <title> Developer Support Scope of Coverage, and Service Level Agreement</title>
- <para><ulink url="https://access.redhat.com/support/offerings/developer/">https://access.redhat.com/support/offerings/developer/</ulink>
-
- </para>
- </formalpara>
- <formalpara id="form-Release_Notes-_Product_Support_and_License_Website_Links_-_JBoss_End_User_License_Agreement_">
- <title>Certified and Compatible Configurations</title>
- <para>
- <ulink url="http://www.jboss.com/products/platforms/portals/testedconfigurations/">http://www.jboss.com/products/platforms/portals/testedconfigurations/</ulink>
- </para>
- </formalpara>
- </chapter>
- <chapter>
- <title>New Features</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="feature_requests.xml" encoding="XML"/>
- </chapter>
- <chapter id="Release_Notes-Known_Issues">
- <title>Known Issues </title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="known_issues.xml" encoding="XML"/>
- </chapter>
- <chapter id="Release_Notes-Issues_Resolved_In_Production">
- <title>Resolved Issues </title>
- <para>
- The following issues were resolved in this release of JBoss Enterprise Portal Platform. </para>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="resolved_issues.xml"/>
- </chapter>
-<!--<chapter>
- <title>
- <remark>NEEDINFO</remark>
- </title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="need_info.xml"/>
-</chapter>--><!--<chapter>
- <title>
- <remark>Not Yet Documented</remark>
- </title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="not_documented.xml"/>
-</chapter>--><!--<chapter id="5.1.1_Release_Notes-Migration">
- <title><remark>Migration</remark></title>
- <para>
- Stuff about migration from 5.1.0 to 5.1.1.
- </para>
- </chapter>--> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Revision_History.xml"/>
-</book>
Copied: epp/docs/branches/5.2/Release_Notes/en-US/5.2.1_Release_Notes.ent (from rev 8560, epp/docs/branches/5.2/Release_Notes/en-US/5.2.0_Release_Notes.ent)
===================================================================
--- epp/docs/branches/5.2/Release_Notes/en-US/5.2.1_Release_Notes.ent (rev 0)
+++ epp/docs/branches/5.2/Release_Notes/en-US/5.2.1_Release_Notes.ent 2012-03-13 23:08:33 UTC (rev 8587)
@@ -0,0 +1,14 @@
+<!-- Product Specifics: -->
+<!ENTITY PRODUCT "JBoss Site Publisher">
+
+<!-- Book specifics: -->
+<!ENTITY BOOKID "Site Publisher Release Notes">
+
+<!-- Corporate Specifics: -->
+<!ENTITY YEAR "2011">
+<!ENTITY HOLDER "Red Hat, Inc">
+
+<!-- Version Specifcs: -->
+<!ENTITY VX "5">
+<!ENTITY VY "5.2">
+<!ENTITY VZ "5.2.1">
Copied: epp/docs/branches/5.2/Release_Notes/en-US/5.2.1_Release_Notes.xml (from rev 8560, epp/docs/branches/5.2/Release_Notes/en-US/5.2.0_Release_Notes.xml)
===================================================================
--- epp/docs/branches/5.2/Release_Notes/en-US/5.2.1_Release_Notes.xml (rev 0)
+++ epp/docs/branches/5.2/Release_Notes/en-US/5.2.1_Release_Notes.xml 2012-03-13 23:08:33 UTC (rev 8587)
@@ -0,0 +1,236 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- This document was created with Syntext Serna Free. --><!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "5.2.1_Release_Notes.ent">
+%BOOK_ENTITIES;
+]>
+<book>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Book_Info.xml"/>
+ <chapter id="Release_Notes-Introduction">
+ <title>Introduction</title>
+ <para>JBoss Enterprise Portal Platform offers an intuitive, easy to manage user interface and a proven core infrastructure to enable organizations to quickly build dynamic web sites in a highly reusable way. By bringing the principals of JBoss Open Choice to the presentation layer, JBoss Enterprise Portal Platform 5 maximizes existing skills and technology investments.
+ </para>
+ <para>By integrating open source frameworks such as JBoss Seam, Hibernate, Tomcat, and JBoss Cache, JBoss Enterprise Portal Platform takes advantage of innovations in the open source community. </para>
+ <para>JBoss Enterprise Portal Platform &VZ; is fully tested and supported by Red Hat, and is certified to work on many leading enterprise hardware and software products.</para>
+ </chapter>
+ <chapter id="Release_Notes-Installation">
+ <title>Installation</title>
+ <para>
+ The JBoss Enterprise Portal Platform <citetitle>Installation Guide</citetitle> contains detailed installation instructions as well as environment requirements.
+ </para>
+ <para>
+ The Installation Guide is available in multiple formats from <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...." type="http"/>.
+ </para>
+ </chapter>
+ <chapter id="Release_Notes-Component_Features">
+ <title>Component Versions </title>
+ <para><remark>Updated table from https://docspace.corp.redhat.com/docs/DOC-68705 (version 20)</remark></para>
+ <table frame="all" pgwide="1">
+ <title>Component Versions</title>
+ <tgroup cols="2" colsep="1">
+ <colspec colnum="1"/>
+ <colspec colnum="2"/>
+ <thead>
+ <row>
+ <entry>Component</entry>
+ <entry>Version</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>EAP</entry>
+ <entry>5.1.2-GA</entry>
+ </row>
+ <row>
+ <entry>eXo junit</entry>
+ <entry>1.2.1-GA</entry>
+ </row>
+ <row>
+ <entry>eXo kernel</entry>
+ <entry>2.3.6-GA</entry>
+ </row>
+ <row>
+ <entry>eXo Core</entry>
+ <entry>2.4.6-GA</entry>
+ </row>
+ <row>
+ <entry>eXo WS</entry>
+ <entry>2.2.6-GA</entry>
+ </row>
+ <row>
+ <entry>eXo JCR</entry>
+ <entry>1.14.6GA</entry>
+ </row>
+ <row>
+ <entry>Apache Shindig</entry>
+ <entry>2.0.2-CP01</entry>
+ </row>
+ <row>
+ <entry>Simple Captcha</entry>
+ <entry>1.1.1-GA-Patch01</entry>
+ </row>
+ <row>
+ <entry>GateIn Parent</entry>
+ <entry>1.1.0-GA</entry>
+ </row>
+ <row>
+ <entry>GateIn dep</entry>
+ <entry>1.1.0-GA</entry>
+ </row>
+ <row>
+ <entry>GateIn Common</entry>
+ <entry>2.0.4-GA</entry>
+ </row>
+ <row>
+ <entry>GateIn WCI</entry>
+ <entry>2.1.1-GA</entry>
+ </row>
+ <row>
+ <entry>GateIn PC</entry>
+ <entry>2.3.1-GA</entry>
+ </row>
+ <row>
+ <entry>GateIn WSRP</entry>
+ <entry>2.1.1-EPP521-GA</entry>
+ </row>
+ <row>
+ <entry>GateIn MOP</entry>
+ <entry>1.1.1-GA</entry>
+ </row>
+ <row>
+ <entry>GateIn SSO</entry>
+ <entry>1.1.1-GA</entry>
+ </row>
+ <row>
+ <entry>PicketLink IDM</entry>
+ <entry>1.3.1.GA</entry>
+ </row>
+ <row>
+ <entry>Chromattic</entry>
+ <entry>1.1.3</entry>
+ </row>
+ <row>
+ <entry>Portlet Bridge</entry>
+ <entry>2.3.0.GA.EPP521</entry>
+ </row>
+ <row>
+ <entry>Seam</entry>
+ <entry>2.2.5.EAP5</entry>
+ </row>
+ <row>
+ <entry>Richfaces</entry>
+ <entry>3.3.1.SP3</entry>
+ </row>
+ <row>
+ <entry>Groovy</entry>
+ <entry>1.7.6</entry>
+ </row>
+ <row>
+ <entry>Commons DBCP</entry>
+ <entry>1.4</entry>
+ </row>
+ <row>
+ <entry>Commons IO</entry>
+ <entry>1.4</entry>
+ </row>
+ <row>
+ <entry>Commons Lang</entry>
+ <entry>2.6</entry>
+ </row>
+ <row>
+ <entry>HSQLDB</entry>
+ <entry>2.0.0</entry>
+ </row>
+ <row>
+ <entry>JBoss Cache</entry>
+ <entry>3.2.7</entry>
+ </row>
+ <row>
+ <entry>GateIn Management</entry>
+ <entry>1.0.0-GA</entry>
+ </row>
+ <row>
+ <entry>Gatein JON Plugin</entry>
+ <entry>1.0.0</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </chapter>
+ <chapter>
+ <title>Upgraded Components</title>
+ <formalpara>
+ <title>New Components</title>
+ <para>The following new components warrant special mention.</para>
+ </formalpara>
+ <variablelist>
+ <varlistentry>
+ <term>Gatein JON Plugin</term>
+ <listitem>
+ <para>The Gatein JON plugin allows the portal to interact with JBoss Operations Network <remark><more info required>.</remark></para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <remark>Shiny New Component Number 2</remark>
+ </term>
+ <listitem>
+ <para><remark>Some info about the shiny new component </remark></para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <formalpara>
+ <title>Updated Components</title>
+ <para>The following updated components warrant special mention.</para>
+ </formalpara>
+ <variablelist>
+ <varlistentry>
+ <term>Java Content Repository</term>
+ <listitem>
+ <para><remark>Anything particularly new about the JCR this time around? </remark></para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <remark>Shiny New Component Number 2</remark>
+ </term>
+ <listitem>
+ <para><remark>Some info about the shiny new component </remark></para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <note>
+ <para>For detailed information about component versions included in this release, refer to <xref linkend="Release_Notes-Component_Features"/></para>
+ </note>
+ </chapter>
+ <chapter id="Release_Notes-Documentation">
+ <title>Documentation</title>
+ <para>
+ An <citetitle>Installation Guide</citetitle> and a <citetitle>User Guide</citetitle> for JBoss Enterprise Portal Platform are available at <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...." type="http"/>. JBoss Enterprise Portal Platform specific documentation is also available from this location.
+ </para>
+ <para>In this release, the <citetitle>Installation Guide</citetitle> has undergone heavy rework and is now presented in a task-based narrative style. Any feedback you have regarding this new format would be greatly appreciated. You can provide feedback by following the instructions in the Feedback section located in the preface of the <citetitle>Installation Guide</citetitle>.</para>
+ </chapter>
+ <chapter id="Release_Notes-_Product_Support_and_License_Website_Links_">
+ <title> Product Support Links </title>
+ <formalpara id="form-Release_Notes-_Product_Support_and_License_Website_Links_-Support_Processes">
+ <title>Product Update and Support Processes</title>
+ <para>
+ <ulink url="https://access.redhat.com/support/policy/updates/jboss_notes/">https://access.redhat.com/support/policy/updates/jboss_notes/</ulink>
+ </para>
+ </formalpara>
+ <formalpara id="form-Release_Notes-_Product_Support_and_License_Website_Links_-_Developer_Support_Scope_of_Coverage_">
+ <title> Developer Support Scope of Coverage, and Service Level Agreement</title>
+ <para><ulink url="https://access.redhat.com/support/offerings/developer/">https://access.redhat.com/support/offerings/developer/</ulink>
+
+ </para>
+ </formalpara>
+ <formalpara id="form-Release_Notes-_Product_Support_and_License_Website_Links_-_JBoss_End_User_License_Agreement_">
+ <title>Certified and Compatible Configurations</title>
+ <para>
+ <ulink url="http://www.jboss.com/products/platforms/portals/testedconfigurations/">http://www.jboss.com/products/platforms/portals/testedconfigurations/</ulink>
+ </para>
+ </formalpara>
+ </chapter>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="known.xml" encoding="XML"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="resolved.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Revision_History.xml"/>
+</book>
Modified: epp/docs/branches/5.2/Release_Notes/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/5.2/Release_Notes/en-US/Book_Info.xml 2012-03-13 20:16:20 UTC (rev 8586)
+++ epp/docs/branches/5.2/Release_Notes/en-US/Book_Info.xml 2012-03-13 23:08:33 UTC (rev 8587)
@@ -4,12 +4,12 @@
%BOOK_ENTITIES;
]>
<bookinfo id="arti-Release_Notes-Release_Notes">
- <title>5.2.0 Release Notes</title>
+ <title>5.2.1 Release Notes</title>
<subtitle>For use with JBoss Enterprise Portal Platform &VZ;.</subtitle>
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.2</productnumber>
- <edition>5.2.0</edition>
- <pubsnumber>101</pubsnumber>
+ <edition>5.2.1</edition>
+ <pubsnumber>1</pubsnumber>
<abstract>
<para>
These release notes contain important information related to JBoss Enterprise Portal Platform &VZ; that may not be currently available in the Product Manuals. You should read these Release Notes in their entirety before installing the product.
Modified: epp/docs/branches/5.2/Release_Notes/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/5.2/Release_Notes/en-US/Revision_History.xml 2012-03-13 20:16:20 UTC (rev 8586)
+++ epp/docs/branches/5.2/Release_Notes/en-US/Revision_History.xml 2012-03-13 23:08:33 UTC (rev 8587)
@@ -8,6 +8,20 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>5.2.1-1</revnumber>
+ <date>Mon Mar 19 2012</date>
+ <author>
+ <firstname>Jared</firstname>
+ <surname>Morgan</surname>
+ <email>jmorgan [at] redhat [dot] com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>First draft run of Release Notes doc using BZ extraction script for JBoss Enterprise Portal Platform 5.2.1 GA.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>5.2.0-101</revnumber>
<date>Thu Dec 14 2011</date>
<author>
Deleted: epp/docs/branches/5.2/Release_Notes/en-US/feature_requests.xml
===================================================================
--- epp/docs/branches/5.2/Release_Notes/en-US/feature_requests.xml 2012-03-13 20:16:20 UTC (rev 8586)
+++ epp/docs/branches/5.2/Release_Notes/en-US/feature_requests.xml 2012-03-13 23:08:33 UTC (rev 8587)
@@ -1,333 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE variablelist PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-]>
-<variablelist>
-<!-- https://issues.jboss.org/browse/JBEPP-736 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-736">JBEPP-736</ulink>
- </term>
- <listitem>
- <remark>Assignee is: mposolda</remark>
- <remark>JIRA is Closed</remark>
- <para>
- It is possible to switch portal clusters between UDP and TCP communication modes using a command-line parameter. The -Dgatein.default.jgroups.stack=[tcp | udp] parameter switches EPP clusters (JCR, IDM, MOPSessionManager, NavigationService, DescriptionService) between the two protocols. The functionality is implemented using an adapted, and mutually exclusive implementation of jboss.default.jgroups.stack.
-
-<note>
- <para>This enhancement is based on, but deliberately independent of, the JBoss Enterprise Application Platform parameter. "jboss.default.jgroups.stack" which supports more values by default than Enterprise Portal Platform currently does. The decision to keep the two parameters separate was for upstream compatibility.</para>
- </note>
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-932 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-932">JBEPP-932</ulink>
- </term>
- <listitem>
- <remark>Assignee is: theute</remark>
- <remark>JIRA is Closed</remark>
- <para>
- URL handler support is available in this release. The WCM component uses this feature to support locales as part of the URL.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-933 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-933">JBEPP-933</ulink>
- </term>
- <listitem>
- <remark>Assignee is: theute</remark>
- <remark>JIRA is Closed</remark>
- <para>
- Performance bottlenecks have been removed when a portal runs with hundreds of navigation nodes.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-934 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-934">JBEPP-934</ulink>
- </term>
- <listitem>
- <remark>Assignee is: theute</remark>
- <remark>JIRA is Closed</remark>
- <para>
- In previous releases, navigation node translations had to be managed in language property files. This release allows Navigation nodes to be translated directly through the administration interface.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-937 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-937">JBEPP-937</ulink>
- </term>
- <listitem>
- <remark>Assignee is: theute</remark>
- <remark>JIRA is Closed</remark>
- <para>
- It is now possible to define a portlet.xml that describes elements such as filters that need to be applied to all portlets. The file is located in jboss-as/server/[configuration]/conf/gatein/portlet.xml
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-938 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-938">JBEPP-938</ulink>
- </term>
- <listitem>
- <remark>Assignee is: mwringe</remark>
- <remark>JIRA is Closed</remark>
- <para>
- This release upgrades Shindig to version 2.0.2. Shindig is used to embed OpenSocial gadgets. Refer to the Component Versions section for the definitive version featured in this release.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-939 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-939">JBEPP-939</ulink>
- </term>
- <listitem>
- <remark>Assignee is: hfnukal</remark>
- <remark>JIRA is Closed</remark>
- <para>
- Web service security between WSRP producers and consumers is available in this release. This enhancement allows for encrypted communication and access to authenticated user content over WSRP.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-940 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-940">JBEPP-940</ulink>
- </term>
- <listitem>
- <remark>Assignee is: bdaw</remark>
- <remark>JIRA is Closed</remark>
- <para>
- This release makes it possible to configure several LDAP servers containing different users with GateIn. In a ReadOnly scenario, the user is searched in all configured sources. In a ReadWrite scenario, the user is created only in the first configured LDAP server, but obtained from all.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1008 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1008">JBEPP-1008</ulink>
- </term>
- <listitem>
- <remark>Assignee is: hfnukal</remark>
- <remark>JIRA is Closed</remark>
- <para>
- Application registry categories are now cached for better performance.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1015 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1015">JBEPP-1015</ulink>
- </term>
- <listitem>
- <remark>Assignee is: theute</remark>
- <remark>JIRA is Closed</remark>
- <para>
- Each site can now have a site description, which can be accessed and used by the management applications.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1016 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1016">JBEPP-1016</ulink>
- </term>
- <listitem>
- <remark>Assignee is: mwringe</remark>
- <remark>JIRA is Closed</remark>
- <para>
- Priority for the loading of skin css files can now be specified in gatein-resources.xml using the css-priority xml element. This allows the css elements to be loaded in a specific order, which can be useful for overriding existing css elements.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1045 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1045">JBEPP-1045</ulink>
- </term>
- <listitem>
- <remark>Assignee is: claprun</remark>
- <remark>JIRA is Closed</remark>
- <para>
- WSRP was previously unavailable for portal extensions. The new WSRP component now properly initializes itself even when started from an extension (as opposed to the default portal container).
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1077 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1077">JBEPP-1077</ulink>
- </term>
- <listitem>
- <remark>This issue is unassigned!</remark>
- <remark>JIRA is Closed</remark>
- <para>
- The datasource for JCR is now using managed transactions, and required a change in the datasource descriptor.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1078 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1078">JBEPP-1078</ulink>
- </term>
- <listitem>
- <remark>Assignee is: hfnukal</remark>
- <remark>JIRA is Closed</remark>
- <para>
- EPP is now partially available in Czech language.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1088 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1088">JBEPP-1088</ulink>
- </term>
- <listitem>
- <remark>Assignee is: theute</remark>
- <remark>JIRA is Closed</remark>
- <para>
- When adding a page to a site, pages are displayed in a drop-down list instead of a free form text field. This makes adding pages more intuitive.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1098 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1098">JBEPP-1098</ulink>
- </term>
- <listitem>
- <remark>Assignee is: mwringe</remark>
- <remark>JIRA is Closed</remark>
- <para>
- This release of JBoss Enterprise Portal Platform adds a configurable setting to control whether the 'info bar' which surrounds new portlets is displayed by default.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1099 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1099">JBEPP-1099</ulink>
- </term>
- <listitem>
- <remark>Assignee is: mposolda</remark>
- <remark>JIRA is Closed</remark>
- <para>
- In this release, the Single Sign On (SSO) component has been enhanced to support FORM authentication for instances where the user can not get access to SSO authentication sessions (such as a Kerberos ticket). Users can now authenticate manually with the portal-specific username and password as a fall-back.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1116 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1116">JBEPP-1116</ulink>
- </term>
- <listitem>
- <remark>Assignee is: claprun</remark>
- <remark>JIRA is Closed</remark>
- <para>
- Configuring a page is no longer restricted to local portlets. It is now possible to define remote portlets (WSRP) in page descriptors to populate the base data for the page.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1140 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1140">JBEPP-1140</ulink>
- </term>
- <listitem>
- <remark>Assignee is: hfnukal</remark>
- <remark>JIRA is Closed</remark>
- <para>
- In previous releases, the portal did not indicate it had started clearly in the logs. Changes to core portal code now specifies the portal has started in the logs, and includes the portal version number for reference.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1149 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1149">JBEPP-1149</ulink>
- </term>
- <listitem>
- <remark>Assignee is: theute</remark>
- <remark>JIRA is Closed</remark>
- <para>
- This release contains enhancements to Gadgets, which, like portlets, can now be integrated on a page definition through XML descriptors.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1158 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1158">JBEPP-1158</ulink>
- </term>
- <listitem>
- <remark>Assignee is: theute</remark>
- <remark>JIRA is Closed</remark>
- <para>
- The HTML Document Object Module (DOM) has been optimized to achieve better performance when transmitting markup, and has been simplified for faster rendering on recent web browsers. Older browsers such as Internet Explorer will still work, however performance will be degraded.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1169 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1169">JBEPP-1169</ulink>
- </term>
- <listitem>
- <remark>Assignee is: theute</remark>
- <remark>JIRA is Closed</remark>
- <para>
- The Apache Shindig configuration file has been made more accessible to be modified more easily. It is now part of eXoGadgetServer.war/containers/default/container.js
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1197 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1197">JBEPP-1197</ulink>
- </term>
- <listitem>
- <remark>Assignee is: hfnukal</remark>
- <remark>JIRA is Closed</remark>
- <para>
- An enhancement to the UserDashboardImpl object now allows dashboard instances to be reused. Dashboards now require less resources to operate correctly.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1210 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1210">JBEPP-1210</ulink>
- </term>
- <listitem>
- <remark>Assignee is: mposolda</remark>
- <remark>JIRA is Closed</remark>
- <para>
- Cluster data transportation has been optimized to reduce the number of network connections and threads.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1250 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1250">JBEPP-1250</ulink>
- </term>
- <listitem>
- <remark>Assignee is: theute</remark>
- <remark>JIRA is Closed</remark>
- <para>
- When defining navigation in an XML descriptor, it is now possible to define the strategy to apply during startup. It is possible to "conserve", "insert", "merge" or "rewrite" the content previously imported.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1332 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1332">JBEPP-1332</ulink>
- </term>
- <listitem>
- <remark>Assignee is: theute</remark>
- <remark>JIRA is Closed</remark>
- <para>
- In this release the default JCR workspace name and system JCR workspace name can now be configured in the configuration.properties file.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1349 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1349">JBEPP-1349</ulink>
- </term>
- <listitem>
- <remark>Assignee is: hfnukal</remark>
- <remark>JIRA is Closed</remark>
- <para>
- There was no way to determine the Enterprise Portal Platform version, based on what was displayed when starting the portal. An enhancement to UIFooterPortlet.gtmpl has been implemented, which allows the user to see what portal version is used by mouse-hovering in the site footer.
- </para>
- </listitem>
- </varlistentry>
-</variablelist>
Added: epp/docs/branches/5.2/Release_Notes/en-US/known.xml
===================================================================
--- epp/docs/branches/5.2/Release_Notes/en-US/known.xml (rev 0)
+++ epp/docs/branches/5.2/Release_Notes/en-US/known.xml 2012-03-13 23:08:33 UTC (rev 8587)
@@ -0,0 +1,26 @@
+<?xml version='1.0'?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<chapter id = "known_issues">
+ <title>Known Issues</title>
+
+ <para>
+ The following issues are known to exist in this version of the JBoss Enterprise Portal Platform and will be fixed in a subsequent release.
+ </para>
+ <variablelist>
+
+<varlistentry>
+ <term><ulink url="https://bugzilla.redhat.com/show_bug.cgi?id=741683" /></term>
+ <listitem>
+ <para>
+ An issue was found in the Site Publisher Installation Guide regarding the requirement for Site Publisher to have a separate database to Enterprise Portal Platform. A customer identified an issue with the clarity of this information when they encountered a problem with database provisioning for the platform. The Site Publisher Installation Guide has been merged with the Installation Guide. The Database Configuration section has been extensively reworked to specify Site Publisher must have its own IDM and JCR database configured, and matching database connector JNDI name directives specified in gatein-ds.xml
+ </para>
+ <para>
+ This behavior persists in JBoss Enterprise Portal Platform 5.2.1 and will be resolved in a future release.
+ </para>
+ </listitem>
+</varlistentry>
+
+ </variablelist>
+</chapter>
Deleted: epp/docs/branches/5.2/Release_Notes/en-US/known_issues.xml
===================================================================
--- epp/docs/branches/5.2/Release_Notes/en-US/known_issues.xml 2012-03-13 20:16:20 UTC (rev 8586)
+++ epp/docs/branches/5.2/Release_Notes/en-US/known_issues.xml 2012-03-13 23:08:33 UTC (rev 8587)
@@ -1,116 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE variablelist PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-]>
-
-
-<variablelist>
-
- <!-- https://issues.jboss.org/browse/JBEPP-1376 -->
- <varlistentry>
- <term><ulink url="https://issues.jboss.org/browse/JBEPP-1376">JBEPP-1376</ulink></term>
- <listitem>
-
- <remark>Assignee is: theute</remark>
-
-
- <remark>JIRA is OPEN</remark>
-
-
- <para>
- When serving content from a portlet, resource encoding is being rewritten with the default encoding of the running JVM. To work around the issue, server the resource as a binary, or set the default system encoding to ISO-8859-1.
- </para>
-
- </listitem>
- </varlistentry>
-
- <!-- https://issues.jboss.org/browse/JBEPP-1396 -->
- <varlistentry>
- <term><ulink url="https://issues.jboss.org/browse/JBEPP-1396">JBEPP-1396</ulink></term>
- <listitem>
-
- <remark>This issue is unassigned!</remark>
-
-
- <remark>JIRA is OPEN</remark>
-
-
- <para>
- When a dashboard page is created and its title translated in various languages, switching languages will not update the dashboard page name on the user interface immediately. To work around the issue, log out and log back in to show the correct translation for the page name.
- </para>
-
- </listitem>
- </varlistentry>
-
- <!-- https://issues.jboss.org/browse/JBEPP-1399 -->
- <varlistentry>
- <term><ulink url="https://issues.jboss.org/browse/JBEPP-1399">JBEPP-1399</ulink></term>
- <listitem>
-
- <remark>This issue is unassigned!</remark>
-
-
- <remark>JIRA is OPEN</remark>
-
-
- <para>
- If you create a system subnode under a node in the Navigation Management, you are allowed the delete the parent node without the "Cannot delete a system node" message being shown. When trying to save the result, a message "Unknown error" is shown and the following NPE is thrown. A fix is being investigated for a future release.
- </para>
-
- </listitem>
- </varlistentry>
-
- <!-- https://issues.jboss.org/browse/JBEPP-1401 -->
- <varlistentry>
- <term><ulink url="https://issues.jboss.org/browse/JBEPP-1401">JBEPP-1401</ulink></term>
- <listitem>
-
- <remark>Assignee is: theute</remark>
-
-
- <remark>JIRA is OPEN</remark>
-
-
- <para>
- An issue with the No Result Found pop-up causes it to display after first searching for a non-existent user string, then searching for a string that is known to exist. There is no work around for this issue.
- </para>
-
- </listitem>
- </varlistentry>
-
- <!-- https://issues.jboss.org/browse/JBEPP-1402 -->
- <varlistentry>
- <term><ulink url="https://issues.jboss.org/browse/JBEPP-1402">JBEPP-1402</ulink></term>
- <listitem>
-
- <remark>Assignee is: theute</remark>
-
-
- <remark>JIRA is OPEN</remark>
-
-
- <para>
- An issue with node copy or clone behavior allows users to copy or clone a system node but not delete the node. This is caused by the node already being a system node, and therefore it can not be deleted based on it's context. There is no work around for this issue.
- </para>
-
- </listitem>
- </varlistentry>
-
- <!-- https://issues.jboss.org/browse/JBEPP-1411 -->
- <varlistentry>
- <term><ulink url="https://issues.jboss.org/browse/JBEPP-1411">JBEPP-1411</ulink></term>
- <listitem>
-
- <remark>This issue is unassigned!</remark>
-
-
- <remark>JIRA is OPEN</remark>
-
-
- <para>
- System child nodes can be deleted if the parent node is deleted. A system node should not be able to de be deleted, regardless of its position in a navigation tree. This behavior will be fixed in a future release.
- </para>
-
- </listitem>
- </varlistentry>
-
-</variablelist>
Deleted: epp/docs/branches/5.2/Release_Notes/en-US/not_documented.xml
===================================================================
--- epp/docs/branches/5.2/Release_Notes/en-US/not_documented.xml 2012-03-13 20:16:20 UTC (rev 8586)
+++ epp/docs/branches/5.2/Release_Notes/en-US/not_documented.xml 2012-03-13 23:08:33 UTC (rev 8587)
@@ -1,3 +0,0 @@
-<para>
-All Issues are documented.
-</para>
Added: epp/docs/branches/5.2/Release_Notes/en-US/resolved.xml
===================================================================
--- epp/docs/branches/5.2/Release_Notes/en-US/resolved.xml (rev 0)
+++ epp/docs/branches/5.2/Release_Notes/en-US/resolved.xml 2012-03-13 23:08:33 UTC (rev 8587)
@@ -0,0 +1,13 @@
+<?xml version='1.0'?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<chapter id = "resolved">
+ <title>Resolved Issues</title>
+ <para>
+ The following issues have been resolved in JBoss Enterprise Portal Platform 5.2.1.
+ </para>
+ <variablelist>
+
+ </variablelist>
+</chapter>
Deleted: epp/docs/branches/5.2/Release_Notes/en-US/resolved_issues.xml
===================================================================
--- epp/docs/branches/5.2/Release_Notes/en-US/resolved_issues.xml 2012-03-13 20:16:20 UTC (rev 8586)
+++ epp/docs/branches/5.2/Release_Notes/en-US/resolved_issues.xml 2012-03-13 23:08:33 UTC (rev 8587)
@@ -1,457 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE variablelist PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-]>
-<variablelist>
-<!-- https://issues.jboss.org/browse/JBEPP-348 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-348">JBEPP-348</ulink>
- </term>
- <listitem>
- <remark>Assignee is: hfnukal</remark>
- <remark>JIRA is Closed</remark>
- <para>
- A Cross-site Scripting (XSS) vulnerability was discovered in the portlet description, which allowed Javascript to be specified in the portlet description through the application registry. The vulnerability has been fixed in this release. <ulink url="https://www.redhat.com/security/data/cve/CVE-2011-4580.html">(CVE-2011-4580)</ulink>
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-353 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-353">JBEPP-353</ulink>
- </term>
- <listitem>
- <remark>Assignee is: hfnukal</remark>
- <remark>JIRA is Closed</remark>
- <para>
- A Cross-site Scripting (XSS) vulnerability was discovered when adding a portlet to a category. The vulnerability has been fixed in this release. <ulink url="https://www.redhat.com/security/data/cve/CVE-2011-4580.html">(CVE-2011-4580)</ulink>
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-631 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-631">JBEPP-631</ulink>
- </term>
- <listitem>
- <remark>Assignee is: hfnukal</remark>
- <remark>JIRA is Closed</remark>
- <para>
- Remote Gadgets were not persisting data in category gadgets with more than five categories when the user switched between pages. User data entered in one screen was being lost when the user switched between pages. The fix implements changes to UIForm.js and UIFormCheckBoxInput.java which handles selected values reliably when the user switches between screens.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-699 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-699">JBEPP-699</ulink>
- </term>
- <listitem>
- <remark>This issue is unassigned!</remark>
- <remark>JIRA is Closed</remark>
- <para>
- A bug in UIUserLanguageSelector caused a problem with dynamically updating the locale when a user selected a different language. The language state had to be saved using the Apply button. The fix introduces changes to locale handling in the affected module which fixes the issue.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-715 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-715">JBEPP-715</ulink>
- </term>
- <listitem>
- <remark>This issue is unassigned!</remark>
- <remark>JIRA is Closed</remark>
- <para>
- The page URL conventions in previous versions of JBoss Enterprise Portal Platform did not allow for Portal pages to have the same name. In these instances, pages with identical names were allocated the same URL, with only one page available through it. A change to the way JBoss Enterprise Portal Platform constructs page URLs resolves this issue.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-763 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-763">JBEPP-763</ulink>
- </term>
- <listitem>
- <remark>Assignee is: hfnukal</remark>
- <remark>JIRA is Closed</remark>
- <para>
- The platform ships with a resource compressor (CSS and Javascript). Some javascript files were incorrectly compressed and would break unless the developer mode was enabled. Enabling the developer mode introduced performance side-effects. The Javascript compression engine has been replaced, and can be turned off if required, which fixes the issue.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-900 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-900">JBEPP-900</ulink>
- </term>
- <listitem>
- <remark>Assignee is: hfnukal</remark>
- <remark>JIRA is Closed</remark>
- <para>
- A bug in the Logo Portlet caused the processAction methods to be called once when the first, valid, processAction method was called to submit the value, and again when the page was rendered. This caused null values to be passed on the second submit. A fix to UILogoPortlet.gtmpl removes the second processAction call issue, which fixes the issue.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-901 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-901">JBEPP-901</ulink>
- </term>
- <listitem>
- <remark>Assignee is: bdaw</remark>
- <remark>JIRA is Closed</remark>
- <para>
- When a "root" user (advanced administrative rights) logs onto the portal, part of the logon process calls a query that fetches all the groups from the database. This query was not optimized to handle databases containing very large numbers of groups. When testing with a large group database, the login process took an unacceptable amount of time. The fix implements performance improvements to the query, and provides enhanced caching for large group records.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-903 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-903">JBEPP-903</ulink>
- </term>
- <listitem>
- <remark>Assignee is: bdaw</remark>
- <remark>JIRA is Closed</remark>
- <para>
- An issue was identified when the OrganizationManagementPortlet displayed many users from the IDM DB. This caused performance issues, specifically impacting load times for the portlet. The fix implements performance optimizations for specific database queries related to the process. Load time performance is improved for the portlet.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-908 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-908">JBEPP-908</ulink>
- </term>
- <listitem>
- <remark>Assignee is: bdaw</remark>
- <remark>JIRA is Closed</remark>
- <para>
- A performance issue in a database query that checked for duplicate emails at user registration caused unacceptable wait times. The larger the user count was in the database, the more pronounced the issue. The fix implements performance optimization in the database query. User registration wait time is improved for portal instances with very large user databases.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-927 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-927">JBEPP-927</ulink>
- </term>
- <listitem>
- <remark>Assignee is: theute</remark>
- <remark>JIRA is Closed</remark>
- <para>
- It is not possible to save notes in the TODO gadget when the gadget is placed anywhere except a dashboard. This behavior is expected. A workaround to this issue has been implemented in this version, which allows notes to be entered into this gadget only. Other gadgets still have this issue.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-950 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-950">JBEPP-950</ulink>
- </term>
- <listitem>
- <remark>Assignee is: mposolda</remark>
- <remark>JIRA is Closed</remark>
- <para>
- An inefficiency in MOPSessionManager cache was causing unacceptable wait times when an user accessed the portal for the first time, when the portal was idle for an extended period, or when accessing pages that had not been previously cached. The fix implements performance improvements for cases where a portal instance has many pages and navigation nodes, improving overall response time.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-951 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-951">JBEPP-951</ulink>
- </term>
- <listitem>
- <remark>Assignee is: mposolda</remark>
- <remark>JIRA is Closed</remark>
- <para>
- Performance issues were discovered in the portal when editing a navigation, or portal page that contained many sub-pages. In some cases, the save action was taking longer than one minute to complete. The fix implements changes to the queries used to retrieve navigation, or portal pages after saving, which improves load times significantly.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-983 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-983">JBEPP-983</ulink>
- </term>
- <listitem>
- <remark>Assignee is: claprun</remark>
- <remark>JIRA is Closed</remark>
- <para>
- An inconsistency in how portlets are handled across different part of the administration interface resulted in an error when remote portlets were added to a category from the "Portlet" tab of the Application Registry. The inconsistency has now be resolved and it should be now possible to properly display remote portlets regardless of how they were added to categories.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-985 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-985">JBEPP-985</ulink>
- </term>
- <listitem>
- <remark>Assignee is: hfnukal</remark>
- <remark>JIRA is Closed</remark>
- <para>
- DateTimeValidator.java had an unnecessary check where the date input value needed to match the (not localized) DATETIME_REGEX. This superfluous requirement caused localized date input to fail. The fix removes the DATETIME_REGEX, which fixes the issue.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1032 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1032">JBEPP-1032</ulink>
- </term>
- <listitem>
- <remark>Assignee is: bdaw</remark>
- <remark>JIRA is Closed</remark>
- <para>
- A bug was discovered where a transaction commit related to IDM database operations was not placed within a final() block. Any misconfiguration, or operation failure, could cause the database connection to remain open. The fix ensures the transaction commit related to IDM database operations is placed within a final() block, which fixes the issue.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1048 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1048">JBEPP-1048</ulink>
- </term>
- <listitem>
- <remark>Assignee is: hfnukal</remark>
- <remark>JIRA is Closed</remark>
- <para>
- A Cross-Site Scripting (XSS) vulnerability was discovered in the Edit Page > Container Title field. The vulnerability is fixed in this release. <ulink url="https://www.redhat.com/security/data/cve/CVE-2011-4580.html">(CVE-2011-4580)</ulink>
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1049 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1049">JBEPP-1049</ulink>
- </term>
- <listitem>
- <remark>Assignee is: theute</remark>
- <remark>JIRA is Closed</remark>
- <para>
- A Cross-site Scripting (XSS) vulnerability was discovered in the New Node label. The vulnerability has been removed in this release. <ulink url="https://www.redhat.com/security/data/cve/CVE-2011-4580.html">(CVE-2011-4580)</ulink>
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1050 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1050">JBEPP-1050</ulink>
- </term>
- <listitem>
- <remark>Assignee is: theute</remark>
- <remark>JIRA is Closed</remark>
- <para>
- A Cross-site Scripting (XSS) vulnerability was discovered in the RSS reader gadget. The vulnerability has been fixed in this release. <ulink url="https://www.redhat.com/security/data/cve/CVE-2011-4580.html">(CVE-2011-4580)</ulink>
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1067 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1067">JBEPP-1067</ulink>
- </term>
- <listitem>
- <remark>Assignee is: bdaw</remark>
- <remark>JIRA is Closed</remark>
- <para>
- Only users from the LDAP database were shown in organization management if LDAP did not support sorting. The fix changes the logging level to INFO in PicketLink IDM.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1082 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1082">JBEPP-1082</ulink>
- </term>
- <listitem>
- <remark>Assignee is: hfnukal</remark>
- <remark>JIRA is Closed</remark>
- <para>
- If gadget restrict access to specific group, it was accessible for not members in Dashboard and page editing.
-Now users cannot add restricted gadget.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1148 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1148">JBEPP-1148</ulink>
- </term>
- <listitem>
- <remark>Assignee is: theute</remark>
- <remark>JIRA is Closed</remark>
- <para>
- Activating JRMP configuration in JBoss EPP 5.1.x (or EPP based products) produced a large quantity of JMX/RMI logs in stdout/stderr. The JRMP agent had logging set to FINE, which resulted in verbose log information. The fix removes the embedded logger configuration, which results in the JBoss Enterprise Application Platform server log configuration being used for logging.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1150 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1150">JBEPP-1150</ulink>
- </term>
- <listitem>
- <remark>Assignee is: mputz</remark>
- <remark>JIRA is Closed</remark>
- <para>
- An invisible navigation node was displayed in the Sitemap portlet when the parent node was expanded (not with Expand All button). The workaround described in the linked JIRA has been implemented in this release, which corrects the originally reported issue.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1167 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1167">JBEPP-1167</ulink>
- </term>
- <listitem>
- <remark>Assignee is: theute</remark>
- <remark>JIRA is Closed</remark>
- <para>
- A problem with regard to the location of token keys prevented Gadgets from working in load-balanced clustered portal environments. Token keys have been moved to a location accessible by all load-balanced clustered portal instances. Gadgets can now be used as intended.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1196 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1196">JBEPP-1196</ulink>
- </term>
- <listitem>
- <remark>Assignee is: hfnukal</remark>
- <remark>JIRA is Closed</remark>
- <para>
- A problem with UploadService was causing the MIME type of .rtf files extracted from DiskFileItem in Apache as "text/rtf". The value should have been extracted as "application/rtf", which caused problems for applications dependent on correct MIME type information. The fix corrects the MIME type encoding, and ensures .rtf files are set with the MIME type "application/rtf".
-
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1221 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1221">JBEPP-1221</ulink>
- </term>
- <listitem>
- <remark>Assignee is: mwringe</remark>
- <remark>JIRA is Closed</remark>
- <para>
- A problem with the GroupManagement.java isAdministrator method caused a NullPointerException when the Organization Portlet is placed on a page and an anonymous user tries to access it. The fix changes the behavior of isAdministrator for anonymous users, which fixes the issue.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1241 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1241">JBEPP-1241</ulink>
- </term>
- <listitem>
- <remark>Assignee is: theute</remark>
- <remark>JIRA is Closed</remark>
- <para>
- A Cross-site Scripting (XSS) vulnerability was discovered in the UIFormDateTimeInput component. The vulnerability has been fixed in this release. <ulink url="https://www.redhat.com/security/data/cve/CVE-2011-4580.html">(CVE-2011-4580)</ulink>
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1243 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1243">JBEPP-1243</ulink>
- </term>
- <listitem>
- <remark>Assignee is: theute</remark>
- <remark>JIRA is Closed</remark>
- <para>
- Group descriptions text entered by users was not properly protected from XSS attacks. It was possible to execute arbitrary Javascript if a user had permissions to enter a group description. The group description field has been protected to not execute any Javascript, which resolves the issue. <ulink url="https://www.redhat.com/security/data/cve/CVE-2011-4580.html">(CVE-2011-4580)</ulink>
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1293 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1293">JBEPP-1293</ulink>
- </term>
- <listitem>
- <remark>Assignee is: kenfinni</remark>
- <remark>JIRA is Closed</remark>
- <para>
- org.jboss.portletbridge.seam.SeamPhaseListenerWrapper.afterPhase() did not correctly handle exceptions. Exceptions that typically occurred during during afterPhase() were truncated (for example StaleObjectStateException in Hibernate commit). The Seam exception handler was not notified of the truncated exceptions therefore the application moves to a next page instead of an error page. The fix ensures org.jboss.portletbridge.seam.SeamPhaseListenerWrapper.afterPhase() catches exceptions and passes them to Seam exception handler (for example, org.jboss.seam.jsf.SeamPhaseListener). Because exceptions are handled correctly, the Seam exception handler displays and error page given the appropriate conditions.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1310 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1310">JBEPP-1310</ulink>
- </term>
- <listitem>
- <remark>Assignee is: hfnukal</remark>
- <remark>JIRA is Closed</remark>
- <para>
- If the Opera browser is used to access the portal home page, a Javascript Uncaught exception is raised: "TypeError: 'Browser.setOpacity' is not a function". The fix incorporates a verified customer-submitted patch to Browser.js, which allows Opera browsers to access the portal home page.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1319 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1319">JBEPP-1319</ulink>
- </term>
- <listitem>
- <remark>Assignee is: claprun</remark>
- <remark>JIRA is Closed</remark>
- <para>
- If the WSRP consumer was refreshed and activated, WSRP selfv2 prevented the server from starting when it was rebooted. The only way to work around this issue was to perform a force quit. The fix adds a &lt;value-param&gt; configuration option to the main WSRP configuration. consumersInitDelay provides a way to specify a delayed start (configurable, in seconds) of the ConsumerRegistry, which prevents a deadlock situation while the self consumers wait for the producer WSDL to be published.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1324 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1324">JBEPP-1324</ulink>
- </term>
- <listitem>
- <remark>Assignee is: hfnukal</remark>
- <remark>JIRA is Closed</remark>
- <para>
- It was found that the invoker servlets, deployed by default via
-httpha-invoker, only performed access control on the HTTP GET and POST
-methods, allowing remote attackers to make unauthenticated requests by
-using different HTTP methods. Due to the second layer of authentication
-provided by a security interceptor, this issue is not exploitable on
-default installations unless an administrator has misconfigured the
-security interceptor or disabled it. (CVE-2011-4085)
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1331 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1331">JBEPP-1331</ulink>
- </term>
- <listitem>
- <remark>Assignee is: theute</remark>
- <remark>JIRA is Closed</remark>
- <para>
- When a portal host name contained the word "portal" in the name, gadgets were not displayed and a TemplateRuntimeException would occur. The fix adds functionality to several portal components which allows for the word "portal" in the host name.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1336 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1336">JBEPP-1336</ulink>
- </term>
- <listitem>
- <remark>Assignee is: theute</remark>
- <remark>JIRA is Closed</remark>
- <para>
- It was found that the GateIn Portal contained verb-specific security constraints. As a result, authentication and authorization were only correctly applied to requests made using the GET and POST HTTP verbs. The GateIn Portal application does not allow a user to trigger any action using HTTP verbs other than POST and GET, so this issue did not expose an exploitable security flaw. As a defence-in-depth measure, the verb-specific security constraints have been removed. Authentication and authorization now correctly apply to requests made using all HTTP verbs.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1351 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1351">JBEPP-1351</ulink>
- </term>
- <listitem>
- <remark>Assignee is: hfnukal</remark>
- <remark>JIRA is Closed</remark>
- <para>
- The org.gatein.sso.agent.login.SSOLoginModule contains the common options "portal" and "realmName" as offered in other LoginModule classes. In the packaged gatein-jboss-beans.xml, this login module did not have these options. This caused problems when a customer wanted to implement SSO on a different portal container (for example in ecmdemo). The fix includes these common options in gatein-jboss-beans.xml, which resolves the issue.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1357 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1357">JBEPP-1357</ulink>
- </term>
- <listitem>
- <remark>Assignee is: claprun</remark>
- <remark>JIRA is Closed</remark>
- <para>
- The Web Services for Remote Portlet (WSRP) configuration files for consumers and producer were previously only looked for in the WSRP extension archive. This resulted in extra configuration complexity for customers who wanted to edit the configuration directives for WSRP consumers and producer. The fix implements changes to the WSRP integration point that will now also look for WSRP configuration files in the conf/gatein directory of the active JBoss AS profile.
- </para>
- </listitem>
- </varlistentry>
-<!-- https://issues.jboss.org/browse/JBEPP-1361 --> <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/browse/JBEPP-1361">JBEPP-1361</ulink>
- </term>
- <listitem>
- <remark>Assignee is: mposolda</remark>
- <remark>JIRA is Closed</remark>
- <para>
- The JBoss Clustered Single Sign On (SSO) Valve must authenticate on all clustered nodes using the same password. The login process in Enterprise Portal Platform differed from normal authentication methods, and customers had to bypass standard authentication by enabling BASIC authentication, or patch login.jsp as described in the Reference Guide. The fix introduces PortalClusteredSSOSupportValve, which removes the patching and workarounds customers had to implement in earlier versions of the product, and increases overall platform security.
- </para>
- </listitem>
- </varlistentry>
-</variablelist>
12 years, 10 months
- 1
- 0
gatein SVN: r8586 - in epp/portal/branches/EPP_5_2_Branch: component and 6 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-03-13 16:16:20 -0400 (Tue, 13 Mar 2012)
New Revision: 8586
Modified:
epp/portal/branches/EPP_5_2_Branch/
epp/portal/branches/EPP_5_2_Branch/component/
epp/portal/branches/EPP_5_2_Branch/component/portal/
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/build.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/src/brewscripts/mead-load-build-dependencies
epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml
epp/portal/branches/EPP_5_2_Branch/pom.xml
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/
Log:
Bug 794471 Upgrade components
Property changes on: epp/portal/branches/EPP_5_2_Branch
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868
/portal/branches/branch-GTNPORTAL-1592:4868,4875,4894
/portal/branches/branch-GTNPORTAL-1643:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745:5765
/portal/branches/branch-GTNPORTAL-1790:5871
/portal/branches/branch-GTNPORTAL-1822:5943,5952
/portal/branches/branch-GTNPORTAL-1832:6030,6063
/portal/branches/branch-GTNPORTAL-1872:6400,6551
/portal/branches/branch-GTNPORTAL-1921:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963:6904,6915-6916
/portal/branches/decoupled-webos:6214-6243
/portal/branches/gatein-management:6920-6958
/portal/branches/global-portlet-metadata:6298-6384
/portal/branches/site-describability:6171-6235
/portal/branches/xss:7377-7595,7597
/portal/branches/xss-issues:7350-7351,7358
/portal/trunk:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450,7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7741,7748,7773,7780,7857,7877,7900,7928,7938,8045,8053,8072
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868
/portal/branches/branch-GTNPORTAL-1592:4868,4875,4894
/portal/branches/branch-GTNPORTAL-1643:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745:5765
/portal/branches/branch-GTNPORTAL-1790:5871
/portal/branches/branch-GTNPORTAL-1822:5943,5952
/portal/branches/branch-GTNPORTAL-1832:6030,6063
/portal/branches/branch-GTNPORTAL-1872:6400,6551
/portal/branches/branch-GTNPORTAL-1921:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963:6904,6915-6916
/portal/branches/decoupled-webos:6214-6243
/portal/branches/gatein-management:6920-6958
/portal/branches/global-portlet-metadata:6298-6384
/portal/branches/site-describability:6171-6235
/portal/branches/xss:7377-7595,7597
/portal/branches/xss-issues:7350-7351,7358
/portal/trunk:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7409,7412,7433,7450,7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7741,7748,7773,7780,7857,7877,7900,7928,7938,8045,8053,8072
Property changes on: epp/portal/branches/EPP_5_2_Branch/component
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868
/portal/branches/branch-GTNPORTAL-1592/component:4868,4875,4894
/portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/component:5765
/portal/branches/branch-GTNPORTAL-1790/component:5871
/portal/branches/branch-GTNPORTAL-1822/component:5943,5952
/portal/branches/branch-GTNPORTAL-1832/component:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component:6400,6551
/portal/branches/branch-GTNPORTAL-1921/component:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916
/portal/trunk/component:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7737,7741,7748,7773,7780,7857,7877,7900,7906,7928,7938,8045,8053,8072
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868
/portal/branches/branch-GTNPORTAL-1592/component:4868,4875,4894
/portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/component:5765
/portal/branches/branch-GTNPORTAL-1790/component:5871
/portal/branches/branch-GTNPORTAL-1822/component:5943,5952
/portal/branches/branch-GTNPORTAL-1832/component:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component:6400,6551
/portal/branches/branch-GTNPORTAL-1921/component:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916
/portal/trunk/component:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7409,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7737,7741,7748,7773,7780,7857,7877,7900,7906,7928,7938,8045,8053,8072
Property changes on: epp/portal/branches/EPP_5_2_Branch/component/portal
___________________________________________________________________
Modified: svn:mergeinfo
- /portal/branches/branch-GTNPORTAL-1592/component/portal:4868,4875
/portal/trunk:7451
/portal/trunk/component/portal:7085,7412,7451,7500,7570-7571,7573,7577,7614-7615,7695-7696,7701-7704,7748,7773,7780,7857,7877,7900,7928,7938,8045,8053,8072
+ /portal/branches/branch-GTNPORTAL-1592/component/portal:4868,4875
/portal/trunk:7451
/portal/trunk/component/portal:7085,7409,7412,7451,7500,7570-7571,7573,7577,7614-7615,7695-7696,7701-7704,7748,7773,7780,7857,7877,7900,7928,7938,8045,8053,8072
Property changes on: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868
/portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4868,4875,4894
/portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765
/portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871
/portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952
/portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551
/portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916
/portal/trunk/component/portal/src/main/java/org:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7737,7741,7748,7773,7780,7857,7877,7900,7906,7928,7938,8045,8053,8072
/portal/trunk/src/main/java/org:7451
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868
/portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4868,4875,4894
/portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765
/portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871
/portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952
/portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551
/portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916
/portal/trunk/component/portal/src/main/java/org:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7409,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7737,7741,7748,7773,7780,7857,7877,7900,7906,7928,7938,8045,8053,8072
/portal/trunk/src/main/java/org:7451
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/build.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/build.xml 2012-03-13 19:34:53 UTC (rev 8585)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/build.xml 2012-03-13 20:16:20 UTC (rev 8586)
@@ -383,6 +383,7 @@
<echo>Resolve dependencies output to ${ant.build.dir}/mvn.resolve.log</echo>
<exec executable="${cmd.mvn}" dir="${scm.dir}" output="${ant.build.dir}/mvn.resolve.log" failonerror="true" failifexecutionfails="">
<arg value="dependency:resolve"/>
+ <arg value="-s../../../../../settings-all.xml"/>
</exec>
<echo>Dependency list output to ${ant.build.dir}/mvn.dependency.list</echo>
@@ -440,7 +441,7 @@
<!--Execute import -->
<echo>Import output to ${ant.build.dir}/import-all.log</echo>
- <exec executable="bash" dir="../src/brewscripts/" output="${ant.build.dir}/import-all.log" failonerror="true" failifexecutionfails="">
+ <exec executable="python" dir="../src/brewscripts/" output="${ant.build.dir}/import-all.log" failonerror="true" failifexecutionfails="">
<arg value="mead-load-build-dependencies"/>
<arg line="--exclude org.gatein --exclude org.exoplatform --exclude org.picketlink ${ant.build.dir}/my-project-build.txt"/>
</exec>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/src/brewscripts/mead-load-build-dependencies
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/src/brewscripts/mead-load-build-dependencies 2012-03-13 19:34:53 UTC (rev 8585)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/src/brewscripts/mead-load-build-dependencies 2012-03-13 20:16:20 UTC (rev 8586)
@@ -266,7 +266,7 @@
print '\nUnknown file type: %s' % link
# do_import = False
if do_import is True:
- run('/mnt/redhat/devel/mikeb/mead/scripts/import-maven --tag mead-import-maven-all %s/*' % tmpdir)
+ run('./import-maven --tag mead-import-maven-all %s/*' % tmpdir)
elif do_import is None:
pass
else:
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2012-03-13 19:34:53 UTC (rev 8585)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2012-03-13 20:16:20 UTC (rev 8586)
@@ -19,8 +19,8 @@
<epp.dir>jboss-epp-5.2</epp.dir>
<maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
- <sso.version>1.1.1-CR01</sso.version>
- <portletbridge.version>2.2.0.GA.EPP520</portletbridge.version>
+ <sso.version>1.1.1-GA</sso.version>
+ <portletbridge.version>2.3.0.GA.EPP521</portletbridge.version>
<org.jboss.eppsp.version>${project.version}</org.jboss.eppsp.version>
<!-- portlet bridge directory - not used, distribution module name is used as directory name -->
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2012-03-13 19:34:53 UTC (rev 8585)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2012-03-13 20:16:20 UTC (rev 8586)
@@ -52,16 +52,16 @@
<org.gatein.dep.version>1.1.0-GA</org.gatein.dep.version>
<org.gatein.wci.version>2.1.1-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.3.1-GA</org.gatein.pc.version>
- <org.picketlink.idm>1.3.1.CR01</org.picketlink.idm>
- <org.gatein.wsrp.version>2.1.1-CR02</org.gatein.wsrp.version>
- <org.gatein.mop.version>1.1.0-GA</org.gatein.mop.version>
+ <org.picketlink.idm>1.3.1.GA</org.picketlink.idm>
+ <org.gatein.wsrp.version>2.1.1-EPP521-GA</org.gatein.wsrp.version>
+ <org.gatein.mop.version>1.1.2-GA</org.gatein.mop.version>
<org.gatein.mgmt.version>1.0.1-GA</org.gatein.mgmt.version>
<org.slf4j.version>1.5.8</org.slf4j.version>
<commons-pool.version>1.5.5</commons-pool.version>
<rhino.version>1.6R5</rhino.version>
<org.codehaus.groovy.version>1.7.6</org.codehaus.groovy.version>
<javax.servlet.version>2.5</javax.servlet.version>
- <version.chromattic>1.1.1</version.chromattic>
+ <version.chromattic>1.1.2</version.chromattic>
<org.staxnav.version>0.9.6</org.staxnav.version>
<jcip.version>1.0</jcip.version>
<commons-dbcp.version>1.2.2</commons-dbcp.version>
Property changes on: epp/portal/branches/EPP_5_2_Branch/wsrp-integration
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/wsrp-integration:5868
/portal/branches/branch-GTNPORTAL-1592/wsrp-integration:4868,4875,4894
/portal/branches/branch-GTNPORTAL-1643/wsrp-integration:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/wsrp-integration:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/wsrp-integration:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/wsrp-integration:5765
/portal/branches/branch-GTNPORTAL-1790/wsrp-integration:5871
/portal/branches/branch-GTNPORTAL-1822/wsrp-integration:5943,5952
/portal/branches/branch-GTNPORTAL-1832/wsrp-integration:6030,6063
/portal/branches/branch-GTNPORTAL-1872/wsrp-integration:6400,6551
/portal/branches/branch-GTNPORTAL-1921/wsrp-integration:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/wsrp-integration:6904,6915-6916
/portal/branches/decoupled-webos/wsrp-integration:6214-6243
/portal/branches/gatein-management/wsrp-integration:6920-6958
/portal/branches/global-portlet-metadata/wsrp-integration:6298-6384
/portal/branches/site-describability/wsrp-integration:6171-6235
/portal/trunk/wsrp-integration:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7737,7741,7748,7773,7780,7857,7877,7900,7906,7928,7938,8045,8053,8072
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/wsrp-integration:5868
/portal/branches/branch-GTNPORTAL-1592/wsrp-integration:4868,4875,4894
/portal/branches/branch-GTNPORTAL-1643/wsrp-integration:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/wsrp-integration:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/wsrp-integration:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/wsrp-integration:5765
/portal/branches/branch-GTNPORTAL-1790/wsrp-integration:5871
/portal/branches/branch-GTNPORTAL-1822/wsrp-integration:5943,5952
/portal/branches/branch-GTNPORTAL-1832/wsrp-integration:6030,6063
/portal/branches/branch-GTNPORTAL-1872/wsrp-integration:6400,6551
/portal/branches/branch-GTNPORTAL-1921/wsrp-integration:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/wsrp-integration:6904,6915-6916
/portal/branches/decoupled-webos/wsrp-integration:6214-6243
/portal/branches/gatein-management/wsrp-integration:6920-6958
/portal/branches/global-portlet-metadata/wsrp-integration:6298-6384
/portal/branches/site-describability/wsrp-integration:6171-6235
/portal/trunk/wsrp-integration:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7409,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7737,7741,7748,7773,7780,7857,7877,7900,7906,7928,7938,8045,8053,8072
12 years, 10 months
- 1
- 0
gatein SVN: r8585 - in components/wsrp/tags: 2.1.1-EPP521-GA and 15 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-03-13 15:34:53 -0400 (Tue, 13 Mar 2012)
New Revision: 8585
Added:
components/wsrp/tags/2.1.1-EPP521-GA/
Modified:
components/wsrp/tags/2.1.1-EPP521-GA/admin-gui/pom.xml
components/wsrp/tags/2.1.1-EPP521-GA/api/pom.xml
components/wsrp/tags/2.1.1-EPP521-GA/common/pom.xml
components/wsrp/tags/2.1.1-EPP521-GA/consumer/pom.xml
components/wsrp/tags/2.1.1-EPP521-GA/hibernate-impl/pom.xml
components/wsrp/tags/2.1.1-EPP521-GA/jcr-impl/pom.xml
components/wsrp/tags/2.1.1-EPP521-GA/pom.xml
components/wsrp/tags/2.1.1-EPP521-GA/producer/pom.xml
components/wsrp/tags/2.1.1-EPP521-GA/test/pom.xml
components/wsrp/tags/2.1.1-EPP521-GA/ws-security/jboss5/pom.xml
components/wsrp/tags/2.1.1-EPP521-GA/ws-security/pom.xml
components/wsrp/tags/2.1.1-EPP521-GA/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml
components/wsrp/tags/2.1.1-EPP521-GA/ws-security/wss/pom.xml
components/wsrp/tags/2.1.1-EPP521-GA/wsrp-producer-war/pom.xml
components/wsrp/tags/2.1.1-EPP521-GA/wsrp1-ws/pom.xml
components/wsrp/tags/2.1.1-EPP521-GA/wsrp2-ws/pom.xml
Log:
Productized WSRP release
Property changes on: components/wsrp/tags/2.1.1-EPP521-GA
___________________________________________________________________
Added: svn:ignore
+ target
.project
.classpath
.settings
.idea
*.iml
Added: svn:mergeinfo
+ /components/wsrp/branches/clustering:7284-7390
Modified: components/wsrp/tags/2.1.1-EPP521-GA/admin-gui/pom.xml
===================================================================
--- components/wsrp/tags/2.1.1-GA/admin-gui/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
+++ components/wsrp/tags/2.1.1-EPP521-GA/admin-gui/pom.xml 2012-03-13 19:34:53 UTC (rev 8585)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.1-EPP521-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/tags/2.1.1-EPP521-GA/api/pom.xml
===================================================================
--- components/wsrp/tags/2.1.1-GA/api/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
+++ components/wsrp/tags/2.1.1-EPP521-GA/api/pom.xml 2012-03-13 19:34:53 UTC (rev 8585)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.1-EPP521-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/tags/2.1.1-EPP521-GA/common/pom.xml
===================================================================
--- components/wsrp/tags/2.1.1-GA/common/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
+++ components/wsrp/tags/2.1.1-EPP521-GA/common/pom.xml 2012-03-13 19:34:53 UTC (rev 8585)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.1-EPP521-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/tags/2.1.1-EPP521-GA/consumer/pom.xml
===================================================================
--- components/wsrp/tags/2.1.1-GA/consumer/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
+++ components/wsrp/tags/2.1.1-EPP521-GA/consumer/pom.xml 2012-03-13 19:34:53 UTC (rev 8585)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.1-EPP521-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/tags/2.1.1-EPP521-GA/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/tags/2.1.1-GA/hibernate-impl/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
+++ components/wsrp/tags/2.1.1-EPP521-GA/hibernate-impl/pom.xml 2012-03-13 19:34:53 UTC (rev 8585)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.1-EPP521-GA</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/tags/2.1.1-EPP521-GA/jcr-impl/pom.xml
===================================================================
--- components/wsrp/tags/2.1.1-GA/jcr-impl/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
+++ components/wsrp/tags/2.1.1-EPP521-GA/jcr-impl/pom.xml 2012-03-13 19:34:53 UTC (rev 8585)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.1-GA</version>
+ <version>2.1.1-EPP521-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/tags/2.1.1-EPP521-GA/pom.xml
===================================================================
--- components/wsrp/tags/2.1.1-GA/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
+++ components/wsrp/tags/2.1.1-EPP521-GA/pom.xml 2012-03-13 19:34:53 UTC (rev 8585)
@@ -36,7 +36,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.1-EPP521-GA</version>
<packaging>pom</packaging>
@@ -47,9 +47,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.1.1-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.1.1-GA</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.1.1-GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.1.1-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.1.1-EPP...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.1.1-EPP521-GA</url>
</scm>
<properties>
@@ -63,6 +63,7 @@
<org.chromattic.version>1.1.3</org.chromattic.version>
<org.jboss.arquillian.version>1.0.0.Alpha2</org.jboss.arquillian.version>
<org.mockito.version>1.8.5</org.mockito.version>
+ <org.jboss.portletbridge.version>2.3.0.GA.EPP521</org.jboss.portletbridge.version>
</properties>
<organization>
Modified: components/wsrp/tags/2.1.1-EPP521-GA/producer/pom.xml
===================================================================
--- components/wsrp/tags/2.1.1-GA/producer/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
+++ components/wsrp/tags/2.1.1-EPP521-GA/producer/pom.xml 2012-03-13 19:34:53 UTC (rev 8585)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.1-EPP521-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/tags/2.1.1-EPP521-GA/test/pom.xml
===================================================================
--- components/wsrp/tags/2.1.1-GA/test/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
+++ components/wsrp/tags/2.1.1-EPP521-GA/test/pom.xml 2012-03-13 19:34:53 UTC (rev 8585)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.1-EPP521-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/tags/2.1.1-EPP521-GA/ws-security/jboss5/pom.xml
===================================================================
--- components/wsrp/tags/2.1.1-GA/ws-security/jboss5/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
+++ components/wsrp/tags/2.1.1-EPP521-GA/ws-security/jboss5/pom.xml 2012-03-13 19:34:53 UTC (rev 8585)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.1-EPP521-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wss-jboss5</artifactId>
Modified: components/wsrp/tags/2.1.1-EPP521-GA/ws-security/pom.xml
===================================================================
--- components/wsrp/tags/2.1.1-GA/ws-security/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
+++ components/wsrp/tags/2.1.1-EPP521-GA/ws-security/pom.xml 2012-03-13 19:34:53 UTC (rev 8585)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.1-EPP521-GA</version>
</parent>
<artifactId>wsrp-wss-parent</artifactId>
Modified: components/wsrp/tags/2.1.1-EPP521-GA/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml
===================================================================
--- components/wsrp/tags/2.1.1-GA/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
+++ components/wsrp/tags/2.1.1-EPP521-GA/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2012-03-13 19:34:53 UTC (rev 8585)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.1-EPP521-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-jb5wss</artifactId>
Modified: components/wsrp/tags/2.1.1-EPP521-GA/ws-security/wss/pom.xml
===================================================================
--- components/wsrp/tags/2.1.1-GA/ws-security/wss/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
+++ components/wsrp/tags/2.1.1-EPP521-GA/ws-security/wss/pom.xml 2012-03-13 19:34:53 UTC (rev 8585)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.1-EPP521-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wss</artifactId>
Modified: components/wsrp/tags/2.1.1-EPP521-GA/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/tags/2.1.1-GA/wsrp-producer-war/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
+++ components/wsrp/tags/2.1.1-EPP521-GA/wsrp-producer-war/pom.xml 2012-03-13 19:34:53 UTC (rev 8585)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.1-EPP521-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/tags/2.1.1-EPP521-GA/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/tags/2.1.1-GA/wsrp1-ws/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
+++ components/wsrp/tags/2.1.1-EPP521-GA/wsrp1-ws/pom.xml 2012-03-13 19:34:53 UTC (rev 8585)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.1-EPP521-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/tags/2.1.1-EPP521-GA/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/tags/2.1.1-GA/wsrp2-ws/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
+++ components/wsrp/tags/2.1.1-EPP521-GA/wsrp2-ws/pom.xml 2012-03-13 19:34:53 UTC (rev 8585)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.1-GA</version>
+ <version>2.1.1-EPP521-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
12 years, 10 months
- 1
- 0
gatein SVN: r8584 - in components/wsrp/branches/2.1.x: admin-gui and 14 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2012-03-13 12:26:32 -0400 (Tue, 13 Mar 2012)
New Revision: 8584
Modified:
components/wsrp/branches/2.1.x/admin-gui/pom.xml
components/wsrp/branches/2.1.x/api/pom.xml
components/wsrp/branches/2.1.x/common/pom.xml
components/wsrp/branches/2.1.x/consumer/pom.xml
components/wsrp/branches/2.1.x/hibernate-impl/pom.xml
components/wsrp/branches/2.1.x/jcr-impl/pom.xml
components/wsrp/branches/2.1.x/pom.xml
components/wsrp/branches/2.1.x/producer/pom.xml
components/wsrp/branches/2.1.x/test/pom.xml
components/wsrp/branches/2.1.x/ws-security/jboss5/pom.xml
components/wsrp/branches/2.1.x/ws-security/pom.xml
components/wsrp/branches/2.1.x/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml
components/wsrp/branches/2.1.x/ws-security/wss/pom.xml
components/wsrp/branches/2.1.x/wsrp-producer-war/pom.xml
components/wsrp/branches/2.1.x/wsrp1-ws/pom.xml
components/wsrp/branches/2.1.x/wsrp2-ws/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/wsrp/branches/2.1.x/admin-gui/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/pom.xml 2012-03-13 16:26:12 UTC (rev 8583)
+++ components/wsrp/branches/2.1.x/admin-gui/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/branches/2.1.x/api/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/api/pom.xml 2012-03-13 16:26:12 UTC (rev 8583)
+++ components/wsrp/branches/2.1.x/api/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/branches/2.1.x/common/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/common/pom.xml 2012-03-13 16:26:12 UTC (rev 8583)
+++ components/wsrp/branches/2.1.x/common/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/branches/2.1.x/consumer/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/consumer/pom.xml 2012-03-13 16:26:12 UTC (rev 8583)
+++ components/wsrp/branches/2.1.x/consumer/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/branches/2.1.x/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/hibernate-impl/pom.xml 2012-03-13 16:26:12 UTC (rev 8583)
+++ components/wsrp/branches/2.1.x/hibernate-impl/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.2-GA-SNAPSHOT</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/branches/2.1.x/jcr-impl/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/jcr-impl/pom.xml 2012-03-13 16:26:12 UTC (rev 8583)
+++ components/wsrp/branches/2.1.x/jcr-impl/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.1-GA</version>
+ <version>2.1.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/branches/2.1.x/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/pom.xml 2012-03-13 16:26:12 UTC (rev 8583)
+++ components/wsrp/branches/2.1.x/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
@@ -36,7 +36,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.2-GA-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -47,9 +47,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.1.1-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.1.1-GA</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.1.1-GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/branches/2....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/branches/2.1.x/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/branches/2.1.x/</url>
</scm>
<properties>
Modified: components/wsrp/branches/2.1.x/producer/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/producer/pom.xml 2012-03-13 16:26:12 UTC (rev 8583)
+++ components/wsrp/branches/2.1.x/producer/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/branches/2.1.x/test/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/test/pom.xml 2012-03-13 16:26:12 UTC (rev 8583)
+++ components/wsrp/branches/2.1.x/test/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/branches/2.1.x/ws-security/jboss5/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/ws-security/jboss5/pom.xml 2012-03-13 16:26:12 UTC (rev 8583)
+++ components/wsrp/branches/2.1.x/ws-security/jboss5/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wss-jboss5</artifactId>
Modified: components/wsrp/branches/2.1.x/ws-security/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/ws-security/pom.xml 2012-03-13 16:26:12 UTC (rev 8583)
+++ components/wsrp/branches/2.1.x/ws-security/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.2-GA-SNAPSHOT</version>
</parent>
<artifactId>wsrp-wss-parent</artifactId>
Modified: components/wsrp/branches/2.1.x/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2012-03-13 16:26:12 UTC (rev 8583)
+++ components/wsrp/branches/2.1.x/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-jb5wss</artifactId>
Modified: components/wsrp/branches/2.1.x/ws-security/wss/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/ws-security/wss/pom.xml 2012-03-13 16:26:12 UTC (rev 8583)
+++ components/wsrp/branches/2.1.x/ws-security/wss/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wss</artifactId>
Modified: components/wsrp/branches/2.1.x/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/wsrp-producer-war/pom.xml 2012-03-13 16:26:12 UTC (rev 8583)
+++ components/wsrp/branches/2.1.x/wsrp-producer-war/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/branches/2.1.x/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/wsrp1-ws/pom.xml 2012-03-13 16:26:12 UTC (rev 8583)
+++ components/wsrp/branches/2.1.x/wsrp1-ws/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA</version>
+ <version>2.1.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/branches/2.1.x/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/wsrp2-ws/pom.xml 2012-03-13 16:26:12 UTC (rev 8583)
+++ components/wsrp/branches/2.1.x/wsrp2-ws/pom.xml 2012-03-13 16:26:32 UTC (rev 8584)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.1-GA</version>
+ <version>2.1.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
12 years, 10 months
- 1
- 0
gatein SVN: r8583 - components/wsrp/tags.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2012-03-13 12:26:12 -0400 (Tue, 13 Mar 2012)
New Revision: 8583
Added:
components/wsrp/tags/2.1.1-GA/
Log:
[maven-release-plugin] copy for tag 2.1.1-GA
12 years, 10 months
- 1
- 0