February 2012 - gatein-commits - Jboss List Archives

gatein SVN: r8478 - in epp/portal/branches/EPP_5_2_Branch: portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component and 5 other directories.

by do-not-reply＠jboss.org

Author: mposolda Date: 2012-02-28 12:26:34 -0500 (Tue, 28 Feb 2012) New Revision: 8478 Added: epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserImpl.java Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_cs.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_de.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_en.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_es.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_fr.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_it.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ja.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ko.xml epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ne.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_nl.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_pt_BR.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ru.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_uk.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_vi.xml epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_zh.xml epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_zh_TW.xml epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ar.xml epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_cs.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ko.xml epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh.xml epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh_TW.xml epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_cs.properties epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_cs.properties epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.properties epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_cs.properties epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties epp/portal/branches/EPP_5_2_Branch/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java Log: Bug 794235 Added support for displayName in UI Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java 2012-02-28 17:26:34 UTC (rev 8478) @@ -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()); @@ -924,4 +950,22 @@ // TODO: it should be there. 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); + } + } } Added: epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserImpl.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserImpl.java (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserImpl.java 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java 2012-02-28 17:26:34 UTC (rev 8478) @@ -52,6 +52,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"; @@ -76,6 +78,10 @@ addUIFormInput(new UIFormStringInput(LAST_NAME, LAST_NAME, null).addValidator(StringLengthValidator.class, 1, 45).addValidator(MandatoryValidator.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)); @@ -120,6 +126,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 @@ -129,6 +140,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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_cs.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_cs.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_cs.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_de.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_de.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_de.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_en.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_en.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_en.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_es.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_es.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_es.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_fr.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_fr.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_fr.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_it.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_it.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_it.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ja.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ja.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ja.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ko.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ko.xml 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ko.xml 2012-02-28 17:26:34 UTC (rev 8478) @@ -35,6 +35,7 @@ <Confirmpassword>비밀번호 확인:</Confirmpassword> <firstName>#{word.firstName}:</firstName> <lastName>#{word.lastName}:</lastName> + <displayName>#{word.displayName}:</displayName> <email>이메일:</email> <note><![CDATA[<span style="color: red">*</span>로 선언된 필드들이 필요합니다.]]></note> <action> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ne.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ne.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ne.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_nl.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_nl.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_nl.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_pt_BR.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_pt_BR.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_pt_BR.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ru.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ru.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ru.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_uk.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_uk.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_uk.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_vi.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_vi.xml 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_vi.xml 2012-02-28 17:26:34 UTC (rev 8478) @@ -35,6 +35,7 @@ <Confirmpassword>Xác nhận mật khẩu:</Confirmpassword> <firstName>#{word.firstName}:</firstName> <lastName>#{word.lastName}:</lastName> + <displayName>#{word.displayName}:</displayName> <email>Hộp thư:</email> <note><![CDATA[Các trường có đánh dấu<span style="color: red">*</span> là trường bắt buộc]]></note> <action> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_zh.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_zh.xml 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_zh.xml 2012-02-28 17:26:34 UTC (rev 8478) @@ -11,6 +11,7 @@ <Confirmpassword>确认密码：</Confirmpassword> <firstName>#{word.firstName}:</firstName> <lastName>#{word.lastName}:</lastName> + <displayName>#{word.displayName}:</displayName> <email>电子邮件地址：</email> <note><![CDATA[<span style="color: red">*</span>必须填写]]></note> <action> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_zh_TW.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_zh_TW.xml 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_zh_TW.xml 2012-02-28 17:26:34 UTC (rev 8478) @@ -11,6 +11,7 @@ <Confirmpassword>再次確認密碼:</Confirmpassword> <firstName>#{word.firstName}:</firstName> <lastName>#{word.lastName}:</lastName> + <displayName>#{word.displayName}:</displayName> <email>Email 地址:</email> <note>星號為必須輸入資料的欄位</note> <action> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ar.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ar.xml 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ar.xml 2012-02-28 17:26:34 UTC (rev 8478) @@ -183,6 +183,7 @@ <Confirmpassword>:تأكيد كلمة السر</Confirmpassword> <firstName>#{word.firstName}:</firstName> <lastName>#{word.lastName}:</lastName> + <displayName>#{word.displayName}:</displayName> <email>:البريد الالكتروني</email> <HomeInfo>معلومات الاقامة</HomeInfo> <user> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_cs.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_cs.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_cs.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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 @@ -442,6 +443,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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ko.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ko.xml 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ko.xml 2012-02-28 17:26:34 UTC (rev 8478) @@ -141,6 +141,7 @@ <Confirmpassword>비밀번호 확인 : </Confirmpassword> <firstName>#{word.firstName}:</firstName> <lastName>#{word.lastName}:</lastName> + <displayName>#{word.displayName}:</displayName> <email>메일 주소:</email> <user> <language>언어:</language> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml 2012-02-28 17:26:34 UTC (rev 8478) @@ -182,6 +182,7 @@ <Confirmpassword>Xác nhận mật khẩu:</Confirmpassword> <firstName>#{word.firstName}:</firstName> <lastName>#{word.lastName}:</lastName> + <displayName>#{word.displayName}:</displayName> <email>Hộp thư:</email> <HomeInfo>Thông tin về nhà ở:</HomeInfo> <user> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh.xml 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh.xml 2012-02-28 17:26:34 UTC (rev 8478) @@ -141,6 +141,7 @@ <Confirmpassword>确认密码： </Confirmpassword> <firstName>#{word.firstName}:</firstName> <lastName>#{word.lastName}:</lastName> + <displayName>#{word.displayName}:</displayName> <email>电子邮件地址：</email> <user> <language>语言：</language> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh_TW.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh_TW.xml 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh_TW.xml 2012-02-28 17:26:34 UTC (rev 8478) @@ -141,6 +141,7 @@ <Confirmpassword>再確認密碼: </Confirmpassword> <firstName>#{word.firstName}:</firstName> <lastName>#{word.lastName}:</lastName> + <displayName>#{word.displayName}:</displayName> <email>Email:</email> <user> <language>#{word.language}:</language> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_cs.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_cs.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_cs.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_cs.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_cs.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_cs.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -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: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.xml 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.xml 2012-02-28 17:26:34 UTC (rev 8478) @@ -59,6 +59,7 @@ <decorator>Decorator</decorator> <department>Department</department> <description>Description</description> + <displayName>Display Name</displayName> <!-- ################################################################### # EXPRESSION START WITH 'e' # Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_cs.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_cs.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_cs.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -1304,6 +1304,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: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2012-02-28 17:26:34 UTC (rev 8478) @@ -1153,6 +1153,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: epp/portal/branches/EPP_5_2_Branch/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java 2012-02-28 17:26:34 UTC (rev 8478) @@ -68,6 +68,10 @@ 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)); } Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java 2012-02-28 16:00:50 UTC (rev 8477) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java 2012-02-28 17:26:34 UTC (rev 8478) @@ -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
0 / 0

gatein SVN: r8477 - 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-02-28 11:00:50 -0500 (Tue, 28 Feb 2012) New Revision: 8477 Modified: epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/AbstractValidator.java Log: - GTNPORTAL-2361: Fixed improper error message. Modified: epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/AbstractValidator.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/AbstractValidator.java 2012-02-28 14:49:58 UTC (rev 8476) +++ epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/validator/AbstractValidator.java 2012-02-28 16:00:50 UTC (rev 8477) @@ -48,7 +48,7 @@ } label = label.trim(); - + // remove trailing ':' if there is one int index = label.indexOf(':'); if(index != -1) @@ -74,9 +74,14 @@ protected MessageException createMessageException(String value, UIFormInput uiInput) throws Exception { - return new MessageException(new ApplicationMessage(getMessageLocalizationKey(), getMessageArgs(value, uiInput), ApplicationMessage.WARNING)); + return createMessageException(value, uiInput, getMessageLocalizationKey()); } + protected MessageException createMessageException(String value, UIFormInput uiInput, String localizationKey) throws Exception + { + return new MessageException(new ApplicationMessage(localizationKey, getMessageArgs(value, uiInput), ApplicationMessage.WARNING)); + } + protected Object[] getMessageArgs(String value, UIFormInput uiInput) throws Exception { return new Object[]{getLabelFor(uiInput)}; @@ -101,7 +106,7 @@ if(exceptionOnMissingMandatory && value == null) { - throw createMessageException("EmptyFieldValidator.msg.empty-input", uiInput); + throw createMessageException(value, uiInput, "EmptyFieldValidator.msg.empty-input"); } return value;

12 years, 10 months

1
0
0 / 0

gatein SVN: r8476 - portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2012-02-28 09:49:58 -0500 (Tue, 28 Feb 2012) New Revision: 8476 Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/AbstractValidator.java Log: - GTNPORTAL-2361: Fixed improper error message. Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/AbstractValidator.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/AbstractValidator.java 2012-02-28 12:56:11 UTC (rev 8475) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/AbstractValidator.java 2012-02-28 14:49:58 UTC (rev 8476) @@ -74,8 +74,13 @@ protected MessageException createMessageException(String value, UIFormInput uiInput) throws Exception { - return new MessageException(new ApplicationMessage(getMessageLocalizationKey(), getMessageArgs(value, uiInput), ApplicationMessage.WARNING)); + return createMessageException(value, uiInput, getMessageLocalizationKey()); } + + protected MessageException createMessageException(String value, UIFormInput uiInput, String localizationKey) throws Exception + { + return new MessageException(new ApplicationMessage(localizationKey, getMessageArgs(value, uiInput), ApplicationMessage.WARNING)); + } protected Object[] getMessageArgs(String value, UIFormInput uiInput) throws Exception { @@ -101,7 +106,7 @@ if(exceptionOnMissingMandatory && value == null) { - throw createMessageException("EmptyFieldValidator.msg.empty-input", uiInput); + throw createMessageException(value, uiInput, "EmptyFieldValidator.msg.empty-input"); } return value;

12 years, 10 months

1
0
0 / 0

gatein SVN: r8475 - epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization.

by do-not-reply＠jboss.org

Author: mposolda Date: 2012-02-28 07:56:11 -0500 (Tue, 28 Feb 2012) New Revision: 8475 Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/organization-configuration.xml Log: Bug 793804 Adding MembershipUpdateListener to force update of UI permissions for particular user if memberships of this user are updated. Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/organization-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/organization-configuration.xml 2012-02-28 03:37:35 UTC (rev 8474) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/organization-configuration.xml 2012-02-28 12:56:11 UTC (rev 8475) @@ -299,6 +299,12 @@ </init-params> </component-plugin> + <component-plugin> + <name>MembershipUpdateListener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.services.organization.impl.MembershipUpdateListener</type> + </component-plugin> + <!-- <component-plugin> <name>ecm.new.user.event.listener</name>

12 years, 10 months

1
0
0 / 0

gatein SVN: r8474 - epp/docs/branches/5.2/Installation_Guide/en-US.

by do-not-reply＠jboss.org

Author: jaredmorgs Date: 2012-02-27 22:37:35 -0500 (Mon, 27 Feb 2012) New Revision: 8474 Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml epp/docs/branches/5.2/Installation_Guide/en-US/HTTPSConfiguration.xml epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml epp/docs/branches/5.2/Installation_Guide/en-US/Uninstall_JBoss.xml Log: Incorporated feedback from theute in https://bugzilla.redhat.com/show_bug.cgi?id=794386. New sections added to Database Configuration, specifically Multiple Portal JCR and IDM. Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml =================================================================== --- epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml 2012-02-27 11:53:06 UTC (rev 8473) +++ epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml 2012-02-28 03:37:35 UTC (rev 8474) @@ -9,7 +9,7 @@ <productname>JBoss Enterprise Portal Platform</productname> <productnumber>5.2</productnumber> <edition>5.2.1</edition> - <pubsnumber>3</pubsnumber> + <pubsnumber>4</pubsnumber> <abstract> <para> This book provides information about obtaining, installing and running JBoss Enterprise Portal Platform. It forms part of the complete document suite along with the <emphasis role="bold">User Guide</emphasis> and <emphasis role="bold">Reference Guide</emphasis> available at <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...." type="http"/>. Modified: epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml =================================================================== --- epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml 2012-02-27 11:53:06 UTC (rev 8473) +++ epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml 2012-02-28 03:37:35 UTC (rev 8474) @@ -19,11 +19,12 @@ <para>Identity Management (IDM) service, which depends on JBoss Hibernate.</para> </listitem> </itemizedlist> + <para>You must create a separate database for both the JCR and IDM services, for <emphasis>each portal container</emphasis> required in your installation. </para> + <para>The formula to apply when provisioning JCR and IDM databases is:</para> + <programlisting>(1 IDM + 1 JCR Database) * (Number of Portal Containers)</programlisting> + <para>For example, if you intend running Site Publisher with JBoss Enterprise Portal Platform, you must create two separate JCR and IDM databases for the <literal>portal</literal> container, and <literal>ecmdemo</literal> container.</para> + <para>Refer to <xref linkend="task-Create_Production_Database"/> to provision the required database based on the number of portal instances. After completing this task, refer to <xref linkend="Single_Portal_JCR_IDM"/> and <xref linkend="Multiple_Portal_JRC_IDM"/> for instructions relating to configuring the JNDI names in the directive files.</para> <warning> - <title>Warning: Separate JCR and IDM Databases</title> - <para>You must create a separate database for both the JCR and IDM services. If you do not create a separate database for each service, database table conflicts will occur and JBoss Enterprise Portal Platform will not start.</para> - </warning> - <warning> <title>Warning: Do not delete <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>PROFILE</replaceable>/data</filename></title> <para> The JCR can store information both in a database and on the file system depending on the configuration of the value storage. Refer to the JBoss Enterprise Portal Platform Reference Guide for more information. @@ -34,11 +35,11 @@ <para> You can change this directory location by editing the <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>PROFILE</replaceable>/conf/gatein/configuration.properties</filename> file, the name of the property being: <literal>gatein.jcr.storage.data.dir</literal></para> </warning> - <para>In the case of HSQLDB, databases are created automatically. For production databases, you must first install the database and create a default user so the platform can create the correct database schema when it is first started.</para> <task id="task-Create_Production_Database"> <title><remark>BZ#794386</remark>Task: Provision JCR and IDM Production Databases</title> <tasksummary> - <para>Read and understand the guideline steps in this task to prepare a JCR production database for JBoss Enterprise Portal Platform.</para> + <para>Read and understand the guideline steps in this task to prepare production databases for JBoss Enterprise Portal Platform. </para> + <para/> </tasksummary> <taskprerequisites> <title>Prerequisites</title> @@ -52,6 +53,9 @@ <listitem> <para>A JDBC connector, which is compatible with the selected JDBC-compliant production database.</para> </listitem> + <listitem> + <para>Understand the database provisioning formula discussed in <xref linkend="sect-Reference_Guide-Database_Configuration"/>.</para> + </listitem> </itemizedlist> </taskprerequisites> <procedure> @@ -62,10 +66,10 @@ <para>Copy the JDBC driver file (the .jar file) to the <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>PROFILE</replaceable>/lib</filename> directory. This adds the driver to the classpath.</para> </step> <step> - <para>Create a database that the JCR service will use exclusively.</para> + <para>Create a separate database for each portal container's JCR service. </para> </step> <step> - <para>Create a second database that the IDM service will use exclusively.</para> + <para>Create a separate database for each portal container's IDM service.</para> </step> <step> <para>Create a database user that has access to all related databases, with the following minimum permissions:</para> @@ -83,120 +87,287 @@ </step> </procedure> </task> - <para>Now you have installed the database and created a user, you can set the JCR and IDM directives in the configuration files as described in <xref linkend="task-Configure_JCR_Database_Datasource"/> and <xref linkend="task-Configure_IDM_Database_Datasource"/>.</para> - <task id="task-Configure_JCR_Database_Datasource"> - <title><remark>BZ#794386</remark>Task: Configure the JCR Database Datasource</title> - <tasksummary> - <para>Complete this task to configure the JCR datasource descriptor.</para> - </tasksummary> - <taskprerequisites> - <title>Prerequisites</title> - <itemizedlist> - <listitem> - <para>Complete <xref linkend="task-Create_Production_Database"/></para> - </listitem> - </itemizedlist> - </taskprerequisites> - <procedure> - <step> - <para>Open <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein-ds.xml</filename> in a text editor.</para> - </step> - <step> - <para>Locate the <jndi-name>gatein-jcr</jndi-name> directives that affect JCR datasource descriptors: </para> + <para>More information about setting up specific datasources can be found in the JBoss Enterprise Application Platform <citetitle>Getting Started Guide</citetitle>, in the <citetitle>Using Other Databases</citetitle> chapter. </para> + <section id="Single_Portal_JCR_IDM"> + <title><remark>BZ#794386 </remark>Single Portal JCR and IDM</title> + <para>For production instances that use a single portal container, you can configure a single JCR and IDM database. If you run JBoss Enterprise Portal Platform with the default configuration from a clean install, without Site Publisher, you meet this requirement.</para> + <para>For customers installing Site Publisher, or customers that require multiple portal containers in their JBoss Enterprise Portal Platform, follow the tasks in <xref linkend="Multiple_Portal_JRC_IDM"/> to ensure you configure the JNDI requirements for multiple platforms correctly.</para> + <task id="task-Configure_JCR_Database_Datasource"> + <title><remark>BZ#794386</remark>Task: Configure the JCR Database Datasource</title> + <tasksummary> + <para>Complete this task to configure the JCR datasource descriptor for instances that have one portal container (the default when you install the platform for the first time, without Site Publisher).</para> + </tasksummary> + <taskprerequisites> + <title>Prerequisites</title> <itemizedlist> <listitem> - <para><connection-url></para> + <para>Complete <xref linkend="task-Create_Production_Database"/></para> </listitem> + </itemizedlist> + </taskprerequisites> + <procedure> + <step> + <para>Open <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein-ds.xml</filename> in a text editor.</para> + </step> + <step> + <para>Locate the <jndi-name>gatein-jcr</jndi-name> directives that affect JCR datasource descriptors: </para> + <itemizedlist> + <listitem> + <para><connection-url></para> + </listitem> + <listitem> + <para><driver-class></para> + </listitem> + <listitem> + <para><user-name></para> + </listitem> + <listitem> + <para><password></para> + </listitem> + </itemizedlist> + </step> + <step> + <para>Change the <connection-url> and <driver-class> directive values to match those specified in the JDBC documentation for your chosen production database.</para> + <important> + <para>Ensure you specify the JCR-specific database in the <connection-url>.</para> + </important> + </step> + <step> + <para>Change the <user-name> and <password> directive values to the default user created in <xref linkend="task-Create_Production_Database"/>. </para> + <important> + <para>The password you specify in <password> is in plain text, and anyone with access to the server can discover the password. Consider encrypting this password.</para> + </important> + </step> + <step> + <formalpara> + <title>Result</title> + <para>You have provided the key information in the <filename>gatein-ds.xml</filename> directives, and the JCR datasource is ready for production use.</para> + </formalpara> + </step> + </procedure> + </task> + <task id="task-Configure_IDM_Database_Datasource"> + <title><remark>BZ#794386</remark>Task: Configure the IDM Database Datasource</title> + <tasksummary> + <para>Complete this task to configure the IDM datasource descriptor.</para> + </tasksummary> + <taskprerequisites> + <title>Prerequisites</title> + <itemizedlist> <listitem> - <para><driver-class></para> + <para>Complete <xref linkend="task-Configure_JCR_Database_Datasource"/></para> </listitem> + </itemizedlist> + </taskprerequisites> + <procedure> + <step> + <para>Open <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein-ds.xml</filename> in a text editor.</para> + </step> + <step> + <para>Locate the <jndi-name>gatein-idm</jndi-name> directives that affect JCR datasource descriptors: </para> + <itemizedlist> + <listitem> + <para><connection-url></para> + </listitem> + <listitem> + <para><driver-class></para> + </listitem> + <listitem> + <para><user-name></para> + </listitem> + <listitem> + <para><password></para> + </listitem> + </itemizedlist> + </step> + <step> + <para>Change the <connection-url> and <driver-class> directive values to match those specified in the JDBC documentation for your chosen production database.</para> + <important> + <para>Ensure you specify the IDM-specific database in the <connection-url>.</para> + </important> + </step> + <step> + <para>Change the <user-name> and <password> directive values to the default user created in <xref linkend="task-Create_Production_Database"/>. </para> + <important> + <para>The password you specify in <password> is in plain text, and anyone with access to the server can discover the password. Consider encrypting this password using a keypair.</para> + </important> + </step> + <step> + <formalpara> + <title>Result</title> + <para>You have provided the key information in the <filename>gatein-ds.xml</filename> directives, and the IDM datasource is ready for production use.</para> + </formalpara> + </step> + </procedure> + </task> + </section> + <section id="Multiple_Portal_JRC_IDM"> + <title><remark>BZ#794386 </remark>Multiple Portal JCR and IDM</title> + <para>If you run Site Publisher with JBoss Enterprise Portal Platform, or need to configure multiple portal containers in your installation of JBoss Enterprise Portal Platform, JNDI requires a separate JCR and IDM datasource definition for <emphasis role="italic">each portal container</emphasis> in <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein-ds.xml</filename>. </para> + <para>This requirement also means a separate JCR and IDM database is required for <emphasis role="italic">each portal container</emphasis>. </para> + <task id="task-Configure_Multiple_JCR_Database_Datasource"> + <title><remark>BZ#794386</remark>Task: Configure Multiple JCR Database Datasources</title> + <tasksummary> + <para>Complete this task to configure the JCR datasource descriptors for two portal containers.</para> + <note> + <para>This task uses Site Publisher as the second database descriptor, however if you are not running Site Publisher you can substitute the Site Publisher JNDI name <literal>ecmdemo</literal> with the name of your second portal container.</para> + </note> + </tasksummary> + <taskprerequisites> + <title>Prerequisites</title> + <itemizedlist> <listitem> - <para><user-name></para> + <para>Complete <xref linkend="task-Create_Production_Database"/>, remembering to provision a JCR and IDM database for each portal container.</para> </listitem> - <listitem> - <para><password></para> - </listitem> </itemizedlist> - </step> - <step> - <para>Change the <connection-url> and <driver-class> directive values to match those specified in the JDBC documentation for your chosen production database.</para> - <important> - <para>Ensure you specify the JCR-specific database in the <connection-url>.</para> - </important> - </step> - <step> - <para>Change the <user-name> and <password> directive values to the default user created in <xref linkend="task-Create_Production_Database"/>. </para> - <important> - <para>The password you specify in <password> is in plain text, and anyone with access to the server can discover the password. Consider encrypting this password.</para> - </important> - </step> - <step> - <formalpara> - <title>Result</title> - <para>You have provided the key information in the <filename>gatein-ds.xml</filename> directives, and the JCR datasource is ready for production use.</para> - </formalpara> - </step> - </procedure> - </task> - <task id="task-Configure_IDM_Database_Datasource"> - <title><remark>BZ#794386</remark>Task: Configure the IDM Database Datasource</title> - <tasksummary> - <para>Complete this task to configure the IDM datasource descriptor.</para> - </tasksummary> - <taskprerequisites> - <title>Prerequisites</title> - <itemizedlist> - <listitem> - <para>Complete <xref linkend="task-Configure_JCR_Database_Datasource"/></para> - </listitem> - </itemizedlist> - </taskprerequisites> - <procedure> - <step> - <para>Open <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein-ds.xml</filename> in a text editor.</para> - </step> - <step> - <para>Locate the <jndi-name>gatein-idm</jndi-name> directives that affect JCR datasource descriptors: </para> + </taskprerequisites> + <procedure> + <step> + <para>Open <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein-ds.xml</filename> in a text editor.</para> + </step> + <step> + <para>Create two <local-tx-datasource> descriptors, with a different <jndi-name> suffix. </para> + <para>You can copy the existing <local-tx-datasource> blocks in the file and modify them to suit. For example:</para> + <itemizedlist> + <listitem> + <para><jndi-name>gatein-jcr_<replaceable>portal</replaceable></jndi-name></para> + </listitem> + <listitem> + <para><jndi-name>gatein-jcr_<replaceable>ecmdemo</replaceable></jndi-name></para> + </listitem> + </itemizedlist> + </step> + <step> + <para>Each <local-tx-datasource> block has a set of common directives that affect datasource descriptors: </para> + <itemizedlist> + <listitem> + <para><connection-url></para> + </listitem> + <listitem> + <para><driver-class></para> + </listitem> + <listitem> + <para><user-name></para> + </listitem> + <listitem> + <para><password></para> + </listitem> + </itemizedlist> + </step> + <step> + <para>For <jndi-name>gatein-jcr_<replaceable>portal</replaceable></jndi-name>, change the <connection-url> and <driver-class> directive values to match those specified in the JDBC documentation for your chosen production database.</para> + <important> + <para>Ensure you specify the JCR-specific database created for the <literal>portal</literal> portal container in the <connection-url>. For example:</para> + <programlisting><connection-url>jdbc:mysql://mysql-hostname:3306/<replaceable>portal</replaceable></connection-url> +<driver-class>com.mysql.jdbc.Driver</driver-class></programlisting> + </important> + </step> + <step> + <para>For <jndi-name>gatein-jcr_<replaceable>ecmdemo</replaceable></jndi-name>, change the <connection-url> and <driver-class> directive values to match those specified in the JDBC documentation for your chosen production database.</para> + <important> + <para>Ensure you specify the JCR-specific database created for the <literal>ecmdemo</literal> portal container in the <connection-url>. For example:</para> + <programlisting><connection-url>jdbc:mysql://mysql-hostname:3306/<replaceable>ecmdemo</replaceable></connection-url> +<driver-class>com.mysql.jdbc.Driver</driver-class></programlisting> + </important> + </step> + <step> + <para>Change the <user-name> and <password> directives in all <local-tx-datasource> blocks to the values for the default user created in <xref linkend="task-Create_Production_Database"/>. </para> + <important> + <para>The password you specify in <password> is in plain text, and anyone with access to the server can discover the password. Consider encrypting this password.</para> + </important> + </step> + <step> + <formalpara> + <title>Result</title> + <para>You have provided the key information in the <filename>gatein-ds.xml</filename> directives, and the JCR datasources for both portal containers are ready for production use.</para> + </formalpara> + </step> + </procedure> + </task> + <task id="task-Configure_Multiple_IDM_Database_Datasource"> + <title><remark>BZ#794386</remark>Task: Configure Multiple IDM Database Datasource</title> + <tasksummary> + <para>Complete this task to configure multiple IDM datasource descriptors. </para> + <note> + <para>This task uses Site Publisher as the second portal container, however if you are not running Site Publisher you can replace the Site Publisher JNDI name <literal>ecmdemo</literal> with the name of your second portal container.</para> + </note> + </tasksummary> + <taskprerequisites> + <title>Prerequisites</title> <itemizedlist> <listitem> - <para><connection-url></para> + <para>Complete <xref linkend="task-Configure_JCR_Database_Datasource"/></para> </listitem> - <listitem> - <para><driver-class></para> - </listitem> - <listitem> - <para><user-name></para> - </listitem> - <listitem> - <para><password></para> - </listitem> </itemizedlist> - </step> - <step> - <para>Change the <connection-url> and <driver-class> directive values to match those specified in the JDBC documentation for your chosen production database.</para> - <important> - <para>Ensure you specify the IDM-specific database in the <connection-url>.</para> - </important> - </step> - <step> - <para>Change the <user-name> and <password> directive values to the default user created in <xref linkend="task-Create_Production_Database"/>. </para> - <important> - <para>The password you specify in <password> is in plain text, and anyone with access to the server can discover the password. Consider encrypting this password using a keypair.</para> - </important> - </step> - <step> - <formalpara> - <title>Result</title> - <para>You have provided the key information in the <filename>gatein-ds.xml</filename> directives, and the IDM datasource is ready for production use.</para> - </formalpara> - </step> - </procedure> - </task> - <para>More information about setting up datasources can be found in the JBoss Enterprise Application Platform <citetitle>Getting Started Guide</citetitle>, in the <citetitle>Using Other Databases</citetitle> chapter. </para> + </taskprerequisites> + <procedure> + <step> + <para>Open <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein-ds.xml</filename> in a text editor.</para> + </step> + <step> + <para>Create two <no-tx-datasource> descriptors, with a different <jndi-name> suffix. </para> + <para>You can copy the existing <no-tx-datasource> blocks in the file and modify them to suit. For example:</para> + <itemizedlist> + <listitem> + <para><jndi-name>gatein-idm_<replaceable>portal</replaceable></jndi-name></para> + </listitem> + <listitem> + <para><jndi-name>gatein-idm_<replaceable>ecmdemo</replaceable></jndi-name></para> + </listitem> + </itemizedlist> + </step> + <step> + <para>Each <no-tx-datasource> block has a set of common directives that affect datasource descriptors: </para> + <itemizedlist> + <listitem> + <para><connection-url></para> + </listitem> + <listitem> + <para><driver-class></para> + </listitem> + <listitem> + <para><user-name></para> + </listitem> + <listitem> + <para><password></para> + </listitem> + </itemizedlist> + </step> + <step> + <para>For <jndi-name>gatein-idm_<replaceable>portal</replaceable></jndi-name>, change the <connection-url> and <driver-class> directive values to match those specified in the JDBC documentation for your chosen production database.</para> + <important> + <para>Ensure you specify the IDM-specific database created for the <literal>portal</literal> portal container in the <connection-url>. For example:</para> + <programlisting><connection-url>jdbc:mysql://mysql-hostname:3306/<replaceable>portal</replaceable></connection-url> +<driver-class>com.mysql.jdbc.Driver</driver-class></programlisting> + </important> + </step> + <step> + <para>For <jndi-name>gatein-idm_<replaceable>ecmdemo</replaceable></jndi-name>, change the <connection-url> and <driver-class> directive values to match those specified in the JDBC documentation for your chosen production database.</para> + <important> + <para>Ensure you specify the IDM-specific database created for the <literal>ecmdemo</literal> portal container in the <connection-url>. For example:</para> + <programlisting><connection-url>jdbc:mysql://mysql-hostname:3306/<replaceable>ecmdemo</replaceable></connection-url> +<driver-class>com.mysql.jdbc.Driver</driver-class></programlisting> + </important> + </step> + <step> + <para>Change the <user-name> and <password> directives in all <no-tx-datasource> blocks to the values for the default user created in <xref linkend="task-Create_Production_Database"/>. </para> + <important> + <para>The password you specify in <password> is in plain text, and anyone with access to the server can discover the password. Consider encrypting this password.</para> + </important> + </step> + <step> + <formalpara> + <title>Result</title> + <para>You have provided the key information in the <filename>gatein-ds.xml</filename> directives, and the IDM datasources for both portal containers are ready for production use.</para> + </formalpara> + </step> + </procedure> + </task> + </section> <section> <title>First-run Database Schema Creation</title> <para>When you start JBoss Enterprise Portal Platform for the first time, - it will create the proper database schema based on the database configuration you specified in <xref linkend="sect-Reference_Guide-Database_Configuration"/>.</para> + it will create the proper database schema based on the database configuration you specified in <xref linkend="Single_Portal_JCR_IDM"/> or <xref linkend="Multiple_Portal_JRC_IDM"/>.</para> <note> <para>JBoss Enterprise Portal Platform assumes the default encoding for your database is <literal>latin1</literal>.</para> @@ -204,18 +375,9 @@ <para>Before starting the server for the first time, continue to <xref linkend="sect-Reference_Guide-EMail_Service_Configuration"/> for the next mandatory configuration requirement.</para> </section> <section> - <title>Example with MySQL Server 5.1</title> - <indexterm> - <primary>Configuration</primary> - <secondary>MySQL</secondary> - </indexterm> - <indexterm> - <primary>Database</primary> - <secondary>MySQL</secondary> - </indexterm> - <indexterm> - <primary>MySQL</primary> - </indexterm> + <title><remark>BZ#794386 </remark>Example with MySQL Server 5.1</title> + <para>This section describes an example how to configure MySQL to work with a single portal container. Refer to <xref linkend="Multiple_Portal_JRC_IDM"/> if you need to configure multiple portal containers in your installation, or intend to use Site Publisher. </para> + <para>More information about setting up other datasources can be found in the JBoss Enterprise Application Platform <citetitle>Getting Started Guide</citetitle>, in the <citetitle>Using Other Databases</citetitle> chapter. </para> <formalpara id="form-Portal_EAP-Using_a_MySQL_Database-Installing_the_MySQL_RDBMS_JDBC_connector"> <title>Installing the MySQL JDBC connector</title> <para>The MySQL JDBC connector is required for EPP to use a <application>MySQL</application> database:</para> Modified: epp/docs/branches/5.2/Installation_Guide/en-US/HTTPSConfiguration.xml =================================================================== --- epp/docs/branches/5.2/Installation_Guide/en-US/HTTPSConfiguration.xml 2012-02-27 11:53:06 UTC (rev 8473) +++ epp/docs/branches/5.2/Installation_Guide/en-US/HTTPSConfiguration.xml 2012-02-28 03:37:35 UTC (rev 8474) @@ -6,7 +6,7 @@ <section id="sect-Installation_Guide-HTTPS_Configuration"> <title><remark>BZ#794440 </remark>HTTPS Configuration</title> <remark>https://bugzilla.redhat.com/show_bug.cgi?id=794440 - 20120221 - Reworked the entire section to cover keystore and truststore configuration specific to EPP. </remark> - <para>JBoss Enterprise Portal Platform runs by default in HTTP mode. For security purposes, and to ensure portal gadgets run correctly, configure it to run in HTTPS mode. </para> + <para>JBoss Enterprise Portal Platform runs by default in HTTP mode. For security purposes, configure your production platform to run in HTTPS mode. </para> <important> <para>Understanding the fundamentals of keystore and truststore configuration is critical to the tasks in this section. </para> <para>Refer to the JBoss Enterprise Application Platform <citetitle>Security Guide</citetitle> <citetitle>"SSL Encryption Overview"</citetitle> chapter for detailed encryption theory and procedures relevant to all JBoss Middleware platforms. </para> @@ -49,7 +49,7 @@ </taskprerequisites> <procedure> <step> - <para>Navigate to<filename> <replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>PROFILE</replaceable>/conf/</filename></para> + <para>Navigate to<filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>PROFILE</replaceable>/conf/</filename></para> </step> <step> <para>Generate the keystore by executing the following command. Ensure you substitute the <replaceable>values</replaceable> with information relevant to your organization, and record the information for later use:</para> @@ -103,6 +103,6 @@ <para>You have configured the platform to communicate using a secure connection.</para> </formalpara> <para> - You can now access the portal via address: <literal>https://<replaceable><ServerAddress></replaceable>:8443/portal</literal> - </para> + You can now access the portal from the address: <literal>https://<replaceable><ServerAddress></replaceable>:8443/portal</literal> + once you have completed the other configuration tasks in this guide.</para> </section> Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml =================================================================== --- epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml 2012-02-27 11:53:06 UTC (rev 8473) +++ epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml 2012-02-28 03:37:35 UTC (rev 8474) @@ -9,6 +9,20 @@ <simpara> <revhistory> <revision> + <revnumber>5.2.1-4</revnumber> + <date>Tue Feb 28 2012</date> + <author> + <firstname>Jared</firstname> + <surname>Morgan</surname> + <email/> + </author> + <revdescription> + <simplelist> + <member>Incorporated feedback from theute in https://bugzilla.redhat.com/show_bug.cgi?id=794386. New sections added to Database Configuration, specifically Multiple Portal JCR and IDM. </member> + </simplelist> + </revdescription> + </revision> + <revision> <revnumber>5.2.1-3</revnumber> <date>Mon Feb 27 2012</date> <author> Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Uninstall_JBoss.xml =================================================================== --- epp/docs/branches/5.2/Installation_Guide/en-US/Uninstall_JBoss.xml 2012-02-27 11:53:06 UTC (rev 8473) +++ epp/docs/branches/5.2/Installation_Guide/en-US/Uninstall_JBoss.xml 2012-02-28 03:37:35 UTC (rev 8474) @@ -1,13 +1,11 @@ -<?xml version='1.0'?> +<?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ <!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent"> %BOOK_ENTITIES; ]> - <chapter id="Uninstall_JBoss"> - <title>Uninstall JBoss Enterprise Portal Platform</title> - <para> - As JBoss Enterprise Portal Platform was installed from a zip file, you may uninstall it by simply deleting the JBoss Enterprise Portal Platform directory installed on your system. - </para> + <title>Uninstall JBoss Enterprise Portal Platform</title> + <para> + As JBoss Enterprise Portal Platform is installed from a Zip file, you can remove it by deleting the JBoss Enterprise Portal Platform directory installed on your system. + </para> </chapter> -

12 years, 10 months

1
0
0 / 0

gatein SVN: r8473 - portal/trunk/packaging.

by do-not-reply＠jboss.org

Author: mstruk Date: 2012-02-27 06:53:06 -0500 (Mon, 27 Feb 2012) New Revision: 8473 Modified: portal/trunk/packaging/pom.xml Log: GTNPORTAL-2154 Support for JBoss AS7 - removed from pkg-all and release profiles for now Modified: portal/trunk/packaging/pom.xml =================================================================== --- portal/trunk/packaging/pom.xml 2012-02-27 11:46:34 UTC (rev 8472) +++ portal/trunk/packaging/pom.xml 2012-02-27 11:53:06 UTC (rev 8473) @@ -45,7 +45,7 @@ <module>jetty</module> <module>jboss-as5</module> <module>jboss-as6</module> - <module>jboss-as7</module> +  </modules> </profile> <profile> @@ -55,7 +55,7 @@ <module>jetty</module> <module>jboss-as5</module> <module>jboss-as6</module> - <module>jboss-as7</module> +  </modules> </profile> <profile>

12 years, 10 months

1
0
0 / 0

gatein SVN: r8472 - in portal/trunk/packaging: jboss-as7 and 10 other directories.

by do-not-reply＠jboss.org

Author: mstruk Date: 2012-02-27 06:46:34 -0500 (Mon, 27 Feb 2012) New Revision: 8472 Added: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/DeploymentArchiveAdd.java portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/DeploymentArchiveDefinition.java portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInPortalAdd.java portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInPortalDefinition.java portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDefinition.java portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependancyAdd.java portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependancyDefinition.java portal/trunk/packaging/jboss-as7/extension/src/main/resources/schema/jboss-as-gatein-1.0.xsd Removed: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptionProviders.java portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptions.java portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/SetGateInArchivesHandler.java portal/trunk/packaging/jboss-as7/extension/src/main/resources/schema/jboss-gatein.xsd portal/trunk/packaging/jboss-as7/extension/src/test/java/org/gatein/integration/jboss/as7/support/ Modified: portal/trunk/packaging/jboss-as7/README.txt portal/trunk/packaging/jboss-as7/extension/pom.xml portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/Attribute.java portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/Constants.java portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtensionConfiguration.java portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemParser.java portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInDependenciesDeploymentProcessor.java portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInInitDeploymentProcessor.java portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInStarterDeploymentProcessor.java portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInStructureDeploymentProcessor.java portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarDeploymentInitializingProcessor.java portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/WarDependenciesDeploymentProcessor.java portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/web/InitService.java portal/trunk/packaging/jboss-as7/extension/src/main/resources/org/gatein/integration/jboss/as7/LocalDescriptions.properties portal/trunk/packaging/jboss-as7/extension/src/test/java/org/gatein/integration/jboss/as7/SubsystemParsingTestCase.java portal/trunk/packaging/jboss-as7/modules/build.xml portal/trunk/packaging/jboss-as7/modules/pom.xml portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml portal/trunk/packaging/jboss-as7/pom.xml portal/trunk/packaging/pom.xml Log: GTNPORTAL-2154 Support for JBoss AS7 - upgraded supported version to JBoss AS 7.1.0.Final - some refactoring and dmr model change Modified: portal/trunk/packaging/jboss-as7/README.txt =================================================================== --- portal/trunk/packaging/jboss-as7/README.txt 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/README.txt 2012-02-27 11:46:34 UTC (rev 8472) @@ -30,15 +30,15 @@ Known Issues ============ -- Only one JBoss AS 7 version is supported at one time. At the moment it's JBoss AS 7.1.0.CR1b. +- Only one JBoss AS 7 version is supported at one time. At the moment it's JBoss AS 7.1.0.Final. - WSRP is not yet supported - <distributable/> is not yet supported - Sample ears have been repackaged as their current default packaging is not supported - Exception occurs, and is ignored when logging out (EXOJCR-1619) +- 'gatein' subsystem configuration in standalone.xml is ignored - Building ======== @@ -46,8 +46,8 @@ Checkout the dependencies sources from sandbox: -svn co http://anonsvn.jboss.org/repos/gatein/sandbox/as7_support/tags/AS7-Beta02 -cd AS7-Beta02 +svn co http://anonsvn.jboss.org/repos/gatein/sandbox/as7_support/tags/AS7-Beta03 +cd AS7-Beta03 This will checkout specific versions of wci and exo.kernel.container, and a new gatein-naming component. @@ -74,7 +74,7 @@ mvn clean install -Set CONTAINERS_DIR env variable to point to a directory containing your application servers (i.e. export CONTAINERS_DIR=$HOME/devel/containers). If you already have ‘jboss-as-7.1.0.CR1b’ in your CONTAINERS_DIR, then remove ‘,download’ from the next command: +Set CONTAINERS_DIR env variable to point to a directory containing your application servers (i.e. export CONTAINERS_DIR=$HOME/devel/containers). If you already have ‘jboss-as-7.1.0.Final’ in your CONTAINERS_DIR, then remove ‘,download’ from the next command: cd packaging/jboss-as7 mvn clean install -Ppkg-jbossas7,download -Dexo.projects.directory.dependencies=$CONTAINERS_DIR @@ -83,7 +83,7 @@ Now that we successfully built GateIn including JBoss AS7 support, let’s run it: -cd pkg/target/jboss-as-7.1.0.CR1b/bin +cd pkg/target/jboss-as-7.1.0.Final/bin ./standalone.sh Modified: portal/trunk/packaging/jboss-as7/extension/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as7/extension/pom.xml 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/extension/pom.xml 2012-02-27 11:46:34 UTC (rev 8472) @@ -71,20 +71,25 @@ <scope>test</scope> <version>${version.junit}</version> </dependency> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-subsystem-test</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> - <plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.6</source> - <target>1.6</target> - <compilerArgument>-proc:none</compilerArgument> + <source>1.6</source> + <target>1.6</target> + <compilerArgument>-proc:none</compilerArgument> </configuration> - </plugin> + </plugin> </plugins> </build> </project> \ No newline at end of file Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/Attribute.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/Attribute.java 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/Attribute.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -32,7 +32,7 @@ UNKNOWN(null), NAME("name"), MAIN("main"), - IMPORT_SERVICES("import-services"); + IMPORT_SERVICES(Constants.IMPORT_SERVICES); private final String name; Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/Constants.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/Constants.java 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/Constants.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -26,12 +26,17 @@ */ interface Constants { - + // xml parser constants String DEPLOYMENT_ARCHIVES = "deployment-archives"; String PORTLET_WAR_DEPENDENCIES = "portlet-war-dependencies"; String ARCHIVE = "archive"; String DEPENDENCY = "dependency"; String MAIN = "main"; String IMPORT_SERVICES = "import-services"; - String TRUE = "true"; + + String PORTAL = "portal"; + + // MDR operations constants + String DEPLOYMENT_ARCHIVE = "deployment-archive"; + String PORTLET_WAR_DEPENDENCY = "portlet-war-dependency"; } Added: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/DeploymentArchiveAdd.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/DeploymentArchiveAdd.java (rev 0) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/DeploymentArchiveAdd.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -0,0 +1,44 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.gatein.integration.jboss.as7; + +import org.jboss.as.controller.AbstractAddStepHandler; +import org.jboss.as.controller.OperationFailedException; +import org.jboss.dmr.ModelNode; + +/** + * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> + */ +public class DeploymentArchiveAdd extends AbstractAddStepHandler +{ + public static final DeploymentArchiveAdd INSTANCE = new DeploymentArchiveAdd(); + + private DeploymentArchiveAdd() + { + } + + @Override + protected void populateModel(ModelNode operation, ModelNode model) throws OperationFailedException + { + DeploymentArchiveDefinition.MAIN.validateAndSet(operation,model); + } +} Property changes on: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/DeploymentArchiveAdd.java ___________________________________________________________________ Added: svn:executable + * Added: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/DeploymentArchiveDefinition.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/DeploymentArchiveDefinition.java (rev 0) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/DeploymentArchiveDefinition.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.gatein.integration.jboss.as7; + +import org.jboss.as.controller.PathElement; +import org.jboss.as.controller.ReloadRequiredRemoveStepHandler; +import org.jboss.as.controller.SimpleAttributeDefinition; +import org.jboss.as.controller.SimpleAttributeDefinitionBuilder; +import org.jboss.as.controller.SimpleResourceDefinition; +import org.jboss.as.controller.registry.AttributeAccess; +import org.jboss.as.controller.registry.ManagementResourceRegistration; +import org.jboss.dmr.ModelNode; +import org.jboss.dmr.ModelType; + +/** + * @author Tomaz Cerar + */ +public class DeploymentArchiveDefinition extends SimpleResourceDefinition +{ + protected static final DeploymentArchiveDefinition INSTANCE = new DeploymentArchiveDefinition(); + + protected static final SimpleAttributeDefinition MAIN = + new SimpleAttributeDefinitionBuilder(Constants.MAIN, ModelType.BOOLEAN, true) + .setAllowExpression(false) + .setDefaultValue(new ModelNode(false)) + .setXmlName(Constants.MAIN) + .setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES) + .build(); + + private DeploymentArchiveDefinition() + { + super(PathElement.pathElement(Constants.DEPLOYMENT_ARCHIVE), + GateInExtension.getResourceDescriptionResolver(Constants.DEPLOYMENT_ARCHIVE), + DeploymentArchiveAdd.INSTANCE, new ReloadRequiredRemoveStepHandler()); + } + + @Override + public void registerAttributes(ManagementResourceRegistration resourceRegistration) + { + resourceRegistration.registerReadOnlyAttribute(MAIN, null); + } +} Property changes on: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/DeploymentArchiveDefinition.java ___________________________________________________________________ Added: svn:executable + * Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -24,6 +24,9 @@ import org.jboss.as.controller.Extension; import org.jboss.as.controller.ExtensionContext; import org.jboss.as.controller.SubsystemRegistration; +import org.jboss.as.controller.descriptions.ResourceDescriptionResolver; +import org.jboss.as.controller.descriptions.StandardResourceDescriptionResolver; +import org.jboss.as.controller.operations.common.GenericSubsystemDescribeHandler; import org.jboss.as.controller.parsing.ExtensionParsingContext; import org.jboss.as.controller.registry.ManagementResourceRegistration; import org.jboss.as.controller.registry.OperationEntry; @@ -34,7 +37,6 @@ import org.jboss.modules.ModuleIdentifier; import org.jboss.msc.service.ServiceName; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DESCRIBE; /** @@ -51,11 +53,13 @@ public static final String SUBSYSTEM_NAME = "gatein"; - private GateInExtensionConfiguration config = new GateInExtensionConfiguration(); + protected static final String DEFAULT_PORTAL_NAME = "default"; - public GateInExtensionConfiguration getConfiguration() + private static final String RESOURCE_NAME = GateInExtension.class.getPackage().getName() + ".LocalDescriptions"; + + static ResourceDescriptionResolver getResourceDescriptionResolver(final String keyPrefix) { - return config; + return new StandardResourceDescriptionResolver(keyPrefix, RESOURCE_NAME, GateInExtension.class.getClassLoader(), true, false); } /** @@ -66,9 +70,12 @@ { log.debug("Activating GateIn Extension"); final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME); - final ManagementResourceRegistration registration = subsystem.registerSubsystemModel(GateInSubsystemDescriptionProviders.SUBSYSTEM); - registration.registerOperationHandler(ADD, new GateInSubsystemAdd(this), GateInSubsystemAdd.DESCRIPTION, false); - registration.registerOperationHandler(DESCRIBE, GateInSubsystemDescribe.INSTANCE, GateInSubsystemDescribe.INSTANCE, false, OperationEntry.EntryType.PRIVATE); + final ManagementResourceRegistration registration = subsystem.registerSubsystemModel(GateInSubsystemDefinition.INSTANCE); + registration.registerOperationHandler(DESCRIBE, GenericSubsystemDescribeHandler.INSTANCE, GenericSubsystemDescribeHandler.INSTANCE, false, OperationEntry.EntryType.PRIVATE); + registration.registerSubModel(DeploymentArchiveDefinition.INSTANCE); + registration.registerSubModel(PortletWarDependancyDefinition.INSTANCE); + registration.registerSubModel(new GateInPortalDefinition(DEFAULT_PORTAL_NAME)); + subsystem.registerXMLElementWriter(GateInSubsystemParser.getInstance()); } @@ -94,12 +101,12 @@ public static ServiceName deploymentUnitName(ModuleIdentifier moduleId, Phase phase) { return ServiceName.of(Services.deploymentUnitName( - GateInExtension.skipModuleLoaderPrefix(moduleId.getName())), phase.name()); + GateInExtension.skipModuleLoaderPrefix(moduleId.getName())), phase.name()); } public static ServiceName deploymentUnitName(ModuleIdentifier moduleId, String... postfix) { return ServiceName.of(Services.deploymentUnitName( - GateInExtension.skipModuleLoaderPrefix(moduleId.getName())), postfix); + GateInExtension.skipModuleLoaderPrefix(moduleId.getName())), postfix); } } Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtensionConfiguration.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtensionConfiguration.java 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtensionConfiguration.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -21,36 +21,53 @@ */ package org.gatein.integration.jboss.as7; +import org.gatein.integration.jboss.as7.deployment.GateInEarKey; +import org.gatein.integration.jboss.as7.deployment.GateInExtKey; +import org.gatein.integration.jboss.as7.deployment.PortletWarKey; +import org.jboss.as.server.deployment.DeploymentUnit; +import org.jboss.as.server.deployment.module.ModuleDependency; +import org.jboss.dmr.ModelNode; +import org.jboss.dmr.Property; +import org.jboss.modules.Module; import org.jboss.modules.ModuleIdentifier; +import org.jboss.modules.ModuleLoader; import org.jboss.msc.service.ServiceName; -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; +import java.util.*; /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ public class GateInExtensionConfiguration { + public static final GateInExtensionConfiguration INSTANCE = new GateInExtensionConfiguration(); + private Set<ModuleIdentifier> extModules; + private Set<ModuleDependency> portletWarDependencies; + private ModuleIdentifier earModule = ModuleIdentifier.create("deployment.gatein.ear"); private final List<ServiceName> childWars = new LinkedList<ServiceName>(); private final List<ServiceName> childSubUnits = new LinkedList<ServiceName>(); - public GateInExtensionConfiguration() + final ModuleLoader moduleLoader = Module.getBootModuleLoader(); + + private GateInExtensionConfiguration() { Set<ModuleIdentifier> set = new LinkedHashSet<ModuleIdentifier>(); set.add(ModuleIdentifier.create("deployment.gatein-sample-extension.ear")); set.add(ModuleIdentifier.create("deployment.gatein-sample-portal.ear")); set.add(ModuleIdentifier.create("deployment.gatein-sample-skin.war")); //set.add(ModuleIdentifier.create("deployment.gatein-wsrp-integration.ear")); - setGateInExtModules(Collections.unmodifiableSet(set)); + extModules = Collections.unmodifiableSet(set); + + Set<ModuleDependency> dset = new LinkedHashSet<ModuleDependency>(); + dset.add(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.gatein.wci"), false, false, false, false)); + dset.add(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.gatein.pc"), false, false, false, false)); + dset.add(new ModuleDependency(moduleLoader, ModuleIdentifier.create("javax.portlet.api"), false, false, false, false)); + portletWarDependencies = Collections.unmodifiableSet(dset); } public Set<ModuleIdentifier> getGateInExtModules() @@ -58,9 +75,9 @@ return extModules; } - public void setGateInExtModules(Set<ModuleIdentifier> modules) + public Set<ModuleDependency> getPortletWarDependencies() { - this.extModules = modules; + return portletWarDependencies; } public ModuleIdentifier getGateInEarModule() @@ -73,17 +90,21 @@ this.earModule = modules; } - public List<ServiceName> getChildWars() + public synchronized List<ServiceName> getChildWars() { - return childWars; + return Collections.unmodifiableList(childWars); } - public List<ServiceName> getChildSubUnits() + public synchronized void addChildWar(ServiceName deploymentServiceName) { + childWars.add(deploymentServiceName); + } + + public synchronized List<ServiceName> getChildSubUnits() { - return childSubUnits; + return Collections.unmodifiableList(childSubUnits); } - public List<String> getChildSubUnitComponentPrefixes() + public synchronized List<String> getChildSubUnitComponentPrefixes() { LinkedList<String> ret = new LinkedList<String>(); for (ServiceName name : childSubUnits) @@ -92,4 +113,87 @@ } return ret; } + + public synchronized void addChildSubUnit(ServiceName serviceName) { + childSubUnits.add(serviceName); + } + + public void setConfigurationFromModel(ModelNode model) + { + ModelNode archives = model.get(Constants.DEPLOYMENT_ARCHIVES); + if (archives.isDefined()) + { + Set<ModuleIdentifier> set = new LinkedHashSet<ModuleIdentifier>(); + + for (Property p: archives.asPropertyList()) + { + boolean isMain = false; + if (p.getValue().isDefined()) + { + for (Property attr: p.getValue().asPropertyList()) + { + if (Constants.MAIN.equals(attr.getName())) + isMain = true; + } + } + if (isMain) + earModule = ModuleIdentifier.create("deployment." + p.getName()); + else + set.add(ModuleIdentifier.create("deployment." + p.getName())); + } + extModules = Collections.unmodifiableSet(set); + } + + ModelNode deps = model.get(Constants.PORTLET_WAR_DEPENDENCIES); + if (deps.isDefined()) + { + Set<ModuleDependency> dset = new LinkedHashSet<ModuleDependency>(); + + for (Property p: deps.asPropertyList()) + { + boolean importSvcs = false; + if (p.getValue().isDefined()) + { + for (Property attr: p.getValue().asPropertyList()) + { + if (Constants.IMPORT_SERVICES.equals(attr.getName())) + importSvcs = true; + } + } + String [] parts = parseNameSlotPair(p.getName()); + dset.add(new ModuleDependency(moduleLoader, ModuleIdentifier.create(parts[0], parts[1]), false, false, importSvcs, true)); + // TODO: add optional, and exports + } + portletWarDependencies = Collections.unmodifiableSet(dset); + } + } + + private String[] parseNameSlotPair(String name) + { + String [] parts = name.split(":"); + if (parts.length == 2) + return parts; + return new String[] {parts[0], null}; + } + + public boolean isGateInArchive(DeploymentUnit du) + { + return du.getAttachment(GateInEarKey.KEY) != null + || du.getAttachment(GateInExtKey.KEY) != null; + } + + public boolean isPortletArchive(DeploymentUnit du) + { + return du.getAttachment(PortletWarKey.INSTANCE) != null; + } + + public boolean isNonGateInPortletArchive(DeploymentUnit du) + { + return !isGateInArchive(du) && isPortletArchive(du); + } + + public boolean isGateInOrPortletArchive(DeploymentUnit du) + { + return isGateInArchive(du) || isPortletArchive(du); + } } Added: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInPortalAdd.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInPortalAdd.java (rev 0) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInPortalAdd.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -0,0 +1,56 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.gatein.integration.jboss.as7; + +import org.jboss.as.controller.AbstractAddStepHandler; +import org.jboss.as.controller.OperationContext; +import org.jboss.as.controller.OperationFailedException; +import org.jboss.as.controller.ServiceVerificationHandler; +import org.jboss.dmr.ModelNode; +import org.jboss.msc.service.ServiceController; + +import java.util.List; + +/** + * @author Tomaz Cerar + */ +public class GateInPortalAdd extends AbstractAddStepHandler +{ + protected static final GateInPortalAdd INSTANCE = new GateInPortalAdd(); + + private GateInPortalAdd() + { + } + + @Override + protected void populateModel(ModelNode operation, ModelNode model) throws OperationFailedException + { + /* noop */ + } + + @Override + protected void performRuntime(OperationContext context, ModelNode operation, ModelNode model, ServiceVerificationHandler verificationHandler, List<ServiceController<?>> newControllers) throws OperationFailedException + { + super.performRuntime(context, operation, model, verificationHandler, newControllers); + } +} + Property changes on: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInPortalAdd.java ___________________________________________________________________ Added: svn:executable + * Added: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInPortalDefinition.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInPortalDefinition.java (rev 0) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInPortalDefinition.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.gatein.integration.jboss.as7; + +import org.jboss.as.controller.PathElement; +import org.jboss.as.controller.ReloadRequiredRemoveStepHandler; +import org.jboss.as.controller.SimpleResourceDefinition; + +/** + * @author Tomaz Cerar r + */ +public class GateInPortalDefinition extends SimpleResourceDefinition +{ + + protected GateInPortalDefinition(String portalName) + { + super(PathElement.pathElement(Constants.PORTAL, portalName), + GateInExtension.getResourceDescriptionResolver(Constants.PORTAL), + GateInPortalAdd.INSTANCE, new ReloadRequiredRemoveStepHandler() + ); + } +} Property changes on: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInPortalDefinition.java ___________________________________________________________________ Added: svn:executable + * Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -25,13 +25,13 @@ import org.gatein.integration.jboss.as7.deployment.GateInInitDeploymentProcessor; import org.gatein.integration.jboss.as7.deployment.GateInStarterDeploymentProcessor; import org.gatein.integration.jboss.as7.deployment.GateInStructureDeploymentProcessor; +import org.gatein.integration.jboss.as7.deployment.PortletWarClassloadingDependencyProcessor; import org.gatein.integration.jboss.as7.deployment.PortletWarDeploymentInitializingProcessor; import org.gatein.integration.jboss.as7.deployment.WarDependenciesDeploymentProcessor; import org.jboss.as.controller.AbstractBoottimeAddStepHandler; import org.jboss.as.controller.OperationContext; import org.jboss.as.controller.OperationFailedException; import org.jboss.as.controller.ServiceVerificationHandler; -import org.jboss.as.controller.descriptions.DescriptionProvider; import org.jboss.as.server.AbstractDeploymentChainStep; import org.jboss.as.server.DeploymentProcessorTarget; import org.jboss.as.server.deployment.Phase; @@ -39,22 +39,13 @@ import org.jboss.msc.service.ServiceController; import java.util.List; -import java.util.Locale; /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ public class GateInSubsystemAdd extends AbstractBoottimeAddStepHandler { - static final DescriptionProvider DESCRIPTION = new DescriptionProvider() - { - public ModelNode getModelDescription(Locale locale) - { - return GateInSubsystemDescriptions.getSubsystemAddDescription(locale); - } - }; - static final int STRUCTURE_PORTLET_WAR_DEPLOYMENT_INIT = 0x0B80; static final int DEPENDENCIES_PORTLET_MODULE = 0x1100; static final int STRUCTURE_GATEIN = 0x2000; @@ -63,25 +54,13 @@ static final int INSTALL_GATEIN_START = 0x4000; static final int MANIFEST_DEPENDENCIES_GATEIN = 0x4000; - private GateInExtension extension; - - public GateInSubsystemAdd(GateInExtension extension) + protected GateInSubsystemAdd() { - this.extension = extension; } protected void populateModel(ModelNode operation, ModelNode model) { - //Initialize the 'type' child node - if (operation.hasDefined(Constants.DEPLOYMENT_ARCHIVES)) - { - model.get(Constants.DEPLOYMENT_ARCHIVES).set(operation.get(Constants.DEPLOYMENT_ARCHIVES)); - } - if (operation.hasDefined(Constants.PORTLET_WAR_DEPENDENCIES)) - { - model.get(Constants.PORTLET_WAR_DEPENDENCIES).set(operation.get(Constants.PORTLET_WAR_DEPENDENCIES)); - } - // Can we read extension configuration here? + /* noop */ } protected void performBoottime(OperationContext context, ModelNode operation, ModelNode model, @@ -94,15 +73,14 @@ { final SharedPortletTldsMetaDataBuilder tldsBuilder = new SharedPortletTldsMetaDataBuilder(); - processorTarget.addDeploymentProcessor(Phase.STRUCTURE, STRUCTURE_GATEIN, new GateInStructureDeploymentProcessor(extension)); - processorTarget.addDeploymentProcessor(Phase.PARSE, STRUCTURE_PORTLET_WAR_DEPLOYMENT_INIT, new PortletWarDeploymentInitializingProcessor(extension)); - processorTarget.addDeploymentProcessor(Phase.PARSE, MANIFEST_DEPENDENCIES_GATEIN, new GateInDependenciesDeploymentProcessor(extension)); - processorTarget.addDeploymentProcessor(Phase.PARSE, INSTALL_GATEIN_CHILD_WARS, new WarDependenciesDeploymentProcessor(extension)); + processorTarget.addDeploymentProcessor(Phase.STRUCTURE, STRUCTURE_GATEIN, new GateInStructureDeploymentProcessor()); + processorTarget.addDeploymentProcessor(Phase.PARSE, STRUCTURE_PORTLET_WAR_DEPLOYMENT_INIT, new PortletWarDeploymentInitializingProcessor()); + processorTarget.addDeploymentProcessor(Phase.PARSE, MANIFEST_DEPENDENCIES_GATEIN, new GateInDependenciesDeploymentProcessor()); + processorTarget.addDeploymentProcessor(Phase.PARSE, INSTALL_GATEIN_CHILD_WARS, new WarDependenciesDeploymentProcessor()); - //processorTarget.addDeploymentProcessor(Phase.DEPENDENCIES, DEPENDENCIES_PORTLET_MODULE, - // new PortletWarClassloadingDependencyProcessor(tldsBuilder.create())); - processorTarget.addDeploymentProcessor(Phase.POST_MODULE, POST_MODULE_GATEIN_INIT, new GateInInitDeploymentProcessor(extension)); - processorTarget.addDeploymentProcessor(Phase.INSTALL, INSTALL_GATEIN_START, new GateInStarterDeploymentProcessor(extension)); + processorTarget.addDeploymentProcessor(Phase.DEPENDENCIES, DEPENDENCIES_PORTLET_MODULE, new PortletWarClassloadingDependencyProcessor(tldsBuilder.create())); + processorTarget.addDeploymentProcessor(Phase.POST_MODULE, POST_MODULE_GATEIN_INIT, new GateInInitDeploymentProcessor()); + processorTarget.addDeploymentProcessor(Phase.INSTALL, INSTALL_GATEIN_START, new GateInStarterDeploymentProcessor()); } }, OperationContext.Stage.RUNTIME); } Added: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDefinition.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDefinition.java (rev 0) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDefinition.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -0,0 +1,62 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.gatein.integration.jboss.as7; + +import org.jboss.as.controller.PathElement; +import org.jboss.as.controller.ReloadRequiredRemoveStepHandler; +import org.jboss.as.controller.SimpleResourceDefinition; +import org.jboss.as.controller.descriptions.DefaultResourceAddDescriptionProvider; +import org.jboss.as.controller.descriptions.DefaultResourceRemoveDescriptionProvider; +import org.jboss.as.controller.descriptions.DescriptionProvider; +import org.jboss.as.controller.descriptions.ModelDescriptionConstants; +import org.jboss.as.controller.descriptions.ResourceDescriptionResolver; +import org.jboss.as.controller.registry.ManagementResourceRegistration; +import org.jboss.as.controller.registry.OperationEntry; + +import java.util.EnumSet; + +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REMOVE; + +/** + * @author Tomaz Cerar + */ +public class GateInSubsystemDefinition extends SimpleResourceDefinition +{ + protected static GateInSubsystemDefinition INSTANCE = new GateInSubsystemDefinition(); + + private GateInSubsystemDefinition() + { + super(PathElement.pathElement(ModelDescriptionConstants.SUBSYSTEM, GateInExtension.SUBSYSTEM_NAME), + GateInExtension.getResourceDescriptionResolver(GateInExtension.SUBSYSTEM_NAME)); + } + + @Override + public void registerOperations(final ManagementResourceRegistration registration) + { + final GateInSubsystemAdd subsystemAdd = new GateInSubsystemAdd(); + final ResourceDescriptionResolver rootResolver = GateInSubsystemDefinition.INSTANCE.getResourceDescriptionResolver(); + final DescriptionProvider subsystemAddDescription = new DefaultResourceAddDescriptionProvider(registration, rootResolver); + registration.registerOperationHandler(ADD, subsystemAdd, subsystemAddDescription, EnumSet.of(OperationEntry.Flag.RESTART_ALL_SERVICES)); + registration.registerOperationHandler(REMOVE, ReloadRequiredRemoveStepHandler.INSTANCE, new DefaultResourceRemoveDescriptionProvider(rootResolver), EnumSet.of(OperationEntry.Flag.RESTART_ALL_SERVICES)); + } +} Property changes on: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDefinition.java ___________________________________________________________________ Added: svn:executable + * Deleted: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -1,73 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.gatein.integration.jboss.as7; - -import org.jboss.as.controller.OperationContext; -import org.jboss.as.controller.OperationFailedException; -import org.jboss.as.controller.OperationStepHandler; -import org.jboss.as.controller.PathAddress; -import org.jboss.as.controller.descriptions.DescriptionProvider; -import org.jboss.dmr.ModelNode; - -import java.util.Locale; - -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; - -/** - * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> - */ -public class GateInSubsystemDescribe implements OperationStepHandler, DescriptionProvider -{ - - static final GateInSubsystemDescribe INSTANCE = new GateInSubsystemDescribe(); - - /** - * {@inheritDoc} - */ - @Override - public void execute(OperationContext context, ModelNode operation) throws OperationFailedException - { - final PathAddress rootAddress = PathAddress.pathAddress(PathAddress.pathAddress(operation.require(OP_ADDR)).getLastElement()); - final ModelNode subModel = context.readResource(PathAddress.EMPTY_ADDRESS).getModel(); - - final ModelNode subsystemAdd = new ModelNode(); - subsystemAdd.get(OP).set(ADD); - subsystemAdd.get(OP_ADDR).set(rootAddress.toModelNode()); - if (subModel.hasDefined(Constants.DEPLOYMENT_ARCHIVES)) - { - subsystemAdd.get(Constants.DEPLOYMENT_ARCHIVES).set(subModel.get(Constants.DEPLOYMENT_ARCHIVES)); - } - if (subModel.hasDefined(Constants.PORTLET_WAR_DEPENDENCIES)) - { - subsystemAdd.get(Constants.PORTLET_WAR_DEPENDENCIES).set(subModel.get(Constants.PORTLET_WAR_DEPENDENCIES)); - } - context.getResult().add(subsystemAdd); - - context.completeStep(); - } - - @Override - public ModelNode getModelDescription(Locale locale) - { - return new ModelNode(); - } -} Deleted: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptionProviders.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptionProviders.java 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptionProviders.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -1,44 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.gatein.integration.jboss.as7; - -import org.jboss.as.controller.descriptions.DescriptionProvider; -import org.jboss.dmr.ModelNode; - -import java.util.Locale; - -/** - * Common web description providers. - * - * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> - */ -public class GateInSubsystemDescriptionProviders -{ - public static final DescriptionProvider SUBSYSTEM = new DescriptionProvider() - { - @Override - public ModelNode getModelDescription(Locale locale) - { - return GateInSubsystemDescriptions.getSubsystemDescription(locale); - } - }; -} Deleted: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptions.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptions.java 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptions.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -1,78 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.gatein.integration.jboss.as7; - -import org.jboss.dmr.ModelNode; - -import java.util.Locale; -import java.util.ResourceBundle; - -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; - -/** - * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> - */ -public class GateInSubsystemDescriptions -{ - static final String RESOURCE_NAME = GateInSubsystemDescriptions.class.getPackage().getName() + ".LocalDescriptions"; - - public static ModelNode getSubsystemDescription(final Locale locale) - { - final ResourceBundle bundle = getResourceBundle(locale); - - final ModelNode node = new ModelNode(); - - node.get(DESCRIPTION).set(bundle.getString("gatein.description")); - node.get(HEAD_COMMENT_ALLOWED).set(true); - node.get(TAIL_COMMENT_ALLOWED).set(true); - node.get(NAMESPACE).set(GateInExtension.NAMESPACE); - - node.get(CHILDREN, "deployment-archives", DESCRIPTION).set(bundle.getString("gatein.deployment-archives.description")); - node.get(CHILDREN, "deployment-archives", MIN_OCCURS).set(0); - node.get(CHILDREN, "deployment-archives", MAX_OCCURS).set(1); - node.get(CHILDREN, "deployment-archives", MODEL_DESCRIPTION); - - node.get(CHILDREN, "portlet-war-dependencies", DESCRIPTION).set(bundle.getString("gatein.portlet-war-dependencies.description")); - node.get(CHILDREN, "portlet-war-dependencies", MIN_OCCURS).set(0); - node.get(CHILDREN, "portlet-war-dependencies", MAX_OCCURS).set(1); - node.get(CHILDREN, "portlet-war-dependencies", MODEL_DESCRIPTION); - - return node; - } - - static ResourceBundle getResourceBundle(Locale locale) - { - if (locale == null) - { - locale = Locale.getDefault(); - } - return ResourceBundle.getBundle(RESOURCE_NAME, locale); - } - - public static ModelNode getSubsystemAddDescription(Locale locale) - { - final ResourceBundle bundle = getResourceBundle(locale); - final ModelNode subsystem = new ModelNode(); - subsystem.get(DESCRIPTION).set(bundle.getString("gatein.add.description")); - return subsystem; - } -} Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemParser.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemParser.java 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemParser.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -21,6 +21,7 @@ */ package org.gatein.integration.jboss.as7; +import org.jboss.as.controller.parsing.ParseUtils; import org.jboss.as.controller.persistence.SubsystemMarshallingContext; import org.jboss.dmr.ModelNode; import org.jboss.dmr.Property; @@ -31,11 +32,18 @@ import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; +import java.util.EnumSet; import java.util.List; -import static org.gatein.integration.jboss.as7.Constants.*; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; -import static org.jboss.as.controller.parsing.ParseUtils.*; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; +import static org.jboss.as.controller.parsing.ParseUtils.requireNoAttributes; +import static org.jboss.as.controller.parsing.ParseUtils.requireNoContent; +import static org.jboss.as.controller.parsing.ParseUtils.requireNoNamespaceAttribute; +import static org.jboss.as.controller.parsing.ParseUtils.unexpectedAttribute; +import static org.jboss.as.controller.parsing.ParseUtils.unexpectedElement; /** * GateIn subsystem parser. @@ -61,13 +69,13 @@ context.startSubsystemElement(GateInExtension.NAMESPACE, false); ModelNode node = context.getModelNode(); - if (node.hasDefined(DEPLOYMENT_ARCHIVES)) + if (node.hasDefined(Constants.DEPLOYMENT_ARCHIVE)) { - writeDeploymentArchives(writer, node.get(DEPLOYMENT_ARCHIVES)); + writeDeploymentArchives(writer, node.get(Constants.DEPLOYMENT_ARCHIVE)); } - if (node.hasDefined(PORTLET_WAR_DEPENDENCIES)) + if (node.hasDefined(Constants.PORTLET_WAR_DEPENDENCY)) { - writePortletWarDependencies(writer, node.get(PORTLET_WAR_DEPENDENCIES)); + writePortletWarDependencies(writer, node.get(Constants.PORTLET_WAR_DEPENDENCY)); } writer.writeEndElement(); } @@ -81,20 +89,8 @@ { writer.writeStartElement(Element.ARCHIVE.getLocalName()); writer.writeAttribute(Attribute.NAME.getLocalName(), archive.getName()); - if (archive.getValue().isDefined() && archive.getValue().asInt() > 0) - { - for (Property property : archive.getValue().asPropertyList()) - { - if (MAIN.equals(property.getName())) - { - writer.writeAttribute(Attribute.MAIN.getLocalName(), TRUE); - } - else - { - throw new RuntimeException("Unexpected model property: " + property + " on " + archive); - } - } - } + ModelNode model = archive.getValue(); + DeploymentArchiveDefinition.MAIN.marshallAsAttribute(model, false, writer); writer.writeEndElement(); } writer.writeEndElement(); @@ -111,20 +107,8 @@ { writer.writeStartElement(Element.DEPENDENCY.getLocalName()); writer.writeAttribute(Attribute.NAME.getLocalName(), dependency.getName()); - if (dependency.getValue().isDefined() && dependency.getValue().asInt() > 0) - { - for (Property property : dependency.getValue().asPropertyList()) - { - if (IMPORT_SERVICES.equals(property.getName())) - { - writer.writeAttribute(Attribute.IMPORT_SERVICES.getLocalName(), TRUE); - } - else - { - throw new RuntimeException("Unexpected model property: " + property + " on " + dependency); - } - } - } + ModelNode model = dependency.getValue(); + PortletWarDependancyDefinition.IMPORT_SERVICES.marshallAsAttribute(model, false, writer); writer.writeEndElement(); } writer.writeEndElement(); @@ -168,14 +152,12 @@ { case DEPLOYMENT_ARCHIVES: { - final ModelNode deploymentArchives = parseDeploymentArchives(reader); - subsystem.get(DEPLOYMENT_ARCHIVES).set(deploymentArchives); + parseDeploymentArchives(reader, address, list); break; } case PORTLET_WAR_DEPENDENCIES: { - final ModelNode portletWarDeps = parsePortletWarDependencies(reader); - subsystem.get(PORTLET_WAR_DEPENDENCIES).set(portletWarDeps); + parsePortletWarDependencies(reader, address, list); break; } default: @@ -183,17 +165,16 @@ throw unexpectedElement(reader); } } - } - else + } else { throw unexpectedElement(reader); } } } - static ModelNode parseDeploymentArchives(XMLExtendedStreamReader reader) throws XMLStreamException + static void parseDeploymentArchives(XMLExtendedStreamReader reader, ModelNode parent, List<ModelNode> operations) throws XMLStreamException { - final ModelNode model = new ModelNode(); + // no attributes requireNoAttributes(reader); // elements @@ -204,7 +185,7 @@ { case ARCHIVE: { - parseArchive(reader, model); + parseArchive(reader, parent, operations); break; } default: @@ -213,32 +194,29 @@ } // validate archives - int mainCount = 0; - for (Property p : model.asPropertyList()) - { - if (p.getValue().isDefined()) - { - List<Property> props = p.getValue().asPropertyList(); - if (props.size() > 0 && MAIN.equals(props.get(0).getName())) - { - mainCount++; - } + //TODO: this must go in DeploymentArchiveAdd + /*int mainCount = 0; + for (Property p : model.asPropertyList()) { + if (p.getValue().isDefined()) { + List<Property> props = p.getValue().asPropertyList(); + if (props.size() > 0 && MAIN.equals(props.get(0).getName())) { + mainCount++; + } } - } + } - if (mainCount != 1) - { + if (mainCount != 1) { throw new RuntimeException("Exactly one archive has to be marked as a main archive (found: " + mainCount + ")"); - } + } */ - return model; } - static void parseArchive(XMLExtendedStreamReader reader, ModelNode model) throws XMLStreamException + static void parseArchive(XMLExtendedStreamReader reader, ModelNode parent, List<ModelNode> operations) throws XMLStreamException { - // attributes + ModelNode model = new ModelNode(); + final int count = reader.getAttributeCount(); - boolean main = false; + String name = null; for (int i = 0; i < count; i++) { @@ -254,8 +232,7 @@ } case MAIN: { - requireTrueOrFalse(value); - main = Boolean.parseBoolean(value); + DeploymentArchiveDefinition.MAIN.parseAndSetParameter(value, model, reader); break; } default: @@ -266,22 +243,21 @@ if (name == null) { throw new RuntimeException("Attribute '" + Attribute.NAME.getLocalName() - + "' of '" + Element.ARCHIVE.getLocalName() + "' element can not be null!"); + + "' of '" + Element.ARCHIVE.getLocalName() + "' element can not be null!"); } - ModelNode attrList = new ModelNode(); - if (main) - { - attrList.add(MAIN, new ModelNode()); - } - model.add(name, attrList); + ModelNode address = parent.clone(); + address.add(Constants.DEPLOYMENT_ARCHIVE, name); + model.get(OP).set(ADD); + model.get(OP_ADDR).set(address); + operations.add(model); + requireNoContent(reader); } - static ModelNode parsePortletWarDependencies(XMLExtendedStreamReader reader) throws XMLStreamException + static void parsePortletWarDependencies(XMLExtendedStreamReader reader, ModelNode parent, List<ModelNode> operations) throws XMLStreamException { - final ModelNode model = new ModelNode(); // no attributes requireNoAttributes(reader); // elements @@ -292,22 +268,21 @@ { case DEPENDENCY: { - parseDependency(reader, model); + parseDependency(reader, parent, operations); break; } default: throw unexpectedElement(reader); } } - - return model; } - static void parseDependency(XMLExtendedStreamReader reader, ModelNode model) throws XMLStreamException + static void parseDependency(XMLExtendedStreamReader reader, ModelNode parent, List<ModelNode> operations) throws XMLStreamException { + + final ModelNode model = new ModelNode(); // attributes final int count = reader.getAttributeCount(); - boolean importSvcs = false; String name = null; for (int i = 0; i < count; i++) { @@ -323,8 +298,9 @@ } case IMPORT_SERVICES: { - requireTrueOrFalse(value); - importSvcs = Boolean.parseBoolean(value); + PortletWarDependancyDefinition.IMPORT_SERVICES.parseAndSetParameter(value, model, reader); + /*requireTrueOrFalse(value); + importSvcs = Boolean.parseBoolean(value);*/ break; } default: @@ -334,25 +310,16 @@ if (name == null) { - throw new RuntimeException("Attribute '" + Attribute.NAME.getLocalName() - + "' of '" + Element.ARCHIVE.getLocalName() + "' element can not be null!"); + throw ParseUtils.missingRequired(reader, EnumSet.of(Attribute.NAME)); } - ModelNode attrList = new ModelNode(); - if (importSvcs) - { - attrList.add(IMPORT_SERVICES, new ModelNode()); - } - model.add(name, attrList); + ModelNode address = parent.clone(); + address.add(Constants.PORTLET_WAR_DEPENDENCY, name); + model.get(OP).set(ADD); + model.get(OP_ADDR).set(address); + operations.add(model); + requireNoContent(reader); } - - private static void requireTrueOrFalse(String value) - { - if (!"true".equals(value) && !"false".equals(value)) - { - throw new RuntimeException("Invalid value for boolean attribute: " + value); - } - } } Added: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependancyAdd.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependancyAdd.java (rev 0) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependancyAdd.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.gatein.integration.jboss.as7; + +import org.jboss.as.controller.AbstractAddStepHandler; +import org.jboss.as.controller.OperationFailedException; +import org.jboss.dmr.ModelNode; + +/** + * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> + */ +public class PortletWarDependancyAdd extends AbstractAddStepHandler { + public static final PortletWarDependancyAdd INSTANCE = new PortletWarDependancyAdd(); + + private PortletWarDependancyAdd() { + } + + @Override + protected void populateModel(ModelNode operation, ModelNode model) throws OperationFailedException { + PortletWarDependancyDefinition.IMPORT_SERVICES.validateAndSet(operation,model); + } +} Property changes on: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependancyAdd.java ___________________________________________________________________ Added: svn:executable + * Added: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependancyDefinition.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependancyDefinition.java (rev 0) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependancyDefinition.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.gatein.integration.jboss.as7; + +import org.jboss.as.controller.PathElement; +import org.jboss.as.controller.ReloadRequiredRemoveStepHandler; +import org.jboss.as.controller.SimpleAttributeDefinition; +import org.jboss.as.controller.SimpleAttributeDefinitionBuilder; +import org.jboss.as.controller.SimpleResourceDefinition; +import org.jboss.as.controller.registry.AttributeAccess; +import org.jboss.as.controller.registry.ManagementResourceRegistration; +import org.jboss.dmr.ModelNode; +import org.jboss.dmr.ModelType; + +/** + * @author Tomaz Cerar + */ +public class PortletWarDependancyDefinition extends SimpleResourceDefinition +{ + protected static final PortletWarDependancyDefinition INSTANCE = new PortletWarDependancyDefinition(); + + protected static final SimpleAttributeDefinition IMPORT_SERVICES = + new SimpleAttributeDefinitionBuilder(Constants.IMPORT_SERVICES, ModelType.BOOLEAN, true) + .setAllowExpression(false) + .setDefaultValue(new ModelNode(false)) + .setXmlName(Constants.IMPORT_SERVICES) + .setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES) + .build(); + + private PortletWarDependancyDefinition() + { + super(PathElement.pathElement(Constants.PORTLET_WAR_DEPENDENCY), GateInExtension.getResourceDescriptionResolver(Constants.PORTLET_WAR_DEPENDENCY), + PortletWarDependancyAdd.INSTANCE, new ReloadRequiredRemoveStepHandler() + ); + } + + @Override + public void registerAttributes(ManagementResourceRegistration resourceRegistration) + { + resourceRegistration.registerReadOnlyAttribute(IMPORT_SERVICES, null); + } +} Property changes on: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependancyDefinition.java ___________________________________________________________________ Added: svn:executable + * Deleted: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/SetGateInArchivesHandler.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/SetGateInArchivesHandler.java 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/SetGateInArchivesHandler.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -1,62 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.gatein.integration.jboss.as7; - -import org.jboss.as.controller.AbstractAddStepHandler; -import org.jboss.as.controller.OperationFailedException; -import org.jboss.as.controller.descriptions.DescriptionProvider; -import org.jboss.dmr.ModelNode; -import org.jboss.dmr.ModelType; - -import java.util.Locale; -import java.util.ResourceBundle; - -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; - -/** - * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> - */ -public class SetGateInArchivesHandler extends AbstractAddStepHandler implements DescriptionProvider -{ - public static final SetGateInArchivesHandler INSTANCE = new SetGateInArchivesHandler(); - - private SetGateInArchivesHandler() - { - } - - @Override - protected void populateModel(ModelNode operation, ModelNode model) throws OperationFailedException - { - - } - - public ModelNode getModelDescription(Locale locale) - { - final ResourceBundle bundle = GateInSubsystemDescriptions.getResourceBundle(locale); - ModelNode node = new ModelNode(); - node.get(DESCRIPTION).set(bundle.getString("gatein.set-deployment-archives.description")); - node.get(REQUEST_PROPERTIES, "services", DESCRIPTION).set(bundle.getString("gatein.deployment-archives.archive.services.description")); - node.get(REQUEST_PROPERTIES, "services", TYPE).set(ModelType.UNDEFINED); - node.get(REQUEST_PROPERTIES, "services", REQUIRED).set(false); - return node; - } -} Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInDependenciesDeploymentProcessor.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInDependenciesDeploymentProcessor.java 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInDependenciesDeploymentProcessor.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -21,7 +21,6 @@ */ package org.gatein.integration.jboss.as7.deployment; -import org.gatein.integration.jboss.as7.GateInExtension; import org.gatein.integration.jboss.as7.GateInExtensionConfiguration; import org.jboss.as.server.deployment.Attachments; import org.jboss.as.server.deployment.DeploymentPhaseContext; @@ -43,22 +42,13 @@ final ModuleIdentifier gateInLibId = ModuleIdentifier.fromString("org.gatein.lib"); - private GateInExtension extension; - private GateInExtensionConfiguration config; + private GateInExtensionConfiguration config =GateInExtensionConfiguration.INSTANCE; - public GateInDependenciesDeploymentProcessor(GateInExtension extension) - { - this.extension = extension; - this.config = extension.getConfiguration(); - } - public void deploy(final DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException { final DeploymentUnit du = phaseContext.getDeploymentUnit(); - if (du.getAttachment(GateInEarKey.KEY) != null - || du.getAttachment(GateInExtKey.KEY) != null - || du.getAttachment(PortletWarKey.INSTANCE) != null) + if (config.isGateInOrPortletArchive(du)) { // add dependency on org.gatein.lib List<ModuleDependency> dependencies = du.getAttachmentList(Attachments.MANIFEST_DEPENDENCIES); @@ -66,14 +56,13 @@ if (!containsDependency(dependencies, gateInLibId)) { du.addToAttachmentList(Attachments.MANIFEST_DEPENDENCIES, - new ModuleDependency(Module.getBootModuleLoader(), gateInLibId, false, false, true)); + new ModuleDependency(Module.getBootModuleLoader(), gateInLibId, false, false, true, false)); } // add gatein deployment modules cross-dependencies ModuleIdentifier moduleId = du.getAttachment(Attachments.MODULE_IDENTIFIER); - if (du.getAttachment(GateInEarKey.KEY) != null - || du.getAttachment(GateInExtKey.KEY) != null) + if (config.isGateInArchive(du)) { final ServiceModuleLoader deploymentModuleLoader = du.getAttachment(Attachments.SERVICE_MODULE_LOADER); @@ -82,7 +71,7 @@ if (!containsDependency(dependencies, config.getGateInEarModule())) { du.addToAttachmentList(Attachments.MANIFEST_DEPENDENCIES, - new ModuleDependency(deploymentModuleLoader, config.getGateInEarModule(), false, false, false)); + new ModuleDependency(deploymentModuleLoader, config.getGateInEarModule(), false, false, false, false)); } } @@ -93,7 +82,7 @@ if (!containsDependency(dependencies, id)) { du.addToAttachmentList(Attachments.MANIFEST_DEPENDENCIES, - new ModuleDependency(deploymentModuleLoader, id, false, false, false)); + new ModuleDependency(deploymentModuleLoader, id, false, false, false, false)); } } } Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInInitDeploymentProcessor.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInInitDeploymentProcessor.java 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInInitDeploymentProcessor.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -44,34 +44,28 @@ { private final Logger log = Logger.getLogger(GateInInitDeploymentProcessor.class); - private GateInExtension extension; + private GateInExtensionConfiguration config = GateInExtensionConfiguration.INSTANCE; - public GateInInitDeploymentProcessor(GateInExtension extension) - { - this.extension = extension; - } - @Override public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException { final DeploymentUnit du = phaseContext.getDeploymentUnit(); - if (du.getAttachment(GateInEarKey.KEY) != null - || du.getAttachment(GateInExtKey.KEY) != null) + if (config.isGateInArchive(du)) { log.info("Module is on GateIn Extension modules list"); - GateInExtensionConfiguration conf = extension.getConfiguration(); - ServiceName initSvcName = GateInExtension.deploymentUnitName(conf.getGateInEarModule(), "gatein", "init"); + + ServiceName initSvcName = GateInExtension.deploymentUnitName(config.getGateInEarModule(), "gatein", "init"); ServiceTarget target = phaseContext.getServiceTarget(); if (du.getAttachment(GateInEarKey.KEY) != null) { // install InitService with dependency on all the deployment modules reaching POST_MODULE // TODO: we are starting up InitService before child modules (jboss.deployment.subunit.*) have gone through POST_MODULE - ServiceBuilder<InitService> builder = target.addService(initSvcName, new InitService(extension)) - .addDependency(GateInExtension.deploymentUnitName(conf.getGateInEarModule(), Phase.POST_MODULE)); + ServiceBuilder<InitService> builder = target.addService(initSvcName, new InitService()) + .addDependency(GateInExtension.deploymentUnitName(config.getGateInEarModule(), Phase.POST_MODULE)); - for (ModuleIdentifier module : conf.getGateInExtModules()) + for (ModuleIdentifier module : config.getGateInExtModules()) { builder.addDependency(GateInExtension.deploymentUnitName(module, Phase.POST_MODULE)); } Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInStarterDeploymentProcessor.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInStarterDeploymentProcessor.java 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInStarterDeploymentProcessor.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -44,15 +44,8 @@ { private ConcurrentHashMap<ModuleIdentifier, ModuleIdentifier> deploymentModules; - private GateInExtension extension; - private GateInExtensionConfiguration config; + private GateInExtensionConfiguration config = GateInExtensionConfiguration.INSTANCE; - public GateInStarterDeploymentProcessor(GateInExtension extension) - { - this.extension = extension; - this.config = extension.getConfiguration(); - } - private synchronized ConcurrentHashMap<ModuleIdentifier, ModuleIdentifier> getDeploymentModules() { if (deploymentModules == null) @@ -76,7 +69,7 @@ // Then enumerate all the child components which should all be scheduled for startup at that point // to get the dependencies for StartupService - if (du.getAttachment(GateInEarKey.KEY) != null || du.getAttachment(GateInExtKey.KEY) != null) + if (config.isGateInArchive(du)) { ModuleIdentifier moduleId = du.getAttachment(Attachments.MODULE_IDENTIFIER); getDeploymentModules().remove(moduleId); Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInStructureDeploymentProcessor.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInStructureDeploymentProcessor.java 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInStructureDeploymentProcessor.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -23,15 +23,12 @@ import org.gatein.integration.jboss.as7.GateInExtension; import org.gatein.integration.jboss.as7.GateInExtensionConfiguration; -import org.jboss.as.ee.structure.DeploymentType; -import org.jboss.as.ee.structure.DeploymentTypeMarker; import org.jboss.as.server.deployment.Attachments; import org.jboss.as.server.deployment.DeploymentPhaseContext; import org.jboss.as.server.deployment.DeploymentUnit; import org.jboss.as.server.deployment.DeploymentUnitProcessingException; import org.jboss.as.server.deployment.DeploymentUnitProcessor; import org.jboss.as.server.deployment.Services; -import org.jboss.as.web.WebSubsystemServices; import org.jboss.logging.Logger; import org.jboss.modules.ModuleIdentifier; import org.jboss.msc.service.AbstractServiceListener; @@ -39,10 +36,6 @@ import org.jboss.msc.service.ServiceListener; import org.jboss.msc.service.ServiceName; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; - /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ @@ -75,13 +68,10 @@ }; - private GateInExtension extension; - private GateInExtensionConfiguration config; + private GateInExtensionConfiguration config = GateInExtensionConfiguration.INSTANCE; - public GateInStructureDeploymentProcessor(GateInExtension extension) + public GateInStructureDeploymentProcessor() { - this.extension = extension; - this.config = extension.getConfiguration(); } @Override @@ -121,14 +111,13 @@ { DeploymentUnit du = phaseContext.getDeploymentUnit(); DeploymentUnit parent = du.getParent(); - if (parent.getAttachment(GateInEarKey.KEY) != null - || parent.getAttachment(GateInExtKey.KEY) != null) + if (config.isGateInArchive(parent)) { //if (DeploymentTypeMarker.isType(DeploymentType.WAR, du)) //{ // config.getChildWars().add(WebSubsystemServices.JBOSS_WEB.append(du.getName())); //} - config.getChildSubUnits().add(Services.deploymentUnitName(parent.getName(), du.getName())); + config.addChildSubUnit(Services.deploymentUnitName(parent.getName(), du.getName())); } } @@ -140,7 +129,7 @@ void installListener(DeploymentPhaseContext phaseContext, ModuleIdentifier moduleId) { ServiceName serviceName = Services.deploymentUnitName( - GateInExtension.skipModuleLoaderPrefix(moduleId.getName())); + GateInExtension.skipModuleLoaderPrefix(moduleId.getName())); ServiceController<?> svcc = phaseContext.getServiceRegistry().getService(serviceName); svcc.addListener(ServiceListener.Inheritance.ALL, listener); Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -21,6 +21,7 @@ */ package org.gatein.integration.jboss.as7.deployment; +import org.gatein.integration.jboss.as7.GateInExtensionConfiguration; import org.jboss.as.server.deployment.Attachments; import org.jboss.as.server.deployment.DeploymentPhaseContext; import org.jboss.as.server.deployment.DeploymentUnit; @@ -30,9 +31,6 @@ import org.jboss.as.server.deployment.module.ModuleSpecification; import org.jboss.as.web.deployment.TldsMetaData; import org.jboss.metadata.web.spec.TldMetaData; -import org.jboss.modules.Module; -import org.jboss.modules.ModuleIdentifier; -import org.jboss.modules.ModuleLoader; import java.util.List; import java.util.Map; @@ -43,12 +41,10 @@ public class PortletWarClassloadingDependencyProcessor implements DeploymentUnitProcessor { - private static final ModuleIdentifier GATEIN_WCI = ModuleIdentifier.create("org.gatein.wci"); - private static final ModuleIdentifier GATEIN_PC = ModuleIdentifier.create("org.gatein.pc"); - private static final ModuleIdentifier JAVAX_PORTLET = ModuleIdentifier.create("javax.portlet.api"); - private List<TldMetaData> tldMetas; + private GateInExtensionConfiguration conf = GateInExtensionConfiguration.INSTANCE; + public PortletWarClassloadingDependencyProcessor(List<TldMetaData> tldMetaData) { this.tldMetas = tldMetaData; @@ -57,22 +53,22 @@ @Override public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException { - final DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit(); - if (deploymentUnit.getAttachment(PortletWarKey.INSTANCE) == null) + final DeploymentUnit du = phaseContext.getDeploymentUnit(); + if (!conf.isPortletArchive(du)) { return; // Skip non portlet deployments } - final ModuleLoader moduleLoader = Module.getBootModuleLoader(); - final ModuleSpecification moduleSpecification = deploymentUnit.getAttachment(Attachments.MODULE_SPECIFICATION); + final ModuleSpecification moduleSpecification = du.getAttachment(Attachments.MODULE_SPECIFICATION); // Add module dependencies - moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, GATEIN_WCI, false, false, false)); - moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, GATEIN_PC, false, false, false)); - moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, JAVAX_PORTLET, false, false, false)); + for (ModuleDependency dep: conf.getPortletWarDependencies()) + { + moduleSpecification.addSystemDependency(dep); + } // Provide tlds for portlet taglibs - provideTlds(deploymentUnit); + provideTlds(du); } private void provideTlds(DeploymentUnit deploymentUnit) Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarDeploymentInitializingProcessor.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarDeploymentInitializingProcessor.java 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarDeploymentInitializingProcessor.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -21,7 +21,6 @@ */ package org.gatein.integration.jboss.as7.deployment; -import org.gatein.integration.jboss.as7.GateInExtension; import org.jboss.as.ee.structure.DeploymentType; import org.jboss.as.ee.structure.DeploymentTypeMarker; import org.jboss.as.server.deployment.Attachments; @@ -39,13 +38,7 @@ { private static final String PORTLET_XML = "WEB-INF/portlet.xml"; - private GateInExtension extension; - public PortletWarDeploymentInitializingProcessor(GateInExtension extension) - { - this.extension = extension; - } - @Override public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException { Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/WarDependenciesDeploymentProcessor.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/WarDependenciesDeploymentProcessor.java 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/WarDependenciesDeploymentProcessor.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -21,7 +21,6 @@ */ package org.gatein.integration.jboss.as7.deployment; -import org.gatein.integration.jboss.as7.GateInExtension; import org.gatein.integration.jboss.as7.GateInExtensionConfiguration; import org.jboss.as.server.deployment.DeploymentPhaseContext; import org.jboss.as.server.deployment.DeploymentUnit; @@ -32,20 +31,16 @@ import org.jboss.metadata.web.jboss.JBossWebMetaData; import org.jboss.msc.service.ServiceName; -import java.lang.Override;import java.lang.String; +import java.lang.Override; +import java.lang.String; /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ public class WarDependenciesDeploymentProcessor implements DeploymentUnitProcessor { - private GateInExtensionConfiguration config; + private GateInExtensionConfiguration config = GateInExtensionConfiguration.INSTANCE; - public WarDependenciesDeploymentProcessor(GateInExtension extension) - { - this.config = extension.getConfiguration(); - } - private void processWarDeployment(DeploymentUnit du) { WarMetaData warMetaData = du.getAttachment(WarMetaData.ATTACHMENT_KEY); @@ -54,19 +49,25 @@ final JBossWebMetaData metaData = warMetaData.getMergedJBossWebMetaData(); String pathName; - if (metaData.getContextRoot() == null) { + if (metaData.getContextRoot() == null) + { pathName = "/" + du.getName().substring(0, du.getName().length() - 4); - } else { + } + else + { pathName = metaData.getContextRoot(); - if ("/".equals(pathName)) { - pathName = ""; - } else if (pathName.length() > 0 && pathName.charAt(0) != '/') { - pathName = "/" + pathName; + if ("/".equals(pathName)) + { + pathName = ""; } + else if (pathName.length() > 0 && pathName.charAt(0) != '/') + { + pathName = "/" + pathName; + } } final ServiceName deploymentServiceName = WebSubsystemServices.deploymentServiceName("default-host", pathName); - config.getChildWars().add(deploymentServiceName); + config.addChildWar(deploymentServiceName); } @Override @@ -75,15 +76,14 @@ DeploymentUnit du = phaseContext.getDeploymentUnit(); DeploymentUnit parent = du.getParent(); - if (du.getParent() != null) { - if (parent.getAttachment(GateInEarKey.KEY) != null - || parent.getAttachment(GateInExtKey.KEY) != null) + if (parent != null) + { + if (config.isGateInArchive(parent)) { processWarDeployment(du); } } - else if (du.getAttachment(GateInEarKey.KEY) != null - || du.getAttachment(GateInExtKey.KEY) != null) + else if (config.isGateInArchive(du)) { processWarDeployment(du); } Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/web/InitService.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/web/InitService.java 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/web/InitService.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -23,6 +23,7 @@ import org.exoplatform.container.RootContainer; import org.gatein.integration.jboss.as7.GateInExtension; +import org.gatein.integration.jboss.as7.GateInExtensionConfiguration; import org.jboss.as.server.moduleservice.ModuleLoadService; import org.jboss.as.server.moduleservice.ServiceModuleLoader; import org.jboss.modules.Module; @@ -38,19 +39,14 @@ public class InitService implements Service<InitService> { - private GateInExtension extension; + private GateInExtensionConfiguration config = GateInExtensionConfiguration.INSTANCE; - public InitService(GateInExtension extension) - { - this.extension = extension; - } - @Override public void start(StartContext context) throws StartException { System.out.println("InitService START"); ServiceController<?> svc = context.getController().getServiceContainer() - .getRequiredService(ServiceModuleLoader.moduleServiceName(extension.getConfiguration().getGateInEarModule())); + .getRequiredService(ServiceModuleLoader.moduleServiceName(config.getGateInEarModule())); ModuleLoadService modService = (ModuleLoadService) svc.getService(); Module module = modService.getValue(); Modified: portal/trunk/packaging/jboss-as7/extension/src/main/resources/org/gatein/integration/jboss/as7/LocalDescriptions.properties =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/resources/org/gatein/integration/jboss/as7/LocalDescriptions.properties 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/extension/src/main/resources/org/gatein/integration/jboss/as7/LocalDescriptions.properties 2012-02-27 11:46:34 UTC (rev 8472) @@ -27,3 +27,25 @@ gatein.set-deployment-archives.description=Sets the deployment archives that are part of GateIn portal installation. gatein.portlet-war-dependencies.description=Set of dependencies to make available to portlet wars. gatein.deployment-archives.archive.services.description=Should META-INF/services configuration be imported for ServiceLoader to find it? + +gatein=GateIn subsystem configuration. +gatein.add=Adds the GateIn subsystem. +gatein.remove=Removes gatein subsystem +gatein.deployment-archive=Set of deployment archives forming a GateIn portal installation. +gatein.portlet-war-dependency=Set of dependencies to make available to portlet wars. + +deployment-archive.add=Adds deployment archive +deployment-archive.remove=Removes deployment archive +deployment-archive.main=Marks archive as main +deployment-archive=Deployment archive +portlet-war-dependency=Portlet war dependency +portlet-war-dependency.add=Adds deployment archive +portlet-war-dependency.remove=Removes deployment archive +portlet-war-dependency.import-services=Marks that dependency should also import services +gatein.portal=GateIn portal defintion +portal=GateIn portal defintion +portal.add=Adds portal +portal.remove=Removes portal +#gatein.set-deployment-archives.description=Sets the deployment archives that are part of GateIn portal installation. +#gatein.portlet-war-dependencies.description=Set of dependencies to make available to portlet wars. +#gatein.deployment-archives.archive.services.description=Should META-INF/services configuration be imported for ServiceLoader to find it? Added: portal/trunk/packaging/jboss-as7/extension/src/main/resources/schema/jboss-as-gatein-1.0.xsd =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/resources/schema/jboss-as-gatein-1.0.xsd (rev 0) +++ portal/trunk/packaging/jboss-as7/extension/src/main/resources/schema/jboss-as-gatein-1.0.xsd 2012-02-27 11:46:34 UTC (rev 8472) @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" + targetNamespace="urn:jboss:domain:gatein:1.0" + xmlns="urn:jboss:domain:gatein:1.0" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="1.0"> + +  + <xs:element name="subsystem" type="gatein-rootType"/> + +  + <xs:complexType name="gatein-rootType"> + <xs:annotation> + <xs:documentation> + <![CDATA[ + The gatein subsystem, used to configure gatein support + ]]> + </xs:documentation> + </xs:annotation> + + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="1" name="deployment-archives" type="deploymentArchivesType"/> + <xs:element minOccurs="0" maxOccurs="1" name="portlet-war-dependencies" type="portletWarDependenciesType"/> + </xs:sequence> + </xs:complexType> + + + <xs:complexType name="deploymentArchivesType"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element name="archive" type="archiveType"> + <xs:annotation> + <xs:documentation> + <![CDATA[ + TODO: Description ... + ]]> + </xs:documentation> + </xs:annotation> + </xs:element> + </xs:choice> + </xs:complexType> + + <xs:complexType name="archiveType"> + <xs:attribute name="name" use="required"/> + <xs:attribute name="main" type="xs:boolean" use="optional" default="false"/> + </xs:complexType> + + <xs:complexType name="portletWarDependenciesType"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element name="dependency" type="dependencyType"> + <xs:annotation> + <xs:documentation> + <![CDATA[ + TODO: Description ... + ]]> + </xs:documentation> + </xs:annotation> + </xs:element> + </xs:choice> + </xs:complexType> + + <xs:complexType name="dependencyType"> + <xs:attribute name="name" use="required"/> + <xs:attribute name="import-services" type="xs:boolean" use="optional" default="false"/> + </xs:complexType> + +</xs:schema> Property changes on: portal/trunk/packaging/jboss-as7/extension/src/main/resources/schema/jboss-as-gatein-1.0.xsd ___________________________________________________________________ Added: svn:executable + * Deleted: portal/trunk/packaging/jboss-as7/extension/src/main/resources/schema/jboss-gatein.xsd =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/main/resources/schema/jboss-gatein.xsd 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/extension/src/main/resources/schema/jboss-gatein.xsd 2012-02-27 11:46:34 UTC (rev 8472) @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" - targetNamespace="urn:jboss:domain:gatein:1.0" - xmlns="urn:jboss:domain:gatein:1.0" - elementFormDefault="qualified" - attributeFormDefault="unqualified" - version="1.0"> - -  - <xs:element name="subsystem" type="gatein-rootType"/> - -  - <xs:complexType name="gatein-rootType"> - <xs:annotation> - <xs:documentation> - <![CDATA[ - The gatein subsystem, used to configure gatein support - ]]> - </xs:documentation> - </xs:annotation> - - <xs:sequence> - <xs:element minOccurs="0" maxOccurs="1" name="deployment-archives" type="deploymentArchivesType"/> - <xs:element minOccurs="0" maxOccurs="1" name="portlet-war-dependencies" type="portletWarDependenciesType"/> - </xs:sequence> - </xs:complexType> - - - <xs:complexType name="deploymentArchivesType"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element name="archive" type="archiveType"> - <xs:annotation> - <xs:documentation> - <![CDATA[ - TODO: Description ... - ]]> - </xs:documentation> - </xs:annotation> - </xs:element> - </xs:choice> - </xs:complexType> - - <xs:complexType name="archiveType"> - <xs:attribute name="name" use="required"/> - <xs:attribute name="main" type="xs:boolean" use="optional" default="false"/> - </xs:complexType> - - <xs:complexType name="portletWarDependenciesType"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element name="dependency" type="dependencyType"> - <xs:annotation> - <xs:documentation> - <![CDATA[ - TODO: Description ... - ]]> - </xs:documentation> - </xs:annotation> - </xs:element> - </xs:choice> - </xs:complexType> - - <xs:complexType name="dependencyType"> - <xs:attribute name="name" use="required"/> - <xs:attribute name="import-services" type="xs:boolean" use="optional" default="false"/> - </xs:complexType> - -</xs:schema> Modified: portal/trunk/packaging/jboss-as7/extension/src/test/java/org/gatein/integration/jboss/as7/SubsystemParsingTestCase.java =================================================================== --- portal/trunk/packaging/jboss-as7/extension/src/test/java/org/gatein/integration/jboss/as7/SubsystemParsingTestCase.java 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/extension/src/test/java/org/gatein/integration/jboss/as7/SubsystemParsingTestCase.java 2012-02-27 11:46:34 UTC (rev 8472) @@ -21,24 +21,30 @@ */ package org.gatein.integration.jboss.as7; -import junit.framework.Assert; -import org.gatein.integration.jboss.as7.support.AbstractParsingTest; -import org.gatein.integration.jboss.as7.support.KernelServices; -import org.jboss.as.controller.PathAddress; -import org.jboss.as.controller.PathElement; -import org.jboss.dmr.ModelNode; -import org.jboss.dmr.Property; -import org.junit.Test; +import org.jboss.as.subsystem.test.*; -import java.util.List; +import java.io.IOException; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; - /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class SubsystemParsingTestCase extends AbstractParsingTest +public class SubsystemParsingTestCase extends AbstractSubsystemBaseTest { + private static final String SUBSYSTEM_XML = + "<subsystem xmlns=\"" + GateInExtension.NAMESPACE + "\">\n" + + " <deployment-archives>\n" + + " <archive name=\"" + Archive.GATEIN.getLocalName() + "\" main=\"true\" />\n" + + " <archive name=\"" + Archive.GATEIN_SAMPLE_EXTENSION.getLocalName() + "\" />\n" + + " <archive name=\"" + Archive.GATEIN_SAMPLE_PORTAL.getLocalName() + "\" />\n" + + " <archive name=\"" + Archive.GATEIN_SAMPLE_SKIN.getLocalName() + "\" />\n" + + " </deployment-archives>\n" + + " <portlet-war-dependencies>\n" + + " <dependency name=\"" + Module.ORG_GATEIN_LIB.getLocalName() + "\" import-services=\"true\" />\n" + + " <dependency name=\"" + Module.ORG_GATEIN_WCI.getLocalName() + "\" />\n" + + " <dependency name=\"" + Module.JAVAX_PORTLET_API.getLocalName() + "\" />\n" + + " </portlet-war-dependencies>\n" + + "</subsystem>"; + static enum Archive { GATEIN("gatein.ear"), @@ -78,198 +84,14 @@ } } - /** - * Tests that the xml is parsed into the correct operations - */ - @Test - public void testParseSubsystem() throws Exception + public SubsystemParsingTestCase() { - //Parse the subsystem xml - String subsystemXml = - "<subsystem xmlns=\"" + GateInExtension.NAMESPACE + "\">\n" + - " <deployment-archives>\n" + - " <archive name=\"" + Archive.GATEIN.getLocalName() + "\" main=\"true\" />\n" + - " <archive name=\"" + Archive.GATEIN_SAMPLE_EXTENSION.getLocalName() + "\" />\n" + - " <archive name=\"" + Archive.GATEIN_SAMPLE_PORTAL.getLocalName() + "\" />\n" + - " <archive name=\"" + Archive.GATEIN_SAMPLE_SKIN.getLocalName() + "\" />\n" + - " </deployment-archives>\n" + - " <portlet-war-dependencies>\n" + - " <dependency name=\"" + Module.ORG_GATEIN_LIB.getLocalName() + "\" import-services=\"true\" />\n" + - " <dependency name=\"" + Module.ORG_GATEIN_WCI.getLocalName() + "\" />\n" + - " <dependency name=\"" + Module.JAVAX_PORTLET_API.getLocalName() + "\" />\n" + - " </portlet-war-dependencies>\n" + - "</subsystem>"; - - List<ModelNode> operations = super.parse(subsystemXml); - - ///Check that we have the expected number of operations - Assert.assertEquals(1, operations.size()); - - //Check that the operation has correct content - //Add subsystem operation is what we expect - ModelNode addSubsystem = operations.get(0); - Assert.assertEquals(ADD, addSubsystem.get(OP).asString()); - PathAddress addr = PathAddress.pathAddress(addSubsystem.get(OP_ADDR)); - Assert.assertEquals(1, addr.size()); - PathElement element = addr.getElement(0); - Assert.assertEquals(SUBSYSTEM, element.getKey()); - Assert.assertEquals(GateInExtension.SUBSYSTEM_NAME, element.getValue()); - - //We expect to have deployment-archives node set - ModelNode deploymentArchives = addSubsystem.get(Constants.DEPLOYMENT_ARCHIVES); - Assert.assertNotNull(Constants.DEPLOYMENT_ARCHIVES, deploymentArchives); - - List<Property> archives = deploymentArchives.asPropertyList(); - Assert.assertEquals(Archive.GATEIN.getLocalName(), archives.get(0).getName()); - Assert.assertEquals(Constants.MAIN, archives.get(0).getValue().asPropertyList().get(0).getName()); - Assert.assertEquals(1, archives.get(0).getValue().asPropertyList().size()); - - Assert.assertEquals(Archive.GATEIN_SAMPLE_EXTENSION.getLocalName(), archives.get(1).getName()); - Assert.assertFalse(archives.get(1).getValue().isDefined()); - - Assert.assertEquals(Archive.GATEIN_SAMPLE_PORTAL.getLocalName(), archives.get(2).getName()); - Assert.assertFalse(archives.get(2).getValue().isDefined()); - - Assert.assertEquals(Archive.GATEIN_SAMPLE_SKIN.getLocalName(), archives.get(3).getName()); - Assert.assertFalse(archives.get(3).getValue().isDefined()); - - - ModelNode portletWarDependencies = addSubsystem.get(Constants.PORTLET_WAR_DEPENDENCIES); - Assert.assertNotNull(Constants.PORTLET_WAR_DEPENDENCIES, portletWarDependencies); - - List<Property> modules = portletWarDependencies.asPropertyList(); - Assert.assertEquals(Module.ORG_GATEIN_LIB.getLocalName(), modules.get(0).getName()); - Assert.assertEquals(Module.ORG_GATEIN_WCI.getLocalName(), modules.get(1).getName()); - Assert.assertEquals(Module.JAVAX_PORTLET_API.getLocalName(), modules.get(2).getName()); + super(GateInExtension.SUBSYSTEM_NAME, new GateInExtension()); } - /** - * Test that the model created from the xml looks as expected - */ - - @Test - public void testInstallIntoController() throws Exception + @Override + protected String getSubsystemXml() throws IOException { - //Parse the subsystem xml and install into the controller - String subsystemXml = - "<subsystem xmlns=\"" + GateInExtension.NAMESPACE + "\">\n" + - " <deployment-archives>\n" + - " <archive name=\"" + Archive.GATEIN.getLocalName() + "\" main=\"true\" />\n" + - " <archive name=\"" + Archive.GATEIN_SAMPLE_EXTENSION.getLocalName() + "\" />\n" + - " <archive name=\"" + Archive.GATEIN_SAMPLE_PORTAL.getLocalName() + "\" />\n" + - " <archive name=\"" + Archive.GATEIN_SAMPLE_SKIN.getLocalName() + "\" />\n" + - " </deployment-archives>\n" + - " <portlet-war-dependencies>\n" + - " <dependency name=\"" + Module.ORG_GATEIN_LIB.getLocalName() + "\" import-services=\"true\" />\n" + - " <dependency name=\"" + Module.ORG_GATEIN_WCI.getLocalName() + "\" />\n" + - " <dependency name=\"" + Module.JAVAX_PORTLET_API.getLocalName() + "\" />\n" + - " </portlet-war-dependencies>\n" + - "</subsystem>"; - KernelServices services = super.installInController(subsystemXml); - - //Read the whole model and make sure it looks as expected - ModelNode model = services.readWholeModel(); - //Useful for debugging :-) - //System.out.println(model); - - Assert.assertTrue(model.get(SUBSYSTEM).hasDefined(GateInExtension.SUBSYSTEM_NAME)); - model = model.get(SUBSYSTEM, GateInExtension.SUBSYSTEM_NAME); - - //We expect to have deployment-archives node set - ModelNode deploymentArchives = model.get(Constants.DEPLOYMENT_ARCHIVES); - Assert.assertNotNull(Constants.DEPLOYMENT_ARCHIVES, deploymentArchives); - - List<Property> archives = deploymentArchives.asPropertyList(); - Assert.assertEquals(Archive.GATEIN.getLocalName(), archives.get(0).getName()); - Assert.assertEquals(Constants.MAIN, archives.get(0).getValue().asPropertyList().get(0).getName()); - Assert.assertEquals(1, archives.get(0).getValue().asPropertyList().size()); - - Assert.assertEquals(Archive.GATEIN_SAMPLE_EXTENSION.getLocalName(), archives.get(1).getName()); - Assert.assertFalse(archives.get(1).getValue().isDefined()); - - Assert.assertEquals(Archive.GATEIN_SAMPLE_PORTAL.getLocalName(), archives.get(2).getName()); - Assert.assertFalse(archives.get(2).getValue().isDefined()); - - Assert.assertEquals(Archive.GATEIN_SAMPLE_SKIN.getLocalName(), archives.get(3).getName()); - Assert.assertFalse(archives.get(3).getValue().isDefined()); - - - ModelNode portletWarDependencies = model.get(Constants.PORTLET_WAR_DEPENDENCIES); - Assert.assertNotNull(Constants.PORTLET_WAR_DEPENDENCIES, portletWarDependencies); - - List<Property> modules = portletWarDependencies.asPropertyList(); - Assert.assertEquals(Module.ORG_GATEIN_LIB.getLocalName(), modules.get(0).getName()); - Assert.assertEquals(Module.ORG_GATEIN_WCI.getLocalName(), modules.get(1).getName()); - Assert.assertEquals(Module.JAVAX_PORTLET_API.getLocalName(), modules.get(2).getName()); + return SUBSYSTEM_XML; } - - /** - * Starts a controller with a given subsystem xml and then checks that a second - * controller started with the xml marshalled from the first one results in the same model - */ - - @Test - public void testParseAndMarshalModel() throws Exception - { - //Parse the subsystem xml and install into the first controller - String subsystemXml = - "<subsystem xmlns=\"" + GateInExtension.NAMESPACE + "\">\n" + - " <deployment-archives>\n" + - " <archive name=\"" + Archive.GATEIN.getLocalName() + "\" main=\"true\" />\n" + - " <archive name=\"" + Archive.GATEIN_SAMPLE_EXTENSION.getLocalName() + "\" />\n" + - " <archive name=\"" + Archive.GATEIN_SAMPLE_PORTAL.getLocalName() + "\" />\n" + - " <archive name=\"" + Archive.GATEIN_SAMPLE_SKIN.getLocalName() + "\" />\n" + - " </deployment-archives>\n" + - " <portlet-war-dependencies>\n" + - " <dependency name=\"" + Module.ORG_GATEIN_LIB.getLocalName() + "\" import-services=\"true\" />\n" + - " <dependency name=\"" + Module.ORG_GATEIN_WCI.getLocalName() + "\" />\n" + - " <dependency name=\"" + Module.JAVAX_PORTLET_API.getLocalName() + "\" />\n" + - " </portlet-war-dependencies>\n" + - "</subsystem>"; - - KernelServices servicesA = super.installInController(subsystemXml); - //Get the model and the persisted xml from the first controller - ModelNode modelA = servicesA.readWholeModel(); - String marshalled = servicesA.getPersistedSubsystemXml(); - - //Install the persisted xml from the first controller into a second controller - KernelServices servicesB = super.installInController(marshalled); - ModelNode modelB = servicesB.readWholeModel(); - - //Make sure the models from the two controllers are identical - super.compare(modelA, modelB); - } - - /** - * Starts a controller with the given subsystem xml and then checks that a second - * controller started with the operations from its describe action results in the same model - */ - - @Test - public void testDescribeHandler() throws Exception - { - //Parse the subsystem xml and install into the first controller - String subsystemXml = - "<subsystem xmlns=\"" + GateInExtension.NAMESPACE + "\">" + - "</subsystem>"; - KernelServices servicesA = super.installInController(subsystemXml); - //Get the model and the describe operations from the first controller - ModelNode modelA = servicesA.readWholeModel(); - ModelNode describeOp = new ModelNode(); - describeOp.get(OP).set(DESCRIBE); - describeOp.get(OP_ADDR).set( - PathAddress.pathAddress( - PathElement.pathElement(SUBSYSTEM, GateInExtension.SUBSYSTEM_NAME)).toModelNode()); - List<ModelNode> operations = super.checkResultAndGetContents(servicesA.executeOperation(describeOp)).asList(); - - - //Install the describe options from the first controller into a second controller - KernelServices servicesB = super.installInController(operations); - ModelNode modelB = servicesB.readWholeModel(); - - //Make sure the models from the two controllers are identical - super.compare(modelA, modelB); - } - - /* TODO: test invalid configuration detection */ } Modified: portal/trunk/packaging/jboss-as7/modules/build.xml =================================================================== --- portal/trunk/packaging/jboss-as7/modules/build.xml 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/modules/build.xml 2012-02-27 11:46:34 UTC (rev 8472) @@ -205,9 +205,6 @@ <maven-resource group="org.gatein.captcha" artifact="simplecaptcha" /> <maven-resource group="org.apache.tika" artifact="tika-core" /> <maven-resource group="org.apache.tika" artifact="tika-parsers" /> -  <maven-resource group="org.apache.ws.commons" artifact="ws-commons-util" /> <maven-resource group="com.experlog" artifact="xapool" /> <maven-resource group="org.apache.xmlbeans" artifact="xmlbeans" /> @@ -218,7 +215,7 @@ <module-def name="org.gatein.wci"> <maven-resource group="org.gatein.wci" artifact="wci-jboss7" /> <maven-resource group="org.gatein.wci" artifact="wci-wci" /> - <maven-resource group="org.gatein.wci" artifact="wci-exo" /> +  </module-def> <module-def name="org.gatein.common"> Modified: portal/trunk/packaging/jboss-as7/modules/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as7/modules/pom.xml 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/modules/pom.xml 2012-02-27 11:46:34 UTC (rev 8472) @@ -45,20 +45,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-jboss6</artifactId> - <exclusions> - <exclusion> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.web</groupId> - <artifactId>jbossweb</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>org.gatein.wci</groupId> @@ -71,6 +57,13 @@ </exclusions> </dependency> + +  +  + <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> @@ -664,23 +657,6 @@ <artifactId>common-logging</artifactId> </dependency> -  - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-jboss7</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-exo</artifactId> - </dependency> - - - -  <dependency> <groupId>org.gatein.pc</groupId> Modified: portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml =================================================================== --- portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml 2012-02-27 11:46:34 UTC (rev 8472) @@ -23,11 +23,14 @@ --> <module xmlns="urn:jboss:module:1.1" name="org.jboss.as.web"> + <properties> + <property name="jboss.api" value="private"/> + </properties> <resources> - <resource-root path="jboss-as-web-7.1.0.CR1b.jar"/> + <resource-root path="jboss-as-web-7.1.0.Final.jar"/> <resource-root path="jasper-jdt-7.0.3.Final.jar"/> - <resource-root path="jbossweb-7.0.7.Final.jar"/> + <resource-root path="jbossweb-7.0.10.Final.jar"/>  </resources> @@ -42,6 +45,7 @@ <module name="javax.servlet.jsp.api"/> <module name="org.jboss.jandex"/> <module name="org.jboss.staxmapper"/> + <module name="org.jboss.as.clustering.api" optional="true"/> <module name="org.jboss.as.clustering.web.spi" optional="true"/> <module name="org.jboss.as.controller"/> <module name="org.jboss.as.ee"/> @@ -51,6 +55,7 @@ <module name="org.jboss.as.server"/> <module name="org.jboss.as.threads"/> <module name="org.jboss.invocation"/> + <module name="org.jboss.marshalling"/> <module name="org.jboss.metadata"/> <module name="org.jboss.modules"/> <module name="org.jboss.msc"/> Modified: portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml =================================================================== --- portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml 2012-02-27 11:46:34 UTC (rev 8472) @@ -4,11 +4,11 @@ <extensions> <extension module="org.jboss.as.clustering.infinispan"/> + <extension module="org.jboss.as.configadmin"/> <extension module="org.jboss.as.connector"/> <extension module="org.jboss.as.deployment-scanner"/> <extension module="org.jboss.as.ee"/> <extension module="org.jboss.as.ejb3"/> - <extension module="org.jboss.as.jaxr"/> <extension module="org.jboss.as.jaxrs"/> <extension module="org.jboss.as.jdr"/> <extension module="org.jboss.as.jmx"/> @@ -36,6 +36,11 @@ <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/> </authentication> </security-realm> + <security-realm name="ApplicationRealm"> + <authentication> + <properties path="application-users.properties" relative-to="jboss.server.config.dir"/> + </authentication> + </security-realm> </security-realms> <management-interfaces> <native-interface security-realm="ManagementRealm"> @@ -86,13 +91,12 @@ </handlers> </root-logger> </subsystem> + <subsystem xmlns="urn:jboss:domain:configadmin:1.0"/> <subsystem xmlns="urn:jboss:domain:datasources:1.0"> <datasources> - <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true" - pool-name="ExampleDS"> + <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true"> <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url> <driver>h2</driver> - <pool></pool> <security> <user-name>sa</user-name> <password>sa</password> @@ -105,8 +109,8 @@ </drivers> </datasources> </subsystem> - <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.0"> - <deployment-scanner scan-interval="5000" relative-to="jboss.server.base.dir" path="deployments" deployment-timeout="300"/> + <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.1"> + <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" deployment-timeout="300"/> </subsystem> <subsystem xmlns="urn:jboss:domain:ee:1.0"/> <subsystem xmlns="urn:jboss:domain:ejb3:1.2"> @@ -140,43 +144,45 @@ </timer-service> <remote connector-ref="remoting-connector" thread-pool-name="default"/> <thread-pools> - <thread-pool name="default" max-threads="10" keepalive-time="100"/> + <thread-pool name="default"> + <max-threads count="10"/> + <keepalive-time time="100" unit="milliseconds"/> + </thread-pool> </thread-pools> </subsystem> <subsystem xmlns="urn:jboss:domain:infinispan:1.1" default-cache-container="hibernate"> <cache-container name="hibernate" default-cache="local-query"> <local-cache name="entity"> + <transaction mode="NON_XA"/> <eviction strategy="LRU" max-entries="10000"/> <expiration max-idle="100000"/> </local-cache> <local-cache name="local-query"> + <transaction mode="NONE"/> <eviction strategy="LRU" max-entries="10000"/> <expiration max-idle="100000"/> </local-cache> <local-cache name="timestamps"> + <transaction mode="NONE"/> <eviction strategy="NONE"/> </local-cache> </cache-container> </subsystem> - <subsystem xmlns="urn:jboss:domain:jaxr:1.0"> - <connection-factory jndi-name="java:jboss/jaxr/ConnectionFactory"/> - <juddi-server publish-url="http://localhost:8080/juddi/publish" query-url="http://localhost:8080/juddi/query"/> - </subsystem> <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/> <subsystem xmlns="urn:jboss:domain:jca:1.1"> - <archive-validation enabled="false"/> + <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/> <bean-validation enabled="false"/> <default-workmanager> - <short-running-threads blocking="true"> - <core-threads count="10" per-cpu="20"/> - <queue-length count="10" per-cpu="20"/> - <max-threads count="10" per-cpu="20"/> + <short-running-threads> + <core-threads count="50"/> + <queue-length count="50"/> + <max-threads count="50"/> <keepalive-time time="10" unit="seconds"/> </short-running-threads> - <long-running-threads blocking="true"> - <core-threads count="10" per-cpu="20"/> - <queue-length count="10" per-cpu="20"/> - <max-threads count="10" per-cpu="20"/> + <long-running-threads> + <core-threads count="50"/> + <queue-length count="50"/> + <max-threads count="50"/> <keepalive-time time="10" unit="seconds"/> </long-running-threads> </default-workmanager> @@ -184,6 +190,7 @@ <subsystem xmlns="urn:jboss:domain:jdr:1.0"/> <subsystem xmlns="urn:jboss:domain:jmx:1.1"> <show-model value="true"/> + <remoting-connector/> </subsystem> <subsystem xmlns="urn:jboss:domain:jpa:1.0"> <jpa default-datasource=""/> @@ -194,47 +201,25 @@ </mail-session> </subsystem> <subsystem xmlns="urn:jboss:domain:naming:1.1"/> - <subsystem xmlns="urn:jboss:domain:osgi:1.1" activation="lazy"> - <configuration pid="org.apache.felix.webconsole.internal.servlet.OsgiManager"> - <property name="manager.root" value="jboss-osgi"/> - </configuration> + <subsystem xmlns="urn:jboss:domain:osgi:1.2" activation="lazy"> <properties>  <property name="org.osgi.framework.startlevel.beginning">1</property> </properties> <capabilities>  - <capability name="javax.api"/> - <capability name="javax.servlet.api"/> + <capability name="javax.servlet.api:v25"/> <capability name="javax.transaction.api"/> -  - <capability name="org.apache.aries.util"/> - <capability name="org.jboss.osgi.webconsole"/> - <capability name="org.osgi.compendium"/>  <capability name="org.apache.felix.log" startlevel="1"/> <capability name="org.jboss.osgi.logging" startlevel="1"/> <capability name="org.apache.felix.configadmin" startlevel="1"/> <capability name="org.jboss.as.osgi.configadmin" startlevel="1"/> -  - <capability name="org.apache.aries.jmx" startlevel="2"/> - <capability name="org.apache.felix.eventadmin" startlevel="2"/> - <capability name="org.apache.felix.metatype" startlevel="2"/> - <capability name="org.apache.felix.scr" startlevel="2"/> - <capability name="org.apache.felix.webconsole" startlevel="2"/> - <capability name="org.jboss.netty" startlevel="2"/> - <capability name="org.jboss.osgi.jmx" startlevel="2"/> - <capability name="org.jboss.osgi.http" startlevel="2"/> - <capability name="org.projectodd.stilts" startlevel="2"/> -  - <capability name="org.jboss.osgi.blueprint" startlevel="3"/> - <capability name="org.jboss.osgi.webapp" startlevel="3"/> - <capability name="org.jboss.osgi.xerces" startlevel="3"/> </capabilities> </subsystem> <subsystem xmlns="urn:jboss:domain:pojo:1.0"/> <subsystem xmlns="urn:jboss:domain:remoting:1.1"> - <connector name="remoting-connector" socket-binding="remoting"/> + <connector name="remoting-connector" socket-binding="remoting" security-realm="ApplicationRealm"/> </subsystem> <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0"/> <subsystem xmlns="urn:jboss:domain:sar:1.0"/> @@ -242,7 +227,15 @@ <security-domains> <security-domain name="other" cache-type="default"> <authentication> - <login-module code="UsersRoles" flag="required"/> + <login-module code="Remoting" flag="optional"> + <module-option name="password-stacking" value="useFirstPass"/> + </login-module> + <login-module code="RealmUsersRoles" flag="required"> + <module-option name="usersProperties" value="${jboss.server.config.dir}/application-users.properties"/> + <module-option name="rolesProperties" value="${jboss.server.config.dir}/application-roles.properties"/> + <module-option name="realm" value="ApplicationRealm"/> + <module-option name="password-stacking" value="useFirstPass"/> + </login-module> </authentication> </security-domain> <security-domain name="jboss-web-policy" cache-type="default"> @@ -291,7 +284,7 @@ </security-domain> </security-domains> </subsystem> - <subsystem xmlns="urn:jboss:domain:threads:1.0"/> + <subsystem xmlns="urn:jboss:domain:threads:1.1"/> <subsystem xmlns="urn:jboss:domain:transactions:1.1"> <core-environment> <process-id> @@ -301,35 +294,22 @@ <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/> <coordinator-environment default-timeout="300"/> </subsystem> - <subsystem xmlns="urn:jboss:domain:web:1.1" default-virtual-server="default-host"> + <subsystem xmlns="urn:jboss:domain:web:1.1" default-virtual-server="default-host" native="false"> <connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/> <virtual-server name="default-host" enable-welcome-root="true"> <alias name="localhost"/> <alias name="example.com"/> </virtual-server> </subsystem> - <subsystem xmlns="urn:jboss:domain:webservices:1.0" xmlns:javaee="http://java.sun.com/xml/ns/javaee" xmlns:jaxwsconfig="urn:jboss:jbossws-jaxws-config:4.0"> + <subsystem xmlns="urn:jboss:domain:webservices:1.1"> <modify-wsdl-address>true</modify-wsdl-address> <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host> -  - <endpoint-config> - <jaxwsconfig:config-name>Standard-Endpoint-Config</jaxwsconfig:config-name> + <endpoint-config name="Standard-Endpoint-Config"/> + <endpoint-config name="Recording-Endpoint-Config"> + <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM"> + <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/> + </pre-handler-chain> </endpoint-config> - <endpoint-config> - <jaxwsconfig:config-name>Recording-Endpoint-Config</jaxwsconfig:config-name> - <jaxwsconfig:pre-handler-chains> - <javaee:handler-chain xmlns="http://java.sun.com/xml/ns/javaee"> - <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>RecordingHandler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </jaxwsconfig:pre-handler-chains> - </endpoint-config> </subsystem> <subsystem xmlns="urn:jboss:domain:weld:1.0"/> <subsystem xmlns="urn:jboss:domain:gatein:1.0"> @@ -359,14 +339,9 @@ <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}"> <socket-binding name="http" port="8080"/> <socket-binding name="https" port="8443"/> - <socket-binding name="jacorb" port="3528"/> - <socket-binding name="jacorb-ssl" port="3529"/> - <socket-binding name="jmx-connector-registry" interface="management" port="1090"/> - <socket-binding name="jmx-connector-server" interface="management" port="1091"/> <socket-binding name="management-native" interface="management" port="${jboss.management.native.port:9999}"/> <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/> - <socket-binding name="messaging" port="5445"/> - <socket-binding name="messaging-throughput" port="5455"/> + <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/> <socket-binding name="osgi-http" interface="management" port="8090"/> <socket-binding name="remoting" port="4447"/> <socket-binding name="txn-recovery-environment" port="4712"/> @@ -375,5 +350,4 @@ <remote-destination host="localhost" port="25"/> </outbound-socket-binding> </socket-binding-group> - -</server> \ No newline at end of file +</server> Modified: portal/trunk/packaging/jboss-as7/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as7/pom.xml 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/jboss-as7/pom.xml 2012-02-27 11:46:34 UTC (rev 8472) @@ -1,4 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.exoplatform.portal</groupId> @@ -12,40 +13,40 @@ <name>GateIn JBoss AS 7.x.x packaging</name> <properties> - <version.jboss.as.release>7.1.0.CR1b</version.jboss.as.release> - <version.jboss.as>7.1.0.CR1b</version.jboss.as> - <version.org.jboss.vfs>3.0.0.GA</version.org.jboss.vfs> - <version.org.gatein.wci.as7>2.1.0-Beta07-AS7-Beta02</version.org.gatein.wci.as7> - <version.exo.kernel.as7>2.3.2-GA-AS7-Beta02</version.exo.kernel.as7> + <version.jboss.as.release>7.1.0.Final</version.jboss.as.release> + <version.jboss.as>7.1.0.Final</version.jboss.as> + <version.org.jboss.vfs>3.1.0.Final</version.org.jboss.vfs> + <version.org.gatein.wci.as7>2.1.1-Beta03-AS7-Beta03</version.org.gatein.wci.as7> + <version.exo.kernel.as7>2.3.6-GA-AS7-Beta03</version.exo.kernel.as7> <version.org.gatein.naming>1.0.0-Beta01</version.org.gatein.naming> <exo.projects.app.jboss7.version>jboss-as-${version.jboss.as.release}</exo.projects.app.jboss7.version> </properties> <build> <defaultGoal>package</defaultGoal> <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>generate-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <echo>" + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>generate-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <echo>" -DON'T FORGET TO FIRST READ packaging/jboss-as7/README.txt + DON'T FORGET TO FIRST READ packaging/jboss-as7/README.txt -" -</echo> - </tasks> - </configuration> - </execution> - </executions> - </plugin> + " + </echo> + </tasks> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> @@ -87,6 +88,12 @@ <version>${version.jboss.as}</version> </dependency> <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-subsystem-test</artifactId> + <scope>test</scope> + <version>${version.jboss.as}</version> + </dependency> + <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-vfs</artifactId> <version>${version.org.jboss.vfs}</version> Modified: portal/trunk/packaging/pom.xml =================================================================== --- portal/trunk/packaging/pom.xml 2012-02-27 11:31:11 UTC (rev 8471) +++ portal/trunk/packaging/pom.xml 2012-02-27 11:46:34 UTC (rev 8472) @@ -45,6 +45,7 @@ <module>jetty</module> <module>jboss-as5</module> <module>jboss-as6</module> + <module>jboss-as7</module> </modules> </profile> <profile> @@ -54,6 +55,7 @@ <module>jetty</module> <module>jboss-as5</module> <module>jboss-as6</module> + <module>jboss-as7</module> </modules> </profile> <profile>

12 years, 10 months

1
0
0 / 0

gatein SVN: r8471 - sandbox/as7_support/tags.

by do-not-reply＠jboss.org

Author: mstruk Date: 2012-02-27 06:31:11 -0500 (Mon, 27 Feb 2012) New Revision: 8471 Added: sandbox/as7_support/tags/AS7-Beta03/ Log: Tagged AS7-Beta03

12 years, 10 months

1
0
0 / 0

gatein SVN: r8470 - in sandbox/as7_support/branches/gatein-as7/wci: jboss/jboss7/src/main/java/org/gatein/wci/jboss and 2 other directories.

by do-not-reply＠jboss.org

Author: mstruk Date: 2012-02-27 05:00:47 -0500 (Mon, 27 Feb 2012) New Revision: 8470 Modified: sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/pom.xml sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/src/main/java/org/gatein/wci/jboss/JB7ServletContainerContext.java sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/src/main/java/org/gatein/wci/jboss/JB7WebAppContext.java sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/spi/ServletContainerContext.java Log: Bring AS7 support up to date with wci changes Modified: sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/pom.xml =================================================================== --- sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/pom.xml 2012-02-27 04:36:23 UTC (rev 8469) +++ sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/pom.xml 2012-02-27 10:00:47 UTC (rev 8470) @@ -2,8 +2,9 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-jboss</artifactId> - <version>2.1.0-Beta07-AS7-Beta02</version> + <version>2.1.1-Beta03-AS7-Beta03</version> </parent> + <modelVersion>4.0.0</modelVersion> <artifactId>wci-jboss7</artifactId> <packaging>jar</packaging> @@ -17,7 +18,7 @@ <dependency> <groupId>org.jboss.web</groupId> <artifactId>jbossweb</artifactId> - <version>7.0.1.Final</version> + <version>7.0.10.Final</version> </dependency> <dependency> <groupId>org.jboss.spec.javax.servlet</groupId> Modified: sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/src/main/java/org/gatein/wci/jboss/JB7ServletContainerContext.java =================================================================== --- sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/src/main/java/org/gatein/wci/jboss/JB7ServletContainerContext.java 2012-02-27 04:36:23 UTC (rev 8469) +++ sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/src/main/java/org/gatein/wci/jboss/JB7ServletContainerContext.java 2012-02-27 10:00:47 UTC (rev 8470) @@ -37,12 +37,15 @@ import org.gatein.wci.RequestDispatchCallback; import org.gatein.wci.ServletContainerVisitor; import org.gatein.wci.WebApp; +import org.gatein.wci.api.GateInServlet; +import org.gatein.wci.api.GateInServletRegistrations; import org.gatein.wci.authentication.GenericAuthentication; import org.gatein.wci.authentication.TicketService; import org.gatein.wci.command.CommandDispatcher; import org.gatein.wci.impl.DefaultServletContainerFactory; import org.gatein.wci.security.Credentials; import org.gatein.wci.spi.ServletContainerContext; +import org.gatein.wci.spi.WebAppContext; import javax.servlet.ServletContext; import javax.servlet.ServletException; @@ -50,7 +53,9 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.io.IOException; +import java.util.HashMap; import java.util.HashSet; +import java.util.Map; import java.util.Set; /** @@ -71,6 +76,9 @@ /** The monitored contexts. */ private final Set<String> monitoredContexts = new HashSet<String>(); + /** The monitored contexts which were manually added. */ + private static Map<String, String> manualMonitoredContexts = new HashMap<String, String>(); + /** . */ private final Engine engine; @@ -91,13 +99,23 @@ public Object include(ServletContext targetServletContext, HttpServletRequest request, HttpServletResponse response, RequestDispatchCallback callback, Object handback) throws ServletException, IOException - { - return dispatcher.include(targetServletContext, request, response, callback, handback); - } + { + if (manualMonitoredContexts.containsKey(targetServletContext.getServletContextName())) + { + String dispatherPath = manualMonitoredContexts.get(targetServletContext.getServletContextName()); + CommandDispatcher dispatcher = new CommandDispatcher(dispatherPath); + return dispatcher.include(targetServletContext, request, response, callback, handback); + } + else + { + return dispatcher.include(targetServletContext, request, response, callback, handback); + } + } public void setCallback(Registration registration) { this.registration = registration; + GateInServletRegistrations.setServletContainerContext(this); } public void unsetCallback(Registration registration) @@ -351,13 +369,19 @@ { log.debug("Context added " + context.getPath()); + // skip if the webapp has explicitly stated it doesn't want native registration + // usefull when portlets are dependent on servlet ordering + if (isDisabledNativeRegistration(context.getServletContext())) + return; + // we need to preemptively synchronize on context to prevent deadlocks from // opposite order locking on jboss-as7 synchronized(context) { + // skip if the webapp has explicitly stated it doesn't want native registration + // usefull when portlets are dependent on servlet ordering JB7WebAppContext webAppContext = new JB7WebAppContext(context); - // if (registration != null) { registration.registerWebApp(webAppContext); @@ -374,6 +398,11 @@ { try { + // skip if the webapp has explicitly stated it doesn't want native registration + // usefull when portlets are dependent on servlet ordering + if (isDisabledNativeRegistration(context.getServletContext())) + return; + // we need to preemptively synchronize on context to prevent deadlocks from // opposite order locking on jboss-as7 synchronized(context) @@ -389,5 +418,49 @@ e.printStackTrace(); } } + + private boolean isDisabledNativeRegistration(ServletContext servletContext) + { + if (servletContext != null) + { + String disableWCINativeRegistration = servletContext.getInitParameter(GateInServlet.WCIDISABLENATIVEREGISTRATION); + if (disableWCINativeRegistration != null && disableWCINativeRegistration.equalsIgnoreCase("true")) + { + return true; + } + else + { + return false; + } + } + else + { + return false; + } + } + + @Override + public void registerWebApp(WebAppContext webappContext, String dispatchPath) + { + if (isDisabledNativeRegistration(webappContext.getServletContext())) + { + this.manualMonitoredContexts.put(webappContext.getServletContext().getServletContextName(), dispatchPath); + registration.registerWebApp(webappContext); + } + } + + @Override + public void unregisterWebApp(ServletContext servletContext) + { + if (isDisabledNativeRegistration(servletContext)) + { + this.manualMonitoredContexts.remove(servletContext.getServletContextName()); + //if the registration is null, then this ServletContainerContext has been stopped already + //and all the registrations have already been removed. + if (registration != null) + { + registration.unregisterWebApp(servletContext.getContextPath()); + } + } + } } - Modified: sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/src/main/java/org/gatein/wci/jboss/JB7WebAppContext.java =================================================================== --- sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/src/main/java/org/gatein/wci/jboss/JB7WebAppContext.java 2012-02-27 04:36:23 UTC (rev 8469) +++ sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/src/main/java/org/gatein/wci/jboss/JB7WebAppContext.java 2012-02-27 10:00:47 UTC (rev 8470) @@ -92,7 +92,7 @@ private void cleanup() { - // This code can cause deadlocks on .war undeploy when container performs multiple such operations concurrently + // This code might cause deadlocks on .war undeploy when container performs multiple such operations concurrently // as for example when JBoss AS7 is shutting down. if (commandServlet != null) @@ -150,4 +150,3 @@ return false; } } - Modified: sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java =================================================================== --- sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java 2012-02-27 04:36:23 UTC (rev 8469) +++ sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java 2012-02-27 10:00:47 UTC (rev 8470) @@ -354,27 +354,37 @@ { throw new IllegalStateException("Disposed registration"); } - synchronized (container.lock) + + if (webAppId == null) { - if (webAppId == null) - { - throw new IllegalArgumentException("No null web app id accepted"); - } + throw new IllegalArgumentException("No null web app id accepted"); + } - // - WebAppImpl webApp = container.webAppMap.remove(webAppId); - if (webApp != null) + WebAppImpl webApp = container.webAppMap.get(webAppId); + if (webApp == null) + { + log.debug("Web application " + webAppId + " was not registered"); + return false; + } + // lock context before locking container to prevent deadlocks + synchronized (webApp.context) + { + synchronized (container.lock) { - log.debug("Web application " + webAppId + " cleanup"); - container.fireEvent(new WebAppLifeCycleEvent(webApp, WebAppLifeCycleEvent.REMOVED)); - webApp.context.stop(); - return true; + webApp = container.webAppMap.remove(webAppId); + if (webApp != null) + { + log.debug("Web application " + webAppId + " cleanup"); + container.fireEvent(new WebAppLifeCycleEvent(webApp, WebAppLifeCycleEvent.REMOVED)); + webApp.context.stop(); + return true; + } + else + { + log.debug("Web application " + webAppId + " was not registered"); + return false; + } } - else - { - log.debug("Web application " + webAppId + " was not registered"); - return false; - } } } Modified: sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/spi/ServletContainerContext.java =================================================================== --- sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/spi/ServletContainerContext.java 2012-02-27 04:36:23 UTC (rev 8469) +++ sandbox/as7_support/branches/gatein-as7/wci/wci/src/main/java/org/gatein/wci/spi/ServletContainerContext.java 2012-02-27 10:00:47 UTC (rev 8470) @@ -43,126 +43,126 @@ */ public interface ServletContainerContext { - /** - * Generic detyped request dispatch to a servlet context using the include mechanism. - * - * @param targetServletContext the target servlet context to dispatch to - * @param request the request valid in the current servlet context - * @param response the response valid in the current servlet context - * @param callback the callback to perform after the dispatch operation - * @param handback the handback object that will be provided to the callback - * @return the object returned by the callback - * @throws ServletException any servlet exception - * @throws IOException any io exception - */ - Object include( - ServletContext targetServletContext, HttpServletRequest request, - HttpServletResponse response, - RequestDispatchCallback callback, - Object handback) throws ServletException, IOException; + /** + * Generic detyped request dispatch to a servlet context using the include mechanism. + * + * @param targetServletContext the target servlet context to dispatch to + * @param request the request valid in the current servlet context + * @param response the response valid in the current servlet context + * @param callback the callback to perform after the dispatch operation + * @param handback the handback object that will be provided to the callback + * @return the object returned by the callback + * @throws ServletException any servlet exception + * @throws IOException any io exception + */ + Object include( + ServletContext targetServletContext, HttpServletRequest request, + HttpServletResponse response, + RequestDispatchCallback callback, + Object handback) throws ServletException, IOException; - /** - * Install the call back object. - * - * @param registration the call back - */ - void setCallback(Registration registration); + /** + * Install the call back object. + * + * @param registration the call back + */ + void setCallback(Registration registration); - /** - * Uninstall the call back object. - * - * @param registration the call back - */ - void unsetCallback(Registration registration); + /** + * Uninstall the call back object. + * + * @param registration the call back + */ + void unsetCallback(Registration registration); - /** - * Manually register a webapp with this ServletContainerContext. - * - * @param webappContext the WebAppContext associated with the application - * @param dispathPath the path to be used - */ - void registerWebApp(WebAppContext webappContext, String dispatchPath); + /** + * Manually register a webapp with this ServletContainerContext. + * + * @param webappContext the WebAppContext associated with the application + * @param dispathPath the path to be used + */ + void registerWebApp(WebAppContext webappContext, String dispatchPath); - /** - * Manually unregister a webapp associated with this ServletContainerContext. - * - * @param servletContext the servletContext of the application to be deregistered - */ - void unregisterWebApp(ServletContext servletContext); + /** + * Manually unregister a webapp associated with this ServletContainerContext. + * + * @param servletContext the servletContext of the application to be deregistered + */ + void unregisterWebApp(ServletContext servletContext); - /** - * Authentication support. - * - * @param request the request valid in the current servlet context - * @param response the response valid in the current servlet context - * @param credentials the credentials which try to authenticate - * @param validityMillis the validity of the authentication - */ - void login(HttpServletRequest request, HttpServletResponse response, Credentials credentials, long validityMillis) throws ServletException, IOException; + /** + * Authentication support. + * + * @param request the request valid in the current servlet context + * @param response the response valid in the current servlet context + * @param credentials the credentials which try to authenticate + * @param validityMillis the validity of the authentication + */ + void login(HttpServletRequest request, HttpServletResponse response, Credentials credentials, long validityMillis) throws ServletException, IOException; - /** - * Authentication support. - * - * @param request the request valid in the current servlet context - * @param response the response valid in the current servlet context - * @param credentials the credentials which try to authenticate - * @param validityMillis the validity of the authentication - */ - void login(HttpServletRequest request, HttpServletResponse response, Credentials credentials, long validityMillis, String initialURI) throws ServletException, IOException; + /** + * Authentication support. + * + * @param request the request valid in the current servlet context + * @param response the response valid in the current servlet context + * @param credentials the credentials which try to authenticate + * @param validityMillis the validity of the authentication + */ + void login(HttpServletRequest request, HttpServletResponse response, Credentials credentials, long validityMillis, String initialURI) throws ServletException, IOException; - /** - * Authentication support. - * - * @param request the request valid in the current servlet context - * @param response the response valid in the current servlet context - */ - void logout(HttpServletRequest request, HttpServletResponse response) throws ServletException; + /** + * Authentication support. + * + * @param request the request valid in the current servlet context + * @param response the response valid in the current servlet context + */ + void logout(HttpServletRequest request, HttpServletResponse response) throws ServletException; - /** - * Returns the name and version of the servlet container in which the - * context is running. - * - * <P> - * The form of the returned string is <code>containername/versionnumber</code>. - * - * - * @return the string containing at least name and version number - */ - public String getContainerInfo(); + /** + * Returns the name and version of the servlet container in which the + * context is running. + * + * <P> + * The form of the returned string is <code>containername/versionnumber</code>. + * + * + * @return the string containing at least name and version number + */ + public String getContainerInfo(); - /** - * The callback interface that a servlet container context can obtain from its registration against - * the <code>org.jboss.portal.web.ServletContainer</code> singleton. - */ - interface Registration - { + /** + * The callback interface that a servlet container context can obtain from its registration against + * the <code>org.jboss.portal.web.ServletContainer</code> singleton. + */ + interface Registration + { - /** - * Registers a web application. - * - * @param webAppContext the web application context - * @return true if the registration was done - * @throws IllegalArgumentException if the argument is null - * @throws IllegalStateException if the registration is cancelled - */ - boolean registerWebApp(WebAppContext webAppContext) throws IllegalStateException, IllegalArgumentException; + /** + * Registers a web application. + * + * @param webAppContext the web application context + * @return true if the registration was done + * @throws IllegalArgumentException if the argument is null + * @throws IllegalStateException if the registration is cancelled + */ + boolean registerWebApp(WebAppContext webAppContext) throws IllegalStateException, IllegalArgumentException; - /** - * Unregister a web application. - * - * @param contextPath the web application id - * @return true if the unregistration was done - * @throws IllegalArgumentException if the argument is null - * @throws IllegalStateException if the registration is cancelled - */ - boolean unregisterWebApp(String contextPath) throws IllegalStateException, IllegalArgumentException; + /** + * Unregister a web application. + * + * @param contextPath the web application id + * @return true if the unregistration was done + * @throws IllegalArgumentException if the argument is null + * @throws IllegalStateException if the registration is cancelled + */ + boolean unregisterWebApp(String contextPath) throws IllegalStateException, IllegalArgumentException; - /** - * Cancel the registration against the servlet container. - * - * @throws IllegalStateException if the registration is cancelled - */ - void cancel() throws IllegalStateException; - } + /** + * Cancel the registration against the servlet container. + * + * @throws IllegalStateException if the registration is cancelled + */ + void cancel() throws IllegalStateException; + } }

12 years, 10 months

1
0
0 / 0

gatein SVN: r8469 - epp/docs/branches/5.2/Admin_Guide/en-US.

by do-not-reply＠jboss.org

Author: jaredmorgs Date: 2012-02-26 23:36:23 -0500 (Sun, 26 Feb 2012) New Revision: 8469 Modified: epp/docs/branches/5.2/Admin_Guide/en-US/Administration_Guide.xml Log: Adjusted parameter entity in Admin Guide root file Modified: epp/docs/branches/5.2/Admin_Guide/en-US/Administration_Guide.xml =================================================================== --- epp/docs/branches/5.2/Admin_Guide/en-US/Administration_Guide.xml 2012-02-27 04:11:22 UTC (rev 8468) +++ epp/docs/branches/5.2/Admin_Guide/en-US/Administration_Guide.xml 2012-02-27 04:36:23 UTC (rev 8469) @@ -1,6 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> - -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +<!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 "Administration_Guide.ent"> %BOOK_ENTITIES; ]>

12 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits February 2012