JBoss Portal SVN: r12854 - in branches/JBoss_Portal_Branch_2_7: core-admin/src/main/org/jboss/portal/core/admin/ui/coordination and 2 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-02-21 11:12:51 -0500 (Sat, 21 Feb 2009)
New Revision: 12854
Removed:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/Action.java
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/JSFBeanContext.java
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java
Log:
- JBPORTAL-2317:
+ Moved Action code up to ManagedBean as it can be used outside of core-admin
+ Fixed incorrect behavior in PropertyAction.updateProperty
+ Renamed RenameAction.pageContainer to renamedObject as it is more correct and fixed behavior
+ Adapted CoordinationBean hierarchy to ManagedBean changes (this needs more testing)
+ Adapted WSRP backing beans to ManagedBean changes (this needs more testing)
+ Renamed ConsumerBean.isOldAndNewEqual to isOldAndNewDifferent since that is the behavior that is
implemented and moved it to ManagedBean along with normalizeStringIfNeeded
+ Fixed implementation of JSFContextBean.createMessage
Deleted: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/Action.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/Action.java 2009-02-21 15:23:55 UTC (rev 12853)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/Action.java 2009-02-21 16:12:51 UTC (rev 12854)
@@ -1,97 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2009, 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.jboss.portal.core.admin.ui.actions;
-
-import org.jboss.portal.common.util.ParameterValidation;
-import org.jboss.portal.faces.gui.ManagedBean;
-
-/**
- * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
- * @version $Revision$
- */
-public abstract class Action extends ManagedBean
-{
- public static final String INVALID_NAME = "INVALID_NAME_ERROR";
- public static final String DUPLICATE = "DUPLICATE_ERROR";
- protected static final String INSTANCE_TYPE = "INSTANCE_TYPE";
- protected static final String PAGE_TYPE = "PAGE_TYPE";
- protected static final String PORTAL_TYPE = "PORTAL_TYPE";
- protected static final String DISPLAY_NAME_TYPE = "DISPLAY_NAME_TYPE";
- protected static final String PROPERTY_TYPE = "PROPERTY_TYPE";
- protected static final String PORTAL_OBJECT_TYPE = "PORTAL_OBJECT_TYPE";
-
- public String checkNameValidity(String name, String targetForErrorMessage)
- {
- if (ParameterValidation.isNullOrEmpty(name))
- {
- beanContext.createTargetedErrorMessage(targetForErrorMessage, INVALID_NAME, name, getLocalizedType());
- return null;
- }
- else
- {
- // Trim name
- name = name.trim();
-
- ParameterValidation.sanitizeFromPatternWithHandler(name, ParameterValidation.XSS_CHECK,
- new MessageValidationHandler(null, targetForErrorMessage, name));
-
- // Check for duplicate
- if (isAlreadyExisting(name))
- {
- beanContext.createTargetedErrorMessage(targetForErrorMessage, DUPLICATE, name, getLocalizedType());
- return null;
- }
-
- return name;
- }
- }
-
- private String getLocalizedType()
- {
- return beanContext.getMessageFromBundle(getObjectTypeName());
- }
-
- protected abstract String getObjectTypeName();
-
- public abstract boolean isAlreadyExisting(String objectName);
-
- private class MessageValidationHandler extends ParameterValidation.ValidationErrorHandler
- {
- private String targetForErrorMessage;
- private String validatedName;
-
- private MessageValidationHandler(String defaultValue, String targetForErrorMessage, String validatedName)
- {
- super(defaultValue);
- this.targetForErrorMessage = targetForErrorMessage;
- this.validatedName = validatedName;
- }
-
- protected String internalValidationErrorHandling(String s)
- {
- beanContext.createTargetedErrorMessage(targetForErrorMessage, INVALID_NAME, validatedName, getLocalizedType());
- return null;
- }
- }
-}
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java 2009-02-21 15:23:55 UTC (rev 12853)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java 2009-02-21 16:12:51 UTC (rev 12854)
@@ -20,17 +20,19 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
******************************************************************************/
+
package org.jboss.portal.core.admin.ui.actions;
import org.jboss.logging.Logger;
import org.jboss.portal.core.model.portal.Page;
import org.jboss.portal.core.model.portal.PageContainer;
+import org.jboss.portal.faces.gui.ManagedBean;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision$
*/
-public class AddPageAction extends Action
+public class AddPageAction extends ManagedBean
{
/** . */
@@ -47,6 +49,7 @@
/** The message id when an error happens. */
public String messageTarget;
+ protected static final String PAGE_TYPE = "PAGE_TYPE";
public void execute()
{
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java 2009-02-21 15:23:55 UTC (rev 12853)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java 2009-02-21 16:12:51 UTC (rev 12854)
@@ -20,12 +20,14 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
******************************************************************************/
+
package org.jboss.portal.core.admin.ui.actions;
import org.jboss.portal.core.admin.ui.InstanceManagerBean;
import org.jboss.portal.core.admin.ui.PortletManagerBean;
import org.jboss.portal.core.model.instance.Instance;
import org.jboss.portal.core.model.instance.InstanceContainer;
+import org.jboss.portal.faces.gui.ManagedBean;
import org.jboss.portal.portlet.Portlet;
import org.jboss.portal.security.RoleSecurityBinding;
import org.jboss.portal.security.SecurityConstants;
@@ -38,7 +40,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision$
*/
-public class CreateInstanceAction extends Action
+public class CreateInstanceAction extends ManagedBean
{
/** . */
@@ -50,6 +52,7 @@
/** . */
private InstanceManagerBean instanceMgr;
private static final String MESSAGE_TARGET = "add_instance_form:instanceId";
+ protected static final String INSTANCE_TYPE = "INSTANCE_TYPE";
public String getInstanceId()
{
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java 2009-02-21 15:23:55 UTC (rev 12853)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java 2009-02-21 16:12:51 UTC (rev 12854)
@@ -28,6 +28,7 @@
import org.jboss.portal.common.util.ConversionException;
import org.jboss.portal.core.admin.ui.DisplayNameBean;
import org.jboss.portal.core.model.HasDisplayName;
+import org.jboss.portal.faces.gui.ManagedBean;
import java.util.Collection;
import java.util.HashMap;
@@ -40,13 +41,14 @@
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-public abstract class DisplayNameAction extends Action
+public abstract class DisplayNameAction extends ManagedBean
{
protected Object managerBean;
protected String newLocale;
protected String newText;
protected DisplayNameBean displayNameBean;
protected HasDisplayName target;
+ protected static final String DISPLAY_NAME_TYPE = "DISPLAY_NAME_TYPE";
public Object getManagerBean()
{
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java 2009-02-21 15:23:55 UTC (rev 12853)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java 2009-02-21 16:12:51 UTC (rev 12854)
@@ -20,6 +20,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
******************************************************************************/
+
package org.jboss.portal.core.admin.ui.actions;
import org.jboss.portal.Mode;
@@ -32,6 +33,7 @@
import org.jboss.portal.core.model.portal.PortalObject;
import org.jboss.portal.core.model.portal.PortalObjectPath;
import org.jboss.portal.core.model.portal.PortalObjectPermission;
+import org.jboss.portal.faces.gui.ManagedBean;
import org.jboss.portal.security.RoleSecurityBinding;
import org.jboss.portal.security.SecurityConstants;
import org.jboss.portal.security.spi.provider.DomainConfigurator;
@@ -46,7 +48,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision$
*/
-public class PortalAction extends Action
+public class PortalAction extends ManagedBean
{
/** . */
@@ -56,6 +58,7 @@
private String portalName;
private static final String MESSAGE_TARGET = "create-portal-form:name";
+ protected static final String PORTAL_TYPE = "PORTAL_TYPE";
public PortalObjectManagerBean getPortalObjectManager()
{
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java 2009-02-21 15:23:55 UTC (rev 12853)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java 2009-02-21 16:12:51 UTC (rev 12854)
@@ -20,17 +20,18 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
******************************************************************************/
+
package org.jboss.portal.core.admin.ui.actions;
import org.jboss.portal.core.admin.ui.PortalObjectManagerBean;
import org.jboss.portal.core.impl.model.portal.PortalObjectImpl;
-import org.jboss.portal.faces.gui.BeanContext;
+import org.jboss.portal.faces.gui.ManagedBean;
/**
* @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision$
*/
-public class PropertyAction extends Action
+public class PropertyAction extends ManagedBean
{
/** . */
@@ -44,6 +45,7 @@
/** . */
private String otherPropertyName;
+ protected static final String PROPERTY_TYPE = "PROPERTY_TYPE";
public PropertyAction(PortalObjectManagerBean pomgr)
@@ -83,22 +85,23 @@
public void updateProperty()
{
- String propertyName = checkNameValidity(otherPropertyName, BeanContext.STATUS);
- String value = "";
- //
- if (propertyName.length() == 0 && selectedProperty != null)
+ String propertyName = checkNameValidity(otherPropertyName, "common-edit-prop-form:property");
+ if (propertyName != null)
{
- propertyName = selectedProperty.trim();
- }
+ if (propertyName.length() == 0 && selectedProperty != null)
+ {
+ propertyName = selectedProperty.trim();
+ }
- //
- if (propertyName.length() > 0)
- {
- if (getPropertyValue() != null)
+ if (propertyName.length() > 0)
{
- value = getPropertyValue().trim();
+ String value = "";
+ if (getPropertyValue() != null)
+ {
+ value = getPropertyValue().trim();
+ }
+ pomgr.getSelectedObject().setDeclaredProperty(propertyName, value);
}
- pomgr.getSelectedObject().setDeclaredProperty(propertyName, value);
}
}
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java 2009-02-21 15:23:55 UTC (rev 12853)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java 2009-02-21 16:12:51 UTC (rev 12854)
@@ -20,12 +20,14 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
******************************************************************************/
+
package org.jboss.portal.core.admin.ui.actions;
import org.jboss.portal.core.admin.ui.PortalObjectManagerBean;
import org.jboss.portal.core.admin.ui.dashboard.DashboardBean;
import org.jboss.portal.core.model.portal.PortalObject;
import org.jboss.portal.core.model.portal.PortalObjectPath;
+import org.jboss.portal.faces.gui.ManagedBean;
import org.jboss.portal.security.spi.provider.DomainConfigurator;
import java.util.Set;
@@ -34,17 +36,18 @@
* @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
* @version $Revision$
*/
-public class RenameAction extends Action
+public class RenameAction extends ManagedBean
{
private String newName;
- /** The page container that will create the child. */
- public PortalObject pageContainer;
+ /** The portal object we're trying to rename. */
+ public PortalObject renamedObject;
private DomainConfigurator domainConfigurator;
private Object bean;
private static final String MESSAGE_TARGET = "renameForm:newName";
+ protected static final String PORTAL_OBJECT_TYPE = "PORTAL_OBJECT_TYPE";
public void setNewName(String newName)
{
@@ -55,7 +58,7 @@
{
if (newName == null)
{
- newName = pageContainer.getName();
+ newName = renamedObject.getName();
}
return newName;
}
@@ -71,46 +74,53 @@
this.domainConfigurator = domainConfigurator;
}
- public PortalObject getPageContainer()
+ public PortalObject getRenamedObject()
{
- return pageContainer;
+ return renamedObject;
}
- public void setPageContainer(PortalObject pageContainer)
+ public void setRenamedObject(PortalObject renamedObject)
{
- this.pageContainer = pageContainer;
+ this.renamedObject = renamedObject;
}
public String execute()
{
+ // if the new name is equal to the current name, do nothing
+ String currentName = renamedObject.getName();
+ if (!isOldAndNewDifferent(currentName, newName))
+ {
+ return null;
+ }
+
newName = checkNameValidity(newName, MESSAGE_TARGET);
if (newName != null)
{
- PortalObject parent = pageContainer.getParent();
+ PortalObject parent = renamedObject.getParent();
PortalObject newObject = null;
try
{
// TODO: Should be in a tx
// Clone portal object
- newObject = pageContainer.copy(parent, newName, true);
+ newObject = renamedObject.copy(parent, newName, true);
// Copy security settings
- Set set = domainConfigurator.getSecurityBindings(pageContainer.getId().toString(PortalObjectPath.CANONICAL_FORMAT));
+ Set set = domainConfigurator.getSecurityBindings(renamedObject.getId().toString(PortalObjectPath.CANONICAL_FORMAT));
domainConfigurator.setSecurityBindings(newObject.getId().toString(PortalObjectPath.CANONICAL_FORMAT), set);
String defaultObject = parent.getDeclaredProperties().get(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME);
- if (pageContainer.getName().equals(defaultObject))
+ if (currentName.equals(defaultObject))
{
parent.setDeclaredProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME, newName);
}
// Destroy previous object
- parent.destroyChild(pageContainer.getName());
+ parent.destroyChild(currentName);
}
catch (Exception e)
{
- log.error("An error occurred while attempting to rename " + pageContainer + "to " + newName);
+ log.error("An error occurred while attempting to rename " + renamedObject + "to " + newName);
beanContext.createErrorMessageFrom(MESSAGE_TARGET, e);
}
@@ -146,6 +156,6 @@
public boolean isAlreadyExisting(String objectName)
{
- return pageContainer.getChild(objectName) != null;
+ return renamedObject.getParent().getChild(objectName) != null;
}
}
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2009-02-21 15:23:55 UTC (rev 12853)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2009-02-21 16:12:51 UTC (rev 12854)
@@ -1,24 +1,25 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2009, 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.jboss.portal.core.admin.ui.coordination;
@@ -216,4 +217,21 @@
return getName().compareTo(other.getName());
}
}
+
+ @Override
+ public String getObjectTypeName()
+ {
+ return "COORDINATION_ALIAS";
+ }
+
+ @Override
+ public String getCreationTargetName()
+ {
+ return "aliasName";
+ }
+
+ public boolean isAlreadyExisting(String objectName)
+ {
+ return displayAliasBindings.containsKey(objectName);
+ }
}
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2009-02-21 15:23:55 UTC (rev 12853)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2009-02-21 16:12:51 UTC (rev 12854)
@@ -1,24 +1,25 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2009, 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.jboss.portal.core.admin.ui.coordination;
@@ -153,6 +154,21 @@
}
public abstract void initKnowing(Collection<PortalObject> children);
+
+ /**
+ * Made public to get access to it in CoordinationManagerBean.getObjectTypeName()
+ *
+ * @return
+ */
+ public abstract String getObjectTypeName();
+
+ /**
+ * Returns the name of the target for errors when creating/renaming a Coordination element. Made public so that it
+ * can be accessed from CoordinationManagerBean
+ *
+ * @return
+ */
+ public abstract String getCreationTargetName();
}
public Page getSelectedPage()
@@ -413,8 +429,19 @@
{
if (selectedType != null)
{
- selectedType.getBean().rename(selectedName, newName);
- refresh();
+ if (!isOldAndNewDifferent(selectedName, newName))
+ {
+ return null;
+ }
+
+ CoordinationBean coordinationBean = selectedType.getBean();
+ newName = checkNameValidity(newName, coordinationBean.getCreationTargetName());
+ if (newName != null)
+ {
+ coordinationBean.rename(selectedName, newName);
+ refresh();
+ }
+
}
// reset selection
@@ -423,4 +450,14 @@
newName = null;
return EDIT_COORDINATION;
}
+
+ protected String getObjectTypeName()
+ {
+ return selectedType.getBean().getObjectTypeName();
+ }
+
+ public boolean isAlreadyExisting(String objectName)
+ {
+ return selectedType.getBean().isAlreadyExisting(objectName);
+ }
}
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2009-02-21 15:23:55 UTC (rev 12853)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2009-02-21 16:12:51 UTC (rev 12854)
@@ -1,24 +1,25 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2009, 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.jboss.portal.core.admin.ui.coordination;
@@ -478,4 +479,20 @@
this.destinations = destinations;
}
}
+
+ public String getObjectTypeName()
+ {
+ return "COORDINATION_WIRING";
+ }
+
+ @Override
+ public String getCreationTargetName()
+ {
+ return "wiringName";
+ }
+
+ public boolean isAlreadyExisting(String objectName)
+ {
+ return displayEventWirings.containsKey(objectName);
+ }
}
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2009-02-21 15:23:55 UTC (rev 12853)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2009-02-21 16:12:51 UTC (rev 12854)
@@ -1,24 +1,25 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2009, 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.jboss.portal.core.admin.ui.coordination;
@@ -69,11 +70,11 @@
public List<? extends SelectItem> getAvailableParameterWindowPairs()
{
- if(availableParameterWindowPairs == null || availableParameterWindowPairs.isEmpty())
+ if (availableParameterWindowPairs == null || availableParameterWindowPairs.isEmpty())
{
return Collections.emptyList();
}
-
+
List<WindowSelectItemGroup> result = new LinkedList<WindowSelectItemGroup>(availableParameterWindowPairs.values());
Collections.sort(result);
return result;
@@ -367,5 +368,22 @@
return o1.getLabel().compareTo(o2.getLabel());
}
}
+
private final static Comparator<SelectItem> COMP = new ParameterWindowSelectItemComparator();
+
+ public String getObjectTypeName()
+ {
+ return "COORDINATION_PARAMETER";
+ }
+
+ @Override
+ public String getCreationTargetName()
+ {
+ return "bindingName";
+ }
+
+ public boolean isAlreadyExisting(String objectName)
+ {
+ return displayParameterBindings.containsKey(objectName);
+ }
}
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2009-02-21 15:23:55 UTC (rev 12853)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2009-02-21 16:12:51 UTC (rev 12854)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2007, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, 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. *
@@ -69,6 +69,7 @@
private static final String CANNOT_ERASE_REG = "bean_consumer_cannot_erase_reg";
private static final String MALFORMED_URL = "bean_consumer_malformed_url";
private static final String UPDATE_SUCCESS = "bean_consumer_update_success";
+ private static final String CONSUMER_TYPE = "CONSUMER_TYPE";
public ConsumerBean()
{
@@ -119,12 +120,26 @@
{
if (consumer != null)
{
+ // renaming scenario
ProducerInfo info = getProducerInfo();
String oldId = info.getId();
- info.setId((String)modifyIfNeeded(oldId, id, "id", false));
+
+ // need to check that the new id is valid
+ if (isOldAndNewDifferent(oldId, id))
+ {
+ id = checkNameValidity(id, "id");
+ if (id != null)
+ {
+ info.setId(id);
+
+ // we're not using modifyIfNeeded here to avoid double equality check, so we need to set modified manually
+ modified = true;
+ }
+ }
}
else
{
+ // initialization scenario
consumer = registry.getConsumer(id);
if (consumer != null)
{
@@ -449,7 +464,7 @@
if (!isRegistrationLocallyModified())
{
IllegalStateException e =
- new IllegalStateException("Registration not locally modified: there should be expected registration from producer!");
+ new IllegalStateException("Registration not locally modified: there should be expected registration from producer!");
log.debug(e);
throw e;
}
@@ -504,7 +519,7 @@
private Object modifyIfNeeded(Object oldValue, Object newValue, String target, boolean checkURL)
{
- if (isOldAndNewEqual(oldValue, newValue))
+ if (isOldAndNewDifferent(oldValue, newValue))
{
if (checkURL)
{
@@ -526,25 +541,6 @@
return oldValue;
}
- private boolean isOldAndNewEqual(Object oldValue, Object newValue)
- {
- oldValue = normalizeStringIfNeeded(oldValue);
- newValue = normalizeStringIfNeeded(newValue);
-
- return (oldValue != null && !oldValue.equals(newValue)) || (oldValue == null && newValue != null);
- }
-
- /**
- * Normalizes Strings by considering empty String as null as JSF would give either
- *
- * @param value
- * @return
- */
- private Object normalizeStringIfNeeded(Object value)
- {
- return (value instanceof String && ((String)value).length() == 0) ? null : value;
- }
-
// Listeners
public void useWSDLListener(ValueChangeEvent event)
@@ -564,8 +560,18 @@
Object oldValue = normalizeStringIfNeeded(event.getOldValue());
if (oldValue != null)
{
- registrationLocallyModified = isOldAndNewEqual(oldValue, event.getNewValue());
+ registrationLocallyModified = isOldAndNewDifferent(oldValue, event.getNewValue());
}
}
}
+
+ protected String getObjectTypeName()
+ {
+ return CONSUMER_TYPE;
+ }
+
+ public boolean isAlreadyExisting(String objectName)
+ {
+ return false;
+ }
}
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2009-02-21 15:23:55 UTC (rev 12853)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2009-02-21 16:12:51 UTC (rev 12854)
@@ -172,6 +172,7 @@
public String createConsumer()
{
+ selectedId = checkNameValidity(selectedId, "consumerName");
if (selectedId != null)
{
try
@@ -182,15 +183,12 @@
}
catch (Exception e)
{
- beanContext.createErrorMessageFrom(e);
+ beanContext.createErrorMessageFrom("consumerName", e);
return null;
}
}
- else
- {
- beanContext.createErrorMessage(INVALID_NEW_CONSUMER_NAME);
- return null;
- }
+
+ return null;
}
public String destroyConsumer()
@@ -368,4 +366,14 @@
{
beanContext.createErrorMessage(NO_CONSUMER);
}
+
+ protected String getObjectTypeName()
+ {
+ return "CONSUMER_TYPE";
+ }
+
+ public boolean isAlreadyExisting(String objectName)
+ {
+ return registry.getConsumer(objectName) != null;
+ }
}
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java 2009-02-21 15:23:55 UTC (rev 12853)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java 2009-02-21 16:12:51 UTC (rev 12854)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2007, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, 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. *
@@ -226,4 +226,14 @@
{
selectedProp = beanContext.getParameter("propName");
}
+
+ protected String getObjectTypeName()
+ {
+ return null; // default implementation as not used
+ }
+
+ public boolean isAlreadyExisting(String objectName)
+ {
+ return false; // default implementation as not used
+ }
}
Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java 2009-02-21 15:23:55 UTC (rev 12853)
+++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java 2009-02-21 16:12:51 UTC (rev 12854)
@@ -52,6 +52,11 @@
*/
public abstract String getParameter(String key);
+ /**
+ * @param target
+ * @param message
+ * @param severity
+ */
protected abstract void createMessage(String target, String message, Object severity);
protected abstract Object getErrorSeverity();
Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/JSFBeanContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/JSFBeanContext.java 2009-02-21 15:23:55 UTC (rev 12853)
+++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/JSFBeanContext.java 2009-02-21 16:12:51 UTC (rev 12854)
@@ -26,6 +26,8 @@
import org.jboss.portal.common.util.ParameterValidation;
import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
import java.util.Locale;
import java.util.Map;
@@ -75,8 +77,22 @@
jsfSeverity = FacesMessage.SEVERITY_ERROR;
}
+ // Get the component id from the target
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ UIViewRoot viewRoot = facesContext.getViewRoot();
+ UIComponent component = viewRoot.findComponent(target);
+ if (component != null)
+ {
+ target = component.getClientId(facesContext);
+ }
+ else
+ {
+ // todo: do something better here
+ System.out.println("Couldn't resolve component target: " + target);
+ }
+
FacesMessage msg = new FacesMessage(jsfSeverity, message, message);
- FacesContext.getCurrentInstance().addMessage(target, msg);
+ facesContext.addMessage(target, msg);
}
protected Object getErrorSeverity()
Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java 2009-02-21 15:23:55 UTC (rev 12853)
+++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java 2009-02-21 16:12:51 UTC (rev 12854)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2007, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, 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. *
@@ -24,6 +24,7 @@
package org.jboss.portal.faces.gui;
import org.apache.log4j.Logger;
+import org.jboss.portal.common.util.ParameterValidation;
/**
@@ -31,14 +32,96 @@
* @version $Revision$
* @since 2.6
*/
-public class ManagedBean
+public abstract class ManagedBean
{
protected Logger log = Logger.getLogger(getClass());
protected BeanContext beanContext;
+ public static final String INVALID_NAME = "INVALID_NAME_ERROR";
+ public static final String DUPLICATE = "DUPLICATE_ERROR";
public void setBeanContext(BeanContext beanContext)
{
this.beanContext = beanContext;
}
+
+ public String checkNameValidity(String name, String targetForErrorMessage)
+ {
+ if (ParameterValidation.isNullOrEmpty(name))
+ {
+ beanContext.createTargetedErrorMessage(targetForErrorMessage, INVALID_NAME, name, getLocalizedType());
+ return null;
+ }
+ else
+ {
+ // Trim name
+ name = name.trim();
+
+ // "sanitize" name: if it's invalid, return null and output message
+ name = ParameterValidation.sanitizeFromPatternWithHandler(name, ParameterValidation.XSS_CHECK,
+ new MessageValidationHandler(null, targetForErrorMessage, name));
+
+ // we got an invalid name, fail!
+ if (name == null)
+ {
+ return null;
+ }
+
+ // Check for duplicate
+ if (isAlreadyExisting(name))
+ {
+ beanContext.createTargetedErrorMessage(targetForErrorMessage, DUPLICATE, name, getLocalizedType());
+ return null;
+ }
+
+ return name;
+ }
+ }
+
+ private String getLocalizedType()
+ {
+ return beanContext.getMessageFromBundle(getObjectTypeName());
+ }
+
+ protected abstract String getObjectTypeName();
+
+ public abstract boolean isAlreadyExisting(String objectName);
+
+ protected boolean isOldAndNewDifferent(Object oldValue, Object newValue)
+ {
+ oldValue = normalizeStringIfNeeded(oldValue);
+ newValue = normalizeStringIfNeeded(newValue);
+
+ return (oldValue != null && !oldValue.equals(newValue)) || (oldValue == null && newValue != null);
+ }
+
+ /**
+ * Normalizes String by considering empty String as null as JSF would give either and trim non-null Strings.
+ *
+ * @param value
+ * @return
+ */
+ protected Object normalizeStringIfNeeded(Object value)
+ {
+ return (value instanceof String && ((String)value).length() == 0) ? null : ((String)value).trim();
+ }
+
+ private class MessageValidationHandler extends ParameterValidation.ValidationErrorHandler
+ {
+ private String targetForErrorMessage;
+ private String validatedName;
+
+ private MessageValidationHandler(String defaultValue, String targetForErrorMessage, String validatedName)
+ {
+ super(defaultValue);
+ this.targetForErrorMessage = targetForErrorMessage;
+ this.validatedName = validatedName;
+ }
+
+ protected String internalValidationErrorHandling(String s)
+ {
+ beanContext.createTargetedErrorMessage(targetForErrorMessage, INVALID_NAME, validatedName, getLocalizedType());
+ return null;
+ }
+ }
}
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r12853 - in modules/common/trunk/common/src: test/java/org/jboss/portal/test/common/util and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-02-21 10:23:55 -0500 (Sat, 21 Feb 2009)
New Revision: 12853
Modified:
modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ParameterValidation.java
modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/util/ParameterValidationTestCase.java
Log:
- Once more... Maybe, we should just remove all punctuation chars except - and _?
Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ParameterValidation.java
===================================================================
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ParameterValidation.java 2009-02-21 14:26:05 UTC (rev 12852)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ParameterValidation.java 2009-02-21 15:23:55 UTC (rev 12853)
@@ -36,7 +36,7 @@
public class ParameterValidation
{
public final static Pattern CSS_DISTANCE = Pattern.compile("\\d+\\W*(em|ex|px|in|cm|mm|pt|pc|%)?");
- public final static Pattern XSS_CHECK = Pattern.compile("([^<>\\(\\)=\\\\]^(?!%5C))*", Pattern.CASE_INSENSITIVE);
+ public final static Pattern XSS_CHECK = Pattern.compile("([^<>\\(\\)=\\\\](?<!%5C))*", Pattern.CASE_INSENSITIVE);
/**
* Implements a behavior to be executed in case a value fails to be validated. Uses the Chain of responsibility
Modified: modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/util/ParameterValidationTestCase.java
===================================================================
--- modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/util/ParameterValidationTestCase.java 2009-02-21 14:26:05 UTC (rev 12852)
+++ modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/util/ParameterValidationTestCase.java 2009-02-21 15:23:55 UTC (rev 12853)
@@ -100,6 +100,11 @@
public void testSanitizeFromPatternXSSCheck()
{
String defaultValue = "default";
+ assertEquals("foo", ParameterValidation.sanitizeFromPattern("foo", ParameterValidation.XSS_CHECK, defaultValue));
+ assertEquals("/foo/bar", ParameterValidation.sanitizeFromPattern("/foo/bar", ParameterValidation.XSS_CHECK, defaultValue));
+ assertEquals("testé", ParameterValidation.sanitizeFromPattern("testé", ParameterValidation.XSS_CHECK, defaultValue));
+ assertEquals("test�", ParameterValidation.sanitizeFromPattern("test�", ParameterValidation.XSS_CHECK, defaultValue));
+
assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("/foo/bar/\\/baz", ParameterValidation.XSS_CHECK, defaultValue));
assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("/foo/bar/%5c/baz", ParameterValidation.XSS_CHECK, defaultValue));
assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("/foo/bar/%5C/baz", ParameterValidation.XSS_CHECK, defaultValue));
@@ -113,6 +118,7 @@
"omeleftnavigation.jsp<script>window.open(\"http://3.211.64.16/XSS/ \", \"XSS\",\"width=550,height=290\")</script>",
ParameterValidation.XSS_CHECK, defaultValue));
assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("/foo/bar/</baz", ParameterValidation.XSS_CHECK, defaultValue));
+
}
public void testSanitizeFromValuesNullValue()
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r12852 - in modules/common/trunk/common/src: test/java/org/jboss/portal/test/common/util and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-02-21 09:26:05 -0500 (Sat, 21 Feb 2009)
New Revision: 12852
Modified:
modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ParameterValidation.java
modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/util/ParameterValidationTestCase.java
Log:
- Getting negative reg-exp right is tricky...
Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ParameterValidation.java
===================================================================
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ParameterValidation.java 2009-02-20 14:37:19 UTC (rev 12851)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ParameterValidation.java 2009-02-21 14:26:05 UTC (rev 12852)
@@ -36,7 +36,7 @@
public class ParameterValidation
{
public final static Pattern CSS_DISTANCE = Pattern.compile("\\d+\\W*(em|ex|px|in|cm|mm|pt|pc|%)?");
- public final static Pattern XSS_CHECK = Pattern.compile("([^<>\\(\\)=\\\\](?!%5c))*", Pattern.CASE_INSENSITIVE);
+ public final static Pattern XSS_CHECK = Pattern.compile("([^<>\\(\\)=\\\\]^(?!%5C))*", Pattern.CASE_INSENSITIVE);
/**
* Implements a behavior to be executed in case a value fails to be validated. Uses the Chain of responsibility
Modified: modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/util/ParameterValidationTestCase.java
===================================================================
--- modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/util/ParameterValidationTestCase.java 2009-02-20 14:37:19 UTC (rev 12851)
+++ modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/util/ParameterValidationTestCase.java 2009-02-21 14:26:05 UTC (rev 12852)
@@ -103,6 +103,11 @@
assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("/foo/bar/\\/baz", ParameterValidation.XSS_CHECK, defaultValue));
assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("/foo/bar/%5c/baz", ParameterValidation.XSS_CHECK, defaultValue));
assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("/foo/bar/%5C/baz", ParameterValidation.XSS_CHECK, defaultValue));
+ assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("%5C", ParameterValidation.XSS_CHECK, defaultValue));
+ assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("%5C\t ", ParameterValidation.XSS_CHECK, defaultValue));
+ assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("\t\n%5c", ParameterValidation.XSS_CHECK, defaultValue));
+ assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("/foo/bar/%5C", ParameterValidation.XSS_CHECK, defaultValue));
+ assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("/foo/bar/%5c", ParameterValidation.XSS_CHECK, defaultValue));
assertEquals(defaultValue, ParameterValidation.sanitizeFromPattern("http://qa.cwcportal.aviation.ge.com:80/portal/auth/portal/main/cwcportal-" +
"Home/cwcportal-Home-LeftNavigationPortletWindow?action=1&org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID=/pages/h" +
"omeleftnavigation.jsp<script>window.open(\"http://3.211.64.16/XSS/ \", \"XSS\",\"width=550,height=290\")</script>",
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r12851 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-02-20 09:37:19 -0500 (Fri, 20 Feb 2009)
New Revision: 12851
Added:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_pt_BR.properties
Log:
JBPORTAL-2293: Support for Brazilian Portuguese (core)
Added: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_pt_BR.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_pt_BR.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_pt_BR.properties 2009-02-20 14:37:19 UTC (rev 12851)
@@ -0,0 +1,37 @@
+################################################################################
+# JBoss, a division of Red Hat #
+# Copyright 2006, Red Hat Middleware, LLC, and individual #
+# contributors as indicated by the @authors tag. See the #
+# copyright.txt in the distribution for a full listing of #
+# individual contributors. #
+# #
+# This is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU Lesser General Public License as #
+# published by the Free Software Foundation; either version 2.1 of #
+# the License, or (at your option) any later version. #
+# #
+# This software is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU #
+# Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public #
+# License along with this software; if not, write to the Free #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
+################################################################################
+
+POWERED_BY=Powered by
+THEME_BY=Tema por
+LOGIN=Login
+LOGOUT=Logout
+PORTLET_INSTANCE_ASSOCIATED=Inst\u00e2ncia de portlet associada \u00e0 esta janela
+PORTLET_NAME=Nome do Portlet
+PORTLET_DESCRIPTION=Descri\u00e7\u00e3o do Portlet
+DASHBOARD=Painel
+CONFIGURE_DASHBOARD=Configurar painel
+COPY_TO_DASHBOARD=Copiar para meu painel
+PORTAL=Portal
+ADMIN=Admin
+MEMBERS=Membros
+LOGGED=Logado como
\ No newline at end of file
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r12850 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-02-20 09:35:51 -0500 (Fri, 20 Feb 2009)
New Revision: 12850
Added:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_pt_BR.properties
Log:
JBPORTAL-2294: Support for Brazilian Portuguese (server)
Added: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_pt_BR.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_pt_BR.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_pt_BR.properties 2009-02-20 14:35:51 UTC (rev 12850)
@@ -0,0 +1,32 @@
+################################################################################
+# JBoss, a division of Red Hat #
+# Copyright 2006, Red Hat Middleware, LLC, and individual #
+# contributors as indicated by the @authors tag. See the #
+# copyright.txt in the distribution for a full listing of #
+# individual contributors. #
+# #
+# This is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU Lesser General Public License as #
+# published by the Free Software Foundation; either version 2.1 of #
+# the License, or (at your option) any later version. #
+# #
+# This software is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU #
+# Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public #
+# License along with this software; if not, write to the Free #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
+################################################################################
+
+ACCOUNT_DISABLED=Sua conta est\u00e1 desabilitada
+ACCOUNT_INEXISTING_OR_WRONG_PASSWORD=O usu\u00e1rio n\u00e3o existe ou a senha est\u00e1 incorreta
+ACCOUNT_NOTASSIGNEDTOROLE=O usu\u00e1rio n\u00e3o tem o papel correto
+
+LOGIN_TITLE=Login JBoss Portal
+LOGIN_USERNAME=Nome do Usu\u00e1rio
+LOGIN_PASSWORD=Senha
+LOGIN_CANCEL=Cancelar
+LOGIN_SUBMIT=Enviar
\ No newline at end of file
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r12849 - in branches/JBoss_Portal_Branch_2_7/core-identity/src/resources: portal-identity-war/WEB-INF and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-02-20 09:33:25 -0500 (Fri, 20 Feb 2009)
New Revision: 12849
Added:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
Log:
JBPORTAL-2295: Support for Brazilian Portuguese (core-dentity)
Added: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties 2009-02-20 14:33:25 UTC (rev 12849)
@@ -0,0 +1,188 @@
+################################################################################
+# JBoss, a division of Red Hat #
+# Copyright 2006, Red Hat Middleware, LLC, and individual #
+# contributors as indicated by the @authors tag. See the #
+# copyright.txt in the distribution for a full listing of #
+# individual contributors. #
+# #
+# This is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU Lesser General Public License as #
+# published by the Free Software Foundation; either version 2.1 of #
+# the License, or (at your option) any later version. #
+# #
+# This software is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU #
+# Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public #
+# License along with this software; if not, write to the Free #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
+################################################################################
+
+IDENTITY_APPLICATION_NOT_AVAILABLE=Portlet n\u00e3o dispon\u00edvel. Verifique sua configura\u00e7\u00e3o e log de erro para mais informa\u00e7\u00f5es.
+
+IDENTITY_WELCOME=Bem-vindo
+IDENTITY_REGISTER=Registro
+IDENTITY_LOST_PASSWORD=Senha Perdida
+IDENTITY_NOT_LOGGED_IN=Voc\u00ea n\u00e3o est\u00e1 atualmente logado.
+IDENTITY_CREATE_ACCOUNT=Voc\u00ea pode criar uma conta.
+IDENTITY_BUTTON_SUBMIT=Confirmar
+IDENTITY_BUTTON_EDIT=Editar
+IDENTITY_BUTTON_CANCEL=Cancelar
+
+IDENTITY_REGISTER_TITLE=Informa\u00e7\u00f5es B\u00e1sicas do Usu\u00e1rio
+IDENTITY_REGISTER_TITLE_CONFIRM=Confirma\u00e7\u00e3o
+IDENTITY_REGISTER_PASSWORD_CONFIRM=Confirme sua senha
+IDENTITY_REGISTER_STATUS_TITLE=Estado do Registro
+IDENTITY_REGISTER_SUCCESS_TITLE=Sua conta foi criada com sucesso. Voc\u00ea pode logar.
+IDENTITY_REGISTER_PENDING_TITLE=Um e-mail foi enviado para o seu endere\u00e7o de e-mail para verificar seu registro.
+IDENTITY_REGISTER_REQUIRED_INFORMATION=indica um campo obrigat\u00f3rio.
+
+IDENTITY_LOST_PASSWORD_TITLE=Esqueceu seus dados de login?
+IDENTITY_LOST_PASSWORD_DESCRIPTION=Por favor, informe seu usu\u00e1rio para resetar sua senha.
+IDENTITY_LOST_PASSWORD_ERROR=Falha ao atualizar a senha.
+IDENTITY_LOST_PASSWORD_STATUS_SUCCESSFUL=Voc\u00ea receber\u00e1 um e-mail com a sua nova senha.
+IDENTITY_LOST_PASSWORD_STATUS_404=Conta n\u00e3o encontrada.
+IDENTITY_LOST_PASSWORD_STATUS_TITLE=Senha n\u00e3o encontrada
+
+IDENTITY_EDIT_PROFILE_ERROR=Erro durante a atualiza\u00e7\u00e3o do perfil.
+IDENTITY_EDIT_PASSWORD_TITLE=Alterar sua senha
+IDENTITY_EDIT_PASSWORD_CURRENT=Senha atual
+IDENTITY_EDIT_CHANGE_PASSWORD=Alterar senha
+IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=Senha n\u00e3o pode ser alterada.
+IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=Senha atualizada.
+
+IDENTITY_EDIT_EMAIL_TITLE=Altere seu endere\u00e7o de e-mail
+IDENTITY_EDIT_EMAIL_NEW=Novo endere\u00e7o de e-mail
+IDENTITY_EDIT_CHANGE_EMAIL=Alterar e-mail
+IDENTITY_EDIT_CHANGE_EMAIL_ERROR=E-mail n\u00e3o alterado
+IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING=Um e-mail de valida\u00e7\u00e3o foi encaminhado ao seu endere\u00e7o.
+IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED=Endere\u00e7o de E-mail alterado.
+
+IDENTITY_EDIT_PROFILE_TITLE=Editar perfil
+IDENTITY_VIEW_PROFILE_TITLE=Ver perfil
+
+IDENTITY_USERNAME=Usu\u00e1rio
+IDENTITY_PASSWORD=Senha
+IDENTITY_EMAIL=E-Mail
+IDENTITY_GIVENNAME=Primeiro nome
+IDENTITY_FAMILYNAME=\u00daltimo nome
+IDENTITY_SKYPE=ID Skype
+IDENTITY_LOCATION=Localiza\u00e7\u00e3o
+IDENTITY_OCCUPATION=Ocupa\u00e7\u00e3o
+IDENTITY_EXTRA=Extra
+IDENTITY_SIGNATURE=Assinatura
+IDENTITY_INTERESTS=Interesses
+IDENTITY_LOCALE=Localidade
+IDENTITY_ICQ=ID ICQ
+IDENTITY_AIM=ID AIM
+IDENTITY_MSNM=ID MSN
+IDENTITY_YIM=ID Yahoo!
+IDENTITY_XMMP=ID XMNP
+IDENTITY_HOMEPAGE=P\u00e1gina Inicial
+IDENTITY_TIMEZONE=Fuso hor\u00e1rio
+IDENTITY_THEME=Tema
+IDENTITY_SECURITY_QUESTION=Pergunta
+IDENTITY_SECURITY_ANSWER=Resposta
+IDENTITY_LAST_LOGIN=\u00daltimo login
+IDENTITY_REIGSTRATION_DATE=Data de registro
+IDENTITY_ENABLED=Habilitado
+IDENTITY_SICKCODE=C\u00f3digo SICK
+
+IDENTITY_CATEGORY_GENERAL=Prefer\u00eancias Gerais
+IDENTITY_CATEGORY_PERSONAL=Informa\u00e7\u00f5es Pessoais
+IDENTITY_CATEGORY_INSTANT=Identidades de Mensagem Instant\u00e2nea
+IDENTITY_CATEGORY_ADDITIONAL=Informa\u00e7\u00f5es Adicionais
+
+IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE=(Assinatura de 255 caracteres no m\u00e1ximo)
+IDENTITY_CATEGORY_ADDITIONAL_EXTRA=(255 caracteres no m\u00e1ximo.)
+
+IDENTITY_MANAGEMENT_ACTION=A\u00e7\u00f5es
+IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE=Editar usu\u00e1rio
+IDENTITY_MANAGEMENT_ACTION_ROLES=Pap\u00e9is
+IDENTITY_MANAGEMENT_ACTION_DELETE=Deletar
+IDENTITY_MANAGEMENT_USER_MANAGEMENT=Gerenciamento de Usu\u00e1rio
+IDENTITY_MANAGEMENT_ROLE_MANAGEMENT=Gerenciamento de Pap\u00e9is
+IDENTITY_MANAGEMENT_SEARCH_USER=Pesquisar usu\u00e1rios
+IDENTITY_MANAGEMENT_CREATE_USER=Criar uma nova conta de usu\u00e1rio
+IDENTITY_MANAGEMENT_CREATE_USER_CREATED=Usu\u00e1rio criado
+IDENTITY_MANAGEMENT_USER_DELETED=Usu\u00e1rio deletado
+IDENTITY_MANAGEMENT_ROLE=Papel
+IDENTITY_MANAGEMENT_ROLE_DISPLAY=Exibir nome
+IDENTITY_MANAGEMENT_ROLE_MEMBERS=Membros
+IDENTITY_MANAGEMENT_ROLE_ASSIGNED=Pap\u00e9is atribu\u00eddos
+IDENTITY_MANAGEMENT_CREATE_ROLE=Criar novo papel
+IDENTITY_MANAGEMENT_EDIT_ROLE=Editar papel
+IDENTITY_MANAGEMENT_CREATE_ROLE=Criar papel
+IDENTITY_MANAGEMENT_DISABLE=Desabilitar
+IDENTITY_MANAGEMENT_DISABLE_USER_DISABLED=Usu\u00e1rio desabilitado
+IDENTITY_MANAGEMENT_ENABLE=habilitado
+IDENTITY_MANAGEMENT_ENABLE_USER_ENABLED=Usu\u00e1rio habilitado
+IDENTITY_MANAGEMENT_RESET_PASSWORD=Reiniciar senha
+IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=Redefinir a senha para o usu\u00e1rio
+IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=O usu\u00e1rio receber\u00e1 uma senha aleat\u00f3ria em seu endere\u00e7o de e-mail.
+IDENTITY_MANAGEMENT_ASSIGN_ROLES=Atribuir pap\u00e9is
+IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=Usu\u00e1rios pendentes
+IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=Usu\u00e1rios registrados
+IDENTITY_MANAGEMENT_APPROVE_ALL=Aprovar selecionados
+IDENTITY_MANAGEMENT_REJECT_ALL=Rejeitar selecionados
+IDENTITY_MANAGEMENT_SELECT_ALL=selecionar todos
+IDENTITY_MANAGEMENT_UNSELECT_ALL=desmarcar todos
+IDENTITY_MANAGEMENT_MATRIX=Matriz
+IDENTITY_MANAGEMENT_SUBSCRIPTION_MODES=Modos de Assinatura
+
+IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS=Registros pendentes
+IDENTITY_MANAGEMENT_PENDING_BPM_ID=Id
+IDENTITY_MANAGEMENT_PENDING_APPROVE=aprovar
+IDENTITY_MANAGEMENT_PENDING_REJECT=rejeitar
+
+IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE=Modo de Assinatura
+IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE=Modo de Administra\u00e7\u00e3o de Assinaturas
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM=Personalizar modo de assinatura
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC=Autom\u00e1tico - sem valida\u00e7\u00e3o de e-mail, sem aprova\u00e7\u00e3o administrativa.
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL=Valida\u00e7\u00e3o de email, sem aprova\u00e7\u00e3o administrativa.
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN=Valida\u00e7\u00e3o de e-mail e aprova\u00e7\u00e3o administrativa.
+
+IDENTITY_REGISTER_VERIFY_CAPTCHA=Verificar imagem
+IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirma\u00e7\u00e3o: Deletar
+IDENTITY_WARNING_CONFIRM_DELETE_USER=Warning! Voc\u00ea est\u00e1 prestes a eliminar o usu\u00e1rio
+IDENTITY_WARNING_CONFIRM_DELETE_ROLE=Aviso! Voc\u00ea est\u00e1 prestes a eliminar o papel
+IDENTITY_REGISTER_CONFIRMATIONEMAIL=Confirme a sua assinatura
+
+IDENTITY_MAIL_SUBJECT_LOST_PASSWORD=Reiniciar sua senha
+IDENTITY_MAIL_SUBJECT_REGISTER=Confirmar assinatura
+IDENTITY_MAIL_SUBJECT_CHANGE_EMAIL=Confirmar endere\u00e7o de e-mail
+
+IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE=N\u00e3o foi poss\u00edvel executar a a\u00e7\u00e3o do papel. Por favor, d\u00ea uma olhada no seu arquivo de log para mais informa\u00e7\u00f5es.
+IDENTITY_MANAGEMENT_ERROR_ACTION_USER=N\u00e3o \u00e9 poss\u00edvel executar a a\u00e7\u00e3o do usu\u00e1rio. Por favor, d\u00ea uma olhada no seu arquivo de log para mais informa\u00e7\u00f5es.
+
+IDENTITY_VERIFICATION_RETURN=Retornar ao portal
+IDENTITY_VERIFICATION_LOGIN=Login
+IDENTITY_VERIFICATION_STATUS_EROOR=Erro durante a valida\u00e7\u00e3o de endere\u00e7o de e-mail.
+IDENTITY_VERIFICATION_STATUS_FAILED=N\u00e3o \u00e9 poss\u00edvel validar o endere\u00e7o de e-mail.
+IDENTITY_VERIFICATION_STATUS_VALIDATED=Endere\u00e7o de e-mail validado.
+IDENTITY_VERIFICATION_STATUS_REGISTER_SUCCESS=Sua conta foi ativada. Voc\u00ea pode logar.
+IDENTITY_VERIFICATION_STATUS_REGISTER_APPROVAL=Seu endere\u00e7o de e-mail foi verificado, mas a conta precisa ser aprovada pelo administrador.
+IDENTITY_VERIFICATION_STATUS_REGISTER_CUSTOM=Sua conta foi ativada. Voc\u00ea pode logar.
+
+IDENTITY_VALIDATION_ERROR_REGISTRATION=Falha ao registrar usu\u00e1rio
+IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=Este nome de usu\u00e1rio ja existe.
+IDENTITY_VALIDATION_ERROR_USERNAME_ERROR=Erro durante a valida\u00e7\u00e3o do nome de usu\u00e1rio.
+IDENTITY_VALIDATION_ERROR_ROLENAME_TAKEN=O nome do papel j\u00e1 existe.
+IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR=Erro durante a valida\u00e7\u00e3o do nome do papel.
+IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH=As senhas n\u00e3o correspondem.
+IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR=Erro durante a valida\u00e7\u00e3o do nome da senha.
+IDENTITY_VALIDATION_ERROR_INVALID_EMAIL=Endere\u00e7o de e-mail inv\u00e1lido.
+IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD=Senha invalida
+IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT=C\u00f3digo incorreto
+
+# Example usage for dynamic values
+IDENTITY_DYNAMIC_VALUE_TEST=r\u00f3tulo de teste
+IDENTITY_DYNAMIC_VALUE_TEST2=r\u00f3tulo2 de teste
+
+javax.portlet.title=Perfil de usu\u00e1rio
+javax.portlet.keywords=gerenciamento,usu\u00e1rio
+
+javax.faces.component.UIInput.REQUIRED=Valor \u00e9 obrigat\u00f3rio
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2009-02-20 13:51:20 UTC (rev 12848)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2009-02-20 14:33:25 UTC (rev 12849)
@@ -40,6 +40,8 @@
<supported-locale>it</supported-locale>
<supported-locale>ru</supported-locale>
<supported-locale>ja</supported-locale>
+ <supported-locale>pt_BR</supported-locale>
+ <supported-locale>fr</supported-locale>
</locale-config>
<message-bundle>conf.bundles.Identity</message-bundle>
</application>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2009-02-20 13:51:20 UTC (rev 12848)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2009-02-20 14:33:25 UTC (rev 12849)
@@ -50,6 +50,7 @@
<supported-locale>ru</supported-locale>
<supported-locale>en</supported-locale>
<supported-locale>it</supported-locale>
+ <supported-locale>pt_BR</supported-locale>
<resource-bundle>conf.bundles.Identity</resource-bundle>
<portlet-preferences>
<preference>
@@ -98,6 +99,7 @@
<supported-locale>fr</supported-locale>
<supported-locale>en</supported-locale>
<supported-locale>it</supported-locale>
+ <supported-locale>pt_BR</supported-locale>
<portlet-info>
<title>User management portlet</title>
<keywords>management,admin</keywords>
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r12848 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-02-20 08:51:20 -0500 (Fri, 20 Feb 2009)
New Revision: 12848
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh
Log:
run.sh build-local fix
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh 2009-02-20 13:14:33 UTC (rev 12847)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh 2009-02-20 13:51:20 UTC (rev 12848)
@@ -2,13 +2,13 @@
export HELPMODE=0
-if [ ! -n "${1+x}" ]; then
- export HELPMODE=1
-elif [ $1 = "help" ]; then
- export HELPMODE=1
-fi
+#if [ ! -n "${1+x}" ]; then
+ #export HELPMODE=1
+#elif [ $1 = "help" ]; then
+ #export HELPMODE=1
+#fi
-if [ $HELPMODE -eq 1 ]; then
+if [ -z "$1" -o "$1" = "help" ]; then
echo "Usage: "
echo " run.sh MODE FF_LOCATION [TESTCLASS_NAME]"
echo
@@ -34,32 +34,49 @@
echo " run.sh single /home/vrockai/opt/firefox3/firefox-bin org/jboss/portal/test/selenium/DashboardTestCase.class"
else
if [ $1 != "help" ]; then
- ant clean
- echo "Action: $1"
- echo "Firefox bin location: $2"
- echo "Testclass name: $3"
+ ant clean
+ echo "Action: $1"
+ echo "Firefox bin location: $2"
+ echo "Testclass name: $3"
fi
if [ $1 = "test" ]; then
- ant -f build.xml copyApps
- ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true"
+ if [ -z "$2" -o ! -f "$2" ]; then
+ echo
+ echo "ERROR: Firefox location not set";
+ exit 0;
+ fi
+ ant -f build.xml copyApps
+ ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true"
+ elif [ $1 = "end2end" ]; then
+ if [ -z "$2" -o ! -f "$2" ]; then
+ echo
+ echo "ERROR: Firefox location not set";
+ exit 0;
+ fi
+ ant -f build.xml copyApps
+ ant -f build.xml selenium-usecase -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true"
+ elif [ $1 = "perf" ]; then
+ if [ -z "$2" -o ! -f "$2" ]; then
+ echo
+ echo "ERROR: Firefox location not set";
+ exit 0;
+ fi
+ ant -f build.xml copyApps
+ ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/"
+ elif [ $1 = "selenium" ]; then
+ ant -f build.xml run-src
+ elif [ $1 = "single" ]; then
+ if [ -z "$2" -o ! -f "$2" ]; then
+ echo
+ echo "ERROR: Firefox location not set";
+ exit 0;
+ fi
+ if [ -z "$3" ]; then
+ echo
+ echo "ERROR: Testclasss not set";
+ exit 0;
+ fi
+ ant -f build.xml single-test -Dbrowser="*firefox $2" -Dtestname="$3"
fi
-
- if [ $1 = "end2end" ]; then
- ant -f build.xml copyApps
- ant -f build.xml selenium-usecase -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true"
- fi
-
- if [ $1 = "perf" ]; then
- ant -f build-local.xml copyApps
- ant -f build-local.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/"
- fi
-
- if [ $1 = "selenium" ]; then
- ant -f build-local.xml run-src
- fi
-
- if [ $1 = "single" ]; then
- ant -f build-local.xml single-test -Dbrowser="*firefox $2" -Dtestname="$3"
- fi
fi
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r12847 - modules/identity/tags/JBP_IDENTITY_1_0_8/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-02-20 08:14:33 -0500 (Fri, 20 Feb 2009)
New Revision: 12847
Modified:
modules/identity/tags/JBP_IDENTITY_1_0_8/build/build.xml
Log:
1.0.8
Modified: modules/identity/tags/JBP_IDENTITY_1_0_8/build/build.xml
===================================================================
--- modules/identity/tags/JBP_IDENTITY_1_0_8/build/build.xml 2009-02-20 13:12:01 UTC (rev 12846)
+++ modules/identity/tags/JBP_IDENTITY_1_0_8/build/build.xml 2009-02-20 13:14:33 UTC (rev 12847)
@@ -61,8 +61,8 @@
<property name="version.major" value="1"/>
<property name="version.minor" value="0"/>
- <property name="version.revision" value="x"/>
- <property name="version.tag" value="SNAPSHOT"/>
+ <property name="version.revision" value="8"/>
+ <property name="version.tag" value="GA"/>
<property name="version.name" value=""/>
<!-- This must be set to the CVS tag for any release -->
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r12846 - modules/identity/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-02-20 08:12:01 -0500 (Fri, 20 Feb 2009)
New Revision: 12846
Added:
modules/identity/tags/JBP_IDENTITY_1_0_8/
Log:
Tagging identity 1.0.8
Copied: modules/identity/tags/JBP_IDENTITY_1_0_8 (from rev 12845, modules/identity/branches/JBP_IDENTITY_BRANCH_1_0)
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r12845 - in modules/portlet/tags/JBP_PORTLET_2_0_6: bridge and 11 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-02-20 07:59:36 -0500 (Fri, 20 Feb 2009)
New Revision: 12845
Modified:
modules/portlet/tags/JBP_PORTLET_2_0_6/bridge/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_6/build/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_6/controller/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_6/docs/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_6/federation/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_6/jsr168api/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_6/management/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_6/mc/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_6/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_6/portal/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_6/portlet/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_6/releaseLibs.sh
modules/portlet/tags/JBP_PORTLET_2_0_6/samples/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_6/test/pom.xml
Log:
2.0.6
Modified: modules/portlet/tags/JBP_PORTLET_2_0_6/bridge/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_6/bridge/pom.xml 2009-02-20 12:51:23 UTC (rev 12844)
+++ modules/portlet/tags/JBP_PORTLET_2_0_6/bridge/pom.xml 2009-02-20 12:59:36 UTC (rev 12845)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.6</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -24,4 +24,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_6/build/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_6/build/pom.xml 2009-02-20 12:51:23 UTC (rev 12844)
+++ modules/portlet/tags/JBP_PORTLET_2_0_6/build/pom.xml 2009-02-20 12:59:36 UTC (rev 12845)
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.6</version>
<packaging>pom</packaging>
<name>JBoss Portal Portlet Module</name>
<description>JBoss Portal Portlet Module</description>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_6/controller/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_6/controller/pom.xml 2009-02-20 12:51:23 UTC (rev 12844)
+++ modules/portlet/tags/JBP_PORTLET_2_0_6/controller/pom.xml 2009-02-20 12:59:36 UTC (rev 12845)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.6</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_6/docs/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_6/docs/pom.xml 2009-02-20 12:51:23 UTC (rev 12844)
+++ modules/portlet/tags/JBP_PORTLET_2_0_6/docs/pom.xml 2009-02-20 12:59:36 UTC (rev 12845)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.6</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<artifactId>docs-aggregator</artifactId>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_6/federation/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_6/federation/pom.xml 2009-02-20 12:51:23 UTC (rev 12844)
+++ modules/portlet/tags/JBP_PORTLET_2_0_6/federation/pom.xml 2009-02-20 12:59:36 UTC (rev 12845)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.6</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -62,4 +62,4 @@
</build>
-</project>
\ No newline at end of file
+</project>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_6/jsr168api/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_6/jsr168api/pom.xml 2009-02-20 12:51:23 UTC (rev 12844)
+++ modules/portlet/tags/JBP_PORTLET_2_0_6/jsr168api/pom.xml 2009-02-20 12:59:36 UTC (rev 12845)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.6</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_6/management/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_6/management/pom.xml 2009-02-20 12:51:23 UTC (rev 12844)
+++ modules/portlet/tags/JBP_PORTLET_2_0_6/management/pom.xml 2009-02-20 12:59:36 UTC (rev 12845)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.6</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -20,4 +20,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_6/mc/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_6/mc/pom.xml 2009-02-20 12:51:23 UTC (rev 12844)
+++ modules/portlet/tags/JBP_PORTLET_2_0_6/mc/pom.xml 2009-02-20 12:59:36 UTC (rev 12845)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.6</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_6/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_6/pom.xml 2009-02-20 12:51:23 UTC (rev 12844)
+++ modules/portlet/tags/JBP_PORTLET_2_0_6/pom.xml 2009-02-20 12:59:36 UTC (rev 12845)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Portlet Module Aggregator</name>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.6</version>
<url>http://labs.jboss.com/jbossportal</url>
<dependencies/>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_6/portal/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_6/portal/pom.xml 2009-02-20 12:51:23 UTC (rev 12844)
+++ modules/portlet/tags/JBP_PORTLET_2_0_6/portal/pom.xml 2009-02-20 12:59:36 UTC (rev 12845)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.6</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_6/portlet/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_6/portlet/pom.xml 2009-02-20 12:51:23 UTC (rev 12844)
+++ modules/portlet/tags/JBP_PORTLET_2_0_6/portlet/pom.xml 2009-02-20 12:59:36 UTC (rev 12845)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.6</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -207,4 +207,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_6/releaseLibs.sh
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_6/releaseLibs.sh 2009-02-20 12:51:23 UTC (rev 12844)
+++ modules/portlet/tags/JBP_PORTLET_2_0_6/releaseLibs.sh 2009-02-20 12:59:36 UTC (rev 12845)
@@ -1,4 +1,4 @@
-repos=$HOME/Dev/portal-modules-repos/portlet/trunk-SNAPSHOT/lib
+repos=$HOME/Dev/portal-modules-repos/portlet/2.0.6/lib
thirdparty=$HOME/Dev/jboss-portal-2.7/thirdparty/jboss-portal/modules/portlet/lib
echo "Copies current version of portlet libraries either to local repository copy or Portal thirdparty to test or release purpose"
@@ -25,9 +25,9 @@
echo "Releasing to Portal thirdparty"
fi
-cp bridge/target/portlet-bridge-2.1.0-SNAPSHOT.jar $loc/portal-portlet-bridge-lib.jar
-cp controller/target/portlet-controller-2.1.0-SNAPSHOT.jar $loc/portal-portlet-controller-lib.jar
-cp federation/target/portlet-federation-2.1.0-SNAPSHOT.jar $loc/portal-portlet-federation-lib.jar
-cp management/target/portlet-management-2.1.0-SNAPSHOT.jar $loc/portal-portlet-management-lib.jar
-cp portlet/target/portlet-portlet-2.1.0-SNAPSHOT.jar $loc/portal-portlet-lib.jar
-cp samples/target/portlet-samples-2.1.0-SNAPSHOT.jar $loc/portal-portlet-samples-lib.jar
+cp bridge/target/portlet-bridge-2.0.6.jar $loc/portal-portlet-bridge-lib.jar
+cp controller/target/portlet-controller-2.0.6.jar $loc/portal-portlet-controller-lib.jar
+cp federation/target/portlet-federation-2.0.6.jar $loc/portal-portlet-federation-lib.jar
+cp management/target/portlet-management-2.0.6.jar $loc/portal-portlet-management-lib.jar
+cp portlet/target/portlet-portlet-2.0.6.jar $loc/portal-portlet-lib.jar
+cp samples/target/portlet-samples-2.0.6.jar $loc/portal-portlet-samples-lib.jar
Modified: modules/portlet/tags/JBP_PORTLET_2_0_6/samples/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_6/samples/pom.xml 2009-02-20 12:51:23 UTC (rev 12844)
+++ modules/portlet/tags/JBP_PORTLET_2_0_6/samples/pom.xml 2009-02-20 12:59:36 UTC (rev 12845)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.6</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_6/test/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_6/test/pom.xml 2009-02-20 12:51:23 UTC (rev 12844)
+++ modules/portlet/tags/JBP_PORTLET_2_0_6/test/pom.xml 2009-02-20 12:59:36 UTC (rev 12845)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.6</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
17 years, 2 months
- 1
- 0