March 2009 - portal-commits - Jboss List Archives

JBoss Portal SVN: r12970 - in branches/JBoss_Portal_AS5_Deployer/core-wsrp: src/main/org/jboss/portal/test/wsrp/other and 4 other directories.

by portal-commits＠lists.jboss.org

Author: mwringe Date: 2009-03-06 18:21:04 -0500 (Fri, 06 Mar 2009) New Revision: 12970 Added: branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_ja.properties Modified: branches/JBoss_Portal_AS5_Deployer/core-wsrp/.classpath branches/JBoss_Portal_AS5_Deployer/core-wsrp/build.xml branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerBeanTestCase.java branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/wsrp-object.xml branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumers.xhtml branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml Log: Merge JBoss_Portal_Branch_2_7 changes (rev range 12254:12964) into JBoss_Portal_AS5_Deployer branch Modified: branches/JBoss_Portal_AS5_Deployer/core-wsrp/.classpath =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-wsrp/.classpath 2009-03-06 23:20:57 UTC (rev 12969) +++ branches/JBoss_Portal_AS5_Deployer/core-wsrp/.classpath 2009-03-06 23:21:04 UTC (rev 12970) @@ -12,6 +12,8 @@ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-jaxrpc.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/> - <classpathentry kind="lib" path="/thirdparty/sun-jsf/lib/jsf-api.jar"/> + <classpathentry kind="lib" path="/thirdparty/glassfish/jsf/lib/jsf-api.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/faces"/> + <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_AS5_Deployer/core-wsrp/build.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-wsrp/build.xml 2009-03-06 23:20:57 UTC (rev 12969) +++ branches/JBoss_Portal_AS5_Deployer/core-wsrp/build.xml 2009-03-06 23:21:04 UTC (rev 12970) @@ -98,9 +98,8 @@ <path refid="apache.log4j.classpath"/> <path refid="sun.servlet.classpath"/> <path refid="junit.junit.classpath"/> - <path refid="sun.jsf.classpath"/> + <path refid="glassfish.jsf.classpath"/> <path refid="el.el.classpath"/> - <path refid="richfaces.richfaces.classpath"/> <path refid="facelets.facelets.classpath"/> <path refid="portlet.portlet.classpath"/> <path refid="jboss/portlet.bridge.classpath"/> @@ -204,13 +203,10 @@  <copy todir="${build.wsrp-admin.war}/WEB-INF/lib"> - <fileset dir="${sun.jstl.lib}" includes="jstl.jar"/> + <fileset dir="${glassfish.jstl.lib}" includes="jstl.jar"/> <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/> <fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-api.jar"/> <fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-impl.jar"/> - <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-api.jar"/> - <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-impl.jar"/> - <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-ui.jar"/> <fileset dir="${build.lib}" includes="portal-wsrp-admin-lib.jar"/> <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/>  Modified: branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerBeanTestCase.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerBeanTestCase.java 2009-03-06 23:20:57 UTC (rev 12969) +++ branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerBeanTestCase.java 2009-03-06 23:21:04 UTC (rev 12970) @@ -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. * @@ -68,7 +68,7 @@ public void testSetCache() { - bean.setCache(new Integer(300)); + bean.setCache(300); assertEquals(300, bean.getCache().intValue()); assertTrue(bean.isModified()); } Modified: branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2009-03-06 23:20:57 UTC (rev 12969) +++ branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2009-03-06 23:21:04 UTC (rev 12970) @@ -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,29 @@ { 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, "edit-cons-form:id"); + if (id != null) + { + info.setId(id); + + // properly update the registry after change of id + registry.updateProducerInfo(info); + + // 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 +467,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 +522,7 @@ private Object modifyIfNeeded(Object oldValue, Object newValue, String target, boolean checkURL) { - if (isOldAndNewEqual(oldValue, newValue)) + if (isOldAndNewDifferent(oldValue, newValue)) { if (checkURL) { @@ -515,7 +533,7 @@ } catch (MalformedURLException e) { - beanContext.createErrorMessage(target, MALFORMED_URL, newValue, e.getLocalizedMessage()); + beanContext.createTargetedErrorMessage(target, MALFORMED_URL, newValue, e.getLocalizedMessage()); } } @@ -526,25 +544,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 +563,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 registry.getConsumer(objectName) != null; + } } Modified: branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2009-03-06 23:20:57 UTC (rev 12969) +++ branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2009-03-06 23:21:04 UTC (rev 12970) @@ -1,24 +1,25 @@ -/* -* 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. -*/ +/****************************************************************************** + * 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.wsrp.admin.ui; @@ -44,18 +45,21 @@ { private ConsumerRegistry registry; private String selectedId; - private static final String CONSUMER_ID = "consumerId"; - static final String CONFIGURE_CONSUMER = "configureConsumer"; - static final String CONSUMERS = "consumers"; - static final String EXPECTED_REG_INFO_KEY = "expectedRegistrationInfo"; private static final String NO_CONSUMER = "bean_consumermanager_no_consumer"; private static final String INVALID_NEW_CONSUMER_NAME = "bean_consumermanager_invalid_new_consumer_name"; private static final String REFRESH_BYPASSED = "bean_consumermanager_refresh_bypassed"; private static final String REFRESH_SUCCESS = "bean_consumermanager_refresh_success"; private static final String REFRESH_FAILURE = "bean_consumermanager_refresh_failure"; private static final String REFRESH_EXCEPTION = "bean_consumermanager_refresh_exception"; + static final String CONFIGURE_CONSUMER = "configureConsumer"; + + static final String CONSUMERS = "consumers"; + static final String EXPECTED_REG_INFO_KEY = "expectedRegistrationInfo"; static final String REFRESH_MODIFY = "bean_consumermanager_refresh_modify"; + static final String REQUESTED_CONSUMER_ID = "id"; + static final String SESSION_CONSUMER_ID = "consumerId"; + private static final String MESSAGE_TARGET = "createConsumer:consumerName"; public ConsumerRegistry getRegistry() { @@ -83,11 +87,22 @@ return registry.getConsumer(selectedId); } + public boolean isConsumersEmpty() + { + return registry.getConfiguredConsumers().isEmpty(); + } + public List<WSRPConsumer> getConsumers() { return registry.getConfiguredConsumers(); } + public String reload() + { + registry.reloadConsumers(); + return CONSUMERS; + } + public String activateConsumer() { if (refreshConsumerId() != null) @@ -158,6 +173,7 @@ public String createConsumer() { + selectedId = checkNameValidity(selectedId, MESSAGE_TARGET); if (selectedId != null) { try @@ -168,15 +184,12 @@ } catch (Exception e) { - beanContext.createErrorMessageFrom(e); + beanContext.createErrorMessageFrom(MESSAGE_TARGET, e); return null; } } - else - { - beanContext.createErrorMessage(INVALID_NEW_CONSUMER_NAME); - return null; - } + + return null; } public String destroyConsumer() @@ -236,7 +249,7 @@ { RefreshResult result = consumer.refresh(true); - String status = getLocalizationKeyFrom(result); + String statusMessage = getLocalizationKeyFrom(result); if (result.hasIssues()) { // create the expected registration info and make it available @@ -244,7 +257,7 @@ expected.refresh(result.getServiceDescription(), consumer.getProducerId(), true, true, true); setExpectedRegistrationInfo(expected); - beanContext.createErrorMessage(status); + beanContext.createErrorMessage(statusMessage); // refresh had issues, we should deactivate this consumer registry.deactivateConsumerWith(consumer.getProducerId()); @@ -261,7 +274,7 @@ registry.deactivateConsumerWith(consumer.getProducerId()); } - beanContext.createInfoMessage(status); + beanContext.createInfoMessage(statusMessage); } return result; } @@ -328,7 +341,7 @@ private String refreshConsumerId() { - selectedId = beanContext.getParameter("id"); + selectedId = beanContext.getParameter(REQUESTED_CONSUMER_ID); return selectedId; } @@ -342,11 +355,11 @@ if (!remove) { - sessionMap.put(CONSUMER_ID, selectedId); + sessionMap.put(SESSION_CONSUMER_ID, selectedId); } else { - sessionMap.remove(CONSUMER_ID); + sessionMap.remove(SESSION_CONSUMER_ID); } } @@ -354,4 +367,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_AS5_Deployer/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java 2009-03-06 23:20:57 UTC (rev 12969) +++ branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java 2009-03-06 23:21:04 UTC (rev 12970) @@ -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. * @@ -23,7 +23,6 @@ package org.jboss.portal.wsrp.admin.ui; -import org.jboss.portal.faces.gui.BeanContext; import org.jboss.portal.faces.gui.ManagedBean; import org.jboss.portal.registration.RegistrationPolicy; import org.jboss.portal.registration.policies.DefaultRegistrationPolicy; @@ -183,7 +182,7 @@ catch (Exception e) { log.debug(e); - beanContext.createErrorMessage(BeanContext.STATUS, "bean_producer_cannot_save", e.getLocalizedMessage()); + beanContext.createErrorMessage("bean_producer_cannot_save", e.getLocalizedMessage()); } return PRODUCER; } @@ -198,7 +197,7 @@ catch (Exception e) { log.debug(e); - beanContext.createErrorMessage(BeanContext.STATUS, "bean_producer_cannot_reload", e.getLocalizedMessage()); + beanContext.createErrorMessage("bean_producer_cannot_reload", e.getLocalizedMessage()); } return PRODUCER; } @@ -227,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 + } } Copied: branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java (from rev 12964, branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java) =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java (rev 0) +++ branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java 2009-03-06 23:21:04 UTC (rev 12970) @@ -0,0 +1,69 @@ +/****************************************************************************** + * 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.wsrp.admin.ui; + +import org.jboss.portal.faces.gui.JSFBeanContext; + +import javax.faces.application.NavigationHandler; +import javax.faces.context.FacesContext; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class RedirectOnNoConsumerNavigationHandler extends NavigationHandler +{ + private NavigationHandler base; + private static final String CONFIGURE_CONSUMER = "configureConsumer"; + private static final String CONSUMERS = "consumers"; + + public RedirectOnNoConsumerNavigationHandler(NavigationHandler base) + { + this.base = base; + } + + public void handleNavigation(FacesContext facesContext, String fromAction, String outcome) + { + // only check for need to redirect when we're asking for consumer details + if (CONFIGURE_CONSUMER.equals(outcome)) + { + // check if we have a currently selected consumer in the request... + String currentConsumer = JSFBeanContext.getParameter(ConsumerManagerBean.REQUESTED_CONSUMER_ID, facesContext); + + // if not, check the session... + if (currentConsumer == null) + { + currentConsumer = (String)JSFBeanContext.getSessionMap(facesContext).get(ConsumerManagerBean.SESSION_CONSUMER_ID); + + // if we still don't have consumer id, redirect to consumer list view + if (currentConsumer == null) + { + outcome = CONSUMERS; + } + } + } + + base.handleNavigation(facesContext, fromAction, outcome); + } +} Modified: branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties 2009-03-06 23:20:57 UTC (rev 12969) +++ branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties 2009-03-06 23:21:04 UTC (rev 12970) @@ -1,6 +1,6 @@ ################################################################################ # JBoss, a division of Red Hat # -# Copyright 2008, 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. # @@ -74,6 +74,7 @@ consumers_table_action_register = Register consumers_table_action_deregister = Deregister consumers_table_action_delete = Delete +consumers_table_reload = Reload consumers # Consumer editing screen edit_consumer_producer = Producer id: @@ -136,9 +137,10 @@ bean_support_unexpected_error = An unexpected error occured: bean_support_cause = Cause: +CONSUMER_TYPE = Consumer # ConsumerBean -bean_consumer_cannot_find_consumer = Couldn't find consumer ''{0}''! +bean_consumer_cannot_find_consumer = Couldn''t find consumer ''{0}''! bean_consumer_cannot_update_consumer = Couldn't update consumer! bean_consumer_cannot_refresh_consumer = Couldn't refresh consumer! bean_consumer_modify_reg_success = Successfully modified registration! @@ -161,8 +163,8 @@ # ProducerBean bean_producer_regpolicy_unset = RegistrationPolicy unset -bean_producer_cannot_save = Couldn't save producer configuration. Cause: {0} -bean_producer_cannot_reload = Couldn't reload producer configuration. Cause: {0} +bean_producer_cannot_save = Couldn''t save producer configuration. Cause: {0} +bean_producer_cannot_reload = Couldn''t reload producer configuration. Cause: {0} bean_producer_save_success = Producer configuration successfully saved! bean_producer_cancel_success = All modifications made to the producer configuration have been cancelled! @@ -172,4 +174,9 @@ registration_property_status_missing_value = Missing value registration_property_status_unchecked_value = Undetermined status registration_property_status_invalid_value = Invalid value -registration_property_status_valid = Valid \ No newline at end of file +registration_property_status_valid = Valid + +org.jboss.portal.object.name.admin.WSRP=WSRP + +INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty or contain '\\' or '%5c' +DUPLICATE_ERROR=A {1} named ''{0}'' already exists! \ No newline at end of file Modified: branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties 2009-03-06 23:20:57 UTC (rev 12969) +++ branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties 2009-03-06 23:21:04 UTC (rev 12970) @@ -1,6 +1,6 @@ ################################################################################ # JBoss, a division of Red Hat # -# Copyright 2008, 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. # @@ -34,20 +34,20 @@ path_consumers_inactive = inactif path_consumers_refreshNeeded = (rafra\u00eechissement requis) confirm_delete_consumer_cancel=Annuler -confirm_delete_consumer_message=Vous \u00eates sur le point d'effacer le concommateur ''{0}''! +confirm_delete_consumer_message=Vous \u00eates sur le point d''effacer le concommateur ''{0}''! confirm_delete_consumer_submit=Effacer consommateur confirm_delete_consumer_title=Voulez-vous r\u00e9ellement effacer le consommateur ''{0}''? confirm_detete_consumer_proceed=\u00cates-vous certains de vouloir proc\u00e9der? confirm_delete_registration_cancel=Annuler -confirm_delete_registration_message=Vous \u00eates sur le point d'effacer les informations locales d'enregistrement pour le consommateur ''{0}''! \n\ -Ceci n'est uniquement requis dans le cas o\u00f9 ce consommateur se serait enregistr\u00e9 aupr\u00e8s d'un producteur distant \n\ -qui aurait ensuite \u00e9t\u00e9 modifi\u00e9 pour ne plus requerir d'enregistrement. \n\ -N'effacez les informations locales d'enregistrement que si vous rencontrez des probl\u00e8mes, sp\u00e9cifiques \u00e0 cette \n\ -situation, avec le producteur distant. Effacer les donn\u00e9es d'enregistrement quand ce n'est pas requis peut entra\u00eener \n\ -l'incapacit\u00e9 future d'acc\u00e9der \u00e0 ce producteur. +confirm_delete_registration_message=Vous \u00eates sur le point d''effacer les informations locales d''enregistrement pour le consommateur ''{0}''! \n\ +Ceci n''est uniquement requis dans le cas o\u00f9 ce consommateur se serait enregistr\u00e9 aupr\u00e8s d''un producteur distant \n\ +qui aurait ensuite \u00e9t\u00e9 modifi\u00e9 pour ne plus requerir d''enregistrement. \n\ +N''effacez les informations locales d''enregistrement que si vous rencontrez des probl\u00e8mes, sp\u00e9cifiques \u00e0 cette \n\ +situation, avec le producteur distant. Effacer les donn\u00e9es d''enregistrement quand ce n''est pas requis peut entra\u00eener \n\ +l''incapacit\u00e9 future d''acc\u00e9der \u00e0 ce producteur. confirm_delete_registration_proceed=\u00cates-vous certains de vouloir proc\u00e9der? confirm_delete_registration_submit=Effacer enregistrement -confirm_delete_registration_title=Voulez-vous r\u00e9ellement effacer l'enregistrement du consommateur ''{0}''? +confirm_delete_registration_title=Voulez-vous r\u00e9ellement effacer l''enregistrement du consommateur ''{0}''? consumers_create_submit=Cr\u00e9er Consommateur consumers_create_title=Cr\u00e9er un consommateur nomm\u00e9: consumers_table_action_activate=Activer @@ -89,12 +89,12 @@ edit_consumer_registration_no_props=Enregistrement indiqu\u00e9 sans besoin de propri\u00e9t\u00e9s d'enregistrement edit_consumer_registration_update_props=Mettre les propri\u00e9t\u00e9s \u00e0 jour bean_consumer_cannot_erase_reg=L'effacement de l'enregistrement n'a pu \u00eatre effectu\u00e9! -bean_consumer_cannot_find_consumer=Le consommateur ''{0}'' n'a pu \u00eatre trouv\u00e9! +bean_consumer_cannot_find_consumer=Le consommateur ''{0}'' n''a pu \u00eatre trouv\u00e9! bean_consumer_cannot_modify_reg=La modification de l'enregistrement n'a pu \u00eatre effectu\u00e9e! bean_consumer_cannot_refresh_consumer=Le rafra\u00eechissement du consommateur n'a pu \u00eatre effectu\u00e9! bean_consumer_cannot_update_consumer=La mise \u00e0 jour du consommateur n'a pu \u00eatre effectu\u00e9e! bean_consumer_invalid_modify=Tentative invalide de modification d'enregistrement sans modifications locales. -bean_consumer_malformed_url=''{0}'' n'est pas une URL valide: {1} +bean_consumer_malformed_url=''{0}'' n''est pas une URL valide: {1} bean_consumer_modify_reg_success=Enregistrement modifi\u00e9! bean_support_cause=Cause: bean_support_unexpected_error=Une erreur inattendue s'est produite: @@ -104,8 +104,8 @@ bean_producer_cannot_save=La sauvegarde de la configuration du producteur a \u00e9chou\u00e9. Cause: {0} bean_producer_regpolicy_unset=RegistrationPolicy non sp\u00e9cifi\u00e9e confirm_delete_reg_property_cancel=Annuler -confirm_delete_reg_property_message=Vous \u00eates sur le point d'effacer la description de la propri\u00e9t\u00e9 d'enregistrement ''{0}''! \n\ -Cel\u00e0 va entra\u00eener l'invalidation des enregistrements des consommateurs qui devront alors modifier \n\ +confirm_delete_reg_property_message=Vous \u00eates sur le point d''effacer la description de la propri\u00e9t\u00e9 d''enregistrement ''{0}''! \n\ +Cel\u00e0 va entra\u00eener l''invalidation des enregistrements des consommateurs qui devront alors modifier \n\ leur information d'enregistrement. confirm_delete_reg_property_submit=Effacer la propri\u00e9t\u00e9 confirm_delete_reg_property_title=Voulez-vous r\u00e9ellement effacer la description de la propri\u00e9t\u00e9 d'enregistrement ''{0}''? @@ -142,4 +142,9 @@ registration_property_status_missing=Manquant registration_property_status_missing_value=Valeur manquante registration_property_status_unchecked_value=Status ind\u00e9termin\u00e9 -registration_property_status_valid=Valide \ No newline at end of file +registration_property_status_valid=Valide +org.jboss.portal.object.name.admin.WSRP=WSRP +consumers_table_reload=Recharger consommateurs +CONSUMER_TYPE=Consommateur +DUPLICATE_ERROR=Un {1} nomm\u00e9 ''{0}'' existe d\u00e9j\u00e0! +INVALID_NAME_ERROR=''{0}'' est un nom invalide pour un {1} : Ne peut pas \u00eatre null, vide ou contenir '\\' ou '%5c' \ No newline at end of file Copied: branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_ja.properties (from rev 12964, branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_ja.properties) =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_ja.properties (rev 0) +++ branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_ja.properties 2009-03-06 23:21:04 UTC (rev 12970) @@ -0,0 +1,172 @@ +################################################################################ +# 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. # +################################################################################ + +## WSRP GUI localization + +# JBoss Portal display information + +org.jboss.portal.object.name.admin.WSRP = \u30ea\u30e2\u30fc\u30c8\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 +org.jboss.portal.object.name.WSRPConfigurationPortlet = WSRP \u8a2d\u5b9a +org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = WSRP \u8a2d\u5b9a\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 + +# Tabs +nav_tabs_consumers = \u30b3\u30f3\u30b7\u30e5\u30fc\u30de \u8a2d\u5b9a +nav_tabs_producer_config = \u30d7\u30ed\u30c7\u30e5\u30fc\u30b5 \u8a2d\u5b9a +nav_tabs_producer_management = \u30d7\u30ed\u30c7\u30e5\u30fc\u30b5\u7ba1\u7406 + +# Object path in consumer template +path_consumers_root = \u30b3\u30f3\u30b7\u30e5\u30fc\u30de +path_consumers_consumer = \u30b3\u30f3\u30b7\u30e5\u30fc\u30de ''{0}'' \u8a2d\u5b9a +path_consumers_active = \u30a2\u30af\u30c6\u30a3\u30d6 +path_consumers_inactive = \u30a4\u30f3\u30a2\u30af\u30c6\u30a3\u30d6 +path_consumers_refreshNeeded = (\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u304c\u5fc5\u8981) + +# Confirm deletion of a consumer screen +confirm_delete_consumer_title = ''{0}'' \u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u3092\u524a\u9664\u3057\u307e\u3059\u304b? +confirm_delete_consumer_message = \u3042\u306a\u305f\u306f ''{0}'' \u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u3092\u524a\u9664\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307e\u3059! +confirm_detete_consumer_proceed = \u672c\u5f53\u306b\u3053\u306e\u4f5c\u696d\u3092\u7d9a\u3051\u307e\u3059\u304b\uff1f +confirm_delete_consumer_submit = \u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u524a\u9664 +confirm_delete_consumer_cancel = \u30ad\u30e3\u30f3\u30bb\u30eb + +# Confirm deletion of local registration information screen +confirm_delete_registration_title = ''{0}'' \u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u306e\u30ed\u30fc\u30ab\u30eb\u767b\u9332\u3092\u524a\u9664\u3057\u307e\u3059\u304b\uff1f +confirm_delete_registration_message = ''{0}'' \u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u306e\u30ed\u30fc\u30ab\u30eb\u767b\u9332\u60c5\u5831\u3092\u524a\u9664\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307e\u3059! \n\ +\u3053\u308c\u306f\u3001\u4ee5\u524d\u3001\u3053\u306e\u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u304c\u30ea\u30e2\u30fc\u30c8\u30d7\u30ed\u30c7\u30e5\u30fc\u30b5\u3068\u3044\u3063\u3057\u3087\u306b\u767b\u9332\u3055\u308c\u3001\u305d\u306e\u30d7\u30ed\u30c7\u30e5\u30fc\u30b5\u304c\u3082\u3046\u767b\u9332\u3092\u5fc5\u8981\u3068\u3057\u306a\u3044\u5834\u5408\u306e\u307f\u5fc5\u8981\u3067\u3059\u3002\n\ +\u3053\u306e\u7279\u5b9a\u306e\u72b6\u6cc1\u3067\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306e\u307f\u30ed\u30fc\u30ab\u30eb\u306e\u767b\u9332\u60c5\u5831\u3092\u524a\u9664\u3057\u3066\u304f\u3060\u3055\u3044\u3002\n\ +\u5fc5\u8981\u304c\u306a\u3044\u306e\u306b\u30ed\u30fc\u30ab\u30eb\u767b\u9332\u3092\u524a\u9664\u3059\u308b\u3068\u3001\u305d\u306e\u30d7\u30ed\u30c7\u30e5\u30fc\u30b5\u306f\u52d5\u4f5c\u4e0d\u80fd\u3068\u306a\u308a\u307e\u3059\u3002 +confirm_delete_registration_proceed = \u672c\u5f53\u306b\u3053\u306e\u4f5c\u696d\u3092\u7d9a\u3051\u307e\u3059\u304b\uff1f +confirm_delete_registration_submit = \u30ed\u30fc\u30ab\u30eb\u767b\u9332\u306e\u524a\u9664 +confirm_delete_registration_cancel = \u30ad\u30e3\u30f3\u30bb\u30eb + +# Consumers screen +consumers_title = \u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u7ba1\u7406 +consumers_create_title = \u547d\u540d\u3055\u308c\u305f\u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u306e\u4f5c\u6210: +consumers_create_submit = \u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u4f5c\u6210 + +# Consumers list +consumers_table_column_consumer = \u30b3\u30f3\u30b7\u30e5\u30fc\u30de +consumers_table_column_consumer_status = \u30b9\u30c6\u30fc\u30bf\u30b9: +consumers_table_column_actions = \u30a2\u30af\u30b7\u30e7\u30f3 +consumers_table_action_configure = \u8a2d\u5b9a +consumers_table_action_refresh = \u30ea\u30d5\u30ec\u30c3\u30b7\u30e5 +consumers_table_action_activate = \u30a2\u30af\u30c6\u30a3\u30d9\u30fc\u30c8 +consumers_table_action_deactivate = \u30c7\u30a3\u30a2\u30af\u30c6\u30a3\u30d9\u30fc\u30c8 +consumers_table_action_register = \u767b\u9332 +consumers_table_action_deregister = \u767b\u9332\u62b9\u6d88 +consumers_table_action_delete = \u524a\u9664 + +# Consumer editing screen +edit_consumer_producer = \u30d7\u30ed\u30c7\u30e5\u30fc\u30b5ID: +edit_consumer_cache = \u30ad\u30e3\u30c3\u30b7\u30e5\u6709\u52b9\u671f\u9650: +edit_consumer_cache_seconds = (\u6709\u52b9\u671f\u9650\u524d\u306e\u79d2\u6570) +edit_consumer_endpoint = \u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8\u8a2d\u5b9a: +edit_consumer_endpoint_wsdl = WSDL\u3092\u4f7f\u7528\uff1f +edit_consumer_endpoint_sd = \u30b5\u30fc\u30d3\u30b9\u8a18\u8ff0URL: +edit_consumer_endpoint_m = \u30de\u30fc\u30af\u30a2\u30c3\u30d7URL: +edit_consumer_endpoint_r = \u767b\u9332URL: +edit_consumer_endpoint_pm = \u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u7ba1\u7406URL: +edit_consumer_registration = \u767b\u9332\u60c5\u5831: +edit_consumer_registration_current = \u73fe\u884c\u306e\u767b\u9332\u60c5\u5831: +edit_consumer_prop_name = \u540d\u524d +edit_consumer_prop_desc = \u8aac\u660e +edit_consumer_prop_value = \u5024 +edit_consumer_registration_update_props = \u30d7\u30ed\u30d1\u30c6\u30a3\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8 +edit_consumer_registration_no_props = \u767b\u9332\u306f\u767b\u9332\u30d7\u30ed\u30d1\u30c6\u30a3\u7121\u3057\u3067\u5fc5\u8981\u306b\u5fdc\u3058\u3066\u8868\u793a\u3055\u308c\u307e\u3059\u3002 +edit_consumer_registration_modify = \u767b\u9332\u306e\u5909\u66f4 +edit_consumer_registration_modify_title = \u3053\u306e\u30d7\u30ed\u30c7\u30e5\u30fc\u30b5\u306e\u6301\u3064\u767b\u9332\u306e\u5909\u66f4 +edit_consumer_registration_expected = \u671f\u5f85\u3055\u308c\u308b\u767b\u9332\u60c5\u5831: +edit_consumer_no_registration = \u30d7\u30ed\u30c7\u30e5\u30fc\u30b5\u306f\u767b\u9332\u5fc5\u9808\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 +edit_consumer_registration_context = \u767b\u9332\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8: +edit_consumer_registration_context_handle = \u30cf\u30f3\u30c9\u30eb: +edit_consumer_registration_context_erase = \u30ed\u30fc\u30ab\u30eb\u767b\u9332\u306e\u524a\u9664 +edit_consumer_registration_context_erase_title = \u30ed\u30fc\u30ab\u30eb\u767b\u9332\u60c5\u5831\u306e\u524a\u9664 (\u6f5c\u5728\u7684\u306b\u5371\u967a!) +edit_consumer_refresh = \u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\uff06\u4fdd\u5b58 +edit_consumer_refresh_title = \u5909\u66f4\u3092\u4fdd\u5b58\u3057\u3001\u30d7\u30ed\u30c7\u30e5\u30fc\u30b5\u306e\u60c5\u5831\u3092\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u3057\u307e\u3059 +edit_consumer_cancel = \u30ad\u30e3\u30f3\u30bb\u30eb + +# Confirm registration property deletion scree +confirm_delete_reg_property_title = ''{0}'' \u767b\u9332\u30d7\u30ed\u30d1\u30c6\u30a3\u30c7\u30b9\u30af\u30ea\u30d7\u30b7\u30e7\u30f3\u3092\u524a\u9664\u3057\u307e\u3059\u304b? +confirm_delete_reg_property_message = \u3042\u306a\u305f\u306f ''{0}'' \u767b\u9332\u30d7\u30ed\u30d1\u30c6\u30a3\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30b7\u30e7\u30f3\u3092\u524a\u9664\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307e\u3059! +confirm_delete_reg_property_proceed = \u672c\u5f53\u306b\u3053\u306e\u4f5c\u696d\u3092\u3064\u3065\u3051\u305f\u3044\u3067\u3059\u304b\uff1f +confirm_delete_reg_property_submit = \u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u524a\u9664 +confirm_delete_reg_property_cancel = \u30ad\u30e3\u30f3\u30bb\u30eb + +# Producer configuration screen +producer_config_title = \u30d7\u30ed\u30c7\u30e5\u30fc\u30b5 \u8a2d\u5b9a +producer_config_sd_requires_reg = \u5b8c\u5168\u306a\u30b5\u30fc\u30d3\u30b9\u8a18\u8ff0\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b\u306b\u306f\u767b\u9332\u3055\u308c\u305f\u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u304c\u5fc5\u8981\u3002 +producer_config_strict = \u53b3\u683c\u306a WSRP \u30b3\u30f3\u30d7\u30e9\u30a4\u30a2\u30f3\u30b9\u3092\u4f7f\u7528\u3002 +producer_config_requires_reg = \u767b\u9332\u304c\u5fc5\u8981\u3002\u3053\u306e\u60c5\u5831\u306e\u5909\u66f4\u306f\u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u767b\u9332\u306e\u7121\u52b9\u5316\u3092\u5f15\u304d\u8d77\u3053\u3059\u3002 +producer_config_reg_policy = \u767b\u9332\u30dd\u30ea\u30b7\u30fc\u30af\u30e9\u30b9\u540d: +producer_config_reg_prop_validator = \u767b\u9332\u30d7\u30ed\u30d1\u30c6\u30a3\u30d0\u30ea\u30c7\u30fc\u30bf\u30af\u30e9\u30b9\u540d: +producer_config_reg_props = \u767b\u9332\u30d7\u30ed\u30d1\u30c6\u30a3 +producer_config_reg_prop_name = \u540d\u524d +producer_config_reg_prop_type = \u30bf\u30a4\u30d7 +producer_config_reg_prop_label = \u30e9\u30d9\u30eb +producer_config_reg_prop_hint = \u30d2\u30f3\u30c8 +producer_config_reg_prop_action = \u30a2\u30af\u30b7\u30e7\u30f3 +producer_config_reg_prop_remove = \u524a\u9664 +producer_config_no_reg_props = \u5fc5\u8981\u306a\u767b\u9332\u30d7\u30ed\u30d1\u30c6\u30a3\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002 +producer_config_add_reg_prop = \u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u8ffd\u52a0 +producer_config_save = \u4fdd\u5b58 +producer_config_cancel = \u30ad\u30e3\u30f3\u30bb\u30eb + +## Localized messages in JSF bean + +bean_support_unexpected_error = \u4e88\u60f3\u5916\u306e\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: +bean_support_cause = \u539f\u56e0: + +# ConsumerBean +bean_consumer_cannot_find_consumer = \u30b3\u30f3\u30b7\u30e5\u30fc\u30de ''{0}'' \u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093! +bean_consumer_cannot_update_consumer = \u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u304c\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u51fa\u6765\u307e\u305b\u3093! +bean_consumer_cannot_refresh_consumer = \u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u304c\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u51fa\u6765\u307e\u305b\u3093! +bean_consumer_modify_reg_success = \u767b\u9332\u304c\u6b63\u3057\u304f\u5909\u66f4\u3055\u308c\u307e\u3057\u305f! +bean_consumer_invalid_modify = \u30ed\u30fc\u30ab\u30eb\u3067\u5909\u66f4\u3055\u308c\u3066\u3044\u306a\u3044\u767b\u9332\u304c\u4e0d\u6b63\u306b\u5909\u66f4\u3055\u308c\u3088\u3046\u3068\u3057\u307e\u3057\u305f! +bean_consumer_cannot_modify_reg = \u767b\u9332\u304c\u5909\u66f4\u51fa\u6765\u307e\u305b\u3093! +bean_consumer_cannot_erase_reg = \u30ed\u30fc\u30ab\u30eb\u767b\u9332\u304c\u524a\u9664\u51fa\u6765\u307e\u305b\u3093! +bean_consumer_malformed_url = ''{0}'' \u306f\u6709\u52b9\u306aURL\u3067\u306f\u3042\u308a\u307e\u305b\u3093: {1} +bean_consumer_update_success = \u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u306e\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u304c\u6210\u529f\u3057\u307e\u3057\u305f! + +# ConsumerManagerBean +bean_consumermanager_invalid_new_consumer_name = null\u3084\u7a7a\u767d\u3067\u306a\u3044\u540d\u524d\u304c\u65b0\u3057\u3044\u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u306b\u5fc5\u8981\u3067\u3059! +bean_consumermanager_no_consumer = \u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u304c\u9078\u629e\u51fa\u6765\u307e\u305b\u3093! +bean_consumermanager_refresh_bypassed = \u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u306f\u5fc5\u8981\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002 +bean_consumermanager_refresh_success = \u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u304c\u6210\u529f\u3057\u307e\u3057\u305f\u3002 +bean_consumermanager_refresh_failure = \u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3002(\u767b\u9332\u60c5\u5831\u304c\u6709\u52b9\u3067\u306f\u306a\u304b\u3063\u305f\u304b\u3082\u3057\u308c\u307e\u305b\u3093)\u3002 +bean_consumermanager_refresh_exception = \u4e88\u60f3\u5916\u306e\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002 +bean_consumermanager_refresh_modify = \u30ed\u30fc\u30ab\u30eb\u307e\u305f\u306f\u30ea\u30e2\u30fc\u30c8\u306e\u60c5\u5831\u304c\u5909\u66f4\u3055\u308c\u307e\u3057\u305f\u3001\u30ea\u30e2\u30fc\u30c8\u30d7\u30ed\u30c7\u30e5\u30fc\u30b5\u306e\u767b\u9332\u3092\u5909\u66f4\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\n\ +\u65b0\u3057\u3044\u30ed\u30fc\u30ab\u30eb\u60c5\u5831\u306f\u4fdd\u5b58\u3055\u308c\u307e\u3059\u304c\u3001\u3042\u306a\u305f\u304c\u30d7\u30ed\u30c7\u30e5\u30fc\u30b5\u306e\u767b\u9332\u3092\u5909\u66f4\u3059\u308b\u307e\u3067\u306f\u73fe\u884c\u306e\u767b\u9332\u30c7\u30fc\u30bf\u304c\u5229\u7528\u3055\u308c\u307e\u3059\u3002 + +# ProducerBean +bean_producer_regpolicy_unset = RegistrationPolicy \u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093 +bean_producer_cannot_save = \u30d7\u30ed\u30c7\u30e5\u30fc\u30b5\u306e\u8a2d\u5b9a\u304c\u4fdd\u5b58\u51fa\u6765\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u539f\u56e0: {0} +bean_producer_cannot_reload = \u30d7\u30ed\u30c7\u30e5\u30fc\u30b5\u306e\u8a2d\u5b9a\u304c\u30ea\u30ed\u30fc\u30c9\u51fa\u6765\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u539f\u56e0: {0} +bean_producer_save_success = \u30d7\u30ed\u30c7\u30e5\u30fc\u30b5\u306e\u8a2d\u5b9a\u304c\u6b63\u3057\u304f\u4fdd\u5b58\u3055\u308c\u307e\u3057\u305f! +bean_producer_cancel_success = \u30d7\u30ed\u30c7\u30e5\u30fc\u30b5\u306e\u8a2d\u5b9a\u3067\u884c\u3063\u305f\u5168\u3066\u306e\u5909\u66f4\u306f\u30ad\u30e3\u30f3\u30bb\u30eb\u3055\u308c\u307e\u3057\u305f! + +## RegistrationProperty Status localization +registration_property_status_inexistent = \u30d7\u30ed\u30c7\u30e5\u30fc\u30b5\u306b\u5b58\u5728\u3057\u306a\u3044 +registration_property_status_missing = \u6b20\u640d +registration_property_status_missing_value = \u6b20\u640d\u5024 +registration_property_status_unchecked_value = \u672a\u77e5\u306e\u72b6\u614b +registration_property_status_invalid_value = \u7121\u52b9\u306a\u5024 +registration_property_status_valid = \u6709\u52b9 Modified: branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml 2009-03-06 23:20:57 UTC (rev 12969) +++ branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml 2009-03-06 23:21:04 UTC (rev 12970) @@ -1,29 +1,29 @@ <?xml version="1.0"?>  <!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN" - "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> + "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> <faces-config> @@ -33,10 +33,12 @@ <view-handler> org.jboss.portletbridge.application.PortletViewHandler </view-handler> + <navigation-handler>org.jboss.portal.wsrp.admin.ui.RedirectOnNoConsumerNavigationHandler</navigation-handler> <state-manager>org.jboss.portletbridge.application.PortletStateManager</state-manager> - <locale-config> + <locale-config> <default-locale>en</default-locale> <supported-locale>fr</supported-locale> + <supported-locale>ja</supported-locale> </locale-config> </application> @@ -75,6 +77,11 @@ <managed-bean-class>org.jboss.portal.wsrp.admin.ui.ConsumerBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> <managed-property> + <property-name>beanContext</property-name> + <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <value>#{beanContext}</value> + </managed-property> + <managed-property> <property-name>registry</property-name> <property-class>org.jboss.portal.wsrp.consumer.ConsumerRegistry</property-class> <value>#{applicationScope.ConsumerRegistry}</value> @@ -87,11 +94,6 @@ <property-name>manager</property-name> <value>#{consumersMgr}</value> </managed-property> - <managed-property> - <property-name>beanContext</property-name> - <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> - <value>#{beanContext}</value> - </managed-property> </managed-bean> <managed-bean> <managed-bean-name>producer</managed-bean-name> Modified: branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jboss-portlet.xml 2009-03-06 23:20:57 UTC (rev 12969) +++ branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jboss-portlet.xml 2009-03-06 23:21:04 UTC (rev 12970) @@ -29,9 +29,6 @@ <trans-attribute>Required</trans-attribute> </transaction> <header-content> - <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript"></script> - <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript"></script> - <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss"/> <link rel="stylesheet" type="text/css" href="/style.css" media="screen"/> </header-content> </portlet> Modified: branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml 2009-03-06 23:20:57 UTC (rev 12969) +++ branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml 2009-03-06 23:21:04 UTC (rev 12970) @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?>  @@ -28,11 +28,6 @@ version="2.4"> <context-param> - <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> - <param-value>org.jboss.portletbridge.application.FaceletPortletViewHandler</param-value> - </context-param> - - <context-param> <param-name>javax.portlet.faces.renderPolicy</param-name> <param-value>ALWAYS_DELEGATE</param-value> </context-param> @@ -42,32 +37,6 @@ <param-value>true</param-value> </context-param> - <context-param> - <param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name> - <param-value>rfRes</param-value> - </context-param> - - <context-param> - <param-name>org.richfaces.LoadStyleStrategy</param-name> - <param-value>NONE</param-value> - </context-param> - - <context-param> - <param-name>org.richfaces.LoadScriptStrategy</param-name> - <param-value>NONE</param-value> - </context-param> - - <context-param> - <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> - <param-value>false</param-value> - </context-param> - -  - <context-param> - <param-name>facelets.BUILD_BEFORE_RESTORE</param-name> - <param-value>true</param-value> - </context-param> -  <context-param> <param-name>facelets.DEVELOPMENT</param-name> @@ -88,19 +57,6 @@ <param-value>server</param-value> </context-param> - <filter> - <display-name>Ajax4jsf Filter</display-name> - <filter-name>ajax4jsf</filter-name> - <filter-class>org.ajax4jsf.Filter</filter-class> - </filter> - <filter-mapping> - <filter-name>ajax4jsf</filter-name> - <servlet-name>FacesServlet</servlet-name> - <dispatcher>FORWARD</dispatcher> - <dispatcher>REQUEST</dispatcher> - <dispatcher>INCLUDE</dispatcher> - </filter-mapping> - <servlet> <servlet-name>FacesServlet</servlet-name> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> Modified: branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/wsrp-object.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/wsrp-object.xml 2009-03-06 23:20:57 UTC (rev 12969) +++ branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/wsrp-object.xml 2009-03-06 23:21:04 UTC (rev 12970) @@ -31,6 +31,8 @@ <if-exists>overwrite</if-exists> <page> <page-name>WSRP</page-name> + <supported-locale>ja</supported-locale> + <resource-bundle>Resource</resource-bundle> <properties> <property> <name>layout.id</name> Modified: branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumers.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumers.xhtml 2009-03-06 23:20:57 UTC (rev 12969) +++ branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumers.xhtml 2009-03-06 23:21:04 UTC (rev 12970) @@ -1,3 +1,26 @@ + + <ui:decorate template="consumerTemplate.xhtml" xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -18,16 +41,20 @@ <h:message for="consumerName" errorClass="portlet-msg-error"/> </h:form> + <br/> +  <h:form id="consumer-list-form"> - <h:dataTable id="consumersList" value="#{consumersMgr.consumers}" var="cons" rendered="#{!empty consumersMgr.consumers}" + <h:dataTable id="consumersList" value="#{consumersMgr.consumers}" var="cons" + rendered="#{!consumersMgr.consumersEmpty}" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable objectList" width="100%"> <h:column> <f:facet name="header"> #{i18n.consumers_table_column_consumer} <div style="font-size: 90%; display:inline; font-weight: normal;"> - [#{i18n.consumers_table_column_consumer_status} <span class="active">#{i18n.path_consumers_active}</span>, + [#{i18n.consumers_table_column_consumer_status} <span + class="active">#{i18n.path_consumers_active}</span>, <span class="inactive">#{i18n.path_consumers_inactive}</span>, <span class="needsRefresh">#{i18n.path_consumers_refreshNeeded}</span>] </div> @@ -50,13 +77,14 @@ <f:param name="id" value="#{cons.producerId}"/> #{i18n.consumers_table_action_refresh} </h:commandLink> | - <h:commandLink action="#{consumersMgr.activateConsumer}" id="activate" + <h:commandLink action="#{consumersMgr.activateConsumer}" id="activate" styleClass="#{cons.active ? 'actionDeactivate' : 'actionActivate'}"> <f:param name="id" value="#{cons.producerId}"/> <f:param name="activate" value="#{!cons.active}"/> #{cons.active ? i18n.consumers_table_action_deactivate : i18n.consumers_table_action_activate} </h:commandLink> - <h:panelGroup rendered="#{!cons.refreshNeeded and cons.active and cons.producerInfo.registrationRequired}"> + <h:panelGroup + rendered="#{!cons.refreshNeeded and cons.active and cons.producerInfo.registrationRequired}"> | <h:commandLink action="#{consumersMgr.registerConsumer}" id="register" styleClass="action#{cons.producerInfo.registered ? 'Deregister' : 'Register'}"> @@ -65,7 +93,7 @@ #{cons.producerInfo.registered ? i18n.consumers_table_action_deregister : i18n.consumers_table_action_register} </h:commandLink> </h:panelGroup> | - <h:commandLink action="confirmDeleteConsumer" styleClass="actionDelete" id="delete" + <h:commandLink action="confirmDeleteConsumer" styleClass="actionDelete" id="delete" actionListener="#{consumersMgr.selectConsumer}"> <f:param name="id" value="#{cons.producerId}"/> #{i18n.consumers_table_action_delete} @@ -73,5 +101,10 @@ </h:column> </h:dataTable> </h:form> + + <h:form> + <h:commandButton id="createConsumerButton" action="#{consumersMgr.reload}" + value="#{i18n.consumers_table_reload}" styleClass="portlet-form-button"/> + </h:form> </ui:define> </ui:decorate> \ No newline at end of file Modified: branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml 2009-03-06 23:20:57 UTC (rev 12969) +++ branches/JBoss_Portal_AS5_Deployer/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml 2009-03-06 23:21:04 UTC (rev 12970) @@ -27,17 +27,17 @@ <tr> <th>#{i18n.edit_consumer_endpoint}</th> <td> - <h:selectBooleanCheckbox id="useWSDL" value="#{consumer.useWSDL}" onchange="this.form.submit()" + <h:selectBooleanCheckbox id="useWSDL" value="#{consumer.useWSDL}" onchange="this.form.submit()" valueChangeListener="#{consumer.useWSDLListener}" - immediate="true"/>#{i18n.edit_consumer_endpoint_wsdl} + immediate="true"/>#{i18n.edit_consumer_endpoint_wsdl} <h:message styleClass="portlet-msg-error" for="useWSDL"/> - <c:choose> - <c:when test="#{consumer.useWSDL}"> + + <h:panelGroup rendered="#{consumer.useWSDL}"> <h:inputText id="wsdl" size="70" value="#{consumer.wsdl}"/> <h:message styleClass="portlet-msg-error" for="wsdl"/> - </c:when> + </h:panelGroup> - <c:otherwise> + <h:panelGroup rendered="#{!consumer.useWSDL}"> <table border="0" class='portlet-table-body'> <tr> <th>#{i18n.edit_consumer_endpoint_sd}</th> @@ -69,8 +69,7 @@ </td> </tr> </table> - </c:otherwise> - </c:choose> + </h:panelGroup> </td> </tr> <c:if test="#{consumer.localInfoPresent}"> @@ -201,4 +200,4 @@ </table> </h:form> </ui:define> -</ui:decorate> \ No newline at end of file +</ui:decorate>

17 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r12969 - in branches/JBoss_Portal_AS5_Deployer/core-admin: src/bin/portal-admin-war/css and 10 other directories.

by portal-commits＠lists.jboss.org

Author: mwringe Date: 2009-03-06 18:20:57 -0500 (Fri, 06 Mar 2009) New Revision: 12969 Added: branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/img/minus.gif branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/img/plus.gif branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_ja.properties branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/error.xhtml Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/.classpath branches/JBoss_Portal_AS5_Deployer/core-admin/build.xml branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/css/basestyles.css branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/css/style.css branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml Log: Merge JBoss_Portal_Branch_2_7 changes (rev range 12254:12964) into JBoss_Portal_AS5_Deployer branch Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/.classpath =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/.classpath 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/.classpath 2009-03-06 23:20:57 UTC (rev 12969) @@ -23,6 +23,6 @@ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/portlet-server"/> <classpathentry kind="lib" path="/thirdparty/portlet/lib/portlet-api.jar"/> - <classpathentry kind="lib" path="/thirdparty/sun-jsf/lib/jsf-api.jar"/> + <classpathentry kind="lib" path="/thirdparty/glassfish/jsf/lib/jsf-api.jar"/> <classpathentry kind="output" path="output/classes"/> </classpath> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/build.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/build.xml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/build.xml 2009-03-06 23:20:57 UTC (rev 12969) @@ -95,11 +95,10 @@ <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> <path refid="hibernate.hibernate.classpath"/> - <path refid="sun.jsf.classpath"/> + <path refid="glassfish.jsf.classpath"/> <path refid="apache.log4j.classpath"/> <path refid="sun.servlet.classpath"/> <path refid="el.el.classpath"/> - <path refid="richfaces.richfaces.classpath"/> <path refid="facelets.facelets.classpath"/> <path refid="portlet.portlet.classpath"/> <path refid="jboss/portlet.bridge.classpath"/> @@ -149,10 +148,10 @@ <pathelement location="${project.tools}/lib/explode.jar"/> <path refid="apache.ant.classpath"/> </path> - <taskdef - name="explode" - classname="org.jboss.portal.common.ant.Explode" - classpathref="explode.task.classpath"/> + <taskdef + name="explode" + classname="org.jboss.portal.common.ant.Explode" + classpathref="explode.task.classpath"/> </target>  @@ -189,28 +188,25 @@  <copy todir="${build.resources}/portal-admin-war/WEB-INF/lib"> - <fileset dir="${sun.jstl.lib}" includes="jstl.jar"/> + <fileset dir="${glassfish.jstl.lib}" includes="jstl.jar"/> <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/> <fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-api.jar"/> <fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-impl.jar"/> - <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-api.jar"/> - <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-impl.jar"/> - <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-ui.jar"/> <fileset dir="${build.lib}" includes="portal-core-admin-lib.jar"/> - <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/> + <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/> <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/> <fileset dir="${apache.digester.lib}" includes="commons-digester.jar"/> <fileset dir="${apache.lang.lib}" includes="commons-lang.jar"/> - </copy> - <copy todir="${build.resources}/portal-admin-war"> - <fileset dir="${source.bin}/portal-admin-war"/> - </copy> + </copy> + <copy todir="${build.resources}/portal-admin-war"> + <fileset dir="${source.bin}/portal-admin-war"/> + </copy>  <copy todir="${build.resources}/portal-admin.sar"> <fileset dir="${build.resources}/portal-admin-sar"/> </copy> <copy todir="${build.resources}/portal-admin.sar/lib"> - <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-loader-lib.jar"/> + <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-loader-lib.jar"/> </copy> <copy todir="${build.resources}/portal-admin.sar/portal-admin.war"> @@ -285,8 +281,8 @@ <target name="deploy-ha" description="Deploy." depends="output"> - <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> - <copy file="${build.lib}/portal-admin.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}" - overwrite="true"/> - </target> + <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> + <copy file="${build.lib}/portal-admin.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}" + overwrite="true"/> + </target> </project> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/css/basestyles.css =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/css/basestyles.css 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/css/basestyles.css 2009-03-06 23:20:57 UTC (rev 12969) @@ -79,6 +79,14 @@ margin: 10px 0 10px 0; } +.tenpx-bottom { + margin: 0 0 10px 0; +} + +.tenpx-top { + margin: 10px 0 0 0; +} + .tenpx-right { margin: 0 10px 0 0; } Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/css/style.css =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/css/style.css 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/css/style.css 2009-03-06 23:20:57 UTC (rev 12969) @@ -623,7 +623,6 @@ .details-header ul li { float: left; list-style: none; - height: 16px; padding: 0 0 0 3px; } @@ -697,6 +696,11 @@ /*--------------------------- Coordination admin */ +div.coordination-section { + border: 1px solid #ccc; + padding: 0 3px 3px 3px; +} + ul.bindingList { margin: 0; padding: 0; Copied: branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/img/minus.gif (from rev 12964, branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/minus.gif) =================================================================== (Binary files differ) Copied: branches/JBoss_Portal_AS5_Deployer/core-admin/src/bin/portal-admin-war/img/plus.gif (from rev 12964, branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/plus.gif) =================================================================== (Binary files differ) Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, 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. * @@ -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; import org.jboss.portal.api.content.SelectedContent; @@ -35,7 +36,6 @@ import org.jboss.portal.core.model.content.ContentType; import org.jboss.portal.core.model.content.spi.ContentProvider; import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet; -import org.jboss.portal.core.model.instance.Instance; import org.jboss.portal.core.model.instance.InstanceContainer; import org.jboss.portal.core.model.portal.Page; import org.jboss.portal.core.model.portal.PortalObject; @@ -45,6 +45,7 @@ import org.jboss.portal.core.model.portal.PortalObjectPermission; import org.jboss.portal.core.model.portal.Window; import org.jboss.portal.faces.component.portlet.PortletEventEvent; +import org.jboss.portal.faces.gui.JSFBeanContext; import org.jboss.portal.identity.RoleModule; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvoker; @@ -64,7 +65,6 @@ import javax.xml.namespace.QName; import java.io.Serializable; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; @@ -139,15 +139,6 @@ private final AuthorizationBean auth = new PortalObjectAuthorizationBean(); /** . */ - private SelectItem[] instanceItems; - - /** . */ - private SelectItem[] portalPageItems; - - /** . */ - private SelectItem[] portalItems; - - /** . */ private List selectedObjectPath; /** . */ @@ -369,21 +360,6 @@ return auth; } - public SelectItem[] getInstanceItems() - { - return instanceItems; - } - - public SelectItem[] getPortalPageItems() - { - return portalPageItems; - } - - public SelectItem[] getPortalItems() - { - return portalItems; - } - public List getSelectedObjectPath() { return selectedObjectPath; @@ -494,7 +470,7 @@ FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, "Success", - "'" + name + "' " + typeName + " was successfully set as default " + typeName); + "'" + name + "' " + typeName + " was successfully set as default " + typeName); FacesContext.getCurrentInstance().addMessage("status", message); } } @@ -567,7 +543,7 @@ // set the state from the id PortalObjectId portalObjectId = null; - if(id != null) + if (id != null) { portalObjectId = PortalObjectId.parse(id, PortalObjectPath.LEGACY_BASE64_FORMAT); } @@ -659,9 +635,6 @@ public void refresh() { propertyAction = null; - instanceItems = null; - portalPageItems = null; - portalItems = null; selectedObjectPath = null; selectedObject = null; selectedProperties = null; @@ -682,7 +655,9 @@ { if (pageManager == null) { + // it'd be better if propertyAction was injected in faces-config.xml so that we can also inject the shared beanContext pageManager = new PageManagerBean(layoutService, portletDefinitionInvoker); + pageManager.setBeanContext(new JSFBeanContext()); } pageManager.page = (Page)selectedObject; } @@ -690,33 +665,14 @@ // selectedProperties = new PropertiesBean(this); controlProperties = new ControlPropertiesBean(this); + + // it'd be better if propertyAction was injected in faces-config.xml so that we can also inject the shared beanContext propertyAction = new PropertyAction(this); + propertyAction.setBeanContext(new JSFBeanContext()); // theme = new ThemeBean(selectedObject); - // - Collection<PortalObject> portals = getSelectedObject().getChildren(PortalObject.PORTAL_MASK); - ArrayList<SelectItem> portalList = new ArrayList<SelectItem>(portals.size() + 1); - for (PortalObject portal : portals) - { - portalList.add(new SelectItem(portal.getName())); - } - portalList.add(new SelectItem("", "no selection")); - portalItems = portalList.toArray(new SelectItem[portalList.size()]); - - // - Collection<PortalObject> pages = getSelectedObject().getChildren(PortalObject.PAGE_MASK); - ArrayList<SelectItem> list = new ArrayList<SelectItem>(pages.size() + 1); - for (PortalObject page : pages) - { - SelectItem item = new SelectItem(page.getName()); - list.add(item); - } - list.add(new SelectItem("", "no selection")); - portalPageItems = list.toArray(new SelectItem[list.size()]); - - // PortalObject o = getSelectedObject(); ArrayList<PortalObject> path = new ArrayList<PortalObject>(); while (o != null) @@ -726,17 +682,6 @@ } Collections.reverse(path); selectedObjectPath = path; - - // rather dirty code... - List tmp = new ArrayList(instanceContainer.getDefinitions()); - Collections.sort(tmp, InstanceManagerBean.INSTANCE_COMPARATOR); - for (int i = 0; i < tmp.size(); i++) - { - Instance instance = (Instance)tmp.get(i); - SelectItem item = new SelectItem(instance.getId()); - tmp.set(i, item); - } - instanceItems = (SelectItem[])tmp.toArray(new SelectItem[tmp.size()]); } public void processEvent(ActionEvent event) @@ -819,10 +764,10 @@ public SelectItem[] getAvailableActions() { return new SelectItem[]{ - new SelectItem("view", "View"), - new SelectItem("viewrecursive", "View Recursive"), - new SelectItem("personalize", "Personalize"), - new SelectItem("personalizerecursive", "Personalize Recursive") + new SelectItem("view", "View"), + new SelectItem("viewrecursive", "View Recursive"), + new SelectItem("personalize", "Personalize"), + new SelectItem("personalizerecursive", "Personalize Recursive") }; } Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, 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. * @@ -20,37 +20,24 @@ * 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; -import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ -public class AddPageAction +public class AddPageAction extends ManagedBean { /** . */ private static final Logger log = Logger.getLogger(AddPageAction.class); - /** . */ - private static final String ERROR_DUPE_NAME = "Duplicate Page name found on this portal!"; - - /** . */ - private static final String ERROR_EMPTY_NAME = "Page name cannot be blank!"; - - /** . */ - private static final String ERROR_NO_NAME = "Page name not specified!"; - - /** . */ - private static final String ERROR_INTERNAL_ERROR = "An internal error happened!"; - /** The page container that will create the child. */ public PageContainer pageContainer; @@ -62,34 +49,13 @@ /** The message id when an error happens. */ public String messageTarget; + protected static final String PAGE_TYPE = "PAGE_TYPE"; public void execute() { - FacesMessage message = null; - - // - if (pageName == null) + pageName = checkNameValidity(pageName, messageTarget); + if (pageName != null) { - message = new FacesMessage(FacesMessage.SEVERITY_ERROR, ERROR_NO_NAME, ERROR_NO_NAME); - } - else - { - pageName = pageName.trim(); - - // - if (pageName.length() == 0) - { - message = new FacesMessage(FacesMessage.SEVERITY_ERROR, ERROR_EMPTY_NAME, ERROR_EMPTY_NAME); - } - else if (pageContainer.getChild(pageName) != null) - { - message = new FacesMessage(FacesMessage.SEVERITY_ERROR, ERROR_DUPE_NAME, ERROR_DUPE_NAME); - } - } - - // - if (message == null) - { try { Page page = pageContainer.createPage(pageName); @@ -102,16 +68,10 @@ } catch (Exception e) { - log.error("An error happened during page creation", e); - message = new FacesMessage(FacesMessage.SEVERITY_ERROR, ERROR_INTERNAL_ERROR, ERROR_INTERNAL_ERROR); + log.error("An error occurred during page creation", e); + beanContext.createErrorMessageFrom(messageTarget, e); } } - - // - if (message != null && messageTarget != null) - { - FacesContext.getCurrentInstance().addMessage(messageTarget, message); - } } public interface Listener @@ -148,4 +108,14 @@ { this.listener = listener; } + + protected String getObjectTypeName() + { + return PAGE_TYPE; + } + + public boolean isAlreadyExisting(String objectName) + { + return pageContainer.getChild(objectName) != null; + } } Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, 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. * @@ -20,19 +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.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; import org.jboss.portal.security.spi.provider.DomainConfigurator; -import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; import java.util.Collections; import java.util.Set; @@ -40,7 +40,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ -public class CreateInstanceAction +public class CreateInstanceAction extends ManagedBean { /** . */ @@ -51,6 +51,8 @@ /** . */ private InstanceManagerBean instanceMgr; + private static final String MESSAGE_TARGET = "add_instance_form:instanceId"; + protected static final String INSTANCE_TYPE = "INSTANCE_TYPE"; public String getInstanceId() { @@ -84,40 +86,10 @@ public String execute() { - FacesContext faces = FacesContext.getCurrentInstance(); - // Validate instance id + instanceId = checkNameValidity(instanceId, MESSAGE_TARGET); if (instanceId == null) { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "No instance id!", null); - faces.addMessage("add_instance_form:instanceId", message); - } - else - { - // Trim name - instanceId = instanceId.trim(); - - // Check for empty string - if (instanceId.length() == 0) - { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "Instance id cannot be blank!", null); - faces.addMessage("add_instance_form:instanceId", message); - } - else - { - // Check for duplicate instance - Instance instance = instanceMgr.getInstanceContainer().getDefinition(instanceId); - if (instance != null) - { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "An instance with the id " + instanceId + " already exist!", null); - faces.addMessage("add_instance_form:instanceId", message); - } - } - } - - // - if (faces.getMessages().hasNext()) - { return null; } @@ -125,8 +97,7 @@ Portlet portlet = portletMgr.getSelectedPortlet(); if (portlet == null) { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "No portlet was selected!", null); - faces.addMessage("add_instance_form:instanceId", message); + beanContext.createTargetedErrorMessage(MESSAGE_TARGET, "NO_SELECTED_PORTLET_ERROR"); return null; } else @@ -152,10 +123,20 @@ } catch (Exception e) { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "An unexpected error happened!", null); - faces.addMessage("add_instance_form:instanceId", message); + log.error("An error occurred during instance creation.", e); + beanContext.createErrorMessageFrom(MESSAGE_TARGET, e); return null; } } } + + protected String getObjectTypeName() + { + return INSTANCE_TYPE; + } + + public boolean isAlreadyExisting(String objectName) + { + return instanceMgr.getInstanceContainer().getDefinition(objectName) != null; + } } Copied: branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java (from rev 12964, branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java) =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java (rev 0) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -0,0 +1,184 @@ +/****************************************************************************** + * 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.i18n.LocaleFormat; +import org.jboss.portal.common.i18n.LocalizedString; +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; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.SortedMap; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +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() + { + return managerBean; + } + + public void setManagerBean(Object managerBean) + { + checkManagerBean(managerBean); + this.managerBean = managerBean; + } + + public String getNewText() + { + return newText; + } + + public void setNewText(String newText) + { + this.newText = newText; + } + + public SortedMap getLocales() + { + return getDisplayNameBean().getLocales(); + } + + public String getNewLocale() + { + return newLocale; + } + + public void setNewLocale(String newLocale) + { + this.newLocale = newLocale; + } + + public DisplayNameBean getDisplayNameBean() + { + if (displayNameBean == null) + { + displayNameBean = new DisplayNameBean(); + } + return displayNameBean; + } + + public void setDisplayNameBean(DisplayNameBean displayNameBean) + { + this.displayNameBean = displayNameBean; + } + + public void addDisplayName() throws ConversionException + { + newText = checkNameValidity(newText, "display-names-view:add-display-name-form:newName"); + if (newText != null) + { + HasDisplayName hasDisplayName = getTarget(); + Map map = getDisplayNameBean().createLocalizedStringMap(LocaleFormat.DEFAULT.getLocale(newLocale), hasDisplayName.getDisplayName(), newText); + LocalizedString newLocalizedString = new LocalizedString(map, Locale.ENGLISH); + target.setDisplayName(newLocalizedString); + } + } + + public List<DisplayNameBean.Value> getCurrentLocales() + { + target = getTarget(); + if (target != null && target.getDisplayName() != null) + { + return (List<DisplayNameBean.Value>)getDisplayNameBean().populateCurrentLocales(target.getDisplayName().getValues()); + } + return null; + } + + public void editDisplayName() + { + String locale = beanContext.getParameter("locale"); + String editAction = beanContext.getParameter("editAction"); + + target = getTarget(); + LocalizedString displayName = target.getDisplayName(); + Map<Locale, String> map = new HashMap<Locale, String>(); + if (displayName != null) + { + Map<Locale, LocalizedString.Value> oldMap = displayName.getValues(); + Collection<LocalizedString.Value> values = oldMap.values(); + if (editAction.equals("delete")) + { + for (LocalizedString.Value value : values) + { + if (!value.getLocale().toString().equals(locale)) + { + map.put(value.getLocale(), value.getString()); + } + } + } + if (editAction.equals("rename")) + { + for (LocalizedString.Value value : values) + { + map.put(value.getLocale(), value.getString()); + if (value.getLocale().toString().equals(locale)) + { + newText = value.getString(); + newLocale = value.getLocale().getLanguage(); + } + } + } + } + LocalizedString newLocalizedString = new LocalizedString(map, Locale.ENGLISH); + target.setDisplayName(newLocalizedString); + } + + public String editDisplayNames() throws ConversionException + { + getTarget(); + getCurrentLocales(); + return "editDisplayNames"; + } + + protected String getObjectTypeName() + { + return DISPLAY_NAME_TYPE; + } + + public boolean isAlreadyExisting(String objectName) + { + return false; // we don't check for duplicates here + } + + protected abstract HasDisplayName getTarget(); + + protected abstract void checkManagerBean(Object managerBean); +} Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, 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. * @@ -20,10 +20,12 @@ * 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; import org.jboss.portal.WindowState; +import org.jboss.portal.common.util.ParameterValidation; import org.jboss.portal.core.admin.ui.PortalObjectManagerBean; import org.jboss.portal.core.model.portal.Page; import org.jboss.portal.core.model.portal.Portal; @@ -31,15 +33,12 @@ 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; import org.jboss.portal.theme.ThemeConstants; -import javax.faces.application.FacesMessage; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.validator.ValidatorException; import java.util.Collections; import java.util.HashSet; import java.util.Set; @@ -49,7 +48,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ -public class PortalAction +public class PortalAction extends ManagedBean { /** . */ @@ -58,14 +57,9 @@ /** . */ private String portalName; - //private String defaultPageName; + private static final String MESSAGE_TARGET = "create-portal-form:name"; + protected static final String PORTAL_TYPE = "PORTAL_TYPE"; - /** . */ - private static final String ERROR_DUPE_NAME = "Duplicate Portal name found on this portal!"; - - /** . */ - private static final String ERROR_EMPTY_NAME = "Portal name cannot be blank!"; - public PortalObjectManagerBean getPortalObjectManager() { return pomgr; @@ -93,87 +87,73 @@ public void setDefaultObjectName(String defaultObjectName) { - if (defaultObjectName != null && !defaultObjectName.equals("")) + if (!ParameterValidation.isNullOrEmpty(defaultObjectName)) { pomgr.getSelectedObject().setDeclaredProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME, defaultObjectName); } - else if (defaultObjectName == null || defaultObjectName.equals("")) + else { pomgr.getSelectedObject().setDeclaredProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME, null); } } - - /** - * Checks for duplicate portal names on the portal instance. Blank page names are not allowed and are controlled by - * the required attribute in the presentation page. - * - * @param context - * @param toValidate - * @param value - */ - public void validatePortalName(FacesContext context, UIComponent toValidate, Object value) - { - String portalName = (String)value; - - // check for empty string - if (portalName.startsWith(" ")) - { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, PortalAction.ERROR_EMPTY_NAME, PortalAction.ERROR_EMPTY_NAME); - throw new ValidatorException(message); - } - - // Check for duplicate child name - if (pomgr.getSelectedObject().getChild(portalName) != null) - { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, PortalAction.ERROR_DUPE_NAME, PortalAction.ERROR_DUPE_NAME); - throw new ValidatorException(message); - } - } - public void addPortal() { try { PortalContainer portalContainer = (PortalContainer)pomgr.getSelectedObject(); - Portal portal = portalContainer.createPortal(portalName); - DomainConfigurator configurator = pomgr.getDomainConfigurator(); - // Initial portal permissions - Set actions = new HashSet(); - actions.add(PortalObjectPermission.VIEW_RECURSIVE_ACTION); - actions.add(PortalObjectPermission.PERSONALIZE_RECURSIVE_ACTION); - RoleSecurityBinding binding = new RoleSecurityBinding(actions, SecurityConstants.UNCHECKED_ROLE_NAME); - Set constraints = Collections.singleton(binding); - configurator.setSecurityBindings(portal.getId().toString(PortalObjectPath.CANONICAL_FORMAT), constraints); + portalName = checkNameValidity(portalName, MESSAGE_TARGET); + if (portalName != null) + { + Portal portal = portalContainer.createPortal(portalName); + DomainConfigurator configurator = pomgr.getDomainConfigurator(); - // We need to add initial layout sets to avoid problems... - portal.setDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT, "generic"); - // portal.setDeclaredProperty(ThemeConstants.PORTAL_PROP_THEME, "Nphalanx"); - portal.setDeclaredProperty(ThemeConstants.PORTAL_PROP_RENDERSET, "divRenderer"); + // Initial portal permissions + Set actions = new HashSet(); + actions.add(PortalObjectPermission.VIEW_RECURSIVE_ACTION); + actions.add(PortalObjectPermission.PERSONALIZE_RECURSIVE_ACTION); + RoleSecurityBinding binding = new RoleSecurityBinding(actions, SecurityConstants.UNCHECKED_ROLE_NAME); + Set constraints = Collections.singleton(binding); + configurator.setSecurityBindings(portal.getId().toString(PortalObjectPath.CANONICAL_FORMAT), constraints); - // - portal.getSupportedWindowStates().add(WindowState.MAXIMIZED); - portal.getSupportedWindowStates().add(WindowState.MINIMIZED); - portal.getSupportedWindowStates().add(WindowState.NORMAL); + // We need to add initial layout sets to avoid problems... + portal.setDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT, "generic"); + portal.setDeclaredProperty(ThemeConstants.PORTAL_PROP_RENDERSET, "divRenderer"); - // - portal.getSupportedModes().add(Mode.EDIT); - portal.getSupportedModes().add(Mode.HELP); - portal.getSupportedModes().add(Mode.VIEW); + // + portal.getSupportedWindowStates().add(WindowState.MAXIMIZED); + portal.getSupportedWindowStates().add(WindowState.MINIMIZED); + portal.getSupportedWindowStates().add(WindowState.NORMAL); - // Create the default page - Page page = portal.createPage("default"); - constraints = Collections.singleton(new RoleSecurityBinding(PortalObjectPermission.VIEW_RECURSIVE_ACTION, SecurityConstants.UNCHECKED_ROLE_NAME)); - configurator.setSecurityBindings(page.getId().toString(PortalObjectPath.CANONICAL_FORMAT), constraints); + // + portal.getSupportedModes().add(Mode.EDIT); + portal.getSupportedModes().add(Mode.HELP); + portal.getSupportedModes().add(Mode.VIEW); - portal.setDeclaredProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME, page.getName()); + // Create the default page + Page page = portal.createPage("default"); + constraints = Collections.singleton(new RoleSecurityBinding(PortalObjectPermission.VIEW_RECURSIVE_ACTION, SecurityConstants.UNCHECKED_ROLE_NAME)); + configurator.setSecurityBindings(page.getId().toString(PortalObjectPath.CANONICAL_FORMAT), constraints); + portal.setDeclaredProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME, page.getName()); + } } catch (Exception e) { - e.printStackTrace(); + log.error("An error occurred during portal creation.", e); + beanContext.createErrorMessageFrom(MESSAGE_TARGET, e); } } + + protected String getObjectTypeName() + { + return PORTAL_TYPE; + } + + public boolean isAlreadyExisting(String objectName) + { + return pomgr.getSelectedObject().getChild(objectName) != null; + } } Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, 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. * @@ -22,199 +22,27 @@ ******************************************************************************/ package org.jboss.portal.core.admin.ui.actions; -import org.jboss.portal.common.i18n.LocaleFormat; -import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.common.util.ConversionException; -import org.jboss.portal.core.admin.ui.DisplayNameBean; import org.jboss.portal.core.admin.ui.InstanceManagerBean; -import org.jboss.portal.core.model.instance.Instance; +import org.jboss.portal.core.model.HasDisplayName; -import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.SortedMap; - /** * @author <a href="mailto:whales@redhat.com">Wesley Hales</a> * @version $Revision: 630 $ */ -public class PortalInstanceDisplayNameAction +public class PortalInstanceDisplayNameAction extends DisplayNameAction { - private Instance selectedInstance; - - public Object bean; - - private String newLocale; - - private String newText; - - private SortedMap locales; - - private String displayNameByLocale; - - private InstanceManagerBean instanceManager; - - private DisplayNameBean displayNameBean; - - public Object getBean() + protected HasDisplayName getTarget() { - return bean; - } + target = ((InstanceManagerBean)managerBean).getSelectedInstance(); - public void setBean(Object bean) - { - this.bean = bean; + return target; } - public void addDisplayName() throws ConversionException + protected void checkManagerBean(Object managerBean) { - if (newText != null) + if (!(managerBean instanceof InstanceManagerBean)) { - Instance instance = getSelectedInstance(); - Map map = getDisplayNameBean().createLocalizedStringMap(LocaleFormat.DEFAULT.getLocale(newLocale),instance.getDisplayName(),newText); - LocalizedString newLocalizedString = new LocalizedString(map, Locale.ENGLISH); - selectedInstance.setDisplayName(newLocalizedString); + throw new IllegalArgumentException("Illegal manager bean property for PortalInstanceDisplayNameAction. Expecting an InstanceManagerBean instance. Got " + managerBean); } - else - { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "You must enter a name", "You must enter a name"); - FacesContext.getCurrentInstance().addMessage("status", message); - } } - - public Instance getSelectedInstance() - { - if (instanceManager instanceof InstanceManagerBean) - { - selectedInstance = instanceManager.getSelectedInstance(); - } - return selectedInstance; - } - - public void setSelectedInstance(Instance selectedInstance) - { - this.selectedInstance = selectedInstance; - } - - public String getNewText() - { - return newText; - } - - public void setNewText(String newText) - { - this.newText = newText; - } - - public SortedMap getLocales() - { - return getDisplayNameBean().getLocales(); - } - - public void setLocales(SortedMap locales) - { - this.locales = locales; - } - - public String getNewLocale() - { - return newLocale; - } - - public void setNewLocale(String newLocale) - { - this.newLocale = newLocale; - } - - public List<DisplayNameBean.Value> getCurrentLocales() - { - selectedInstance = getSelectedInstance(); - if (selectedInstance != null && selectedInstance.getDisplayName() != null) - { - List<DisplayNameBean.Value> currentLocales = getDisplayNameBean().populateCurrentLocales(selectedInstance.getDisplayName().getValues()); - - return currentLocales; - } - return null; - } - - public void editDisplayName() - { - String locale = getFacesParam("locale"); - String editAction = getFacesParam("editAction"); - - Instance selectedInstance = getSelectedInstance(); - LocalizedString displayName = selectedInstance.getDisplayName(); - Map<Locale, String> map = new HashMap<Locale, String>(); - if (displayName != null) - { - Map<Locale, LocalizedString.Value> oldMap = displayName.getValues(); - Collection<LocalizedString.Value> values = oldMap.values(); - if (editAction.equals("delete")) - { - for (LocalizedString.Value value : values) - { - if (!value.getLocale().toString().equals(locale.toString())) - { - map.put(value.getLocale(), value.getString()); - } - } - } - if (editAction.equals("rename")) - { - for (LocalizedString.Value value : values) - { - map.put(value.getLocale(), value.getString()); - if (value.getLocale().toString().equals(locale.toString())) - { - newText = value.getString(); - newLocale = value.getLocale().getLanguage(); - } - } - } - } - LocalizedString newLocalizedString = new LocalizedString(map, Locale.ENGLISH); - selectedInstance.setDisplayName(newLocalizedString); - } - - - public String getFacesParam(String param) - { - return FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get(param); - } - - - public String editDisplayNames() throws ConversionException - { - getSelectedInstance(); - getCurrentLocales(); - return "editDisplayNames"; - } - - public InstanceManagerBean getInstanceManager() - { - return instanceManager; - } - - public void setInstanceManager(InstanceManagerBean instanceManager) - { - this.instanceManager = instanceManager; - } - - public DisplayNameBean getDisplayNameBean() - { - if(displayNameBean == null){ - displayNameBean = new DisplayNameBean(); - } - return displayNameBean; - } - - public void setDisplayNameBean(DisplayNameBean displayNameBean) - { - this.displayNameBean = displayNameBean; - } } Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, 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. * @@ -22,188 +22,28 @@ ******************************************************************************/ package org.jboss.portal.core.admin.ui.actions; -import org.jboss.portal.common.i18n.LocaleFormat; -import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.common.util.ConversionException; -import org.jboss.portal.core.admin.ui.DisplayNameBean; import org.jboss.portal.core.admin.ui.PortalObjectManagerBean; -import org.jboss.portal.core.model.portal.PortalObject; +import org.jboss.portal.core.model.HasDisplayName; -import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.SortedMap; - /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> * @author <a href="mailto:whales@redhat.com">Wesley Hales</a> * @version $Revision$ */ -public class PortalObjectDisplayNameAction { - - private PortalObject selectedObject; - - public Object bean; - - private String newLocale; - - private String newText; - - private SortedMap locales; - - private String displayNameByLocale; - - private DisplayNameBean displayNameBean; - - public Object getBean() +public class PortalObjectDisplayNameAction extends DisplayNameAction +{ + protected HasDisplayName getTarget() { - return bean; + target = ((PortalObjectManagerBean)managerBean).getSelectedObject(); + return target; } - public void setBean(Object bean) + protected void checkManagerBean(Object managerBean) { - this.bean = bean; - } - - public void addDisplayName() throws ConversionException - { - if (newText != null) + if (!(managerBean instanceof PortalObjectManagerBean)) { - PortalObject portalObject = getSelectedObject(); - Map map = getDisplayNameBean().createLocalizedStringMap(LocaleFormat.DEFAULT.getLocale(newLocale),portalObject.getDisplayName(),newText); - LocalizedString newLocalizedString = new LocalizedString(map, Locale.ENGLISH); - portalObject.setDisplayName(newLocalizedString); + throw new IllegalArgumentException("Illegal manager bean property for PortalObjectDisplayNameAction. Expecting a PortalObjectManagerBean instance. Got " + managerBean); } - else - { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "You must enter a name", "You must enter a name"); - FacesContext.getCurrentInstance().addMessage("status", message); - } } - - - public PortalObject getSelectedObject() - { - if (bean instanceof PortalObjectManagerBean) - { - selectedObject = ((PortalObjectManagerBean) bean).getSelectedObject(); - } - return selectedObject; - } - - public void setSelectedObject(PortalObject selectedObject) - { - this.selectedObject = selectedObject; - } - - public String getNewText() - { - return newText; - } - - public void setNewText(String newText) - { - this.newText = newText; - } - - public String getNewLocale() - { - return newLocale; - } - - public void setNewLocale(String newLocale) - { - this.newLocale = newLocale; - } - - public SortedMap getLocales() - { - return getDisplayNameBean().getLocales(); - } - - public void setLocales(SortedMap locales) - { - this.locales = locales; - } - - public List<DisplayNameBean.Value> getCurrentLocales() - { - selectedObject = getSelectedObject(); - if (selectedObject != null && selectedObject.getDisplayName() != null) - { - List<DisplayNameBean.Value> currentLocales = getDisplayNameBean().populateCurrentLocales(selectedObject.getDisplayName().getValues()); - return currentLocales; - } - return null; - } - - public void editDisplayName() - { - String locale = getFacesParam("locale"); - String editAction = getFacesParam("editAction"); - - PortalObject portalObject = getSelectedObject(); - LocalizedString displayName = portalObject.getDisplayName(); - Map<Locale, String> map = new HashMap<Locale, String>(); - if (displayName != null) - { - Map<Locale, LocalizedString.Value> oldMap = displayName.getValues(); - Collection<LocalizedString.Value> values = oldMap.values(); - if (editAction.equals("delete")) - { - for (LocalizedString.Value value : values) - { - if (!value.getLocale().toString().equals(locale.toString())) - { - map.put(value.getLocale(), value.getString()); - } - } - } - if (editAction.equals("rename")) - { - for (LocalizedString.Value value : values) - { - map.put(value.getLocale(), value.getString()); - if (value.getLocale().toString().equals(locale.toString())) - { - newText = value.getString(); - newLocale = value.getLocale().getLanguage(); - } - } - } - } - LocalizedString newLocalizedString = new LocalizedString(map, Locale.ENGLISH); - selectedObject.setDisplayName(newLocalizedString); - } - - public String getFacesParam(String param){ - return FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get(param); - } - - - public String editDisplayNames() throws ConversionException - { - getSelectedObject(); - getCurrentLocales(); - return "editDisplayNames"; - } - - public DisplayNameBean getDisplayNameBean() - { - if(displayNameBean == null){ - displayNameBean = new DisplayNameBean(); - } - return displayNameBean; - } - - public void setDisplayNameBean(DisplayNameBean displayNameBean) - { - this.displayNameBean = displayNameBean; - } - } Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, 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. * @@ -20,22 +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.portal.core.admin.ui.PortalObjectManagerBean; import org.jboss.portal.core.impl.model.portal.PortalObjectImpl; +import org.jboss.portal.faces.gui.ManagedBean; +import org.jboss.portal.common.util.ParameterValidation; -import javax.faces.application.FacesMessage; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.validator.ValidatorException; -import java.util.Map; - /** * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PropertyAction +public class PropertyAction extends ManagedBean { /** . */ @@ -49,9 +46,8 @@ /** . */ private String otherPropertyName; + protected static final String PROPERTY_TYPE = "PROPERTY_TYPE"; - /** . */ - private static final String ERROR_EMPTY_NAME = "Property name cannot be blank!"; public PropertyAction(PortalObjectManagerBean pomgr) { @@ -78,47 +74,41 @@ this.propertyValue = propertyValue; } - - public void validatePropertyName(FacesContext context, UIComponent toValidate, Object value) - { - String propertyName = (String)value; - - // check for empty string - if (propertyName == null || propertyName.startsWith(" ") || propertyName.equals("")) - { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, PropertyAction.ERROR_EMPTY_NAME, PropertyAction.ERROR_EMPTY_NAME); - throw new ValidatorException(message); - } - } - public void selectProperty() { } public void removeProperty() { - Map pmap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); - String name = (String)pmap.get("name"); + String name = beanContext.getParameter("name"); ((PortalObjectImpl)pomgr.getSelectedObject()).setDeclaredProperty(name, null); } public void updateProperty() { - String propertyName = otherPropertyName.trim(); - String value = ""; - // - if (propertyName.length() == 0 && selectedProperty != null) - { - propertyName = selectedProperty.trim(); + String propertyName = ""; + + //This particular property can be null and still be valid + if(!ParameterValidation.isNullOrEmpty(otherPropertyName)){ + propertyName = checkNameValidity(otherPropertyName, "common-edit-prop-form:property"); } - // - if (propertyName.length() > 0) + if (propertyName != null) { - if (getPropertyValue() != null){ - value = getPropertyValue().trim(); + if (propertyName.length() == 0 && selectedProperty != null) + { + propertyName = selectedProperty.trim(); } - pomgr.getSelectedObject().setDeclaredProperty(propertyName, value); + + if (propertyName.length() > 0) + { + String value = ""; + if (getPropertyValue() != null) + { + value = getPropertyValue().trim(); + } + pomgr.getSelectedObject().setDeclaredProperty(propertyName, value); + } } } @@ -131,4 +121,14 @@ { this.otherPropertyName = otherPropertyName; } + + protected String getObjectTypeName() + { + return PROPERTY_TYPE; + } + + public boolean isAlreadyExisting(String objectName) + { + return pomgr.getSelectedObject().getDeclaredProperty(objectName) != null; + } } Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, 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. * @@ -20,35 +20,34 @@ * 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.DuplicatePortalObjectException; -import org.jboss.portal.core.model.portal.NoSuchPortalObjectException; -import org.jboss.portal.core.model.portal.PageContainer; 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 javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; import java.util.Set; /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> * @version $Revision$ */ -public class RenameAction +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) { @@ -59,7 +58,7 @@ { if (newName == null) { - newName = pageContainer.getName(); + newName = renamedObject.getName(); } return newName; } @@ -75,66 +74,68 @@ 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() { - PortalObject parent = pageContainer.getParent(); - PortalObject newObject = null; - try + // if the new name is equal to the current name, do nothing + String currentName = renamedObject.getName(); + if (!isOldAndNewDifferent(currentName, newName)) { - // TODO: Should be in a tx + return null; + } - // Clone portal object - newObject = pageContainer.copy(parent, newName, true); + newName = checkNameValidity(newName, MESSAGE_TARGET); + if (newName != null) + { + PortalObject parent = renamedObject.getParent(); + PortalObject newObject = null; + try + { + // TODO: Should be in a tx - // Copy security settings - Set set = domainConfigurator.getSecurityBindings(pageContainer.getId().toString(PortalObjectPath.CANONICAL_FORMAT)); - domainConfigurator.setSecurityBindings(newObject.getId().toString(PortalObjectPath.CANONICAL_FORMAT), set); + // Clone portal object + newObject = renamedObject.copy(parent, newName, true); - String defaultObject = (String)parent.getDeclaredProperties().get(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME); - if (pageContainer.getName().equals(defaultObject)) + // Copy security settings + 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 (currentName.equals(defaultObject)) + { + parent.setDeclaredProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME, newName); + } + + // Destroy previous object + parent.destroyChild(currentName); + } + catch (Exception e) { - parent.setDeclaredProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME, newName); + log.error("An error occurred while attempting to rename " + renamedObject + "to " + newName); + beanContext.createErrorMessageFrom(MESSAGE_TARGET, e); } - // Destroy previous object - parent.destroyChild(pageContainer.getName()); + // TODO: This is not clean + if (bean instanceof PortalObjectManagerBean) + { + ((PortalObjectManagerBean)bean).selectObject(parent); + return "objects"; + } + else if (bean instanceof DashboardBean) + { + ((DashboardBean)bean).selectedPageName = newObject.getName(); + } } - catch (IllegalArgumentException e) - { - e.printStackTrace(); - } - catch (DuplicatePortalObjectException e) - { - String message = "The name \"" + newName + "\" is already used, please choose a different one"; - FacesContext.getCurrentInstance().addMessage("renameForm:newName", new FacesMessage(FacesMessage.SEVERITY_ERROR, message, message)); - return null; - } - catch (NoSuchPortalObjectException e) - { - e.printStackTrace(); - } - // TODO: This is not clean - if (bean instanceof PortalObjectManagerBean) - { - ((PortalObjectManagerBean)bean).selectObject(parent); - return "objects"; - } - else if (bean instanceof DashboardBean) - { - ((DashboardBean)bean).selectedPageName = newObject.getName(); - } - return null; } @@ -148,5 +149,13 @@ this.bean = bean; } + protected String getObjectTypeName() + { + return PORTAL_OBJECT_TYPE; + } + public boolean isAlreadyExisting(String objectName) + { + return renamedObject.getParent().getChild(objectName) != null; + } } Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, 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. * @@ -39,13 +39,14 @@ import org.jboss.portal.faces.component.portlet.PortletRenderEvent; import org.jboss.portal.faces.el.PropertyValue; import org.jboss.portal.faces.el.dynamic.DynamicBean; +import org.jboss.portal.faces.gui.ManagedBean; import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse.Event; import org.jboss.portal.theme.LayoutService; import org.jboss.portal.theme.PortalLayout; import org.jboss.portal.theme.ThemeConstants; -import javax.faces.application.FacesMessage; +import javax.faces.component.UIInput; import javax.faces.context.FacesContext; import javax.faces.event.AbortProcessingException; import javax.faces.event.ActionEvent; @@ -67,7 +68,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ -public class PageManagerBean +public class PageManagerBean extends ManagedBean { private static final QName CONTENT_SELECT = new QName("urn:jboss:portal:content", "select"); @@ -83,7 +84,6 @@ /** . */ private static final int ADD_ACTION = 'a'; - private static final String VIEW_ROOT = ":_viewRoot"; public PageManagerBean(LayoutService layoutService, PortletInvoker portletInvoker) { @@ -112,18 +112,30 @@ public String selectedContentURI; /** . */ - private Map<String,String> selectedContentParameters; + private Map<String, String> selectedContentParameters; /** . */ public Map selectedRenderParameters; + UIInput windowName = null; + + public UIInput getWindowName() + { + return windowName; + } + + public void setWindowName(UIInput windowName) + { + this.windowName = windowName; + } + public String getNamespace() { - return FacesContext.getCurrentInstance().getExternalContext().encodeNamespace("") + VIEW_ROOT; + return windowName.getClientId(FacesContext.getCurrentInstance()); } public List getContentTypeItems() - { + { LinkedList<SelectItem> types = new LinkedList<SelectItem>(); for (Object o : ContentProviderRegistryService.getInstance().getContentTypes()) { @@ -145,7 +157,7 @@ public ContentType getSelectedContentType() { - return selectedContentType; + return selectedContentType; } public void setSelectedContentType(ContentType selectedContentType) @@ -262,7 +274,7 @@ { // String selectedContentURI = this.selectedContentURI; - Map<String,String> selectedContentParams = this.selectedContentParameters; + Map<String, String> selectedContentParams = this.selectedContentParameters; // Reset to new state this.selectedContentURI = null; @@ -270,23 +282,23 @@ this.selectedRenderParameters = new HashMap(); // Obtain a window name - String windowName = (String)FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get("blah"); - if (windowName.trim().length() == 0) + String windowName = (String)normalizeStringIfNeeded(beanContext.getParameter("blah")); + if (windowName == null) { + // no specified name in the UI, generate one windowName = createWindowName(selectedContentType.toString(), selectedContentURI, false); while (page.getWindow(windowName) != null) { windowName = createWindowName(selectedContentType.toString(), selectedContentURI, true); } } - - // Check for duplicate window name - if (page.getWindow(windowName) != null) + else { - FacesContext faces = FacesContext.getCurrentInstance(); - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "Duplicate window name found on this page!", null); - faces.addMessage("windowName", message); - throw new AbortProcessingException(); + windowName = checkNameValidity(windowName, "windowForm:windowName"); + if (windowName == null) + { + throw new AbortProcessingException("Duplicate window name!"); + } } // @@ -298,7 +310,7 @@ { for (Object o : selectedContentParams.entrySet()) { - Map.Entry<String,String> entry = (Map.Entry<String,String>)o; + Map.Entry<String, String> entry = (Map.Entry<String, String>)o; String paramName = entry.getKey(); String paramValue = entry.getValue(); content.setParameter(paramName, paramValue); @@ -322,7 +334,7 @@ tmp.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + i); } - this.windowName = ""; + this.windowName.setValue(""); } catch (DuplicatePortalObjectException unexpected) { @@ -331,10 +343,7 @@ } else { - FacesContext faces = FacesContext.getCurrentInstance(); - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "No content was selected!", null); - faces.addMessage("layoutForm", message); -// throw new AbortProcessingException(); + beanContext.createTargetedErrorMessage("layoutForm", "COMMON_NO_SELECTED_CONTENT"); } } else if (direction == MOVE_LEFT) @@ -369,18 +378,6 @@ assignedWindows.values.clear(); } - private String windowName; - - public String getWindowName() - { - return windowName; - } - - public void setWindowName(String windowName) - { - this.windowName = windowName; - } - /** Portlet event */ public void assignWindow(ActionEvent event) { @@ -393,7 +390,7 @@ String[] windowNames = ((String[])renderParams.get("windowName")); if (windowNames != null && windowNames.length > 0) { - setWindowName(windowNames[0]); + windowName.setValue(windowNames[0]); } } else if (event instanceof PortletEventEvent) @@ -402,12 +399,12 @@ Event portletEvent = eventEvent.getEvent(); QName name = portletEvent.getName(); // only react to content selection events - if(CONTENT_SELECT.equals(name)) + if (CONTENT_SELECT.equals(name)) { if (portletEvent.getPayload() instanceof String) { String uri = (String)portletEvent.getPayload(); - this.selectedContentURI = uri; + this.selectedContentURI = uri; this.selectedContentParameters = null; } else if (portletEvent.getPayload() instanceof SelectedContent) @@ -555,4 +552,14 @@ return true; } } + + protected String getObjectTypeName() + { + return "WINDOW_TYPE"; + } + + public boolean isAlreadyExisting(String objectName) + { + return page.getWindow(objectName) != null; + } } Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -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; @@ -128,27 +129,29 @@ return result; } - public String create() + protected void internalRename(String oldName, String newName) throws IllegalCoordinationException { + managerBean.getCoordinationService().renameAliasBinding(managerBean.getSelectedPage(), oldName, newName); + } + + protected void internalCreate() throws IllegalCoordinationException + { if (aliasName != null) { - try + HashSet<QName> qNames = new HashSet<QName>(); + for (String qName : originalQNames) { - HashSet<QName> qNames = new HashSet<QName>(); - for (String qName : originalQNames) - { - qNames.add(QName.valueOf(qName)); - } - managerBean.getCoordinationService().setAliasBinding(managerBean.getSelectedPage(), aliasName, qNames); + qNames.add(QName.valueOf(qName)); } - catch (IllegalCoordinationException e) - { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. - } + managerBean.getCoordinationService().setAliasBinding(managerBean.getSelectedPage(), aliasName, qNames); } - return resetSelection(); } + protected String getBeanName() + { + return aliasName; + } + public String resetSelection() { aliasName = null; @@ -163,12 +166,6 @@ return resetSelection(); } - public String rename(String oldName, String newName) throws IllegalCoordinationException - { - managerBean.getCoordinationService().renameAliasBinding(managerBean.getSelectedPage(), oldName, newName); - return resetSelection(); - } - public void extractInfoFrom(Window window, PortletInfo info) { // retrieve metadata on public render parameters @@ -216,4 +213,21 @@ return getName().compareTo(other.getName()); } } + + @Override + public String getObjectTypeName() + { + return "COORDINATION_ALIAS"; + } + + @Override + public String getObjectNameForMessages() + { + return "alias"; + } + + public boolean isAlreadyExisting(String objectName) + { + return displayAliasBindings.containsKey(objectName); + } } Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -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; @@ -65,6 +66,7 @@ private CoordinationType selectedType; private String newName; static final String EDIT_COORDINATION = "editCoordination"; + private static final String RENAME_COORDINATION = "renameCoordination"; private enum CoordinationType { @@ -135,12 +137,62 @@ public abstract String delete(String name) throws IllegalCoordinationException; - public abstract String rename(String oldName, String newName) throws IllegalCoordinationException; + public String rename(String oldName, String newName) + { + if (isOldAndNewDifferent(oldName, newName)) + { + if (checkNameValidity(newName, "renameForm:newName") != null) + { + try + { + internalRename(oldName, newName); + } + catch (IllegalCoordinationException e) + { + beanContext.createErrorMessageFrom(e); + } + } + else + { + // redisplay page with error message + return RENAME_COORDINATION; + } + } + return resetSelection(); + } + + protected abstract void internalRename(String oldName, String newName) throws IllegalCoordinationException; + public abstract void extractInfoFrom(Window window, PortletInfo info); - public abstract String create() throws IllegalCoordinationException; + public String create() + { + String nameForMessages = getObjectNameForMessages(); + String target = "create-" + nameForMessages + "-form:" + getAdditionalFormId() + nameForMessages + "Name"; + if (checkNameValidity(getBeanName(), target) != null) + { + try + { + internalCreate(); + } + catch (IllegalCoordinationException e) + { + beanContext.createErrorMessageFrom(e); + } + } + else + { + // do not reset the selection if the name is incorrect, let user modify it first... + // also gives the opportunity to display error messages + return null; + } + return resetSelection(); + } + + protected abstract void internalCreate() throws IllegalCoordinationException; + public String resetSelection() { managerBean.refresh(); @@ -153,6 +205,34 @@ } public abstract void initKnowing(Collection<PortalObject> children); + + /** + * Made public to get access to it in CoordinationManagerBean.getObjectTypeName() + * + * @return + */ + public abstract String getObjectTypeName(); + + /** + * Returns the object name used in identifiers for target of messages. Creation forms have id similar to: + * <code>created-getObjectNameForMessages()-form</code> while, input fields for these forms are named: + * <code>getObjectNameForMessages()Name</code>. + * + * @return + */ + protected abstract String getObjectNameForMessages(); + + protected abstract String getBeanName(); + + /** + * Additional form information for create form if needed. + * + * @return + */ + protected String getAdditionalFormId() + { + return ""; + } } public Page getSelectedPage() @@ -383,7 +463,7 @@ } catch (IllegalCoordinationException e) { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + beanContext.createErrorMessageFrom(e); } } @@ -413,8 +493,19 @@ { if (selectedType != null) { - selectedType.getBean().rename(selectedName, newName); - refresh(); + CoordinationBean coordinationBean = selectedType.getBean(); + + // call rename on sub-bean and check that we're not requesting renaming again (in case an error occurred) + if (RENAME_COORDINATION.equals(coordinationBean.rename(selectedName, newName))) + { + // error occurred: redisplay rename dialog + return RENAME_COORDINATION; + } + else + { + // all went well: refresh! + refresh(); + } } // reset selection @@ -423,4 +514,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_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -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; @@ -290,22 +291,24 @@ } } - public String create() + protected void internalRename(String oldName, String newName) throws IllegalCoordinationException { + managerBean.getCoordinationService().renameEventWiring(managerBean.getSelectedPage(), oldName, newName); + } + + protected void internalCreate() throws IllegalCoordinationException + { if (currentWiring != null) { - try - { - managerBean.getCoordinationService().setEventWiring(currentWiring.getSources(), currentWiring.getDestinations(), currentWiring.getName()); - } - catch (IllegalCoordinationException e) - { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. - } + managerBean.getCoordinationService().setEventWiring(currentWiring.getSources(), currentWiring.getDestinations(), currentWiring.getName()); } - return resetSelection(); } + protected String getBeanName() + { + return currentWiring != null ? currentWiring.getName() : null; + } + public String resetSelection() { currentWiring = null; @@ -323,12 +326,6 @@ return resetSelection(); } - public String rename(String oldName, String newName) throws IllegalCoordinationException - { - managerBean.getCoordinationService().renameEventWiring(managerBean.getSelectedPage(), oldName, newName); - return resetSelection(); - } - public void extractInfoFrom(Window window, PortletInfo info) { // retrieve metadata on events @@ -478,4 +475,26 @@ this.destinations = destinations; } } + + public String getObjectTypeName() + { + return "COORDINATION_WIRING"; + } + + @Override + public String getObjectNameForMessages() + { + return "wiring"; + } + + @Override + protected String getAdditionalFormId() + { + return "COORDINATION_EVENT_CREATE_STEP5:"; + } + + public boolean isAlreadyExisting(String objectName) + { + return displayEventWirings.containsKey(objectName); + } } Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -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; @@ -161,8 +162,13 @@ } } - public String create() throws IllegalCoordinationException + protected void internalRename(String oldName, String newName) throws IllegalCoordinationException { + managerBean.getCoordinationService().renameParameterBinding(managerBean.getSelectedPage(), oldName, newName); + } + + protected void internalCreate() throws IllegalCoordinationException + { if (windowBindingName != null) { Map<Window, Set<QName>> windowBinding = new HashMap<Window, Set<QName>>(); @@ -177,8 +183,11 @@ managerBean.getCoordinationService().setParameterBinding(windowBindingName, windowBinding); } + } - return resetSelection(); + protected String getBeanName() + { + return windowBindingName; } public String resetSelection() @@ -195,12 +204,6 @@ return resetSelection(); } - public String rename(String name, String newName) throws IllegalCoordinationException - { - managerBean.getCoordinationService().renameParameterBinding(managerBean.getSelectedPage(), name, newName); - return resetSelection(); - } - /** * Enforce the fact that you can only select one qname per window * @@ -367,5 +370,22 @@ return o1.getLabel().compareTo(o2.getLabel()); } } + private final static Comparator<SelectItem> COMP = new ParameterWindowSelectItemComparator(); + + public String getObjectTypeName() + { + return "COORDINATION_PARAMETER"; + } + + @Override + public String getObjectNameForMessages() + { + return "binding"; + } + + public boolean isAlreadyExisting(String objectName) + { + return displayParameterBindings.containsKey(objectName); + } } Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java 2009-03-06 23:20:57 UTC (rev 12969) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, 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. * @@ -34,6 +34,7 @@ import org.jboss.portal.core.model.portal.PortalObjectContainer; import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.PortalObjectPath; +import org.jboss.portal.faces.gui.JSFBeanContext; import org.jboss.portal.theme.LayoutService; import org.jboss.portal.theme.ThemeConstants; import org.jboss.portal.theme.ThemeService; @@ -115,7 +116,9 @@ // Create page manager if it does not exit if (pageManager == null) { + // it'd be better if propertyAction was injected in faces-config.xml so that we can also inject the shared beanContext pageManager = new PageManagerBean(layoutService, new PortletDefinitionInvoker(instanceContainer)); + pageManager.setBeanContext(new JSFBeanContext()); } // Get user name @@ -147,7 +150,7 @@ defaultPageName = PortalObject.DEFAULT_OBJECT_NAME; } selectePageIsDefault = selectedPageName.equals(defaultPageName); - + // Collection pages = userPortal.getChildren(PortalObject.PAGE_MASK); pageItems = new SelectItem[pages.size()]; @@ -199,7 +202,7 @@ try { userPortal.destroyChild(selectedPageName); - + // Fallback to default page String defaultPageName = pageManager.page.getProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME); if (defaultPageName == null) Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2009-03-06 23:20:57 UTC (rev 12969) @@ -1,6 +1,6 @@ ################################################################################ # JBoss, a division of Red Hat # -# Copyright 2006, 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. # @@ -104,6 +104,7 @@ COMMON_DEFINE_NAME_WINDOW=Define a name for the window of content (optional) COMMON_WINDOW_NAME=Window Name COMMON_SELECT_TYPE_CONTENT=Select the type of content that will be added to the page +COMMON_NO_SELECTED_CONTENT=You must select a content type! COMMON_CONTENT_TYPE=Content Type COMMON_SELECT_CONTENT=Select content that will be added to the page COMMON_PAGE_LAYOUT=Page Layout @@ -320,8 +321,20 @@ COORDINATION_EVENT_CREATE_PREVIEW_STEP3=The produced window events will be wired to the following destination event: COORDINATION_EVENT_CREATE_PREVIEW_STEP4=for the following destination windows: - - COORDINATION_WIRING=event wiring COORDINATION_PARAMETER=parameter binding COORDINATION_ALIAS=alias binding + +INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty or contain '\\' or '%5c' +NO_SELECTED_PORTLET_ERROR=No portlet was selected! +DUPLICATE_ERROR=A {1} named ''{0}'' already exists! +bean_support_unexpected_error=Unexpected error: +bean_support_cause=Cause: + +INSTANCE_TYPE=instance +PAGE_TYPE=page +PORTAL_TYPE=portal +DISPLAY_NAME_TYPE=display name +PROPERTY_TYPE=property +PORTAL_OBJECT_TYPE=portal object +WINDOW_TYPE=window Copied: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_ja.properties (from rev 12964, branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_ja.properties) =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_ja.properties (rev 0) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_ja.properties 2009-03-06 23:20:57 UTC (rev 12969) @@ -0,0 +1,328 @@ +################################################################################ +# 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. # +################################################################################ + +PORTLET_INSTANCES=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9 +INSTANCE_DELETE=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u524a\u9664 +PORTLET_CAUSING_REFERENCING_NOT_ABLE=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u304c\u30a6\u30a3\u30f3\u30c9\u30a6\u53c2\u7167\u3092\u767a\u751f\u3055\u305b\u3066\u304a\u308a\u3001\u3053\u308c\u3089\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u306f\u8868\u793a\u3067\u304d\u306a\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093 +ARE_YOU_SURE_DELETE=\u672c\u5f53\u306b\u3053\u306e\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u524a\u9664\u3057\u307e\u3059\u304b\uff1f +DASHBOARD_THEME_PROPERTIES=\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9 \u30c6\u30fc\u30de \u30d7\u30ed\u30d1\u30c6\u30a3 +CONFIGURE_DASHBOARD_SETTINGS=\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u30bb\u30c3\u30c6\u30a3\u30f3\u30b0\u306e\u8a2d\u5b9a +DASHBOARDS=\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9 +ADD_DISPLAY_NAMES=\u8868\u793a\u540d\u306e\u8ffd\u52a0 +CURRENT_DISPLAY_NAMES=\u73fe\u5728\u306e\u8868\u793a\u540d +SAVE=\u4fdd\u5b58 +MANAGE=\u7ba1\u7406 +PORTALS_NO_CAP=\u30dd\u30fc\u30bf\u30eb +PORTAL=\u30dd\u30fc\u30bf\u30eb +SUB_PORTALS=\u30b5\u30d6\u30dd\u30fc\u30bf\u30eb +PAGES_WITHIN=\u30da\u30fc\u30b8\u5185\u90e8 +CREATE_PORTAL_NAMED=\u65b0\u898f\u30dd\u30fc\u30bf\u30eb\u4f5c\u6210 \u540d\u524d: +PAGE_LAYOUT=\u30da\u30fc\u30b8\u30ec\u30a4\u30a2\u30a6\u30c8 +SECURITY=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3 +THEME=\u30c6\u30fc\u30de +RENAME=\u540d\u524d\u5909\u66f4 +DISPLAY_NAMES=\u8868\u793a\u540d +MANAGE_SUB_PAGES_WITHIN=\u30b5\u30d6\u30da\u30fc\u30b8\u306e\u7ba1\u7406 \u89aa\u30da\u30fc\u30b8: +CREATE_PAGE_NAMED=\u65b0\u898f\u30da\u30fc\u30b8\u4f5c\u6210 \u540d\u524d: +SET_PAGE_PERMISSIONS=\u30da\u30fc\u30b8\u306e\u6a29\u9650\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +PAGE_THEME_PROPERTIES=\u30da\u30fc\u30b8\u30c6\u30fc\u30de\u30d7\u30ed\u30d1\u30c6\u30a3 +SET_PORTAL_PERMISSIONS=\u30dd\u30fc\u30bf\u30eb\u306e\u6a29\u9650\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +PORTAL_THEME_PROPERTIES=\u30dd\u30fc\u30bf\u30eb\u30c6\u30fc\u30de\u30d7\u30ed\u30d1\u30c6\u30a3 +SETTINGS_ARE_INHERITED_BY_ALL_PAGES=\u3053\u308c\u3089\u306e\u30bb\u30c3\u30c6\u30a3\u30f3\u30b0\u306f\u3001\u3059\u3079\u3066\u306e\u30da\u30fc\u30b8\u3068\u30dd\u30fc\u30bf\u30eb\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u3088\u3063\u3066\u53d7\u3051\u7d99\u304c\u308c\u307e\u3059\u3002\u3042\u306a\u305f\u306f\u3001\u305d\u308c\u305e\u308c\u306e\u30c6\u30fc\u30de\u30bb\u30c3\u30c6\u30a3\u30f3\u30b0\u30da\u30fc\u30b8\u306e\u4e0a\u3067\u9069\u5f53\u306a\u5024\u3092\u9078\u3076\u3053\u3068\u306b\u3088\u3063\u3066\u3001\u3053\u308c\u3089\u306e\u30bb\u30c3\u30c6\u30a3\u30f3\u30b0\u3092\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9\u3059\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093 +EVENT_LISTENER_BINDING=\u30a4\u30d9\u30f3\u30c8\u30ea\u30b9\u30ca\u30fc\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0 +CHOOSE_ID_PORTALEVENTLISTENER=\u30d0\u30a4\u30f3\u30c9\u3059\u308b\u305f\u3081\u306ePortalEventListener\u306eID\u3092\u9078\u3093\u3067\u304f\u3060\u3055\u3044\u3002 +SET_PERMISSIONS_FOR=\u30d1\u30fc\u30df\u30b7\u30e7\u30f3\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044: +WINDOW_NO_CAP=\u30a6\u30a3\u30f3\u30c9\u30a6 +WINDOW_THEME_PROPERTIES=\u30a6\u30a3\u30f3\u30c9\u30a6\u30c6\u30fc\u30de\u30d7\u30ed\u30d1\u30c6\u30a3 +INSTANCE_ID=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9ID +INSTANCE_NAME=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u540d +ACTIONS=\u30a2\u30af\u30b7\u30e7\u30f3 +PREFERENCES=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9 +PORTLET_DETAILS=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u8a73\u7d30 +ASSOCIATED_PORTLET_NOT_AVAILABLE=\u9023\u643a\u3059\u308b\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306f\u3042\u308a\u307e\u305b\u3093\u3002 +PREFERENCES_NO_CAP=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9 +SECURITY_SETTINGS=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u8a2d\u5b9a +MAKE_DEFAULT=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u4f5c\u6210 +MANAGE_WINDOWS_WITHIN=\u7ba1\u7406\u30a6\u30a3\u30f3\u30c9\u30a6\u5185 +PORTAL_OBJECTS=\u30dd\u30fc\u30bf\u30eb\u30aa\u30d6\u30b8\u30a7\u30af\u30c8 +PORTALS=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 +PORTLET_NAME=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u540d +DESCRIPTION=\u8aac\u660e +REMOTE=Remote +REMOTABLE=Remotable +CREATE_INSTANCE=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u4f5c\u6210 +PORTLET_DEFINITIONS=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u5b9a\u7fa9 +DETAILS=\u8a73\u7d30 +INSTANCE_CREATION=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u4f5c\u6210 +CREATE_INSTANCE_NAMED=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u4f5c\u6210 \u540d\u524d: +RENAME_THE=\u540d\u524d\u306e\u5909\u66f4: +TO=to +THIS_MINIMIZED_STATE=\u3053\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u306f\u6700\u5c0f\u306b\u8a2d\u5b9a\u3055\u308c\u307e\u3059\u3002 +THIS_NORMAL_STATE=\u3053\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u306f\u30ce\u30fc\u30de\u30eb\u306b\u8a2d\u5b9a\u3055\u308c\u307e\u3059\u3002 +THIS_MAXIMIZED_STATE=\u3053\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u306f\u6700\u5927\u306b\u8a2d\u5b9a\u3055\u308c\u307e\u3059\u3002 +THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED=\u3053\u306e\u30da\u30fc\u30b8\u5185\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u306f\u6700\u5927\u5316\u3059\u308b\u3088\u3046\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u308b\u305f\u3081\u3001\u3053\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u306f\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u6700\u5c0f\u5316\u3055\u308c\u307e\u3059\u3002 +SWITCH_TO_WIZARD_MODE=\u30a6\u30a3\u30b6\u30fc\u30c9\u30e2\u30fc\u30c9\u3078\u5909\u66f4 +CREATE_PORTAL=\u30dd\u30fc\u30bf\u30eb\u306e\u4f5c\u6210 +CREATE_PAGE=\u30da\u30fc\u30b8\u306e\u4f5c\u6210 +DEFAULT=\u30c7\u30d5\u30a9\u30eb\u30c8 +WINDOW=Window +VIEW_PORTLETS_PROVIDED_BY=\u8868\u793a\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306f\u547d\u540d\u3055\u308c\u305f\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30d7\u30ed\u30d0\u30a4\u30c0\u30fc\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u307e\u3059\u3002 +VIEW_PORTLETS=\u8868\u793a\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 + +COMMON_INCONSISTENT_STATE=\u4e0d\u6574\u5408\u306a\u72b6\u614b +COMMON_DELETE=\u524a\u9664 +COMMON_DELETING=\u8b66\u544a! \u524a\u9664\u3055\u308c\u307e\u3059: +COMMON_FROM=from the +COMMON_SURE_DELETE=\u672c\u5f53\u306b\u524a\u9664\u3057\u3066\u3088\u308d\u3057\u3044\u3067\u3059\u304b? : +COMMON_ERROR_HANDLING=\u30da\u30fc\u30b8\u30a8\u30e9\u30fc\u30cf\u30f3\u30c9\u30ea\u30f3\u30b0 +COMMON_CONFIGURE_ERRORS=\u30b7\u30b9\u30c6\u30e0\u304c\u30da\u30fc\u30b8\u30ec\u30d9\u30eb\u3067\u30a8\u30e9\u30fc\u3092\u30cf\u30f3\u30c9\u30eb\u3059\u308b\u65b9\u6cd5\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044 +COMMON_CASE=\u30b1\u30fc\u30b9 +COMMON_INHERITANCE=\u7d99\u627f +COMMON_ACTION=\u30a2\u30af\u30b7\u30e7\u30f3 +COMMON_INHERIT_ACTION=\u89aa\u304b\u3089\u30a2\u30af\u30b7\u30e7\u30f3\u3092\u7d99\u627f\u3059\u308b +COMMON_CONTENT_DEFINITION=\u30b3\u30f3\u30c6\u30f3\u30c4\u5b9a\u7fa9 +COMMON_DEFINE_NAME_WINDOW=\u30b3\u30f3\u30c6\u30f3\u30c4\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u540d\u524d\u3092\u5b9a\u7fa9\u3057\u3066\u304f\u3060\u3055\u3044(\u30aa\u30d7\u30b7\u30e7\u30f3) +COMMON_WINDOW_NAME=\u30a6\u30a3\u30f3\u30c9\u30a6\u540d +COMMON_SELECT_TYPE_CONTENT=\u30da\u30fc\u30b8\u306b\u8ffd\u52a0\u3059\u308b\u30b3\u30f3\u30c6\u30f3\u30c8\u306e\u30bf\u30a4\u30d7\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +COMMON_CONTENT_TYPE=\u30b3\u30f3\u30c6\u30f3\u30c4\u30bf\u30a4\u30d7 +COMMON_SELECT_CONTENT=\u30da\u30fc\u30b8\u306b\u8ffd\u52a0\u3059\u308b\u30b3\u30f3\u30c6\u30f3\u30c8\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +COMMON_PAGE_LAYOUT=\u30da\u30fc\u30b8\u30ec\u30a4\u30a2\u30a6\u30c8 +COMMON_REGION=\u30ea\u30fc\u30b8\u30e7\u30f3 +COMMON_UNASSIGNED_WINDOW=\u30a2\u30b5\u30a4\u30f3\u3055\u308c\u3066\u3044\u306a\u3044\u30a6\u30a3\u30f3\u30c9\u30a6 +COMMON_PORTAL_ERROR_HANDLING=\u30dd\u30fc\u30bf\u30eb\uff06\u30da\u30fc\u30b8 \u30a8\u30e9\u30fc\u30cf\u30f3\u30c9\u30ea\u30f3\u30b0 +COMMON_PORTAL_CONFIGURE_ERRORS=\u30dd\u30fc\u30bf\u30eb\u30ec\u30d9\u30eb\u3067\u30b7\u30b9\u30c6\u30e0\u304c\u30a8\u30e9\u30fc\u3092\u30cf\u30f3\u30c9\u30eb\u3059\u308b\u65b9\u6cd5\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +COMMON_KEY=\u30ad\u30fc +COMMON_NAME=\u540d\u524d +COMMON_READONLY=ReadOnly +COMMON_VALUE=\u5024 +COMMON_NO_DEFINED_PREFERENCES=\u3053\u306e\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306f\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9\u304c\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002 +COMMON_EDIT_EXISTING_VALUES=\u73fe\u5728\u306e\u5024\u3092\u7de8\u96c6 +COMMON_APPEND_VALUE=\u5024\u3092\u8ffd\u52a0 +COMMON_PROPERTIES=\u30d7\u30ed\u30d1\u30c6\u30a3 +COMMON_ADD_PROPERTY=\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u8ffd\u52a0 +COMMON_SELECT_PREDEFINED_PROPERTY=\u5b9a\u7fa9\u3055\u308c\u305f\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u9078\u629e +COMMON_OR=or +COMMON_ENTER_PROPERTY_NAME=\u30d7\u30ed\u30d1\u30c6\u30a3\u540d\u306e\u5165\u529b +COMMON_MANAGE_PROPERTIES=\u73fe\u5728\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u308b\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u7ba1\u7406 +COMMON_DESCRIPTION=\u8aac\u660e +COMMON_INHERITED=\u7d99\u627f +COMMON_YES=\u306f\u3044 +COMMON_NO=\u3044\u3044\u3048 +COMMON_ROLES=\u30ed\u30fc\u30eb +COMMON_PERMISSIONS=\u6a29\u9650 +COMMON_ROLE=\u30ed\u30fc\u30eb +COMMON_SETTING=\u30bb\u30c3\u30c6\u30a3\u30f3\u30b0 +COMMON_LAYOUT=\u30ec\u30a4\u30a2\u30a6\u30c8 +COMMON_NAME_LAYOUT_IMPLEMENTATION=\u30da\u30fc\u30b8\u3067\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u914d\u7f6e\u3059\u308b\u306e\u306b\u7528\u3044\u3089\u308c\u308b\u30ec\u30a4\u30a2\u30a6\u30c8\u30a4\u30f3\u30d7\u30ea\u30e1\u30f3\u30c6\u30fc\u30b7\u30e7\u30f3\u306e\u540d\u524d +COMMON_THEME=\u30c6\u30fc\u30de +COMMON_NAME_LOOK_AND_FEEL=\u5229\u7528\u3059\u308b\u30eb\u30c3\u30af\uff06\u30d5\u30a3\u30fc\u30eb\u306e\u540d\u524d +COMMON_RENDERSET=\u30ec\u30f3\u30c0\u30bb\u30c3\u30c8 +COMMON_NAME_RENDER_ENGINE_PAGES=\u30ec\u30f3\u30c0\u30fc\u30da\u30fc\u30b8\u306b\u5229\u7528\u3059\u308b\u30ec\u30f3\u30c0\u30fc\u30a8\u30f3\u30b8\u30f3\u306e\u540d\u524d +COMMON_WINDOW_RENDERER=\u30a6\u30a3\u30f3\u30c9\u30a6\u30ec\u30f3\u30c0\u30e9\u30fc +COMMON_NAME_RENDER_ENGINE_WINDOWS=\u30ec\u30f3\u30c0\u30fc\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u5229\u7528\u3059\u308b\u30ec\u30f3\u30c0\u30fc\u30a8\u30f3\u30b8\u30f3\u306e\u540d\u524d +COMMON_DECORATION_RENDERER=\u30c7\u30b3\u30ec\u30fc\u30b7\u30e7\u30f3 \u30ec\u30f3\u30c0\u30e9\u30fc +COMMON_NAME_RENDER_ENGINE_DECORATIONS=\u30ec\u30f3\u30c0\u30fc\u30a6\u30a3\u30f3\u30c9\u30a6\u30c7\u30b3\u30ec\u30fc\u30b7\u30e7\u30f3\u306b\u5229\u7528\u3059\u308b\u30ec\u30f3\u30c0\u30fc\u30a8\u30f3\u30b8\u30f3\u306e\u540d\u524d +COMMON_PORTLET_RENDERER=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 \u30ec\u30f3\u30c0\u30e9\u30fc +COMMON_NAME_RENDER_ENGINE_PORTLETS=\u30ec\u30f3\u30c0\u30fc\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306b\u5229\u7528\u3059\u308b\u30ec\u30f3\u30c0\u30fc\u30a8\u30f3\u30b8\u30f3\u306e\u540d\u524d +COMMON_PORTLET_INSTANCE_INFORMATION=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u60c5\u5831 +COMMON_PORTLET_NAME=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u540d +COMMON_PORTLET_DESCRIPTION=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u8aac\u660e +COMMON_PORTLET_TITLE=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30bf\u30a4\u30c8\u30eb +COMMON_PORTLET_KEYWORDS=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30ad\u30fc\u30ef\u30fc\u30c9 +COMMON_PORTLET_LOCALES=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u5834\u6240 +COMMON_PORTLET_INSTANCE_DISPLAY_NAMES=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u8868\u793a\u540d +COMMON_ADD_INSTANCE_DISPLAY_NAMES=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u8868\u793a\u540d\u306e\u8ffd\u52a0 +COMMON_CURRENT_INSTANCE_DISPLAY_NAMES=\u73fe\u5728\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u8868\u793a\u540d +COMMON_CANCEL=\u30ad\u30e3\u30f3\u30bb\u30eb +COMMON_UPDATE=\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8 +COMMON_ADD=\u8ffd\u52a0 +COMMON_ADD_PROPERTY_BUTTON=\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u8ffd\u52a0 +COMMON_UP=Up +COMMON_DOWN=Down +COMMON_NEW_VALUE=\u65b0\u3057\u3044\u5024 +COMMON_APPEND=\u8ffd\u52a0 +COMMON_LOCALE=\u5834\u6240 +COMMON_DISPLAY_NAME=\u8868\u793a\u540d +COMMON_MEDIA_TYPES=\u30e1\u30c7\u30a3\u30a2\u30bf\u30a4\u30d7 +COMMON_WINDOW_STATES=\u30a6\u30a3\u30f3\u30c9\u30a6\u30b9\u30c6\u30fc\u30c8 +COMMON_PORTLET_MODES=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30e2\u30fc\u30c9 +COMMON_PREFERENCES=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9 +COMMON_PUBLIC_RENDER_PARAMETERS=\u30d1\u30d6\u30ea\u30c3\u30af\u30ec\u30f3\u30c0\u30fc\u30d1\u30e9\u30e1\u30fc\u30bf +COMMON_ID=Id +COMMON_TITLE=\u30bf\u30a4\u30c8\u30eb +COMMON_KEYWORDS=\u30ad\u30fc\u30ef\u30fc\u30c9 +COMMON_LOCALES=\u5834\u6240 +COMMON_TRANSPORT_GUARANTEES=\u30c8\u30e9\u30f3\u30b9\u30dd\u30fc\u30c8\u30ae\u30e3\u30e9\u30f3\u30c6\u30a3\u30fc +COMMON_CACHE_EXPIRATION=\u30ad\u30e3\u30c3\u30b7\u30e5\u6709\u52b9\u671f\u9650 +COMMON_SECONDS=\u79d2 +COMMON_PUBLIC_NAVIGATION_PARAMETERS=\u30d1\u30d6\u30ea\u30c3\u30af\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u30d1\u30e9\u30e1\u30fc\u30bf +COMMON_CONSUMED_EVENTS=Consumed Events +COMMON_PRODUCED_EVENTS=Produced Events + +DASHBOARD_PERSONAL_EDITOR=\u30d1\u30fc\u30bd\u30ca\u30eb \u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9 \u30a8\u30c7\u30a3\u30bf +DASHBOARD_CREATE_NEW_PAGE=\u65b0\u3057\u3044\u30da\u30fc\u30b8\u306e\u4f5c\u6210 +DASHBOARD_CREATE_PAGE=\u30da\u30fc\u30b8\u540d +DASHBOARD_RENAME_THIS_PAGE=\u30da\u30fc\u30b8\u540d\u306e\u5909\u66f4 +DASHBOARD_NEW_PAGE_NAME=\u65b0\u3057\u3044\u30da\u30fc\u30b8\u540d +DASHBOARD_USE_PAGE_MANAGE_CONTENT_APPEARANCE=\u3042\u306a\u305f\u306e\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u30da\u30fc\u30b8\u306e\u30b3\u30f3\u30c6\u30f3\u30c8\u3068\u4f53\u88c1\u3092\u7ba1\u7406\u3059\u308b\u305f\u3081\u306b\u3001\u3053\u306e\u30da\u30fc\u30b8\u3092\u4f7f\u3063\u3066\u304f\u3060\u3055\u3044 +DASHBOARD_YOU_CAN_CONTROL_TITLES_COLUMN_THEMES=\u3042\u306a\u305f\u306f\u30da\u30fc\u30b8\u30bf\u30a4\u30c8\u30eb\u3001\u30ab\u30e9\u30e0\u30ec\u30a4\u30a2\u30a6\u30c8\u3001\u30da\u30fc\u30b8\u30c6\u30fc\u30de\u306e\u8ffd\u52a0\u3001\u9806\u5e8f\u3001\u524a\u9664\u3092\u5236\u5fa1\u3067\u304d\u307e\u3059\u3002 +DASHBOARD_CURRENTLY_EDITING_PAGE=\u73fe\u5728\u7de8\u96c6\u3057\u3066\u3044\u308b\u30da\u30fc\u30b8 +DASHBOARD_THEME_AND_LAYOUT=\u30c6\u30fc\u30de\u3068\u30ec\u30a4\u30a2\u30a6\u30c8 +DASHBOARD_APPLY_THEME=\u3042\u306a\u305f\u306e\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u306e\u30c6\u30fc\u30de\u3092\u5272\u308a\u5f53\u3066\u3066\u304f\u3060\u3055\u3044\u3002\u3082\u3057\u304f\u306f\u30ec\u30a4\u30a2\u30a6\u30c8\u306e\u30ab\u30e9\u30e0\u6570\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +DASHBOARD_CHOOSE_LAYOUT=\u30ec\u30a4\u30a2\u30a6\u30c8\u306e\u9078\u629e +DASHBOARD_CHOOSE_THEME=\u30c6\u30fc\u30de\u306e\u9078\u629e +DASHBOARD_CANNOT_UNDO_ACTION=\u3053\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u306f\u5143\u306b\u623b\u3059\u4e8b\u304c\u3067\u304d\u307e\u305b\u3093\u3002 +DASHBOARD_DELETE_THIS_PAGE=\u30da\u30fc\u30b8\u306e\u524a\u9664 +DASHBOARD_SAVE=\u4fdd\u5b58 +DASHBOARD_SELECT=\u9078\u629e + +WIZARD_ADDING_NEW_PORTLET=\u65b0\u3057\u3044\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u8ffd\u52a0 +WIZARD_STEP=Step +WIZARD_SELECT_PORTLET=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u9078\u629e +WIZARD_SELECT_PORTAL=\u30dd\u30fc\u30bf\u30eb\u306e\u9078\u629e +WIZARD_SELECT_PAGE=\u30da\u30fc\u30b8\u306e\u9078\u629e +WIZARD_SELECT_REGION=\u30ea\u30fc\u30b8\u30e7\u30f3\u306e\u9078\u629e +WIZARD_CONFIRM=\u78ba\u8a8d +WIZARD_CONTENT=\u30b3\u30f3\u30c6\u30f3\u30c8 +WIZARD_SWITCH_ADVANCED_MODE=ADVANCED MODE\u3078\u306e\u5207\u308a\u66ff\u3048 +WIZARD_PORTLET=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 +WIZARD_PORTAL=\u30dd\u30fc\u30bf\u30eb +WIZARD_PAGE=\u30da\u30fc\u30b8 +WIZARD_REGION=\u30ea\u30fc\u30b8\u30e7\u30f3 +WIZARD_PREVIOUS=Previous +WIZARD_NEXT=Next +WIZARD_SUB_PAGES=Sub-Pages +WIZARD_PORTLET_PROVIDER=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30d7\u30ed\u30d0\u30a4\u30c0\u30fc +WIZARD_CHANGE=\u5909\u66f4 + +DISPLAY_THE_DEFAULT_ERROR_MESSAGE=\u30c7\u30d5\u30a9\u30eb\u30c8\u30a8\u30e9\u30fc\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u8868\u793a +REDIRECT_TO_THE_SPECIFIED_RESOURCE=\u8a18\u8ff0\u3055\u308c\u305f\u30ea\u30bd\u30fc\u30b9\u306e\u30ea\u30c0\u30a4\u30ec\u30af\u30c8 +REMOVE_THE_RESOURCE_FROM_PAGE=\u30da\u30fc\u30b8\u304b\u3089\u30ea\u30bd\u30fc\u30b9\u3092\u524a\u9664 + +THEME_LAYOUT_ID_NAME=\u30ec\u30a4\u30a2\u30a6\u30c8ID +THEME_LAYOUT_ID_DESCRIPTION=\u30ec\u30a4\u30a2\u30a6\u30c8\u5024\u306f\u30da\u30fc\u30b8\u306e\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u3092\u4f5c\u6210\u3057\u307e\u3059\u3002 +THEME_THEME_ID_NAME=\u30c6\u30fc\u30deID +THEME_THEME_ID_DESCRIPTION=\u30c6\u30fc\u30de\u5024\u306f\u30da\u30fc\u30b8\u3092\u304a\u304a\u3044\u307e\u3059\u3002 +THEME_RENDER_SET_ID_NAME=\u30ec\u30f3\u30c0\u30bb\u30c3\u30c8 id +THEME_RENDER_SET_ID_DESCRIPTION=\u30ec\u30f3\u30c0\u30bb\u30c3\u30c8 id +THEME_RENDER_REGION_ID_NAME=\u30ea\u30fc\u30b8\u30e7\u30f3ID +THEME_RENDER_REGION_ID_DESCRIPTION=\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u30ea\u30fc\u30b8\u30e7\u30f3 id +THEME_RENDER_REGION_ORDER_NAME=\u30ea\u30fc\u30b8\u30e7\u30f3\u30aa\u30fc\u30c0\u30fc +THEME_RENDER_REGION_ORDER_DESCRIPTION=\u30ea\u30fc\u30b8\u30e7\u30f3\u5185\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u5782\u76f4\u3001\u307e\u305f\u306f\u6c34\u5e73\u9806 +AJAX_PARTIAL_REFRESH_NAME=\u90e8\u5206\u7684\u306a\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5 +AJAX_PARTIAL_REFRESH_DESCRIPTION=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u90e8\u5206\u7684\u306a\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u3092\u6709\u52b9 +AJAX_DND_NAME=\u30c9\u30e9\u30c3\u30b0\uff06\u30c9\u30ed\u30c3\u30d7 +AJAX_DND_DESCRIPTION=\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u30c9\u30e9\u30c3\u30b0\uff06\u30c9\u30ed\u30c3\u30d7\u3092\u6709\u52b9 +WINDOW_CONTENT_TYPE_NAME=\u30b3\u30f3\u30c6\u30f3\u30c8\u30bf\u30a4\u30d7 +WINDOW_CONTENT_TYPE_DESCRIPTION=\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u30b3\u30f3\u30c6\u30f3\u30c8\u306e\u30bf\u30a4\u30d7 +DEFAULT_CHILD_NAME_NAME=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u5b50\u306e\u540d\u524d +DEFAULT_CHILD_NAME_DESCRIPTION=\u5b50\u306e\u540d\u524d\u304c\u660e\u793a\u7684\u306b\u6307\u5b9a\u3055\u308c\u3066\u3044\u306a\u3044\u5834\u5408\u306b\u4f7f\u308f\u308c\u308b\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u540d\u524d +TAB_ORDER_NAME=\u30bf\u30d6\u9806 +TAB_ORDER_DESCRIPTION=\u30da\u30fc\u30b8\u5185\u306b\u8868\u793a\u3055\u308c\u308b\u30bf\u30d6\u306e\u9806\u5e8f +INITIAL_WINDOW_STATE_NAME=\u30a4\u30cb\u30b7\u30e3\u30eb\u30e2\u30fc\u30c9 +INITIAL_WINDOW_STATE_DESCRIPTION=\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u30a4\u30cb\u30b7\u30e3\u30eb\u30e2\u30fc\u30c9 + +CONTROL_POLICY_PAGE_ACCESS_DENIED_NAME=\u30a6\u30a3\u30f3\u30c9\u30a6\u3078\u306e\u30a2\u30af\u30bb\u30b9\u304c\u62d2\u5426\u3055\u308c\u305f\u3068\u304d +CONTROL_POLICY_PAGE_ACCESS_DENIED_DESCRIPTION=\u30a6\u30a3\u30f3\u30c9\u30a6\u3078\u306e\u30a2\u30af\u30bb\u30b9\u304c\u62d2\u5426\u3055\u308c\u305f\u3068\u304d +CONTROL_POLICY_PAGE_UNAVAILABLE_NAME=\u30a6\u30a3\u30f3\u30c9\u30a6\u304c\u5229\u7528\u51fa\u6765\u306a\u3044\u3068\u304d +CONTROL_POLICY_PAGE_UNAVAILABLE_DESCRIPTION=\u30a6\u30a3\u30f3\u30c9\u30a6\u304c\u5229\u7528\u51fa\u6765\u306a\u3044\u3068\u304d +CONTROL_POLICY_PAGE_ERROR_NAME=\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d +CONTROL_POLICY_PAGE_ERROR_DESCRIPTION=\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d +CONTROL_POLICY_PAGE_INTERNAL_ERROR_NAME=\u30a6\u30a3\u30f3\u30c9\u30a6\u5185\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d +CONTROL_POLICY_PAGE_INTERNAL_ERROR_DESCRIPTION=\u30a6\u30a3\u30f3\u30c9\u30a6\u5185\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d +CONTROL_POLICY_PAGE_NOT_FOUND_NAME=\u30a6\u30a3\u30f3\u30c9\u30a6\u304c\u898b\u3064\u304b\u3089\u306a\u3044\u3068\u304d +CONTROL_POLICY_PAGE_NOT_FOUND_DESCRIPTION=\u30a6\u30a3\u30f3\u30c9\u30a6\u304c\u898b\u3064\u304b\u3089\u306a\u3044\u3068\u304d +CONTROL_POLICY_PAGE_RESOURCE_URI_NAME=\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u3078\u306e\u30ea\u30c0\u30a4\u30ec\u30af\u30c8\u6642\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d +CONTROL_POLICY_PAGE_RESOURCE_URI_DESCRIPTION=\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u3078\u306e\u30ea\u30c0\u30a4\u30ec\u30af\u30c8\u6642\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d +CONTROL_POLICY_PORTAL_ACCESS_DENIED_NAME=\u30da\u30fc\u30b8\u3078\u306e\u30a2\u30af\u30bb\u30b9\u304c\u62d2\u5426\u3055\u308c\u305f\u3068\u304d +CONTROL_POLICY_PORTAL_ACCESS_DENIED_DESCRIPTION=\u3078\u306e\u30a2\u30af\u30bb\u30b9\u304c\u62d2\u5426\u3055\u308c\u305f\u3068\u304d +CONTROL_POLICY_PORTAL_UNAVAILABLE_NAME=\u30da\u30fc\u30b8\u304c\u5229\u7528\u51fa\u6765\u306a\u3044\u3068\u304d +CONTROL_POLICY_PORTAL_UNAVAILABLE_DESCRIPTION=\u30da\u30fc\u30b8\u304c\u5229\u7528\u51fa\u6765\u306a\u3044\u3068\u304d +CONTROL_POLICY_PORTAL_ERROR_NAME=\u30da\u30fc\u30b8\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d +CONTROL_POLICY_PORTAL_ERROR_DESCRIPTION=\u30da\u30fc\u30b8\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d +CONTROL_POLICY_PORTAL_INTERNAL_ERROR_NAME=\u30da\u30fc\u30b8\u5185\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d +CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DESCRIPTION=\u30da\u30fc\u30b8\u5185\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d +CONTROL_POLICY_PORTAL_NOT_FOUND_NAME=\u30da\u30fc\u30b8\u304c\u898b\u3064\u304b\u3089\u306a\u3044\u3068\u304d +CONTROL_POLICY_PORTAL_NOT_FOUND_DESCRIPTION=\u30da\u30fc\u30b8\u304c\u898b\u3064\u304b\u3089\u306a\u3044\u3068\u304d +CONTROL_POLICY_PORTAL_RESOURCE_URI_NAME=\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u3078\u306e\u30ea\u30c0\u30a4\u30ec\u30af\u30c8\u6642\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d +CONTROL_POLICY_PORTAL_RESOURCE_URI_DESCRIPTION=\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u3078\u306e\u30ea\u30c0\u30a4\u30ec\u30af\u30c8\u6642\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u3068\u304d + +NO_BOUND_LISTENER=\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u305f\u30ea\u30b9\u30ca\u30fc\u306a\u3057 + +COORDINATION_COORDINATION=\u30b3\u30fc\u30c7\u30a3\u30cd\u30fc\u30b7\u30e7\u30f3 +COORDINATION_PARAMETER_BINDINGS=\u30d1\u30e9\u30e1\u30fc\u30bf\u30fc\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0 +COORDINATION_PARAMETER_EXPLICIT_MODE=\u660e\u793a\u7684\u306a\u30d1\u30e9\u30e1\u30fc\u30bf\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u3092\u884c\u3046 +COORDINATION_PARAMETER_MANAGE_EXISTING=\u73fe\u72b6\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u30fc\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u306e\u7ba1\u7406: +COORDINATION_PARAMETER_EXISTING_NONE=\u30d1\u30e9\u30e1\u30fc\u30bf\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u304c\u5b58\u5728\u3057\u307e\u305b\u3093\u3002 +COORDINATION_PARAMETER_EXISTING_NAME=\u540d\u524d +COORDINATION_PARAMETER_EXISTING_PAIRS=\u30a6\u30a3\u30f3\u30c9\u30a6 / \u30d1\u30e9\u30e1\u30fc\u30bf \u30da\u30a2 +COORDINATION_PARAMETER_EXISTING_ACTIONS=\u30a2\u30af\u30b7\u30e7\u30f3 +COORDINATION_PARAMETER_CREATE=\u65b0\u3057\u3044\u30d1\u30e9\u30e1\u30fc\u30bf\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u306e\u4f5c\u6210: +COORDINATION_PARAMETER_CREATE_NO_PAIRS=\u30d1\u30d6\u30ea\u30c3\u30af\u306a\u30ec\u30f3\u30c0\u30fc\u30d1\u30e9\u30e1\u30fc\u30bf\u304c\u3042\u308a\u307e\u305b\u3093\u3002 \u65b0\u3057\u3044\u30d1\u30e9\u30e1\u30fc\u30bf\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002 +COORDINATION_PARAMETER_CREATE_STEP1=1. \u30d1\u30d6\u30ea\u30c3\u30af\u306a\u30a6\u30a3\u30f3\u30c9\u30a6 / \u30d1\u30e9\u30e1\u30fc\u30bf \u30da\u30a2\u306e\u9078\u629e: +COORDINATION_PARAMETER_CREATE_STEP2=2. \u30d1\u30e9\u30e1\u30fc\u30bf\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u306e\u547d\u540d: +COORDINATION_PARAMETER_CREATE_CREATE=\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u306e\u4f5c\u6210 + +COORDINATION_WINDOWS=\u30a6\u30a3\u30f3\u30c9\u30a6 + +COORDINATION_ALIAS_BINDINGS=\u30a8\u30a4\u30ea\u30a2\u30b9\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0 +COORDINATION_ALIAS_MANAGE_EXISTING=\u73fe\u72b6\u306e\u30a8\u30a4\u30ea\u30a2\u30b9\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u306e\u7ba1\u7406: +COORDINATION_ALIAS_EXISTING_NONE=\u30a8\u30a4\u30ea\u30a2\u30b9\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u304c\u5b58\u5728\u3057\u307e\u305b\u3093\u3002 +COORDINATION_ALIAS_EXISTING_NAME=\u540d\u524d +COORDINATION_ALIAS_EXISTING_ORIGINAL=\u30aa\u30ea\u30b8\u30ca\u30eb QName +COORDINATION_ALIAS_EXISTING_ACTIONS=\u30a2\u30af\u30b7\u30e7\u30f3 +COORDINATION_ALIAS_CREATE=\u65b0\u3057\u3044\u30a8\u30a4\u30ea\u30a2\u30b9\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u306e\u4f5c\u6210: +COORDINATION_ALIAS_CREATE_NO_PARAMS=\u30d1\u30d6\u30ea\u30c3\u30af\u306a\u30a8\u30a4\u30ea\u30a2\u30b9\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u304c\u3042\u308a\u307e\u305b\u3093\u3002 \u65b0\u3057\u3044\u30a8\u30a4\u30ea\u30a2\u30b9\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002 +COORDINATION_ALIAS_CREATE_STEP1=1. \u30d1\u30d6\u30ea\u30c3\u30af\u306a\u30ec\u30f3\u30c0\u30fc\u30d1\u30e9\u30e1\u30fc\u30bf\u306e\u4f5c\u6210: +COORDINATION_ALIAS_CREATE_STEP2=2. \u30a8\u30a4\u30ea\u30a2\u30b9\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u306e\u547d\u540d: +COORDINATION_ALIAS_CREATE_CREATE=\u30a8\u30a4\u30ea\u30a2\u30b9\u306e\u4f5c\u6210 + +COORDINATION_EVENT_WIRINGS=\u30a4\u30d9\u30f3\u30c8 \u30ef\u30a4\u30e4\u30ea\u30f3\u30b0 +COORDINATION_EVENT_EXPLICIT_MODE=\u660e\u793a\u7684\u306a\u30a4\u30d9\u30f3\u30c8\u30ef\u30a4\u30e4\u30ea\u30f3\u30b0\u3092\u884c\u3046 +COORDINATION_EVENT_MANAGE_EXISTING=\u73fe\u72b6\u306e\u30a4\u30d9\u30f3\u30c8 \u30ef\u30a4\u30e4\u30ea\u30f3\u30b0\u306e\u7ba1\u7406: +COORDINATION_EVENT_EXISTING_NONE=\u30a4\u30d9\u30f3\u30c8 \u30ef\u30a4\u30e4\u30ea\u30f3\u30b0\u304c\u5b58\u5728\u3057\u307e\u305b\u3093\u3002 +COORDINATION_EVENT_EXISTING_NAME=\u540d\u524d +COORDINATION_EVENT_EXISTING_SOURCE_WINDOWS=\u30bd\u30fc\u30b9\u30a6\u30a3\u30f3\u30c9\u30a6 +COORDINATION_EVENT_EXISTING_SOURCE_EVENTS=\u30bd\u30fc\u30b9\u30a4\u30d9\u30f3\u30c8 +COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS=\u5b9b\u5148\u30a4\u30d9\u30f3\u30c8 +COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS=\u5b9b\u5148\u30a6\u30a3\u30f3\u30c9\u30a6 +COORDINATION_EVENT_EXISTING_ACTIONS=\u30a2\u30af\u30b7\u30e7\u30f3 +COORDINATION_EVENT_CREATE=\u65b0\u3057\u3044\u30a4\u30d9\u30f3\u30c8 \u30ef\u30a4\u30e4\u30ea\u30f3\u30b0\u306e\u4f5c\u6210: +COORDINATION_EVENT_CREATE_NO_EVENTS=\u30a4\u30d9\u30f3\u30c8 \u304c\u3042\u308a\u307e\u305b\u3093\u3002 \u65b0\u3057\u3044\u30a4\u30d9\u30f3\u30c8 \u30ef\u30a4\u30e4\u30ea\u30f3\u30b0\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002 +COORDINATION_EVENT_CREATE_STEP1=1. \u30bd\u30fc\u30b9\u30a4\u30d9\u30f3\u30c8\u306e\u9078\u629e: +COORDINATION_EVENT_CREATE_STEP2=2. \u30a4\u30d9\u30f3\u30c8\u3092\u767a\u751f\u3055\u305b\u308b\u30bd\u30fc\u30b9\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u9078\u629e: +COORDINATION_EVENT_CREATE_STEP3=3. \u5b9b\u5148\u30a4\u30d9\u30f3\u30c8\u3092\u9078\u629e: +COORDINATION_EVENT_CREATE_STEP4=4. \u30a4\u30d9\u30f3\u30c8\u3092\u51e6\u7406\u3059\u308b\u5b9b\u5148\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u9078\u629e: +COORDINATION_EVENT_CREATE_STEP5=5. \u30ef\u30a4\u30e4\u30ea\u30f3\u30b0\u306e\u547d\u540d: +COORDINATION_EVENT_CREATE_CREATE=\u30ef\u30a4\u30e4\u30ea\u30f3\u30b0\u306e\u4f5c\u6210 +COORDINATION_EVENT_CREATE_PREVIEW=\u65b0\u3057\u3044\u30a4\u30d9\u30f3\u30c8\u30ef\u30a4\u30e4\u30ea\u30f3\u30b0\u306e\u30d7\u30ec\u30d3\u30e5\u30fc: +COORDINATION_EVENT_CREATE_PREVIEW_STEP1=\u3042\u306a\u305f\u306f\u3001\u4ee5\u4e0b\u306e\u30bd\u30fc\u30b9\u30a4\u30d9\u30f3\u30c8\u3092\u9078\u629e\u3057\u307e\u3057\u305f: +COORDINATION_EVENT_CREATE_PREVIEW_STEP2=\u4ee5\u4e0b\u306e\u30bd\u30fc\u30b9\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u3088\u3063\u3066\u5f15\u304d\u8d77\u3053\u3055\u308c\u307e\u3059: +COORDINATION_EVENT_CREATE_PREVIEW_STEP3=\u767a\u751f\u3057\u305f\u30a6\u30a3\u30f3\u30c9\u30a6\u30a4\u30d9\u30f3\u30c8\u304c\u30ef\u30a4\u30e4\u3055\u308c\u308b\u5b9b\u5148\u30a4\u30d9\u30f3\u30c8: +COORDINATION_EVENT_CREATE_PREVIEW_STEP4=\u5b9b\u5148\u30a6\u30a3\u30f3\u30c9\u30a6: + + + +COORDINATION_WIRING=\u30a4\u30d9\u30f3\u30c8 \u30ef\u30a4\u30e4\u30ea\u30f3\u30b0 +COORDINATION_PARAMETER=\u30d1\u30e9\u30e1\u30fc\u30bf\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0 +COORDINATION_ALIAS=\u30a8\u30a4\u30ea\u30a2\u30b9\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0 Copied: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties (from rev 12964, branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties) =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties (rev 0) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties 2009-03-06 23:20:57 UTC (rev 12969) @@ -0,0 +1,340 @@ +################################################################################ +# 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. # +################################################################################ + +PORTLET_INSTANCES=Inst\u00E2ncias de Portlets +INSTANCE_DELETE=Excluir inst\u00E2ncia +PORTLET_CAUSING_REFERENCING_NOT_ABLE=janelas que referenciam essa inst\u00E2ncia de portlet n\u00E3o ser\u00E3o capazes de exibir o seu conte\u00FAdo +ARE_YOU_SURE_DELETE=Tem certeza de que deseja excluir esta inst\u00E2ncia de portlet? +DASHBOARD_THEME_PROPERTIES=Propriedades do Tema do Meu Portal +CONFIGURE_DASHBOARD_SETTINGS=Configurar defini\u00E7\u00F5es do Meu Portal +DASHBOARDS=Meus Portais +ADD_DISPLAY_NAMES=Adicionar Nomes de Exibi\u00E7\u00E3o +CURRENT_DISPLAY_NAMES=Nomes de Exibi\u00E7\u00E3o Atuais +SAVE=Gravar +MANAGE=Gerenciar +PORTALS_NO_CAP=portais +PORTAL=portal +SUB_PORTALS=sub-portais +PAGES_WITHIN=p\u00E1ginas com +CREATE_PORTAL_NAMED=Criar portal chamado +PAGE_LAYOUT=Layout de p\u00E1gina +SECURITY=Seguran\u00E7a +THEME=Tema +RENAME=Renomear +DISPLAY_NAMES=Nomes de Exibi\u00E7\u00E3o +MANAGE_SUB_PAGES_WITHIN=Gerenciar sub-p\u00E1ginas dentro +CREATE_PAGE_NAMED=Criar p\u00E1gina chamada +SET_PAGE_PERMISSIONS=Por favor, defina as permiss\u00F5es da p\u00E1gina +PAGE_THEME_PROPERTIES=Propriedades do tema da p\u00E1gina +SET_PORTAL_PERMISSIONS=Por favor, defina as permiss\u00F5es do portal +PORTAL_THEME_PROPERTIES=Propriedades do tema do portal +SETTINGS_ARE_INHERITED_BY_ALL_PAGES=Essas configura\u00E7\u00F5es s\u00E3o herdadas por todas as p\u00E1ginas e janelas deste portal. Voc\u00EA pode sobrescrever essas configura\u00E7\u00F5es, selecionando o valor adequado na respectiva p\u00E1gina de defini\u00E7\u00E3o de Temas +EVENT_LISTENER_BINDING=Event Listener Binding +CHOOSE_ID_PORTALEVENTLISTENER=Escolha o id do PortalEventListener para vincular a este +SET_PERMISSIONS_FOR=Por favor, defina as permiss\u00F5es para o +WINDOW_NO_CAP=janela +WINDOW_THEME_PROPERTIES=Propriedades do tema da janela +INSTANCE_ID=Id da inst\u00E3ncia +INSTANCE_NAME=Nome da inst\u00E2ncia +ACTIONS=A\u00E7\u00F5es +PREFERENCES=Prefer\u00EAncias +PORTLET_DETAILS=detalhes do portlet +ASSOCIATED_PORTLET_NOT_AVAILABLE=O portlet associado n\u00E3o est\u00E1 dispon\u00EDvel +PREFERENCES_NO_CAP=prefer\u00EAncias +SECURITY_SETTINGS=configura\u00E7\u00F5es de seguran\u00E7a +MAKE_DEFAULT=Tornar padr\u00E3o +MANAGE_WINDOWS_WITHIN=Gerenciar janelas com +PORTAL_OBJECTS=Objetos do Portal +PORTALS=Portais +PORTLET_NAME=Nome do portlet +DESCRIPTION=Descri\u00E7\u00E3o +REMOTE=Remoto +REMOTABLE=Remoto +CREATE_INSTANCE=Criar inst\u00E2ncia +PORTLET_DEFINITIONS=Defini\u00E7\u00F5es de Portlets +DETAILS=detalhes +INSTANCE_CREATION=cria\u00E7\u00E3o de inst\u00E2ncia +CREATE_INSTANCE_NAMED=Criar uma inst\u00E2ncia chamada +RENAME_THE=Renomeie o +TO=para +THIS_MINIMIZED_STATE=Esta janela est\u00E1 definida com um estado minimizado +THIS_NORMAL_STATE=Esta janela est\u00E1 definida com um estado normal +THIS_MAXIMIZED_STATE=Esta janela est\u00E1 definida com um estado maximizado +THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED=Esta janela est\u00E1 com o estado padr\u00E3o para minimizado porque uma janela dentro desta p\u00E1gina est\u00E1 definida para maximizada +SWITCH_TO_WIZARD_MODE=Mude para o modo de assistente +CREATE_PORTAL=Criar portal +CREATE_PAGE=Criar p\u00E1gina +DEFAULT=Padr\u00E3o +WINDOW=Janela +VIEW_PORTLETS_PROVIDED_BY=Visualizar portlets fornecidos pelo provedor de portlet chamado +VIEW_PORTLETS=Visualizar portlets + +COMMON_INCONSISTENT_STATE=Estado inconsistente +COMMON_DELETE=Excluir +COMMON_DELETING=ATEN\u00C7\u00C3O\! Voc\u00EA est\u00E1 prestes a excluir o +COMMON_FROM=a partir do +COMMON_SURE_DELETE=Tem certeza de que deseja excluir esta +COMMON_ERROR_HANDLING=P\u00E1gina de Gerenciamento de Erro +COMMON_CONFIGURE_ERRORS=Configurar o modo como o sistema lida com erros em n\u00EDvel de p\u00E1gina +COMMON_CASE=Caso +COMMON_INHERITANCE=Heran\u00E7a +COMMON_ACTION=A\u00E7\u00E3o +COMMON_INHERIT_ACTION=herdar a\u00E7\u00E3o dos pais +COMMON_CONTENT_DEFINITION=Defini\u00E7\u00E3o de Conte\u00FAdo +COMMON_DEFINE_NAME_WINDOW=Defina um nome para a janela de conte\u00FAdo (opcional) +COMMON_WINDOW_NAME=Nome da Janela +COMMON_SELECT_TYPE_CONTENT=Selecione o tipo de conte\u00FAdo que ser\u00E1 adicionado \u00E0 p\u00E1gina +COMMON_NO_SELECTED_CONTENT=Voc\u00EA deve selecionar um tipo de conte\u00FAdo\! +COMMON_CONTENT_TYPE=Tipo de Conte\u00FAdo +COMMON_SELECT_CONTENT=Selecione o conte\u00FAdo que ser\u00E1 adicionado \u00E0 p\u00E1gina +COMMON_PAGE_LAYOUT=Layout da P\u00E1gina +COMMON_REGION=Regi\u00E3o +COMMON_UNASSIGNED_WINDOW=Janelas n\u00E3o assinadas +COMMON_PORTAL_ERROR_HANDLING=Gerenciamento de Erros do Portal +COMMON_PORTAL_CONFIGURE_ERRORS=Configurar o modo como o sistema lida com erros em n\u00EDvel do portal +COMMON_KEY=Chave +COMMON_NAME=Nome +COMMON_READONLY=Apenas leitura +COMMON_VALUE=Valor +COMMON_NO_DEFINED_PREFERENCES=Nenhuma prefer\u00EAncia definida para este portlet +COMMON_EDIT_EXISTING_VALUES=Editar valores existentes +COMMON_APPEND_VALUE=Adicionar um valor +COMMON_PROPERTIES=Propriedades +COMMON_ADD_PROPERTY=Adicionar uma propriedade +COMMON_SELECT_PREDEFINED_PROPERTY=Selecione propriedades predefinidas +COMMON_OR=ou +COMMON_ENTER_PROPERTY_NAME=Digite o nome da propriedade +COMMON_MANAGE_PROPERTIES=Ger\u00EAnciar propriedades atualmente definidas +COMMON_DESCRIPTION=Descri\u00E7\u00E3o +COMMON_INHERITED=Herdado +COMMON_YES=Sim +COMMON_NO=N\u00E3o +COMMON_ROLES=Perfis +COMMON_PERMISSIONS=Permiss\u00F5es +COMMON_ROLE=Perfil +COMMON_SETTING=Configura\u00E7\u00E3o +COMMON_LAYOUT=Layout +COMMON_NAME_LAYOUT_IMPLEMENTATION=Nome do layout utilizado para organizar as janelas de portlets nas p\u00E1ginas +COMMON_THEME=Tema +COMMON_NAME_LOOK_AND_FEEL=Nome da apar\u00EAncia +COMMON_RENDERSET=RenderSet +COMMON_NAME_RENDER_ENGINE_PAGES=Nome do motor de renderiza\u00E7\u00E3o utilizado para renderizar as p\u00E1ginas +COMMON_WINDOW_RENDERER=Renderizador da Janela +COMMON_NAME_RENDER_ENGINE_WINDOWS=Nome do motor de renderiza\u00E7\u00E3o utilizado para renderizar as janelas +COMMON_DECORATION_RENDERER=Renderiza\u00E7\u00E3o da Decora\u00E7\u00E3o +COMMON_NAME_RENDER_ENGINE_DECORATIONS=Nome do motor de renderiza\u00E7\u00E3o utilizado nas decora\u00E7\u00F5es da janela +COMMON_PORTLET_RENDERER=Renderizador do Portlet +COMMON_NAME_RENDER_ENGINE_PORTLETS=Nome do layout utilizado para organizar janelas de portlets em p\u00E1ginas +COMMON_PORTLET_INSTANCE_INFORMATION=Informa\u00E7\u00E3o sobre a Inst\u00E2ncia do Portlet +COMMON_PORTLET_NAME=Nome do portlet +COMMON_PORTLET_DESCRIPTION=Descri\u00E7\u00E3o do portlet +COMMON_PORTLET_TITLE=T\u00EDtulo do portlet +COMMON_PORTLET_KEYWORDS=Palavras-chave do portlet +COMMON_PORTLET_LOCALES=L\u00EDnguas do portlet +COMMON_PORTLET_INSTANCE_DISPLAY_NAMES=Nomes de exibi\u00E7\u00E3o da Inst\u00E2ncia do Portlet +COMMON_ADD_INSTANCE_DISPLAY_NAMES=Adicionar Nome de Exibi\u00E7\u00E3o para Inst\u00E2ncia +COMMON_CURRENT_INSTANCE_DISPLAY_NAMES=Nome de Exibi\u00E7\u00E3o Atual para Inst\u00E2ncia +COMMON_CANCEL=Cancelar +COMMON_UPDATE=Atualizar +COMMON_ADD=Adicionar +COMMON_ADD_PROPERTY_BUTTON=Adicionar Propriedade +COMMON_UP=Cima +COMMON_DOWN=Baixo +COMMON_NEW_VALUE=Novo valor +COMMON_APPEND=Adicionar +COMMON_LOCALE=Nacionalidade +COMMON_DISPLAY_NAME=Nome de Exibi\u00E7\u00E3o +COMMON_MEDIA_TYPES=Tipos de M\u00EDdia +COMMON_WINDOW_STATES=Estados da Janela +COMMON_PORTLET_MODES=Modos do Portlet +COMMON_PREFERENCES=Prefer\u00EAncias +COMMON_PUBLIC_RENDER_PARAMETERS=Par\u00E2metros de Renderiza\u00E7\u00E3o P\u00FAblicos +COMMON_ID=Id +COMMON_TITLE=T\u00EDtulo +COMMON_KEYWORDS=Palavras-chave +COMMON_LOCALES=Nacionalidades +COMMON_TRANSPORT_GUARANTEES=Garantias de Transporte +COMMON_CACHE_EXPIRATION=Expira\u00E7\u00E3o de Cache +COMMON_SECONDS=segundos +COMMON_PUBLIC_NAVIGATION_PARAMETERS=Par\u00E2metros de Navega\u00E7\u00E3o P\u00FAblicos +COMMON_CONSUMED_EVENTS=Eventos Consumidos +COMMON_PRODUCED_EVENTS=Eventos Produzidos + +DASHBOARD_PERSONAL_EDITOR=Editor do Meu Portal +DASHBOARD_CREATE_NEW_PAGE=Criar uma P\u00E1gina Nova +DASHBOARD_CREATE_PAGE=Nome da p\u00E1gina +DASHBOARD_RENAME_THIS_PAGE=Renomear essa P\u00E1gina +DASHBOARD_NEW_PAGE_NAME=Novo nome de p\u00E1gina +DASHBOARD_USE_PAGE_MANAGE_CONTENT_APPEARANCE=Utilize esta p\u00E1gina para gerenciar o conte\u00FAdo e a apar\u00EAncia das p\u00E1ginas do Meu Portal +DASHBOARD_YOU_CAN_CONTROL_TITLES_COLUMN_THEMES=Voc\u00EA pode controlar os t\u00EDtulos das p\u00E1ginas, layouts da colunas, p\u00E1gina de temas, e acrescentar, ordenar ou remover portlets +DASHBOARD_CURRENTLY_EDITING_PAGE=Editando p\u00E1gina +DASHBOARD_THEME_AND_LAYOUT=Tema e Layout +DASHBOARD_APPLY_THEME=Aplicar um tema para o Meu Portal, ou selecione o n\u00FAmero de colunas para o layout +DASHBOARD_CHOOSE_LAYOUT=Escolha um layout +DASHBOARD_CHOOSE_THEME=Escolha um tema +DASHBOARD_CANNOT_UNDO_ACTION=Voc\u00EA n\u00E3o pode desfazer esta a\u00E7\u00E3o +DASHBOARD_DELETE_THIS_PAGE=Excluir essa P\u00E1gina +DASHBOARD_SAVE=Gravar +DASHBOARD_SELECT=Selecionar + +WIZARD_ADDING_NEW_PORTLET=Adicionando um novo portlet +WIZARD_STEP=Passo +WIZARD_SELECT_PORTLET=Selecione o portlet +WIZARD_SELECT_PORTAL=Selecione o Portal +WIZARD_SELECT_PAGE=Selecione a P\u00E1gina +WIZARD_SELECT_REGION=Selecione a Regi\u00E3o +WIZARD_CONFIRM=Confirmar +WIZARD_CONTENT=Conte\u00FAdo +WIZARD_SWITCH_ADVANCED_MODE=Alternar para o modo avan\u00E7ado +WIZARD_PORTLET=Portlet +WIZARD_PORTAL=Portal +WIZARD_PAGE=P\u00E1gina +WIZARD_REGION=Regi\u00E3o +WIZARD_PREVIOUS=Anterior +WIZARD_NEXT=Pr\u00F3ximo +WIZARD_SUB_PAGES=Sub-P\u00E1ginas +WIZARD_PORTLET_PROVIDER=Fornecedor de portlet +WIZARD_CHANGE=Mudar + +DISPLAY_THE_DEFAULT_ERROR_MESSAGE=Exibir mensagem de erro padr\u00E3o +REDIRECT_TO_THE_SPECIFIED_RESOURCE=Redirecionar para o recurso especificado +REMOVE_THE_RESOURCE_FROM_PAGE=Remover o recurso da p\u00E1gina + +THEME_LAYOUT_ID_NAME=Id do layout +THEME_LAYOUT_ID_DESCRIPTION=O valor do layout formata a p\u00E1gina +THEME_THEME_ID_NAME=Id do tema +THEME_THEME_ID_DESCRIPTION=O valor do tema define a apar\u00EAncia da p\u00E1gina +THEME_RENDER_SET_ID_NAME=Id do renderset +THEME_RENDER_SET_ID_DESCRIPTION=O id do renderset +THEME_RENDER_REGION_ID_NAME=Id da regi\u00E3o +THEME_RENDER_REGION_ID_DESCRIPTION=A regi\u00E3o que ser\u00E1 a janela +THEME_RENDER_REGION_ORDER_NAME=Ordem da regi\u00E3o +THEME_RENDER_REGION_ORDER_DESCRIPTION=A ordem vertical ou horizontal da janela dentro de uma regi\u00E3o +AJAX_PARTIAL_REFRESH_NAME=Atualiza\u00E7\u00E3o parcial +AJAX_PARTIAL_REFRESH_DESCRIPTION=Permitir atualiza\u00E7\u00E3o parcial de portlets +AJAX_DND_NAME=Arrastar e soltar +AJAX_DND_DESCRIPTION=Ativar arrastar e soltar para janelas +WINDOW_CONTENT_TYPE_NAME=Tipo de conte\u00FAdo +WINDOW_CONTENT_TYPE_DESCRIPTION=O tipo de conte\u00FAdo de uma janela +DEFAULT_CHILD_NAME_NAME=Nome padr\u00E3o para o filho +DEFAULT_CHILD_NAME_DESCRIPTION=O nome filho \u00E9 utilizado quando nenhum nome espec\u00EDfico para o filho \u00E9 especificado +TAB_ORDER_NAME=Ordem da aba +TAB_ORDER_DESCRIPTION=A valor de ordena\u00E7\u00E3o para exibir p\u00E1ginas em abas +INITIAL_WINDOW_STATE_NAME=Modo Inicial +INITIAL_WINDOW_STATE_DESCRIPTION=O modo inicial da janela +CONTROL_POLICY_PAGE_ACCESS_DENIED_NAME=Quando o acesso \u00E0 janela \u00E9 negado +CONTROL_POLICY_PAGE_ACCESS_DENIED_DESCRIPTION=Quando o acesso \u00E0 janela \u00E9 negado +CONTROL_POLICY_PAGE_UNAVAILABLE_NAME=Quando a janela est\u00E1 indispon\u00EDvel +CONTROL_POLICY_PAGE_UNAVAILABLE_DESCRIPTION=Quando a janela est\u00E1 indispon\u00EDvel +CONTROL_POLICY_PAGE_ERROR_NAME=Quando h\u00E1 um erro na janela +CONTROL_POLICY_PAGE_ERROR_DESCRIPTION=Quando h\u00E1 um erro na janela +CONTROL_POLICY_PAGE_INTERNAL_ERROR_NAME=Quando h\u00E1 um erro dentro da janela +CONTROL_POLICY_PAGE_INTERNAL_ERROR_DESCRIPTION=Quando h\u00E1 um erro dentro da janela +CONTROL_POLICY_PAGE_NOT_FOUND_NAME=Quando a janela n\u00E3o for encontrada +CONTROL_POLICY_PAGE_NOT_FOUND_DESCRIPTION=Quando a janela n\u00E3o for encontrada +CONTROL_POLICY_PAGE_RESOURCE_URI_NAME=Quando ocorrer um erro, redirecionar para este recurso +CONTROL_POLICY_PAGE_RESOURCE_URI_DESCRIPTION=Quando ocorrer um erro, redirecionar para este recurso +CONTROL_POLICY_PORTAL_ACCESS_DENIED_NAME=Quando o acesso \u00E0 p\u00E1gina \u00E9 negado +CONTROL_POLICY_PORTAL_ACCESS_DENIED_DESCRIPTION=Quando o acesso \u00E0 p\u00E1gina \u00E9 negado +CONTROL_POLICY_PORTAL_UNAVAILABLE_NAME=Quando a p\u00E1gina n\u00E3o est\u00E1 dispon\u00EDvel +CONTROL_POLICY_PORTAL_UNAVAILABLE_DESCRIPTION=Quando a p\u00E1gina n\u00E3o est\u00E1 dispon\u00EDvel +CONTROL_POLICY_PORTAL_ERROR_NAME=When there is an error on the page +CONTROL_POLICY_PORTAL_ERROR_DESCRIPTION=Quando h\u00E1 um erro na p\u00E1gina +CONTROL_POLICY_PORTAL_INTERNAL_ERROR_NAME=Quando h\u00E1 um erro dentro da p\u00E1gina +CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DESCRIPTION=Quando h\u00E1 um erro dentro da p\u00E1gina +CONTROL_POLICY_PORTAL_NOT_FOUND_NAME=Quando a p\u00E1gina n\u00E3o for encontrada +CONTROL_POLICY_PORTAL_NOT_FOUND_DESCRIPTION=Quando a p\u00E1gina n\u00E3o for encontrada +CONTROL_POLICY_PORTAL_RESOURCE_URI_NAME=Quando ocorrer um erro, redirecionar para este recurso +CONTROL_POLICY_PORTAL_RESOURCE_URI_DESCRIPTION=Quando ocorrer um erro, redirecionar para este recurso + +NO_BOUND_LISTENER=nenhum listener vinculado + +COORDINATION_COORDINATION=Coordena\u00E7\u00E3o +COORDINATION_PARAMETER_BINDINGS=Parameter bindings +COORDINATION_PARAMETER_EXPLICIT_MODE=Use explicit parameter binding +COORDINATION_PARAMETER_MANAGE_EXISTING=Manage existing parameter bindings: +COORDINATION_PARAMETER_EXISTING_NONE=No existing parameter bindings. +COORDINATION_PARAMETER_EXISTING_NAME=Nome +COORDINATION_PARAMETER_EXISTING_PAIRS=Window / parameter pairs +COORDINATION_PARAMETER_EXISTING_ACTIONS=A\u00E7\u00F5es +COORDINATION_PARAMETER_CREATE=Criar um novo par\u00E2metro de binding\: +COORDINATION_PARAMETER_CREATE_NO_PAIRS=Nenhum par\u00E2metro p\u00FAblico de renderiza\u00E7\u00E3o. N\u00E3o \u00E9 poss\u00EDvel criar novo par\u00E2metro de bindings. +COORDINATION_PARAMETER_CREATE_STEP1=1. Selecione par\u00E2metro p\u00FAblico / window pairs\: +COORDINATION_PARAMETER_CREATE_STEP2=2. Nome do par\u00E2metro de binding\: +COORDINATION_PARAMETER_CREATE_CREATE=Criar binding + +COORDINATION_WINDOWS=Janelas + +COORDINATION_ALIAS_BINDINGS=Alias bindings +COORDINATION_ALIAS_MANAGE_EXISTING=Manage existing alias bindings: +COORDINATION_ALIAS_EXISTING_NONE=No existing alias bindings. +COORDINATION_ALIAS_EXISTING_NAME=Nome +COORDINATION_ALIAS_EXISTING_ORIGINAL=QName Original +COORDINATION_ALIAS_EXISTING_ACTIONS=A\u00E7\u00F5es +COORDINATION_ALIAS_CREATE=Create new alias binding: +COORDINATION_ALIAS_CREATE_NO_PARAMS=No available public render parameters. Cannot create new alias bindings. +COORDINATION_ALIAS_CREATE_STEP1=1. Select public render parameter: +COORDINATION_ALIAS_CREATE_STEP2=2. Name alias binding: +COORDINATION_ALIAS_CREATE_CREATE=Criar alias + +COORDINATION_EVENT_WIRINGS=Event wirings +COORDINATION_EVENT_EXPLICIT_MODE=Use explicit event wiring +COORDINATION_EVENT_MANAGE_EXISTING=Manage existing event wirings: +COORDINATION_EVENT_EXISTING_NONE=No existing event wirings. +COORDINATION_EVENT_EXISTING_NAME=Nome +COORDINATION_EVENT_EXISTING_SOURCE_WINDOWS=Source windows +COORDINATION_EVENT_EXISTING_SOURCE_EVENTS=Source events +COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS=Destination events +COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS=Destination windows +COORDINATION_EVENT_EXISTING_ACTIONS=A\u00E7\u00F5es +COORDINATION_EVENT_CREATE=Create new event wiring: +COORDINATION_EVENT_CREATE_NO_EVENTS=No available events. Cannot create new event wirings. +COORDINATION_EVENT_CREATE_STEP1=1. Select source event: +COORDINATION_EVENT_CREATE_STEP2=2. Select source windows producing event: +COORDINATION_EVENT_CREATE_STEP3=3. Select destination event: +COORDINATION_EVENT_CREATE_STEP4=4. Select destination windows consuming event: +COORDINATION_EVENT_CREATE_STEP5=5. Name wiring: +COORDINATION_EVENT_CREATE_CREATE=Create wiring +COORDINATION_EVENT_CREATE_PREVIEW=New event wiring preview: +COORDINATION_EVENT_CREATE_PREVIEW_STEP1=You have selected the following source event: +COORDINATION_EVENT_CREATE_PREVIEW_STEP2=triggered by the following source windows: +COORDINATION_EVENT_CREATE_PREVIEW_STEP3=The produced window events will be wired to the following destination event: +COORDINATION_EVENT_CREATE_PREVIEW_STEP4=for the following destination windows: + +COORDINATION_WIRING=event wiring +COORDINATION_PARAMETER=parameter binding +COORDINATION_ALIAS=alias binding + +INVALID_NAME_ERROR=''{0}'' \u00E9 um nome de {1} inv\u00E1lido\: N\u00E3o pode ser nulo, vazio, ou que contenha '\\' ou '%5c' +NO_SELECTED_PORTLET_ERROR=Nenhum portlet foi selecionado! +DUPLICATE_ERROR=O {1} chamado ''{0}'' j\u00E1 existe\! +bean_support_unexpected_error=Erro inesperado: +bean_support_cause=Causa: + +INSTANCE_TYPE=inst\u00E2ncia +PAGE_TYPE=p\u00E1gina +PORTAL_TYPE=portal +DISPLAY_NAME_TYPE=nomes de exibi\u00E7\u00E3o +PROPERTY_TYPE=propriedade +PORTAL_OBJECT_TYPE=objeto do portal +WINDOW_TYPE=janela Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2009-03-06 23:20:57 UTC (rev 12969) @@ -1,24 +1,24 @@ <?xml version="1.0"?>  @@ -29,7 +29,7 @@ <application> <view-handler> - org.jboss.portletbridge.application.PortletViewHandler + org.jboss.portletbridge.application.PortletViewHandler </view-handler> <state-manager>org.jboss.portletbridge.application.PortletStateManager</state-manager> <message-bundle>Resource</message-bundle> @@ -38,6 +38,7 @@ <default-locale>en</default-locale> <supported-locale>it</supported-locale> <supported-locale>de</supported-locale> + <supported-locale>ja</supported-locale> </locale-config> </application> @@ -111,6 +112,11 @@ <property-name>portalObjectManager</property-name> <value>#{sessionScope.portalobjectmgr}</value> </managed-property> + <managed-property> + <property-name>beanContext</property-name> + <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <value>#{beanContext}</value> + </managed-property> </managed-bean> <managed-bean> <managed-bean-name>addPageAction</managed-bean-name> @@ -128,6 +134,11 @@ <property-name>listener</property-name> <value>#{sessionScope.dashboard}</value> </managed-property> + <managed-property> + <property-name>beanContext</property-name> + <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <value>#{beanContext}</value> + </managed-property> </managed-bean> <managed-bean> <managed-bean-name>assignContentToWindowAction</managed-bean-name> @@ -265,13 +276,17 @@ <property-name>instanceManager</property-name> <value>#{sessionScope.instancemgr}</value> </managed-property> + <managed-property> + <property-name>beanContext</property-name> + <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <value>#{beanContext}</value> + </managed-property> </managed-bean> -  + | Dashboard beans + --> <managed-bean> <managed-bean-name>dashboard</managed-bean-name> @@ -310,6 +325,11 @@ <property-name>listener</property-name> <value>#{sessionScope.dashboard}</value> </managed-property> + <managed-property> + <property-name>beanContext</property-name> + <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <value>#{beanContext}</value> + </managed-property> </managed-bean> <managed-bean> @@ -317,7 +337,7 @@ <managed-bean-class>org.jboss.portal.core.admin.ui.actions.RenameAction</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> <managed-property> - <property-name>pageContainer</property-name> + <property-name>renamedObject</property-name> <value>#{portalobjectmgr.selectedObject}</value> </managed-property> <managed-property> @@ -328,6 +348,11 @@ <property-name>domainConfigurator</property-name> <value>#{applicationScope.AuthorizationDomainRegistry.portalobject.configurator}</value> </managed-property> + <managed-property> + <property-name>beanContext</property-name> + <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <value>#{beanContext}</value> + </managed-property> </managed-bean> <managed-bean> @@ -335,9 +360,14 @@ <managed-bean-class>org.jboss.portal.core.admin.ui.actions.PortalObjectDisplayNameAction</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> <managed-property> - <property-name>bean</property-name> + <property-name>managerBean</property-name> <value>#{portalobjectmgr}</value> </managed-property> + <managed-property> + <property-name>beanContext</property-name> + <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <value>#{beanContext}</value> + </managed-property> </managed-bean> <managed-bean> @@ -345,9 +375,14 @@ <managed-bean-class>org.jboss.portal.core.admin.ui.actions.PortalInstanceDisplayNameAction</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> <managed-property> - <property-name>instanceManager</property-name> + <property-name>managerBean</property-name> <value>#{sessionScope.instancemgr}</value> </managed-property> + <managed-property> + <property-name>beanContext</property-name> + <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <value>#{beanContext}</value> + </managed-property> </managed-bean> <managed-bean> @@ -355,7 +390,7 @@ <managed-bean-class>org.jboss.portal.core.admin.ui.actions.RenameAction</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> <managed-property> - <property-name>pageContainer</property-name> + <property-name>renamedObject</property-name> <value>#{dashboard.selectedPage}</value> </managed-property> <managed-property> @@ -366,6 +401,11 @@ <property-name>domainConfigurator</property-name> <value>#{applicationScope.AuthorizationDomainRegistry.portalobject.configurator}</value> </managed-property> + <managed-property> + <property-name>beanContext</property-name> + <property-class>org.jboss.portal.faces.gui.BeanContext</property-class> + <value>#{beanContext}</value> + </managed-property> </managed-bean>  @@ -598,7 +638,7 @@ <component-type>org.jboss.portal.Portlet</component-type> <component-class>org.jboss.portal.faces.component.portlet.UIPortlet</component-class> </component> - + <render-kit> <renderer> <component-family>javax.faces.Input</component-family> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 2009-03-06 23:20:57 UTC (rev 12969) @@ -35,9 +35,6 @@ <trans-attribute>Required</trans-attribute> </transaction> <header-content> - <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript" ></script> - <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript" ></script> - <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss" /> <link rel="stylesheet" type="text/css" href="/css/style.css" media="screen"/> <link rel="stylesheet" type="text/css" href="/css/boxes.css"/> </header-content> @@ -57,9 +54,6 @@ <trans-attribute>Required</trans-attribute> </transaction> <header-content> - <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript" ></script> - <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript" ></script> - <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss" /> <link rel="stylesheet" type="text/css" href="/css/style.css" media="screen"/> </header-content> <portlet-info> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2009-03-06 23:20:57 UTC (rev 12969) @@ -1,24 +1,24 @@ <?xml version="1.0"?>  @@ -29,85 +29,63 @@ version="2.4"> <context-param> - <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> - <param-value>org.jboss.portletbridge.application.FaceletPortletViewHandler</param-value> - </context-param> + <param-name>javax.portlet.faces.renderPolicy</param-name> + <param-value>ALWAYS_DELEGATE</param-value> + </context-param> - <context-param> - <param-name>javax.portlet.faces.renderPolicy</param-name> - <param-value>ALWAYS_DELEGATE</param-value> - </context-param> - - <context-param> - <param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name> - <param-value>rfRes</param-value> - </context-param> - - <context-param> - <param-name>org.richfaces.LoadStyleStrategy</param-name> - <param-value>NONE</param-value> - </context-param> - - <context-param> - <param-name>org.richfaces.LoadScriptStrategy</param-name> - <param-value>NONE</param-value> - </context-param> - - <context-param> - <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> - <param-value>false</param-value> - </context-param> - -  - <context-param> - <param-name>facelets.BUILD_BEFORE_RESTORE</param-name> - <param-value>true</param-value> - </context-param> - -  <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> - <context-param> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>true</param-value> - </context-param> + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>false</param-value> + </context-param> <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + + <context-param> <param-name>facelets.LIBRARIES</param-name> <param-value>/WEB-INF/portal.taglib.xml</param-value> </context-param> - <filter> - <display-name>Ajax4jsf Filter</display-name> - <filter-name>ajax4jsf</filter-name> - <filter-class>org.ajax4jsf.Filter</filter-class> - </filter> - <filter-mapping> - <filter-name>ajax4jsf</filter-name> - <servlet-name>FacesServlet</servlet-name> - <dispatcher>FORWARD</dispatcher> - <dispatcher>REQUEST</dispatcher> - <dispatcher>INCLUDE</dispatcher> - </filter-mapping> +  +  +  - <servlet> - <servlet-name>FacesServlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> + <error-page> + <exception-type>javax.servlet.ServletException</exception-type> + <location>/faces/jsf/error.xhtml</location> + </error-page> + <error-page> + <exception-type>javax.faces.application.ViewExpiredException</exception-type> + <location>/jsf/error.xhtml</location> + </error-page> - <servlet-mapping> - <servlet-name>FacesServlet</servlet-name> - <url-pattern>/faces/*</url-pattern> - </servlet-mapping> + <error-page> + <exception-type>javax.faces.FacesException</exception-type> + <location>/jsf/error.xhtml</location> + </error-page> - <session-config> - <session-timeout>10</session-timeout> - </session-config> + <servlet> + <servlet-name>FacesServlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>FacesServlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + </servlet-mapping> + + <session-config> + <session-timeout>10</session-timeout> + </session-config> + </web-app> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -24,7 +24,7 @@ <h:form id="windowForm"> <label for="windowName"> <span class="portlet-form-field-label admin-label">#{bundle.COMMON_WINDOW_NAME}:</span> - <h:inputText id="windowName" value="#{pageManager.windowName}" + <h:inputText id="windowName" binding="#{pageManager.windowName}" styleClass="portlet-form-input-field id-window-name"/> </label> <h:message for="windowName" errorClass="portlet-msg-error"/> @@ -56,7 +56,7 @@ initialMode="edit_content" initialWindowState="normal" renderParameters="#{pageManager.selectedRenderParameters}" - onClick="url.setParameter('windowName', document.getElementById(document.getElementById('namespaceHolder').value + ':windowForm:windowName').value);"/> + onClick="url.setParameter('windowName', document.getElementById(document.getElementById('namespaceHolder').value).value);"/> <input type="hidden" value="#{pageManager.namespace}" id="namespaceHolder"/> </td> </tr> @@ -86,7 +86,7 @@ <tr> <td valign="top"> <h:commandButton - onclick="document.getElementById('blah').value=document.getElementById('#{pageManager.namespace}:windowForm:windowName').value" + onclick="document.getElementById('blah').value=document.getElementById('#{pageManager.namespace}').value" value="#{bundle.COMMON_ADD}" id="a_#{regionName}" actionListener="#{pageManager.assignWindows}" styleClass="portlet-form-button layout-button"/> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -52,6 +52,7 @@ <td> <h:inputText id="property" styleClass="portlet-form-input-field" value="#{properties.action.otherPropertyName}"/> + <h:message for="property" errorClass="portlet-msg-error"/> </td> </tr> </tbody> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -1,46 +1,69 @@ -<div xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" + + +<div xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> <h:form id="common-edit-theme-form"> <table class="full-width datatable"> <thead class="portlet-section-header"> - <tr> - <th>#{bundle.COMMON_NAME}</th> - <th>#{bundle.COMMON_DESCRIPTION}</th> - <th>#{bundle.COMMON_SETTING}</th> - </tr> + <tr> + <th>#{bundle.COMMON_NAME}</th> + <th>#{bundle.COMMON_DESCRIPTION}</th> + <th>#{bundle.COMMON_SETTING}</th> + </tr> </thead> <tbody> - <tr class="portlet-section-body"> - <td>#{bundle.COMMON_LAYOUT}</td> - <td>#{bundle.COMMON_NAME_LAYOUT_IMPLEMENTATION}</td> - <td> - <h:selectOneMenu id="layout" value="#{theme.layoutName}"> - <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-alternate"> - <td>#{bundle.COMMON_THEME}</td> - <td>#{bundle.COMMON_NAME_LOOK_AND_FEEL}</td> - <td> - <h:selectOneMenu id="theme" value="#{theme.themeName}"> - <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-body"> - <td>#{bundle.COMMON_RENDERSET}</td> - <td>#{bundle.COMMON_NAME_RENDER_ENGINE_PAGES}</td> - <td> - <h:selectOneMenu id="renderSet" value="#{theme.renderSetName}"> - <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> - </h:selectOneMenu> - </td> - </tr> + <tr class="portlet-section-body"> + <td>#{bundle.COMMON_LAYOUT}</td> + <td>#{bundle.COMMON_NAME_LAYOUT_IMPLEMENTATION}</td> + <td> + <h:selectOneMenu id="layout" value="#{theme.layoutName}"> + <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr class="portlet-section-alternate"> + <td>#{bundle.COMMON_THEME}</td> + <td>#{bundle.COMMON_NAME_LOOK_AND_FEEL}</td> + <td> + <h:selectOneMenu id="theme" value="#{theme.themeName}"> + <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr class="portlet-section-body"> + <td>#{bundle.COMMON_RENDERSET}</td> + <td>#{bundle.COMMON_NAME_RENDER_ENGINE_PAGES}</td> + <td> + <h:selectOneMenu id="renderSet" value="#{theme.renderSetName}"> + <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> + </h:selectOneMenu> + </td> + </tr> </tbody> </table> - <br /> + <br/> <ui:insert name="form_submit"/> </h:form> </div> \ No newline at end of file Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -2,8 +2,6 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich" xmlns:portal="http://www.jboss.org/portal"> <div class="details-container"> @@ -125,69 +123,68 @@ <div class="half-width float-right details-right-col"> -<f:subview rendered="#{showDisplayNameEditor}"> +<f:subview rendered="#{showDisplayNameEditor}" id="display-names-view"> <div class="whiteWithLtGreyHeader meta-box"> <h3 class="blue">#{bundle.COMMON_ADD_INSTANCE_DISPLAY_NAMES}</h3> <div class="pad5"> - <h:form id="add-display-name-form" style="background-color:transparent;width:100%;margin:0;padding:0;display:inline;"> - <h:inputText id="newName" value="#{instanceDisplayNameAction.newText}" required="true"/> - <h:selectOneMenu id="locales" value="#{instanceDisplayNameAction.newLocale}"> - <f:selectItems value="#{instanceDisplayNameAction.locales}"/> - </h:selectOneMenu> - <h:commandButton id="addDisplay" value="#{instanceDisplayNameAction.newText ne null ? 'Modify' : 'Add'} Name" - action="#{instanceDisplayNameAction.addDisplayName}" - styleClass="portlet-form-button"/> - </h:form> + <h:form id="add-display-name-form" style="background-color:transparent;width:100%;margin:0;padding:0;display:inline;"> + <h:inputText id="newName" value="#{instanceDisplayNameAction.newText}" required="true"/> + <h:message for="newName" errorClass="portlet-msg-error"/> + <h:selectOneMenu id="locales" value="#{instanceDisplayNameAction.newLocale}"> + <f:selectItems value="#{instanceDisplayNameAction.locales}"/> + </h:selectOneMenu> + <h:commandButton id="addDisplay" value="#{instanceDisplayNameAction.newText ne null ? 'Modify' : 'Add'} Name" + action="#{instanceDisplayNameAction.addDisplayName}" styleClass="portlet-form-button"/> + </h:form> </div> <br/> <h3 class="blue">#{bundle.COMMON_CURRENT_INSTANCE_DISPLAY_NAMES}</h3> <div class="pad5"> + <h:form id="instance-display-form" style="display:inline;width:100%;"> + <h:dataTable id="locale-datatable" var="value" value="#{instanceDisplayNameAction.currentLocales}" + styleClass="objectList datatable" + rowClasses="portlet-section-body,portlet-section-alternate-blue" + columnClasses="objectNameColumn, objectActionColumn" + headerClass="portlet-section-header"> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.COMMON_LOCALE}"/> + </f:facet> + #{value.localeDisplayName} + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.COMMON_DISPLAY_NAME}"/> + </f:facet> + #{value.text} + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.COMMON_DELETE}"/> + </f:facet> - <h:form id="instance-display-form" style="display:inline;width:100%;"> - <h:dataTable id="locale-datatable" var="value" value="#{instanceDisplayNameAction.currentLocales}" - styleClass="objectList datatable" - rowClasses="portlet-section-body,portlet-section-alternate-blue" - columnClasses="objectNameColumn, objectActionColumn" - headerClass="portlet-section-header"> - <h:column> - <f:facet name="header"> - <h:outputText value="#{bundle.COMMON_LOCALE}"/> - </f:facet> - #{value.localeDisplayName} - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{bundle.COMMON_DISPLAY_NAME}"/> - </f:facet> - #{value.text} - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{bundle.COMMON_DELETE}"/> - </f:facet> + <div><h:commandLink id="delete-link" action="#{instanceDisplayNameAction.editDisplayName}"> + <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> + <f:param name="locale" value="#{value.locale}"/> + <f:param name="editAction" value="delete"/> + </h:commandLink></div> + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.RENAME}"/> + </f:facet> - <div style="width:150px"><h:commandLink id="delete-link" action="#{instanceDisplayNameAction.editDisplayName}"> - <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> - <f:param name="locale" value="#{value.locale}"/> - <f:param name="editAction" value="delete"/> - </h:commandLink></div> - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{bundle.RENAME}"/> - </f:facet> - - <div style="width:150px"> - <h:commandLink id="edit-link" action="#{instanceDisplayNameAction.editDisplayName}"> - <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> - <f:param name="locale" value="#{value.locale}"/> - <f:param name="editAction" value="rename"/> - </h:commandLink></div> - </h:column> - </h:dataTable> - </h:form> + <div style="width:150px"> + <h:commandLink id="edit-link" action="#{instanceDisplayNameAction.editDisplayName}"> + <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> + <f:param name="locale" value="#{value.locale}"/> + <f:param name="editAction" value="rename"/> + </h:commandLink></div> + </h:column> + </h:dataTable> + </h:form> </div> </div> @@ -209,7 +206,7 @@ </c:forEach> </dl> </portal:box> - <portal:box class="whiteWithLtGreyHeader meta-box"> +<portal:box class="whiteWithLtGreyHeader meta-box"> <h3>#{bundle.COMMON_CONSUMED_EVENTS}</h3> <dl> <c:forEach var="consumedEvent" items="#{portlet.consumedEvents}"> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -8,8 +8,8 @@ <ui:param name="portalObjectScreen" value="#{bundle.DISPLAY_NAMES}"/> <ui:define name="content"> - <br/><br/> - <div class="float-left third-width-pad5"> + <br/> + <div class="float-left third-width"> <h:form id="display-name-form"> <h3 class="sectionTitle zero">#{bundle.ADD_DISPLAY_NAMES}</h3> @@ -24,7 +24,7 @@ </h:form> </div> - <div class="float-left two-third-width-pad5"> + <div class="float-right two-third-width"> <h:form id="display-name-form1"> <h3 class="sectionTitle zero">#{bundle.CURRENT_DISPLAY_NAMES}</h3> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -5,19 +5,26 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:pfc="http://www.jboss.com/portal/facelet/common" - xmlns:c="http://java.sun.com/jstl/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> + xmlns:c="http://java.sun.com/jstl/core"> <ui:param name="portalObjectScreen" value="#{bundle.COORDINATION_COORDINATION}"/> <ui:define name="content"> <script type="text/javascript">  @@ -26,14 +33,17 @@ <br/>  - <div class="tenpx-top-bottom"> - <h2 class="portlet-area-header" onclick="toggle_visibility('aliasBindings');" style="cursor: pointer"><a name="#{bundle.COORDINATION_ALIAS_BINDINGS}"/>#{bundle.COORDINATION_ALIAS_BINDINGS}</h2> + <div class="tenpx-top"> + <h2 class="portlet-area-header" onclick="toggle_visibility('aliasBindings');" style="cursor: pointer"> + <img id="aliasBindingsDisc" src="/portal-admin/img/minus.gif" alt="-"/> + <a name="#{bundle.COORDINATION_ALIAS_BINDINGS}"/>#{bundle.COORDINATION_ALIAS_BINDINGS} + </h2>  - <div id="aliasBindings"> - <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_ALIAS_CREATE}</h3> + <div id="aliasBindings" class="coordination-section"> + <h3 class="sectionTitle tenpx-bottom" style="margin-top: 3px;">#{bundle.COORDINATION_ALIAS_CREATE}</h3> <h:outputText value="#{bundle.COORDINATION_ALIAS_CREATE_NO_PARAMS}" rendered="#{empty aliasManager.availableRenderParameters}"/> - <h:form rendered="#{!empty aliasManager.availableRenderParameters}"> + <h:form rendered="#{!empty aliasManager.availableRenderParameters}" id="create-alias-form"> <div class="float-left tenpx-right"> <h4>#{bundle.COORDINATION_ALIAS_CREATE_STEP1}</h4> <h:selectManyListbox id="alias" size="5" value="#{aliasManager.originalQNames}" @@ -45,8 +55,11 @@ <h:panelGroup rendered="#{!empty aliasManager.originalQNames}"> <h4>#{bundle.COORDINATION_ALIAS_CREATE_STEP2}</h4> <div class="full-width"> - <span><h:inputText id="aliasName" value="#{aliasManager.aliasName}"/></span> <span> + <h:inputText id="aliasName" value="#{aliasManager.aliasName}"/> + <h:message for="aliasName" errorClass="portlet-msg-error"/> + </span> + <span> <h:commandButton value="#{bundle.COORDINATION_ALIAS_CREATE_CREATE}" action="#{aliasManager.create}" styleClass="portlet-form-button"/> <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{aliasManager.cancel}" @@ -108,10 +121,15 @@ </div> </div> + <br/> +  <div class="tenpx-top-bottom"> - <h2 class="portlet-area-header" onclick="toggle_visibility('parameterBindings');" style="cursor: pointer"><a name="#{bundle.COORDINATION_PARAMETER_BINDINGS}"/>#{bundle.COORDINATION_PARAMETER_BINDINGS}</h2> - <div id="parameterBindings"> + <h2 class="portlet-area-header" onclick="toggle_visibility('parameterBindings');" style="cursor: pointer"> + <img id="parameterBindingsDisc" src="/portal-admin/img/minus.gif" alt="-"/> + <a name="#{bundle.COORDINATION_PARAMETER_BINDINGS}"/>#{bundle.COORDINATION_PARAMETER_BINDINGS} + </h2> + <div id="parameterBindings" class="coordination-section"> <h:form> <h:selectBooleanCheckbox id="useExplicitBinding" value="#{coordinationManager.explicitParametersUsed}" onchange="this.form.submit()" immediate="true"/> @@ -123,7 +141,7 @@  <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_PARAMETER_CREATE}</h3> <h:outputText value="#{bundle.COORDINATION_PARAMETER_CREATE_NO_PAIRS}" rendered="#{empty parameterManager.availableParameterWindowPairs}"/> - <h:form rendered="#{!empty parameterManager.availableParameterWindowPairs}"> + <h:form rendered="#{!empty parameterManager.availableParameterWindowPairs}" id="create-binding-form"> <div class="float-left tenpx-right"> <h4>#{bundle.COORDINATION_PARAMETER_CREATE_STEP1}</h4> <h:selectManyListbox id="parameterWindowPair" size="5" value="#{parameterManager.selectedParameterWindowPairs}" @@ -136,8 +154,11 @@ <div class="float-left paramBinding-step2"> <h4>#{bundle.COORDINATION_PARAMETER_CREATE_STEP2}</h4> <div class="full-width"> - <span><h:inputText id="bindingName" value="#{parameterManager.windowBindingName}"/></span> <span> + <h:inputText id="bindingName" value="#{parameterManager.windowBindingName}"/> + <h:message for="bindingName" errorClass="portlet-msg-error"/> + </span> + <span> <h:commandButton value="#{bundle.COORDINATION_PARAMETER_CREATE_CREATE}" action="#{parameterManager.create}" styleClass="portlet-form-button"/> <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{parameterManager.cancel}" @@ -203,20 +224,25 @@ </div> </div> + <br/> +  - <h2 class="portlet-area-header" onclick="toggle_visibility('eventWirings');" style="cursor: pointer"><a name="#{bundle.COORDINATION_EVENT_WIRINGS}"/>#{bundle.COORDINATION_EVENT_WIRINGS}</h2> - <div id="eventWirings"> + <h2 class="portlet-area-header" onclick="toggle_visibility('eventWirings');" style="cursor: pointer"> + <img id="eventWiringsDisc" src="/portal-admin/img/minus.gif" alt="-"/> + <a name="#{bundle.COORDINATION_EVENT_WIRINGS}"/>#{bundle.COORDINATION_EVENT_WIRINGS} + </h2> + <div id="eventWirings" class="coordination-section"> <h:form> <h:selectBooleanCheckbox id="useExplicitEvents" value="#{coordinationManager.explicitEventsUsed}" onchange="this.form.submit()" immediate="true"/>#{bundle.COORDINATION_EVENT_EXPLICIT_MODE} </h:form> <hr/> - +  <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_CREATE}</h3> <h:outputText value="#{bundle.COORDINATION_EVENT_CREATE_NO_EVENTS}" rendered="#{empty eventManager.sourceEvents}"/> - <h:form rendered="#{!empty eventManager.sourceEvents}"> + <h:form rendered="#{!empty eventManager.sourceEvents}" id="create-wiring-form"> <div class="half-width float-left"> <div class="full-width pad5"> <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP1}</h4> @@ -298,6 +324,7 @@ <div class="margin10"> <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP5}</h4> <h:inputText id="wiringName" value="#{eventManager.wiringName}"/> + <h:message for="wiringName" errorClass="portlet-msg-error"/> <h:commandButton value="#{bundle.COORDINATION_EVENT_CREATE_CREATE}" action="#{eventManager.create}" styleClass="portlet-form-button"/> <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{eventManager.cancel}" Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -6,7 +6,8 @@ <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.SECURITY}"/> <ui:define name="content"> - <h3>#{bundle.SET_PAGE_PERMISSIONS}</h3> + <br/> + <p class="portlet-area-header">#{bundle.SET_PAGE_PERMISSIONS}</p> <ui:decorate template="/jsf/common/editSecurity.xhtml"> <ui:param name="auth" value="#{portalobjectmgr.auth}"/> </ui:decorate> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -6,7 +6,8 @@ <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.THEME}"/> <ui:define name="content"> - <h3>#{bundle.PAGE_THEME_PROPERTIES}</h3> + <br/> + <p class="portlet-area-header">#{bundle.PAGE_THEME_PROPERTIES}</p> <ui:decorate template="common/editTheme.xhtml"> <ui:param name="theme" value="#{portalobjectmgr.theme}"/> <ui:define name="form_submit"> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -6,7 +6,8 @@ <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.SECURITY}"/> <ui:define name="content"> - <h3>#{bundle.SET_PORTAL_PERMISSIONS}</h3> + <br/> + <p class="portlet-area-header">#{bundle.SET_PORTAL_PERMISSIONS}</p> <ui:decorate template="/jsf/common/editSecurity.xhtml"> <ui:param name="auth" value="#{portalobjectmgr.auth}"/> </ui:decorate> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -6,7 +6,8 @@ <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.THEME}"/> <ui:define name="content"> - <h3>#{bundle.PORTAL_THEME_PROPERTIES}</h3> + <br/> + <p class="portlet-area-header">#{bundle.PORTAL_THEME_PROPERTIES}</p> <p>#{bundle.SETTINGS_ARE_INHERITED_BY_ALL_PAGES}.</p> <br/> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -6,8 +6,9 @@ <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.SECURITY}"/> <ui:define name="content"> - <h3>#{bundle.SET_PERMISSIONS_FOR} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> - #{bundle.WINDOW_NO_CAP}</h3> + <br/> + <p class="portlet-area-header">#{bundle.SET_PERMISSIONS_FOR} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{bundle.WINDOW_NO_CAP}</p> <ui:include src="common/editSecurity.xhtml"/> </ui:define> </ui:composition> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -6,7 +6,8 @@ <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.THEME}"/> <ui:define name="content"> - <h3>#{bundle.WINDOW_THEME_PROPERTIES}</h3> + <br/> + <p class="portlet-area-header">#{bundle.WINDOW_THEME_PROPERTIES}</p> <ui:decorate template="common/editWindowTheme.xhtml"> <ui:param name="theme" value="#{portalobjectmgr.theme}"/> <ui:define name="form_submit"> Copied: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/error.xhtml (from rev 12964, branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/error.xhtml) =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/error.xhtml (rev 0) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/error.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -0,0 +1,7 @@ +<ui:composition + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> +  + </ui:composition> \ No newline at end of file Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -6,174 +6,187 @@ xmlns:jbp="http://www.jboss.com/portal" xmlns:c="http://java.sun.com/jstl/core"> -<ui:composition template="instancesTemplate.xhtml"> + <ui:composition template="instancesTemplate.xhtml"> -<ui:define name="content"> + <ui:define name="content"> -<c:if test="#{empty instancemgr.selectedPlugin}"> - <h:form id="instances-form"> - <ul class="pagination property-container"> - <c:if test="#{instancemgr.instanceCount > instancemgr.paginationSize}"> - <c:forEach begin="0" end="#{(instancemgr.instanceCount - 1)/ instancemgr.paginationSize}" step="1" - var="index"> - <li class="#{index == (instancemgr.selectedFrom / instancemgr.paginationSize)? 'selected' : ''}"> - <h:commandLink action="#{instancemgr.selectFrom}"> - <f:param name="from" value="#{index * instancemgr.paginationSize}"/> - <h:outputText value="#{index * instancemgr.paginationSize}"/> - </h:commandLink> - </li> - </c:forEach> + <c:if test="#{empty instancemgr.selectedPlugin}"> + <h:form id="instances-form"> + <ul class="pagination property-container"> + <c:if test="#{instancemgr.instanceCount > instancemgr.paginationSize}"> + <c:forEach begin="0" end="#{(instancemgr.instanceCount - 1)/ instancemgr.paginationSize}" step="1" + var="index"> + <li + class="#{index == (instancemgr.selectedFrom / instancemgr.paginationSize)? 'selected' : ''}"> + <h:commandLink action="#{instancemgr.selectFrom}"> + <f:param name="from" value="#{index * instancemgr.paginationSize}"/> + <h:outputText value="#{index * instancemgr.paginationSize}"/> + </h:commandLink> + </li> + </c:forEach> + </c:if> + </ul> + <table id="instancesTable2" class="portlet-def-table datatable"> + <thead class="portlet-section-header"> + <tr> + <th>#{bundle.INSTANCE_ID}</th> + <th>#{bundle.INSTANCE_NAME}</th> + <th>#{bundle.ACTIONS}</th> + </tr> + </thead> + <tbody> + <c:forEach items="#{instancemgr.selectedInstances}" var="instance" varStatus="status"> + <tr + class="#{instance.id == instancemgr.selectedId ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}"> + <td> + <img src="#{instance.portlet.smallIconLocation}" alt="icon" align="middle" + style="margin:0 4px 0 0"/> + <h:commandLink id="instance-#{status.index}" + action="#{instancemgr.selectInstance}"> + <h:outputText value="#{instance.id}"/> + <f:param name="id" value="#{instance.id}"/> + <f:param name="plugin" value="info"/> + </h:commandLink> + </td> + <td> + <h:outputText value="#{instance.displayName}"/> + </td> + <td> + <h:panelGrid columns="7" cellpadding="0" cellspacing="0" border="0"> + <h:commandLink action="#{instancemgr.selectInstance}" styleClass="actionSecurity" + id="security-instance-#{status.index}"> + <f:param name="id" value="#{instance.id}"/> + <f:param name="plugin" value="security"/> + #{bundle.SECURITY} + </h:commandLink> + <h:commandLink rendered="#{! empty(instancemgr.selectedInstancesPrefs[instance.id])}" + id="preference-instance-#{status.index}" + action="#{instancemgr.selectInstance}" + styleClass="actionPreferences"> + <f:param name="id" value="#{instance.id}"/> + <f:param name="plugin" value="preferences"/> + #{bundle.PREFERENCES} + </h:commandLink> + <h:commandLink action="confirmDeleteInstance" + id="delete-instance-#{status.index}" + styleClass="actionDeleteInstance" + actionListener="#{instancemgr.selectInstance}"> + <f:param name="id" value="#{instance.id}"/> + #{bundle.COMMON_DELETE} + </h:commandLink> + </h:panelGrid> + </td> + </tr> + </c:forEach> + </tbody> + <tfoot class="portlet-section-header"> + <tr> + <th>#{bundle.INSTANCE_ID}</th> + <th>#{bundle.INSTANCE_NAME}</th> + <th>#{bundle.ACTIONS}</th> + </tr> + </tfoot> + </table> + <ul class="pagination property-container"> + <c:if test="#{instancemgr.instanceCount > instancemgr.paginationSize}"> + <c:forEach begin="0" end="#{(instancemgr.instanceCount - 1)/ instancemgr.paginationSize}" step="1" + var="index"> + <li + class="#{index == (instancemgr.selectedFrom / instancemgr.paginationSize)? 'selected' : ''}"> + <h:commandLink id="pagination-#{index}" action="#{instancemgr.selectFrom}"> + <f:param name="from" value="#{index * instancemgr.paginationSize}"/> + <h:outputText value="#{index * instancemgr.paginationSize}"/> + </h:commandLink> + </li> + </c:forEach> + </c:if> + </ul> + </h:form> </c:if> - </ul> - <table id="instancesTable2" class="portlet-def-table datatable"> - <thead class="portlet-section-header"> - <tr> - <th>#{bundle.INSTANCE_ID}</th> - <th>#{bundle.INSTANCE_NAME}</th> - <th>#{bundle.ACTIONS}</th> - </tr> - </thead> - <tbody> - <c:forEach items="#{instancemgr.selectedInstances}" var="instance" varStatus="status"> - <tr - class="#{instance.id == instancemgr.selectedId ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}"> - <td> - <img src="#{instance.portlet.smallIconLocation}" align="middle" style="margin:0 4px 0 0"/> - <h:commandLink id="#{instance.id}" action="#{instancemgr.selectInstance}"> - <h:outputText value="#{instance.id}"/> - <f:param name="id" value="#{instance.id}"/> - <f:param name="plugin" value="info"/> - </h:commandLink> - </td> - <td> - <h:outputText value="#{instance.displayName}"/> - </td> - <td> - <h:panelGrid columns="7" cellpadding="0" cellspacing="0" border="0"> - <h:commandLink action="#{instancemgr.selectInstance}" styleClass="actionSecurity" id="security-#{instance.id}"> - <f:param name="id" value="#{instance.id}"/> - <f:param name="plugin" value="security"/> - #{bundle.SECURITY} - </h:commandLink> - <h:commandLink rendered="#{! empty(instancemgr.selectedInstancesPrefs[instance.id])}" - id="preference-#{instance.id}" action="#{instancemgr.selectInstance}" styleClass="actionPreferences"> - <f:param name="id" value="#{instance.id}"/> - <f:param name="plugin" value="preferences"/> - #{bundle.PREFERENCES} - </h:commandLink> - <h:commandLink action="confirmDeleteInstance" id="delete-#{instance.id}" - styleClass="actionDeleteInstance" - actionListener="#{instancemgr.selectInstance}"> - <f:param name="id" value="#{instance.id}"/> - #{bundle.COMMON_DELETE} - </h:commandLink> - </h:panelGrid> - </td> - </tr> - </c:forEach> - </tbody> - <tfoot class="portlet-section-header"> - <tr> - <th>#{bundle.INSTANCE_ID}</th> - <th>#{bundle.INSTANCE_NAME}</th> - <th>#{bundle.ACTIONS}</th> - </tr> - </tfoot> - </table> - <ul class="pagination property-container"> - <c:if test="#{instancemgr.instanceCount > instancemgr.paginationSize}"> - <c:forEach begin="0" end="#{(instancemgr.instanceCount - 1)/ instancemgr.paginationSize}" step="1" - var="index"> - <li class="#{index == (instancemgr.selectedFrom / instancemgr.paginationSize)? 'selected' : ''}"> - <h:commandLink id="pagination-#{index}" action="#{instancemgr.selectFrom}"> - <f:param name="from" value="#{index * instancemgr.paginationSize}"/> - <h:outputText value="#{index * instancemgr.paginationSize}"/> - </h:commandLink> - </li> - </c:forEach> - </c:if> - </ul> - </h:form> -</c:if> -<c:if test="#{instancemgr.selectedPlugin == 'info'}"> -  - <h:form id="instance-form1"> - <ul class="objectpath"> - <li class="pathItem"> - <h:commandLink id="instance-link" action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink> - </li> - <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> - <li class="selected"> - <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PORTLET_DETAILS} - </li> - </ul> - </h:form> - <br/> - <c:choose> - <c:when test="#{instancemgr.selectedInstance.portlet != null}"> - <ui:include src="common/showPortletDetails.xhtml"> - <ui:param name="portlet" value="#{instancemgr.selectedInstance.portlet}"/> - <ui:param name="portletmgr" value="#{portletmgr}"/> - <ui:param name="showDisplayNameEditor" value="true"/> - </ui:include> - </c:when> - <c:otherwise> - #{bundle.ASSOCIATED_PORTLET_NOT_AVAILABLE}. - </c:otherwise> - </c:choose> -</c:if> + <c:if test="#{instancemgr.selectedPlugin == 'info'}"> +  + <h:form id="instance-form1"> + <ul class="objectpath"> + <li class="pathItem"> + <h:commandLink id="instance-link" + action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PORTLET_DETAILS} + </li> + </ul> + </h:form> + <br/> + <c:choose> + <c:when test="#{instancemgr.selectedInstance.portlet != null}"> + <ui:include src="common/showPortletDetails.xhtml"> + <ui:param name="portlet" value="#{instancemgr.selectedInstance.portlet}"/> + <ui:param name="portletmgr" value="#{portletmgr}"/> + <ui:param name="showDisplayNameEditor" value="true"/> + </ui:include> + </c:when> + <c:otherwise> + #{bundle.ASSOCIATED_PORTLET_NOT_AVAILABLE}. + </c:otherwise> + </c:choose> + </c:if> -<c:if test="#{instancemgr.selectedPlugin == 'preferences'}"> -  - <h:form id="instance-form2"> - <ul class="objectpath"> - <li class="pathItem"> - <h:commandLink id="instance-link" action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink> - </li> - <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> - <li class="selected"> - <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PREFERENCES_NO_CAP} - </li> - </ul> - </h:form> - <br/> + <c:if test="#{instancemgr.selectedPlugin == 'preferences'}"> +  + <h:form id="instance-form2"> + <ul class="objectpath"> + <li class="pathItem"> + <h:commandLink id="instance-link" + action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PREFERENCES_NO_CAP} + </li> + </ul> + </h:form> + <br/> - <div class="property-container"> - <ui:include src="common/editPreferences.xhtml"> - <ui:param name="prefs" value="#{instancemgr.selectedPrefs}"/> - </ui:include> - <br /> - <h:form> - <h:commandButton id="save" value="#{bundle.SAVE}" action="#{instancemgr.updatePrefs}" styleClass="portlet-form-button"/> - <h:commandButton id="cancel" value="#{bundle.COMMON_CANCEL}" action="#{instancemgr.cancelPrefs}" styleClass="portlet-form-button"/> - </h:form> - </div> -</c:if> + <div class="property-container"> + <ui:include src="common/editPreferences.xhtml"> + <ui:param name="prefs" value="#{instancemgr.selectedPrefs}"/> + </ui:include> + <br/> + <h:form> + <h:commandButton id="save" value="#{bundle.SAVE}" action="#{instancemgr.updatePrefs}" + styleClass="portlet-form-button"/> + <h:commandButton id="cancel" value="#{bundle.COMMON_CANCEL}" action="#{instancemgr.cancelPrefs}" + styleClass="portlet-form-button"/> + </h:form> + </div> + </c:if> -<c:if test="#{instancemgr.selectedPlugin == 'security'}"> -  - <h:form id="instance-form3"> - <ul class="objectpath"> - <li class="pathItem"> - <h:commandLink id="instance-link" action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink> - </li> - <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> - <li class="selected"> - <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.SECURITY_SETTINGS} - </li> - </ul> - </h:form> - <br/> + <c:if test="#{instancemgr.selectedPlugin == 'security'}"> +  + <h:form id="instance-form3"> + <ul class="objectpath"> + <li class="pathItem"> + <h:commandLink id="instance-link" + action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="selected"> + <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.SECURITY_SETTINGS} + </li> + </ul> + </h:form> + <br/> - <div class="property-container"> - <ui:decorate template="/jsf/common/editSecurity.xhtml"> - <ui:param name="auth" value="#{instancemgr.auth}"/> - </ui:decorate> - </div> -</c:if> + <div class="property-container"> + <ui:decorate template="/jsf/common/editSecurity.xhtml"> + <ui:param name="auth" value="#{instancemgr.auth}"/> + </ui:decorate> + </div> + </c:if> -</ui:define> -</ui:composition> + </ui:define> + </ui:composition> </div> Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/renameCoordination.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -7,13 +7,11 @@ <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.RENAME}"/> <ui:define name="content"> - <h3>#{bundle.RENAME} #{coordinationManager.selectedType}</h3> + <h3 class="sectionTitle">#{bundle.RENAME} #{coordinationManager.selectedType}</h3> <h:form id="renameForm"> - <h:message for="newName"/> - <p>#{bundle.RENAME_THE} <span class="objectName">#{coordinationManager.selectedName}</span> #{coordinationManager.selectedType} #{bundle.TO}: - <h:inputText id="newName" value="#{coordinationManager.newName}"/> + <h:inputText id="newName" value="#{coordinationManager.newName}"/> <h:message for="newName" errorClass="portlet-msg-error"/> <h:commandButton value="#{bundle.RENAME}" action="#{coordinationManager.renameSelected}" styleClass="portlet-form-button portlet-section-buttonrow"/> <h:commandButton value="#{bundle.COMMON_CANCEL}" action="editCoordination" Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml 2009-03-06 22:21:24 UTC (rev 12968) +++ branches/JBoss_Portal_AS5_Deployer/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml 2009-03-06 23:20:57 UTC (rev 12969) @@ -7,16 +7,14 @@ <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.RENAME}"/> <ui:define name="content"> - <h3>#{bundle.RENAME} #{portalobjectmgr.selectedObjectType}</h3> + <h3 class="sectionTitle">#{bundle.RENAME} #{portalobjectmgr.selectedObjectType}</h3> <h:form id="renameForm"> - <h:message for="newName"/> - <p>#{bundle.RENAME_THE} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObjectType} #{bundle.TO}: - <h:inputText id="newName" value="#{renameAction.newName}"/> + <h:inputText id="newName" value="#{renameAction.newName}"/> <h:message for="newName" errorClass="portlet-msg-error"/> <h:commandButton id="rename" value="#{bundle.RENAME}" action="#{renameAction.execute}" styleClass="portlet-form-button portlet-section-buttonrow"/> - <h:commandButton id="cancel" value="#{bundle.CANCEL}" action="objects" + <h:commandButton id="cancel" value="#{bundle.COMMON_CANCEL}" action="objects" styleClass="portlet-form-button portlet-section-buttonrow"/> </p> </h:form>

17 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r12968 - branches/JBoss_Portal_AS5_Deployer/build.

by portal-commits＠lists.jboss.org

Author: mwringe Date: 2009-03-06 17:21:24 -0500 (Fri, 06 Mar 2009) New Revision: 12968 Modified: branches/JBoss_Portal_AS5_Deployer/build/build-thirdparty.xml branches/JBoss_Portal_AS5_Deployer/build/distrib.xml Log: Update contrib.xml file to create an alternative jboss-portal structure. Update build-thirdparty.xml to include newer versions of jars for use with JBoss AS5. Modified: branches/JBoss_Portal_AS5_Deployer/build/build-thirdparty.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/build/build-thirdparty.xml 2009-03-06 21:21:08 UTC (rev 12967) +++ branches/JBoss_Portal_AS5_Deployer/build/build-thirdparty.xml 2009-03-06 22:21:24 UTC (rev 12968) @@ -40,31 +40,33 @@ The repository is in CVS under the module repository.jboss.com whose contents are pushed to the http://repository.jboss.com site. --> - - <componentref name="jboss-portal/modules/common" version="1.2.2"/> + + <componentref name="jboss-portal/modules/common" version="trunk-SNAPSHOT"/> + <componentref name="jboss-portal/modules/deployer" version="trunk-SNAPSHOT"/> + <componentref name="jboss-portal/modules/metadata" version="trunk-SNAPSHOT"/> <componentref name="jboss-portal/modules/web" version="1.2.2"/> <componentref name="jboss-portal/modules/test" version="1.0.3"/> - <componentref name="jboss-portal/modules/portlet" version="2.0.4"/> + <componentref name="jboss-portal/modules/portlet" version="trunk-SNAPSHOT"/> <componentref name="jboss-portal/modules/identity" version="1.0.5"/> <componentref name="jboss-portal/modules/cms" version="1.2.1"/> - <componentref name="antlr" version="2.7.6.ga"/> + <componentref name="antlr" version="2.7.6-brew"/> <componentref name="apache-ant" version="1.6.5"/> <componentref name="jackrabbit" version="1.4"/> - <componentref name="apache-beanutils" version="1.7.0"/> + <componentref name="apache-beanutils" version="1.7.0clean-brew"/> <componentref name="apache-codec" version="1.3.0"/> - <componentref name="apache-collections" version="3.1"/> - <componentref name="apache-digester" version="1.6"/> + <componentref name="apache-collections" version="3.1-brew"/> + <componentref name="apache-digester" version="1.7-brew"/> <componentref name="apache-fileupload" version="1.2"/> <componentref name="apache-httpclient" version="3.0.1"/> <componentref name="apache-lang" version="2.1"/> - <componentref name="apache-log4j" version="1.2.8"/> + <componentref name="apache-log4j" version="1.2.14-brew"/> <componentref name="apache-logging" version="1.0.5.SP1-jboss"/> <componentref name="apache-lucene" version="2.2.0"/> <componentref name="apache-net" version="1.4.1"/> - <componentref name="apache-xerces" version="2.7.1"/> + <componentref name="apache-xerces" version="2.7.1-brew"/> <componentref name="asm" version="1.5.3"/> - <componentref name="beanshell" version="1.3.0"/> - <componentref name="cglib" version="2.1.3"/> + <componentref name="beanshell" version="1.3.0-brew"/> + <componentref name="cglib" version="2.1.3dep-brew"/> <componentref name="commons-el" version="1.0"/> <componentref name="dbunit" version="2.1"/> <componentref name="dom4j" version="1.6.1jboss"/> @@ -73,57 +75,59 @@ <componentref name="facelets" version="1.1.15-B1"/> <componentref name="richfaces" version="3.2.2.GA"/> <componentref name="jboss/portlet-bridge" version="1.0.0.B4"/> - <componentref name="hibernate" version="3.2.4.SP1"/> + <componentref name="hibernate" version="3.2.4.SP1_CP06-brew"/> <componentref name="httpunit" version="1.6"/> - <componentref name="hsqldb" version="1.8.0.2"/> + <componentref name="hsqldb" version="1.8.0.8.patch01-brew"/> <componentref name="ibm-wsdl4j" version="1.6.2"/> <componentref name="jakarta-cactus" version="1.7.2"/> <componentref name="jakarta-io" version="1.0"/> - <componentref name="jbossas/core-libs" version="4.0.4.GA"/> - <componentref name="jboss/aop" version="1.5.2.GA"/> - <componentref name="jboss/cache" version="1.4.1.SP9-brew"/> - <componentref name="jboss/jbossretro-rt" version="1.0.3.GA"/> + <componentref name="jbossas/core-libs" version="5.0.0.GA"/> + <componentref name="jboss/aop" version="2.0.0.GA"/> + <componentref name="jboss/cache" version="1.4.1.SP10-brew"/> + <componentref name="jboss/jboss-deployers" version="2.0.0.Beta12"/>  + <componentref name="jboss/jboss-mdr" version="2.0.0.Beta15"/>  + <componentref name="jboss/jboss-metadata" version="1.0.0-SNAPSHOT"/> + <componentref name="jboss/jbossretro-rt" version="1.0.5.GA"/> <componentref name="jboss/jbossws" version="2.0.1.SP2"/> - <componentref name="jboss/jbossxb" version="1.0.0.CR7"/> - <componentref name="jboss/microcontainer" version="1.0.2"/> - <componentref name="jboss/remoting" version="2.2.0.SP4"/> - <componentref name="jboss/serialization" version="1.0.1.GA"/> + <componentref name="jboss/jbossxb" version="1.0.0.SP3-brew"/> + <componentref name="jboss/microcontainer" version="1.0.2-brew"/> + <componentref name="jboss/remoting" version="2.2.2.SP10-brew"/> + <componentref name="jboss/serialization" version="1.0.3.GA-brew"/> <componentref name="jboss/test" version="1.0.0.CR1"/> <componentref name="jflex" version="1.4.0"/> <componentref name="jcaptcha" version="1.0.6"/> <componentref name="jwebunit" version="1.2"/> <componentref name="jcr" version="1.0"/> <componentref name="jetty" version="6.0"/> - <componentref name="jgroups" version="2.4.1.SP4"/> + <componentref name="jgroups" version="2.4.4.GA-brew"/> <componentref name="jsunit" version="2.1"/> - <componentref name="junit" version="3.8.1"/> - <componentref name="odmg" version="3.0"/> + <componentref name="junit" version="3.8.2-brew"/> + <componentref name="odmg" version="3.0-brew"/> <componentref name="oswego-concurrent" version="1.3.4"/> - <componentref name="qdox" version="1.4"/> - <componentref name="trove" version="1.0.2"/> + <componentref name="qdox" version="1.6.1-brew"/> + <componentref name="trove" version="1.0.2-brew"/> <componentref name="sleepycat" version="3.0.12"/> <componentref name="slf4j" version="1.3.0"/> <componentref name="stax-api" version="1.0"/> - <componentref name="sun-jaf" version="1.1"/> - <componentref name="sun-javacc" version="3.2-portal"/> - <componentref name="sun-javamail" version="1.3.1"/> - <componentref name="sun-jsf" version="1.2_08-brew"/> + <componentref name="glassfish/jaf" version="1.1.0-brew"/> + <componentref name="sun-javacc" version="3.2-brew"/> + <componentref name="glassfish/javamail" version="1.4.0-brew"/> + <componentref name="glassfish/jsf" version="1.2_09-brew"/> <componentref name="sun-opends" version="snapshot"/> <componentref name="sun-servlet" version="2.4"/> <componentref name="sun-jaxb" version="2.1.4"/> - <componentref name="xdoclet" version="1.2.3"/> + <componentref name="xdoclet" version="1.2.3-brew"/> <componentref name="jbpm/jpdl" version="3.2.2"/> <componentref name="freemarker" version="2.3.9"/> <componentref name="wutka-dtdparser" version="1.2.1"/> <componentref name="portals-bridges" version="1.0.3"/> <componentref name="tagsoup" version="1.2"/> <componentref name="portlet" version="2.0-Draft32"/> - <componentref name="sun-jstl" version="1.2"/> - <componentref name="jboss/web" version="2.1.0.GA"/> + <componentref name="glassfish/jstl" version="1.2.0-brew"/> + <componentref name="jboss/web" version="2.1.1.GA"/> +  + <componentref name="org/jboss/cluster/hibernate-jbc-cacheprovider" version="1.0.0.GA"/> -  - <componentref name="org/jboss/cluster/hibernate-jbc-cacheprovider" version="1.0.0.GA"/> - </build> <synchronizeinfo/> Modified: branches/JBoss_Portal_AS5_Deployer/build/distrib.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/build/distrib.xml 2009-03-06 21:21:08 UTC (rev 12967) +++ branches/JBoss_Portal_AS5_Deployer/build/distrib.xml 2009-03-06 22:21:24 UTC (rev 12968) @@ -285,13 +285,16 @@ <antcall target="package-bin"> <param name="todir" value="${portal.build.normal.bin}"/> </antcall> - <copy todir="${portal.build.normal.bin}/jboss-portal.sar"> + <copy todir="${portal.build.normal.bin}/jboss-portal/jboss-portal.sar"> <fileset dir="${source.dir}/core/output/resources/jboss-portal.sar"/> </copy> - <copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-cms.sar"> + <move todir="${portal.build.normal.bin}/jboss-portal/portal-core.war"> + <fileset dir="${portal.build.normal.bin}/jboss-portal/jboss-portal.sar/portal-core.war"/> + </move> + <copy todir="${portal.build.normal.bin}/jboss-portal/portal-cms.sar"> <fileset dir="${source.dir}/core-cms/output/resources/portal-cms.sar" includes="**"/> </copy> - <copy todir="${portal.build.normal.bin}/jboss-portal.sar"> + <copy todir="${portal.build.normal.bin}/jboss-portal"> <fileset dir="${source.dir}/workflow/output/resources" includes="portal-workflow.sar/**"/> <fileset dir="${source.dir}/widget/output/resources" includes="portal-widget.war/**"/> <fileset dir="${source.dir}/widget/output/resources" includes="portal-widget-netvibes.war/**"/> @@ -299,15 +302,15 @@ <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/> <fileset dir="${source.dir}/core-identity/output/resources" includes="portal-identity.sar/**"/> </copy> - <copy todir="${portal.build.normal.bin}/jboss-portal.sar/samples"> + <copy todir="${portal.build.normal.bin}/jboss-portal/samples"> <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/> <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-news-samples.war/**"/> <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-weather-samples.war/**"/> <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-portlet-samples.war/**"/> <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-users-samples.sar/**"/> </copy> - <mkdir dir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"/> - <copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"> + <mkdir dir="${portal.build.normal.bin}/jboss-portal/portal-wsrp.sar"/> + <copy todir="${portal.build.normal.bin}/jboss-portal/portal-wsrp.sar"> <fileset dir="${source.dir}/wsrp/output/lib/portal-wsrp-exploded.sar"/> </copy> </target> @@ -446,4 +449,4 @@  <target name="main" depends="licenses,build,package,zip" description="do everything - build source, doc, distro"/> -</project> \ No newline at end of file +</project>

17 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r12967 - in branches/JBoss_Portal_AS5_Deployer/core: src/main/org/jboss/portal/core/deployment/jboss and 10 other directories.

by portal-commits＠lists.jboss.org

Author: mwringe Date: 2009-03-06 16:21:08 -0500 (Fri, 06 Mar 2009) New Revision: 12967 Added: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/InstanceDeploymentImpl.java branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentImpl.java branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentContainer.java branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletDeploymentImpl.java branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/META-INF/aliases.txt branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/META-INF/default-object.xml branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/META-INF/jboss-dependency.xml branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/dtd/jboss-portal-app_2_6.dtd branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-war/WEB-INF/jboss-portal-app.xml Removed: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory.java branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/data/default-object.xml branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/dtd/jboss-app_2_6.dtd branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-war/WEB-INF/jboss-app.xml Modified: branches/JBoss_Portal_AS5_Deployer/core/.classpath branches/JBoss_Portal_AS5_Deployer/core/build.xml branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/AjaxInfoImpl.java branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilder.java branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilderFactory.java branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/MarkupHeaderInfoImpl.java branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletIconInfoImpl.java branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/model/instance/metadata/InstanceMetaData.java branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalMetaData.java branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/test/core/deployment/PortletInstancesMetaDataFactoryTestCase.java branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/META-INF/jboss-service.xml branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/portal-aop.xml Log: Update to use the newer version of the deployer and metadata modules. Modified: branches/JBoss_Portal_AS5_Deployer/core/.classpath =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/.classpath 2009-03-06 21:08:48 UTC (rev 12966) +++ branches/JBoss_Portal_AS5_Deployer/core/.classpath 2009-03-06 21:21:08 UTC (rev 12967) @@ -6,8 +6,6 @@ <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/jsp-api.jar"/> <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/> <classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/> - <classpathentry kind="lib" path="/thirdparty/sun-javamail/lib/mail.jar"/> - <classpathentry kind="lib" path="/thirdparty/beanshell/lib/bsh-1.3.0.jar"/> <classpathentry kind="lib" path="/thirdparty/apache-fileupload/lib/commons-fileupload.jar"/> <classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/> <classpathentry kind="lib" path="/thirdparty/apache-logging/lib/commons-logging.jar"/> @@ -37,7 +35,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/registration"/> <classpathentry combineaccessrules="false" kind="src" path="/workflow"/> <classpathentry combineaccessrules="false" kind="src" path="/portlet-server"/> - <classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xml-apis.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar" sourcepath="/module-common-trunk"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/web/lib/portal-web-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> @@ -51,5 +48,43 @@ <classpathentry kind="lib" path="/thirdparty/portlet/lib/portlet-api.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-controller-lib.jar" sourcepath="/module-portlet-2.0.0.CR2"/> <classpathentry kind="lib" path="/thirdparty/jboss/cache/lib/jboss-cache-jdk50.jar"/> + <classpathentry kind="lib" path="/home/mwringe/Projects/workspaces/workspace-jbossas-trunk/build/output/jboss-5.0.0.GA/common/lib/jboss-transaction-aspects.jar"/> + <classpathentry kind="lib" path="/home/mwringe/.m2/repository/org/jboss/portal/portlet/portlet-portal/2.1.0-SNAPSHOT/portlet-portal-2.1.0-SNAPSHOT.jar"/> + <classpathentry kind="lib" path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-bridge-lib.jar"/> + <classpathentry kind="lib" path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-bridge-lib-sources.jar"/> + <classpathentry kind="lib" path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-controller-lib.jar"/> + <classpathentry kind="lib" path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-controller-lib-sources.jar"/> + <classpathentry kind="lib" path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-federation-lib.jar"/> + <classpathentry kind="lib" path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-federation-lib-sources.jar"/> + <classpathentry kind="lib" path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/> + <classpathentry kind="lib" path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib-sources.jar"/> + <classpathentry kind="lib" path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-management-lib.jar"/> + <classpathentry kind="lib" path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-management-lib-sources.jar"/> + <classpathentry kind="lib" path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-samples-lib.jar"/> + <classpathentry kind="lib" path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-samples-lib-sources.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/metadata/lib/portal-metadata-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/glassfish/javamail/lib/mail.jar"/> + <classpathentry kind="lib" path="/thirdparty/beanshell/lib/bsh.jar"/> + <classpathentry kind="lib" path="/thirdparty/apache-xml-commons/lib/xml-apis.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/jboss-metadata/lib/jboss-metadata.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/deployer/lib/portal-deployer-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-client.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-client-sources.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-client-spi.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-client-spi-sources.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-core.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-core-sources.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-core-spi.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-core-spi-sources.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-impl.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-impl-sources.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-spi.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-spi-sources.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-structure-spi.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-structure-spi-sources.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-vfs.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-vfs-sources.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-vfs-spi.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-vfs-spi-sources.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_AS5_Deployer/core/build.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/build.xml 2009-03-06 21:08:48 UTC (rev 12966) +++ branches/JBoss_Portal_AS5_Deployer/core/build.xml 2009-03-06 21:21:08 UTC (rev 12967) @@ -89,11 +89,14 @@ <path id="library.classpath"> <path refid="portlet.portlet.classpath"/> <path refid="jboss.portal/modules/common.classpath"/> + <path refid="jboss.portal/modules/deployer.classpath"/> + <path refid="jboss.portal/modules/metadata.classpath"/> <path refid="jboss.portal/modules/web.classpath"/> <path refid="jboss.portal/modules/identity.classpath"/> <path refid="jboss.portal/modules/portlet.classpath"/> <path refid="jboss.portal/modules/test.classpath"/> <path refid="jboss.microcontainer.classpath"/> + <path refid="jboss/jboss.deployers.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> @@ -107,7 +110,7 @@ <path refid="apache.fileupload.classpath"/> <path refid="jakarta.io.classpath"/> <path refid="oswego.concurrent.classpath"/> - <path refid="sun.javamail.classpath"/> + <path refid="glassfish.javamail.classpath"/> <path refid="jwebunit.jwebunit.classpath"/> <path refid="dbunit.dbunit.classpath"/> <path refid="sun.jaf.classpath"/> @@ -116,6 +119,7 @@ <path refid="facelets.facelets.classpath"/> <path refid="dom4j.dom4j.classpath"/> <path refid="jboss.aop.classpath"/> + <path refid="jboss/jboss.metadata.classpath"/> <path refid="trove.trove.classpath"/> <path refid="qdox.qdox.classpath"/> <pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/> @@ -167,9 +171,11 @@ <pathelement path="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/> <pathelement path="${jboss.aop.lib}/jboss-aop.jar"/> <path refid="javassist.javassist.classpath"/> + <path refid="jboss/jboss.mdr.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="trove.trove.classpath"/> <path refid="qdox.qdox.classpath"/> + <path refid="jboss.portal/modules/metadata.classpath"/> </path> <taskdef name="explode" @@ -199,6 +205,8 @@ <path refid="oswego.concurrent.classpath"/> <path refid="trove.trove.classpath"/> <path refid="qdox.qdox.classpath"/> + <path refid="jboss/jboss.mdr.classpath"/> + <path refid="jboss.portal/modules/metadata.classpath"/> </path> <taskdef name="aopc" @@ -234,6 +242,13 @@ <path refid="jboss.portal/modules/web.classpath"/> <path refid="jboss.portal/modules/portlet.classpath"/> <path refid="jboss.portal/modules/identity.classpath"/> + <path refid="jboss.portal/modules/metadata.classpath"/> + <path refid="jboss/jboss.metadata.classpath"/> + <path refid="jbossas/core.libs.classpath"/> + <path refid="jboss/jboss.deployers.classpath"/> + <path refid="portlet.portlet.classpath"/> + + <path refid="jboss.portal/modules/deployer.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-portlet-server.classpath"/> <path refid="jboss.portal-security.classpath"/> @@ -246,12 +261,18 @@ verbose="true"> <classpath refid="bilto"/> <src path="${build.classes}"/> - <aoppath path="${build.resources}/portal-core-sar/portal-aop.xml"/> - <aoppath path="${source.etc}/jboss-aop/base-aop.xml"/> + <aoppath> + <pathelement path="${build.resources}/portal-core-sar/portal-aop.xml"/> + <pathelement path="${source.etc}/jboss-aop/base-aop.xml"/> + </aoppath> <include name="org/jboss/portal/core/aspects/server/TransactionInterceptor.class"/> <include name="org/jboss/portal/core/aspects/server/UserInterceptor$UserFinalizer.class"/> <include name="org/jboss/portal/core/aspects/portlet/TransactionInterceptor.class"/> <include name="org/jboss/portal/core/deployment/jboss/ObjectDeployment.class"/> + + <include name="org/jboss/portal/core/deployment/jboss/ObjectDeploymentImpl.class"/> + <include name="org/jboss/portal/core/deployment/jboss/InstanceDeploymentImpl.class"/> + <include name="org/jboss/portal/core/deployment/jboss/PortletAppDeployment.class"/> <include name="org/jboss/portal/core/impl/model/instance/InstanceContainerImpl.class"/> <include name="org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.class"/> Added: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/InstanceDeploymentImpl.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/InstanceDeploymentImpl.java (rev 0) +++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/InstanceDeploymentImpl.java 2009-03-06 21:21:08 UTC (rev 12967) @@ -0,0 +1,187 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.core.deployment.jboss; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.logging.Logger; +import org.jboss.portal.core.model.instance.DuplicateInstanceException; +import org.jboss.portal.core.model.instance.Instance; +import org.jboss.portal.core.model.instance.InstanceContainer; +import org.jboss.portal.deployer.container.InstanceDeployment; +import org.jboss.portal.metadata.portlet.instances.InstanceMetaData; +import org.jboss.portal.metadata.portlet.instances.PolicyPermissionMetaData; +import org.jboss.portal.metadata.portlet.instances.PortletDeploymentInstanceMetaData; +import org.jboss.portal.metadata.portlet.instances.PortletDeploymentInstancesMetaData; +import org.jboss.portal.metadata.portlet.instances.PortletPreferenceMetaData; +import org.jboss.portal.metadata.portlet.instances.PortletPreferencesMetaData; +import org.jboss.portal.metadata.portlet.instances.SecurityConstraintMetaData; +import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.state.PropertyChange; +import org.jboss.portal.portlet.state.PropertyMap; +import org.jboss.portal.security.RoleSecurityBinding; +import org.jboss.portal.security.spi.provider.AuthorizationDomain; +import org.jboss.portal.security.spi.provider.DomainConfigurator; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class InstanceDeploymentImpl implements InstanceDeployment +{ + + protected final Logger log = Logger.getLogger(getClass()); + + protected InstanceContainer instanceContainer; + + public void setInstanceContainer(InstanceContainer instanceContainer) + { + this.instanceContainer = instanceContainer; + } + + /** + * Deploys the instance to the instance container running in the portlet sar. + * + * @param instancesMetaData The metadata for the instance. + * @throws Exception If an exception occurs while deploying the instance + */ + //Requires a transaction to execute properly, setup through aop configuration for the deployer. + public void deployInstances(PortletDeploymentInstancesMetaData instancesMetaData, String appId) throws DeploymentException + { + List<PortletDeploymentInstanceMetaData> instancesMD = instancesMetaData.getDeploymentInstances(); + try + { + for (int i = 0; i < instancesMD.size(); i++) + { + PortletDeploymentInstanceMetaData instanceMD = instancesMD.get(i); + + Instance instance = instanceContainer.getDefinition(instanceMD.getInstance().getInstanceId()); + + if (instance == null) + { + createInstance(instanceMD.getInstance(), appId); + } + else if (instanceMD.getOverwrite() == true) + { + log.debug("Instance " + instanceMD.getInstance().getInstanceId() + " is about to be overwritten"); + configureInstance(instanceMD.getInstance(), instance); + } + else + { + log.debug("Instance " + instanceMD.getInstance().getInstanceId() + " already exists"); + } + } + } + catch (Exception e) + { + throw new DeploymentException(e); + } + } + + protected void createInstance(InstanceMetaData instanceMD, String appId) throws IllegalArgumentException, + DuplicateInstanceException, PortletInvokerException + { + log.debug("Creating portlet instance " + instanceMD.getInstanceId()); + System.out.println("LOCAL :" + appId + " : " + instanceMD.getPortletRef()); + instanceMD.setPortletRef("local." + appId + "." + instanceMD.getPortletRef()); + + Instance instance = instanceContainer.createDefinition(instanceMD.getInstanceId(), instanceMD.getPortletRef()); + + configureInstance(instanceMD, instance); + } + + protected void configureInstance(InstanceMetaData instanceMD, Instance instance) throws PortletInvokerException + { + log.debug("Configuring portlet instance " + instanceMD.getInstanceId()); + List<PropertyChange> changes = new ArrayList<PropertyChange>(); + + // Reset all preferences that are not overridden + PortletPreferencesMetaData preferencesMetaData = instanceMD.getPortletPreferences(); + PropertyMap propertyMap = instance.getProperties(); + + if (propertyMap != null && propertyMap.size() > 0) + { + for (String key : propertyMap.keySet()) + { + if (preferencesMetaData == null || preferencesMetaData.getPreferences() == null + || preferencesMetaData.getPreferences().contains(key) == false) + { + changes.add(PropertyChange.newReset(key)); + } + } + } + + // Configure preferences only if needed + if (preferencesMetaData != null && preferencesMetaData.getPreferences() != null + && preferencesMetaData.getPreferences().size() > 0) + { + for (int i = 0; i < preferencesMetaData.getPreferences().size(); i++) + { + PortletPreferenceMetaData portletPreferenceMetaData = preferencesMetaData.getPreferences().get(i); + PropertyChange change = PropertyChange.newUpdate(portletPreferenceMetaData.getName(), + portletPreferenceMetaData.getValue()); + changes.add(change); + } + } + + if (changes.size() > 0) + { + instance.setProperties(changes.toArray(new PropertyChange[changes.size()])); + } + + // Configure security + SecurityConstraintMetaData securityConstraints = instanceMD.getSecurityContraint(); + + if (securityConstraints == null) + { + securityConstraints = new SecurityConstraintMetaData(); + PolicyPermissionMetaData policyPermission = new PolicyPermissionMetaData(); + HashSet<String> actionNames = new HashSet<String>(); + actionNames.add("view"); + policyPermission.setActionNames(actionNames); + policyPermission.setRoleName("__unchecked__".intern()); + + List<PolicyPermissionMetaData> policyPermissions = new ArrayList<PolicyPermissionMetaData>(); + policyPermissions.add(policyPermission); + + securityConstraints.setPolicyPermission(policyPermissions); + } + + HashSet<RoleSecurityBinding> bindings = new HashSet<RoleSecurityBinding>(); + for (int i = 0; i < securityConstraints.getPolicyPermission().size(); i++) + { + PolicyPermissionMetaData policyMD = securityConstraints.getPolicyPermission().get(i); + RoleSecurityBinding binding = new RoleSecurityBinding(policyMD.getActionNames(), policyMD.getRoleName()); + bindings.add(binding); + } + + AuthorizationDomain authDomain = instance.getContainer().getAuthorizationDomain(); + DomainConfigurator domainConfigurator = authDomain.getConfigurator(); + domainConfigurator.setSecurityBindings(instance.getId(), bindings); + } + +} Modified: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java 2009-03-06 21:08:48 UTC (rev 12966) +++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java 2009-03-06 21:21:08 UTC (rev 12967) @@ -93,6 +93,7 @@ public void start() throws DeploymentException { + if (true) {return;} try { doStart(); @@ -104,8 +105,10 @@ } } + // @org.jboss.aspects.tx.Tx(org.jboss.aspects.tx.TxType.REQUIRED) protected void doStart() throws Exception { + if(true){return;} InputStream in = null; try { Modified: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java 2009-03-06 21:08:48 UTC (rev 12966) +++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java 2009-03-06 21:21:08 UTC (rev 12967) @@ -46,6 +46,7 @@ public class ObjectDeploymentFactory extends AbstractDeploymentFactory { + //object.xml protected static final Pattern URL_PATTERN = Pattern.compile(".*-object\\.xml"); /** . */ Added: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentImpl.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentImpl.java (rev 0) +++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentImpl.java 2009-03-06 21:21:08 UTC (rev 12967) @@ -0,0 +1,625 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.core.deployment.jboss; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; + +import javax.xml.namespace.QName; + +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.logging.Logger; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; +import org.jboss.portal.common.i18n.LocaleFormat; +import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.common.i18n.ResourceBundleManager; +import org.jboss.portal.common.util.ConversionException; +import org.jboss.portal.core.controller.coordination.CoordinationConfigurator; +import org.jboss.portal.core.controller.coordination.IllegalCoordinationException; +import org.jboss.portal.core.impl.model.portal.WindowImpl; +import org.jboss.portal.core.model.MetaDataResourceBundleFactory; +import org.jboss.portal.core.model.content.ContentType; +import org.jboss.portal.core.model.content.spi.ContentProviderRegistry; +import org.jboss.portal.core.model.portal.DuplicatePortalObjectException; +import org.jboss.portal.core.model.portal.Page; +import org.jboss.portal.core.model.portal.PageContainer; +import org.jboss.portal.core.model.portal.Portal; +import org.jboss.portal.core.model.portal.PortalContainer; +import org.jboss.portal.core.model.portal.PortalObject; +import org.jboss.portal.core.model.portal.PortalObjectContainer; +import org.jboss.portal.core.model.portal.PortalObjectId; +import org.jboss.portal.core.model.portal.PortalObjectPath; +import org.jboss.portal.core.model.portal.PortalObjectPermission; +import org.jboss.portal.core.model.portal.Window; +import org.jboss.portal.core.model.portal.metadata.BuildContext; +import org.jboss.portal.metadata.portal.object.AliasBindingMetaData; +import org.jboss.portal.metadata.portal.object.CommonPortalObject; +import org.jboss.portal.metadata.portal.object.ContextMetaData; +import org.jboss.portal.metadata.portal.object.CoordinationMetaData; +import org.jboss.portal.metadata.portal.object.EventWiringMetaData; +import org.jboss.portal.metadata.portal.object.PageMetaData; +import org.jboss.portal.metadata.portal.object.ParameterBindingMetaData; +import org.jboss.portal.metadata.portal.object.PortalMetaData; +import org.jboss.portal.metadata.portal.object.PortalObjectDeploymentMetaData; +import org.jboss.portal.metadata.portal.object.PortalObjectMetaData; +import org.jboss.portal.metadata.portal.object.PropertyMetaData; +import org.jboss.portal.metadata.portal.object.WindowCoordinationMetaData; +import org.jboss.portal.metadata.portal.object.WindowMetaData; +import org.jboss.portal.metadata.portal.object.WiringMetaData; +import org.jboss.portal.metadata.portlet.common.LocalizedDescriptionMetaData; +import org.jboss.portal.metadata.portlet.instances.PolicyPermissionMetaData; +import org.jboss.portal.metadata.portlet.instances.SecurityConstraintMetaData; +import org.jboss.portal.portlet.deployment.LocalizedStringBuilder; +import org.jboss.portal.metadata.portlet.portlet.PortletModeMetaData; +import org.jboss.portal.metadata.portlet.portlet.WindowStateMetaData; +import org.jboss.portal.security.RoleSecurityBinding; +import org.jboss.portal.security.SecurityConstants; +import org.jboss.portal.security.metadata.SecurityConstraintsMetaData; +import org.jboss.portal.security.spi.provider.DomainConfigurator; +import org.jboss.portal.security.spi.provider.SecurityConfigurationException; +import org.jboss.portal.theme.ThemeConstants; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class ObjectDeploymentImpl implements org.jboss.portal.deployer.container.PortalObjectDeployment +{ + + private static Logger log = Logger.getLogger(ObjectDeploymentImpl.class); + + PortalObjectContainer portalObjectContainer; + + ContentProviderRegistry contentProviderRegistry; + + CoordinationConfigurator coordinationConfigurator; + + public void setPortalObjectContainer(PortalObjectContainer portalObjectContainer) + { + this.portalObjectContainer = portalObjectContainer; + } + + public void setContentProviderRegistry(ContentProviderRegistry contentProviderRegistry) + { + this.contentProviderRegistry = contentProviderRegistry; + } + + public void setCoordinationConfigurator(CoordinationConfigurator coordinationConfigurator) + { + this.coordinationConfigurator = coordinationConfigurator; + } + + public void deployObjects(PortalObjectMetaData portalObjectMetaData, ClassLoader webappClassLoader) + throws DeploymentException + { + System.out.println("OBJECTDEPLOYMENTIMPL DEPLOY : " + portalObjectMetaData); + try{ + for (PortalObjectDeploymentMetaData objectDeploymentMetaData : portalObjectMetaData.getDeployments()) + { + System.out.println("GETCONTEXT : " + objectDeploymentMetaData.getContext()); + if (objectDeploymentMetaData.getContext() != null) + { + createPortalObject(objectDeploymentMetaData, webappClassLoader); + } + } + for (PortalObjectDeploymentMetaData objectDeploymentMetaData : portalObjectMetaData.getDeployments()) + { + if (objectDeploymentMetaData.getPortal() != null) + { + createPortalObject(objectDeploymentMetaData, webappClassLoader); + } + } + for (PortalObjectDeploymentMetaData objectDeploymentMetaData : portalObjectMetaData.getDeployments()) + { + if (objectDeploymentMetaData.getPage() != null) + { + createPortalObject(objectDeploymentMetaData, webappClassLoader); + } + } + for (PortalObjectDeploymentMetaData objectDeploymentMetaData : portalObjectMetaData.getDeployments()) + { + if (objectDeploymentMetaData.getWindow()!= null) + { + createPortalObject(objectDeploymentMetaData, webappClassLoader); + } + } + } + catch (Exception e) + { + throw new DeploymentException("Could not deploy portal objects.", e); + } + } + + /** + * Create a PortalObject class from a PortalObjectMetaData object. + * + * @param portalObjectMetaData + */ + public void createPortalObject(PortalObjectDeploymentMetaData portalObjectMetaData, ClassLoader webappClassLoader) + throws Exception + { + System.out.println ("CREATEPORTALOBJECT"); + + ContextMetaData contextMetaData = portalObjectMetaData.getContext(); + PortalMetaData portalMetaData = portalObjectMetaData.getPortal(); + PageMetaData pageMetaData = portalObjectMetaData.getPage(); + WindowMetaData windowMetaData = portalObjectMetaData.getWindow(); + + CommonPortalObject commonPortalObject = null; + + if (contextMetaData != null) + { + commonPortalObject = contextMetaData; + } + else if (portalMetaData != null) + { + commonPortalObject = portalMetaData; + } + else if (pageMetaData != null) + { + commonPortalObject = pageMetaData; + } + else if (windowMetaData != null) + { + commonPortalObject = windowMetaData; + } + + String parentRef = portalObjectMetaData.getParentRef(); + System.out.println("PARENTREF : \'" + parentRef + "\' : " + (parentRef == null) + " : " + portalObjectMetaData + " : " + contextMetaData + " : " + portalMetaData + " : " + pageMetaData + " : " + windowMetaData ); + PortalObjectId parentId = (parentRef == null) ? null : PortalObjectId.parse(parentRef, + PortalObjectPath.LEGACY_FORMAT); + if (parentId != null) + { + PortalObject parent = this.portalObjectContainer.getObject(parentId); + if (parent != null) + { + boolean create = true; + if (parent.getChild(commonPortalObject.getName()) != null) + { + if (portalObjectMetaData.isOverwrite()) + { + parent.destroyChild(commonPortalObject.getName()); + } + else + { + create = false; + } + } + if (create) + { + log.debug("Building portal object"); + createPortalObject(commonPortalObject, parent, webappClassLoader); + } + + } + else if (parent == null) + { + log.warn("Cannot create portal object " + portalObjectMetaData + " because the parent '" + + portalObjectMetaData.getParentRef() + "' that the deployment descriptor references does not exist"); + } + } + else + { + if (this.portalObjectContainer.getContext(commonPortalObject.getName()) == null) + { + log.debug("Building portal object"); + createPortalObject(commonPortalObject, null, webappClassLoader); + } + } + + } + + public PortalObject createPortalObject(CommonPortalObject commonPortalObject, PortalObject parent, + ClassLoader webappClassLoader) throws DuplicatePortalObjectException, DeploymentException, + IllegalCoordinationException + { + PortalObject portalObject; + + System.out.println("COMMONPORTALOBJECT " + commonPortalObject); + + if (commonPortalObject instanceof ContextMetaData) + { + portalObject = createPortalObject((ContextMetaData) commonPortalObject, parent); + } + else if (commonPortalObject instanceof PageMetaData) + { + portalObject = createPortalObject((PageMetaData) commonPortalObject, parent); + } + else if (commonPortalObject instanceof WindowMetaData) + { + portalObject = createPortalObject((WindowMetaData) commonPortalObject, parent); + } + else if (commonPortalObject instanceof PortalMetaData) + { + portalObject = createPortalObject((PortalMetaData) commonPortalObject, parent); + } + else + { + throw new DeploymentException("Class " + commonPortalObject.getClass() + " is not a recongized valid class."); + } + + configure(commonPortalObject, portalObject, webappClassLoader); + + System.out.println("COMMON PORTAL OBJECT : " + commonPortalObject); + + if (commonPortalObject.getChildren() != null) + { + for (int i = 0; i < commonPortalObject.getChildren().size(); i++) + { + CommonPortalObject child = commonPortalObject.getChildren().get(i); + createPortalObject(child, portalObject, webappClassLoader); + } + } + + // Coordination - must be applied after children (windows) were created + CoordinationMetaData coordinationMD = null; + if (commonPortalObject instanceof PortalMetaData) + { + coordinationMD = ((PortalMetaData) commonPortalObject).getCoordination(); + } + else if (commonPortalObject instanceof PageMetaData) + { + coordinationMD = ((PageMetaData) commonPortalObject).getCoordination(); + } + + if (coordinationMD != null) + { + configureCoodination(coordinationMD, portalObject); + } + + return portalObject; + } + + public PortalObject createPortalObject(ContextMetaData contextMetaData, PortalObject parent) + throws DuplicatePortalObjectException + { + String contextName = contextMetaData.getName(); + return portalObjectContainer.createContext(contextName); + } + + public PortalObject createPortalObject(PageMetaData pageMetaData, PortalObject parent) + throws IllegalArgumentException, DuplicatePortalObjectException + { + if (!(parent instanceof PageContainer)) + { + throw new IllegalArgumentException("Cannot build page " + pageMetaData.getName() + + " because the parent it references is not a page container " + parent); + } + + // + return ((PageContainer) parent).createPage(pageMetaData.getName()); + } + + public PortalObject createPortalObject(PortalMetaData portalMetaData, PortalObject parent) + throws IllegalArgumentException, DuplicatePortalObjectException + { + System.out.println("PARENT IS " + parent); + if (!(parent instanceof PortalContainer)) + { + throw new IllegalArgumentException("Not a context"); + } + + Portal portal = ((PortalContainer) parent).createPortal(portalMetaData.getName()); + + if (portalMetaData.getModes() != null && portalMetaData.getModes().getModes() != null) + { + List<String> modes = portalMetaData.getModes().getModes(); + for (int i = 0; i < modes.size(); i++) + { + Mode mode = new Mode(modes.get(i)); + portal.getSupportedModes().add(mode); + } + } + + if (portalMetaData.getSupportedWindowStates() != null + && portalMetaData.getSupportedWindowStates().getWindowStates() != null) + { + List<String> windowStates = portalMetaData.getSupportedWindowStates().getWindowStates(); + for (int i = 0; i < windowStates.size(); i++) + { + WindowState windowState = new WindowState(windowStates.get(i)); + portal.getSupportedWindowStates().add(windowState); + } + } + + return portal; + } + + public PortalObject createPortalObject(WindowMetaData windowMetaData, PortalObject parent) + throws IllegalArgumentException, DuplicatePortalObjectException + { + if (!(parent instanceof Page)) + { + throw new IllegalArgumentException("Not a page"); + } + + ContentType contentType = ContentType.create(windowMetaData.getContent().getContentType()); + + // + Window window = ((Page) parent).createWindow(windowMetaData.getName(), contentType, windowMetaData.getContent() + .getContentURI()); + + // + window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_REGION, windowMetaData.getRegion()); + window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + windowMetaData.getHeight()); + if (windowMetaData.getInitialWindowState() != null) + { + window + .setDeclaredProperty(WindowImpl.PORTAL_INITIAL_WINDOW_STATE, "" + windowMetaData.getInitialWindowState()); + } + if (windowMetaData.getInitialMode() != null) + { + window.setDeclaredProperty(WindowImpl.PORTAL_INITIAL_MODE, "" + windowMetaData.getInitialMode()); + } + + // + return window; + } + + private void configure(CommonPortalObject commonPortalObject, PortalObject object, ClassLoader webappClassLoader) + throws SecurityConfigurationException + { + // Configure properties + + System.out.println("COMMONPORTALOBJECT : " + commonPortalObject.getName()); + + if (commonPortalObject.getProperties() != null && commonPortalObject.getProperties().getProperties() != null) + { + List<PropertyMetaData> propertyMetaData = commonPortalObject.getProperties().getProperties(); + if (propertyMetaData != null) + { + for (int i = 0; i < propertyMetaData.size(); i++) + { + String name = propertyMetaData.get(i).getName(); + String value = propertyMetaData.get(i).getValue(); + object.setDeclaredProperty(name, value); + } + } + } + + // Configure listener + object.setListener(commonPortalObject.getListener()); + + if (commonPortalObject.getResourceBundle() != null) + { + String resourceBundle = commonPortalObject.getResourceBundle(); + ResourceBundleManager bundleMgr = MetaDataResourceBundleFactory.createResourceBundleManager(webappClassLoader, + commonPortalObject.getSupportedLocales(), commonPortalObject.getResourceBundle()); + object.setDisplayName(bundleMgr.getLocalizedValue("org.jboss.portal.object.name." + + object.getId().getPath().toString(PortalObjectPath.LEGACY_FORMAT), object.getName())); + } + + LocalizedString localizedString = null; + Map<Locale, String> localizedStringValues = new HashMap<Locale, String>(); + if (commonPortalObject.getDisplayNames() != null) + { + for (int i = 0; i < commonPortalObject.getDisplayNames().size(); i++) + { + LocalizedDescriptionMetaData displayNameMetaData = commonPortalObject.getDisplayNames().get(i); + String lang = displayNameMetaData.getLang(); + Locale locale; + try + { + locale = LocaleFormat.DEFAULT.getLocale(lang); + localizedStringValues.put(locale, displayNameMetaData.getDescription()); + } + catch (ConversionException e) + { + log.error("Cannot set localized display-name, for language: " + lang, e); + } + } + } + if (localizedStringValues.size() != 0) + { + localizedString = new LocalizedString(localizedStringValues, Locale.ENGLISH); + } + + // Configure display name + if (localizedString != null) + { + object.setDisplayName(localizedString); + } + + // Configure security + Set<RoleSecurityBinding> securityBindings = new HashSet<RoleSecurityBinding>(); + + if (commonPortalObject.getSecurityConstraint() != null) + { + System.out.println("GOT SECURITY CONSTRAINTS : " + commonPortalObject.getSecurityConstraint().getPolicyPermission().size()); + for (int i = 0; i < commonPortalObject.getSecurityConstraint().getPolicyPermission().size(); i++) + { + PolicyPermissionMetaData policyPermissionMetaData = commonPortalObject.getSecurityConstraint() + .getPolicyPermission().get(i); + if (policyPermissionMetaData.getUnchecked() != null) + { + RoleSecurityBinding binding = new RoleSecurityBinding(policyPermissionMetaData.getActionNames(), + SecurityConstants.UNCHECKED_ROLE_NAME); + securityBindings.add(binding); + } + else + { + Set actionName = policyPermissionMetaData.getActionNames(); + String roleName = policyPermissionMetaData.getRoleName(); + RoleSecurityBinding binding = new RoleSecurityBinding(actionName, roleName); + securityBindings.add(binding); + } + } + } + + if (securityBindings.size() == 0) + { + if (commonPortalObject instanceof PortalMetaData) + { + // Default is view recursive + RoleSecurityBinding binding = new RoleSecurityBinding(PortalObjectPermission.VIEW_RECURSIVE_ACTION, + SecurityConstants.UNCHECKED_ROLE_NAME); + securityBindings.add(binding); + } + else if (commonPortalObject instanceof ContextMetaData) + { + // Default is view + RoleSecurityBinding binding = new RoleSecurityBinding(PortalObjectPermission.VIEW_ACTION, + SecurityConstants.UNCHECKED_ROLE_NAME); + securityBindings.add(binding); + } + } + else + { + // Skip window configuration + if (commonPortalObject instanceof WindowMetaData) + { + securityBindings = null; + log + .warn("Window " + + commonPortalObject.getName() + + " has a security " + + "configuration but it is not taken in account, portlet instance configuration should be done rather"); + } + } + + System.out.println("SECURITY BINDINGS : " + securityBindings); + if (securityBindings != null) + { + for (RoleSecurityBinding rsb : securityBindings) + { + System.out.println("RSB : " + rsb.getRoleName() + " : " + rsb.getActionsAsString()); + } + } + + // + if (securityBindings != null) + { + // Apply the constraint + PortalObjectContainer poc = this.portalObjectContainer; + DomainConfigurator domainConfigurator = poc.getAuthorizationDomain().getConfigurator(); + domainConfigurator.setSecurityBindings(object.getId().toString(PortalObjectPath.CANONICAL_FORMAT), + securityBindings); + } + } + + protected void configureCoodination(CoordinationMetaData coordinationMD, PortalObject portalObject) + throws IllegalCoordinationException + { + // implicit mode parameter + String bindingsImplicitMode = coordinationMD.getBindings().getImplicitMode(); + if (bindingsImplicitMode != null) + { + this.coordinationConfigurator.setParameterBindingImplicitMode((PageContainer) portalObject, Boolean + .valueOf(bindingsImplicitMode)); + } + // implicit mode event + String wiringImplicitMode = coordinationMD.getWirings().getImplicitMode(); + if (wiringImplicitMode != null) + { + this.coordinationConfigurator.setEventWiringImplicitMode((PageContainer) portalObject, Boolean + .valueOf(wiringImplicitMode)); + } + + if (portalObject instanceof Page) + { + Page page = (Page) portalObject; + + Map<Window, Set<QName>> bindings = new HashMap<Window, Set<QName>>(); + + for (ParameterBindingMetaData parameterBindingMetaData : coordinationMD.getBindings().getParameterBindings()) + { + for (WindowCoordinationMetaData windowsMetaData : parameterBindingMetaData.getWindowCoordination()) + { + String windowName = windowsMetaData.getWindowName(); + Window window = page.getWindow(windowName); + + if (window == null) + { + throw new IllegalCoordinationException("Cannot obtain window: \"" + windowName + "\" on page: " + + page.getName()); + } + + Set<QName> qNames = new HashSet<QName>(); + for (String name : windowsMetaData.getQNames()) + { + QName qName = new QName(name); + qNames.add(qName); + } + + bindings.put(window, qNames); + } + this.coordinationConfigurator.setParameterBinding(parameterBindingMetaData.getId(), bindings); + } + + for (AliasBindingMetaData aliasBindingMetaData : coordinationMD.getBindings().getAliasBindings()) + { + + Set<QName> qNames = new HashSet<QName>(); + for (String name : aliasBindingMetaData.getQNames()) + { + QName qName = new QName(name); + qNames.add(qName); + } + + this.coordinationConfigurator.setAliasBinding(page, aliasBindingMetaData.getId(), qNames); + } + + for (EventWiringMetaData wiringMetaData : coordinationMD.getWirings().getEventWiring()) + { + Map<Window, QName> sources = new HashMap<Window, QName>(); + Map<Window, QName> destinations = new HashMap<Window, QName>(); + + populateWindows(sources, wiringMetaData.getSources(), page); + populateWindows(destinations, wiringMetaData.getDestinations(), page); + + this.coordinationConfigurator.setEventWiring(sources, destinations, wiringMetaData.getName()); + } + + } + } + + protected void populateWindows(Map<Window, QName> map, List<WindowCoordinationMetaData> windows, Page page) + throws IllegalCoordinationException + { + for (WindowCoordinationMetaData windowCoordination : windows) + { + String qName = windowCoordination.getQName(); + QName name = QName.valueOf(qName); + + Window window = page.getWindow(windowCoordination.getWindowName()); + + if (window == null) + { + throw new IllegalCoordinationException("Cannot obtain window: \"" + windowCoordination.getWindowName() + + "\" on page: " + page.getName()); + } + + map.put(window, name); + } + } + +} Deleted: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java 2009-03-06 21:08:48 UTC (rev 12966) +++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java 2009-03-06 21:21:08 UTC (rev 12967) @@ -1,478 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.core.deployment.jboss; - -import org.jboss.deployment.DeploymentException; -import org.jboss.mx.util.MBeanProxyExt; -import org.jboss.portal.common.io.IOTools; -import org.jboss.portal.common.net.URLNavigator; -import org.jboss.portal.common.net.URLVisitor; -import org.jboss.portal.common.xml.NullEntityResolver; -import org.jboss.portal.common.xml.XMLTools; -import org.jboss.portal.core.metadata.ServiceMetaData; -import org.jboss.portal.core.metadata.portlet.JBossApplicationMetaData; -import org.jboss.portal.core.model.instance.DuplicateInstanceException; -import org.jboss.portal.core.model.instance.Instance; -import org.jboss.portal.core.model.instance.metadata.InstanceMetaData; -import org.jboss.portal.portlet.InvalidPortletIdException; -import org.jboss.portal.portlet.NoSuchPortletException; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.container.managed.ManagedObjectRegistryEventListener; -import org.jboss.portal.portlet.impl.metadata.portlet.PortletPreferenceMetaData; -import org.jboss.portal.portlet.impl.metadata.portlet.PortletPreferencesMetaData; -import org.jboss.portal.portlet.state.PropertyChange; -import org.jboss.portal.portlet.state.PropertyMap; -import org.jboss.portal.security.RoleSecurityBinding; -import org.jboss.portal.security.SecurityConstants; -import org.jboss.portal.security.metadata.SecurityConstraintsMetaData; -import org.jboss.portal.security.spi.provider.AuthorizationDomain; -import org.jboss.portal.security.spi.provider.DomainConfigurator; -import org.jboss.portal.security.spi.provider.SecurityConfigurationException; -import org.jboss.portal.server.deployment.PortalWebApp; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.xml.sax.EntityResolver; - -import javax.management.MBeanServer; -import javax.management.ObjectName; -import javax.xml.parsers.DocumentBuilder; -import java.io.File; -import java.io.InputStream; -import java.net.URL; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ - */ -public class PortletAppDeployment extends org.jboss.portal.portlet.deployment.jboss.PortletAppDeployment -{ - - /** . */ - public static final int OVERWRITE_IF_EXISTS = 0; - - /** . */ - public static final int KEEP_IF_EXISTS = 1; - - /** . */ - private PortletAppDeploymentFactory factory; - - public PortletAppDeployment(URL url, PortalWebApp pwa, ManagedObjectRegistryEventListener listener, MBeanServer mbeanServer, PortletAppDeploymentFactory factory) - { - super(url, pwa, listener, mbeanServer, factory); - this.factory = factory; - } - - public void start() throws DeploymentException - { - //disable since we want to use the one from the deployer module - if (true) return; - // Inject services if needed - injectServices(); - - // - super.start(); - - // Build instances objects related to the portlet life cycle - if (factory.getCreateInstances()) - { - buildInstances(); - } - } - - /** Inject service proxies into the context of the web application if it is needed. */ - protected void injectServices() - { - if (jbossAppMD instanceof JBossApplicationMetaData) - { - JBossApplicationMetaData jBossApplicationMetaData = ((JBossApplicationMetaData)jbossAppMD); - for (Iterator<ServiceMetaData> i = jBossApplicationMetaData.getServices().values().iterator(); i.hasNext();) - { - ServiceMetaData serviceMD = (ServiceMetaData)i.next(); - - // - String serviceName = serviceMD.getName(); - String serviceClass = serviceMD.getClassName(); - String serviceRef = serviceMD.getRef(); - log.debug("Trying to inject service '" + serviceName + "' (ref: '" + serviceRef + "' class: " + serviceClass + - ") in the servlet context of " + pwa.getURL()); - - // - if (serviceRef.startsWith(":")) - { - log.debug("Detecting a relative service reference " + serviceRef + " prepending it with " + factory.getConfig().getDomain()); - serviceRef = factory.getConfig().getDomain() + serviceRef; - } - - // - try - { - Class proxyClass = pwa.getClassLoader().loadClass(serviceClass); - ObjectName objectName = ObjectName.getInstance(serviceRef); - Object proxy = MBeanProxyExt.create(proxyClass, objectName, mbeanServer, true); - pwa.getServletContext().setAttribute(serviceName, proxy); - } - catch (Exception e) - { - log.error("Was not able to create service proxy", e); - } - } - } - } - - private void buildInstances() - { - // Read portlet-instances.xml - try - { - // All the meta data gathered - final ArrayList metaDataCtxs = new ArrayList(); - - // Parse instances from legacy -object.xml - log.debug("Looking for the WEB-INF path of " + pwa.getId()); - final String webInfPath = pwa.getServletContext().getRealPath("/WEB-INF"); - if (webInfPath != null) - { - File webInfFile = new File(webInfPath); - URL webInfURL = webInfFile.toURL(); - URLNavigator.visit(webInfURL, new URLVisitor() - { - public void startDir(URL url, String name) - { - } - - public void endDir(URL url, String name) - { - } - - public void file(URL url, String name) - { - boolean logged = false; - if (name.endsWith("-object.xml")) - { - InputStream in = null; - try - { - in = IOTools.safeBufferedWrapper(url.openStream()); - DocumentBuilder builder = XMLTools.getDocumentBuilderFactory().newDocumentBuilder(); - EntityResolver entityResolver = factory.getPortalObjectEntityResolver(); - if (entityResolver == null) - { - log.debug("Coult not obtain entity resolver for " + url); - entityResolver = new NullEntityResolver(); - } - else - { - log.debug("Obtained entity resolver " + entityResolver + " for " + url); - } - builder.setEntityResolver(entityResolver); - Document doc = builder.parse(in); - Element deploymentsElt = doc.getDocumentElement(); - for (Iterator i = XMLTools.getChildrenIterator(deploymentsElt, "deployment"); i.hasNext();) - { - Element deploymentElt = (Element)i.next(); - - // - Element instanceElt = XMLTools.getUniqueChild(deploymentElt, "instance", false); - - // - if (instanceElt != null) - { - if (!logged) - { - log.debug("Found -object.xml containing instances, you need to convert and move them to the file " + webInfPath + "/portlet-instances.xml"); - logged = true; - } - - // - InstanceMetaData metaData = InstanceMetaData.buildLegacyMetaData(instanceElt, pwa.getId()); - - // - if (metaData != null) - { - InstanceMetaDataContext metaDataCtx = new InstanceMetaDataContext(metaData, KEEP_IF_EXISTS); - metaDataCtxs.add(metaDataCtx); - } - } - } - } - catch (Exception e) - { - e.printStackTrace(); - } - finally - { - IOTools.safeClose(in); - } - } - } - }); - } - else - { - log.debug("No real path found"); - } - - // Output legacy file on the console - if (metaDataCtxs.size() > 0) - { - DocumentBuilder builder = XMLTools.getDocumentBuilderFactory().newDocumentBuilder(); - Document doc = builder.newDocument(); - Element deployments = (Element)doc.appendChild(doc.createElement("deployments")); - for (int i = 0; i < metaDataCtxs.size(); i++) - { - InstanceMetaDataContext metaDataCtx = (InstanceMetaDataContext)metaDataCtxs.get(i); - InstanceMetaData instanceMD = metaDataCtx.metaData; - Element deploymentElt = (Element)deployments.appendChild(doc.createElement("deployment")); - Element instanceElt = (Element)deploymentElt.appendChild(doc.createElement("instance")); - Element instanceIdElt = (Element)instanceElt.appendChild(doc.createElement("instance-id")); - instanceIdElt.appendChild(doc.createTextNode(instanceMD.getId())); - Element portletRefElt = (Element)instanceElt.appendChild(doc.createElement("portlet-ref")); - portletRefElt.appendChild(doc.createTextNode(instanceMD.getPortletRef())); - } - String migratedContent = XMLTools.toString(doc, false, true, true, "utf-8"); - log.info("These instances have been found in -object.xml, you should put them in the file " + webInfPath + "/portlet-instances.xml"); - log.info(migratedContent); - } - - // Get instances from portlet-instances.xml - InputStream in = null; - try - { - in = IOTools.safeBufferedWrapper(pwa.getServletContext().getResourceAsStream("/WEB-INF/portlet-instances.xml")); - if (in != null) - { - DocumentBuilder builder = XMLTools.getDocumentBuilderFactory().newDocumentBuilder(); - EntityResolver entityResolver = factory.getPortletInstancesEntityResolver(); - if (entityResolver == null) - { - log.debug("Coult not obtain entity resolver for portlet-instances.xml"); - entityResolver = new NullEntityResolver(); - } - else - { - log.debug("Obtained entity resolver " + entityResolver + " for portlet-instances.xml"); - } - builder.setEntityResolver(entityResolver); - Document doc = builder.parse(in); - - // - for (Iterator i = XMLTools.getChildrenIterator(doc.getDocumentElement(), "deployment"); i.hasNext();) - { - Element deploymentElt = (Element)i.next(); - - // - Element instanceElt = XMLTools.getUniqueChild(deploymentElt, "instance", true); - - // - InstanceMetaData metaData = InstanceMetaData.buildMetaData(instanceElt, pwa); - - // - Element ifExistsElt = XMLTools.getUniqueChild(deploymentElt, "if-exists", false); - int ifExists = KEEP_IF_EXISTS; - if (ifExistsElt != null) - { - String tmp = XMLTools.asString(ifExistsElt); - if ("overwrite".equals(tmp)) - { - ifExists = OVERWRITE_IF_EXISTS; - } - else if ("keep".equals(tmp)) - { - ifExists = KEEP_IF_EXISTS; - } - } - - // - InstanceMetaDataContext metaDataCtx = new InstanceMetaDataContext(metaData, ifExists); - - // - metaDataCtxs.add(metaDataCtx); - } - } - } - finally - { - IOTools.safeClose(in); - } - - // Create instances when we have - if (metaDataCtxs.size() > 0) - { - createInstances(metaDataCtxs); - } - } - catch (Exception e) - { - log.error("Error when creating instances", e); - } - } - - private void createInstances(List metaDataCtxs) throws Exception - { - // Create all the instances when possible - for (int i = 0; i < metaDataCtxs.size(); i++) - { - InstanceMetaDataContext metaDataCtx = (InstanceMetaDataContext)metaDataCtxs.get(i); - // - try - { - handleInstance(metaDataCtx); - } - catch (NoSuchPortletException e) - { - String msg = "Failed to create instance " + metaDataCtx.metaData.getId() + " of portlet " + e.getPortletId() + - " because portlet " + e.getPortletId() + " is not available"; - log.warn(msg); - log.debug(msg, e); - } - catch (InvalidPortletIdException e) - { - String msg = "Failed to create instance " + metaDataCtx.metaData.getId() + " of portlet " + e.getPortletId() + - " because portlet id " + e.getPortletId() + " is invalid"; - log.warn(msg); - log.debug(msg, e); - } - catch (PortletInvokerException e) - { - String msg = "Failed to create instance " + metaDataCtx.metaData.getId() + " of portlet"; - log.warn(msg); - log.debug(msg, e); - } - catch (DuplicateInstanceException e) - { - String msg = "Instance " + metaDataCtx.metaData.getId() + " already exists"; - log.warn(msg); - log.debug(msg, e); - } - catch (SecurityConfigurationException e) - { - String msg = "Cannot configure security of instance " + metaDataCtx.metaData.getId(); - log.warn(msg); - log.debug(msg, e); - } - } - } - - /** Requires a transaction to execute, setup in aop configuration. */ - private void handleInstance(InstanceMetaDataContext metaDataCtx) throws PortletInvokerException, SecurityConfigurationException, DuplicateInstanceException - { - InstanceMetaData metaData = metaDataCtx.metaData; - Instance instance = factory.getInstanceContainer().getDefinition(metaData.getId()); - if (instance == null) - { - createInstance(metaData); - } - else if (metaDataCtx.ifExists == OVERWRITE_IF_EXISTS) - { - log.debug("Reconfiguring instance " + metaData.getId() + " that already exists"); - configureInstance(instance, metaData); - } - else - { - log.debug("Instance " + metaData.getId() + " exists"); - } - } - - private void configureInstance(Instance instance, InstanceMetaData metaData) throws PortletInvokerException, SecurityConfigurationException - { - List<PropertyChange> changes = new ArrayList<PropertyChange>(); - - // Reset all preferences that are not overridden - PortletPreferencesMetaData preferencesMetaData = metaData.getPreferences(); - PropertyMap propertyMap = instance.getProperties(); - if (propertyMap != null && propertyMap.size() > 0) - { - for (String key : propertyMap.keySet()) - { - if (preferencesMetaData == null || preferencesMetaData.getPortletPreferences() == null || preferencesMetaData.getPortletPreferences().get(key) == null) - { - changes.add(PropertyChange.newReset(key)); - } - } - } - - // Configure preferences only if needed - if (preferencesMetaData != null && preferencesMetaData.getPortletPreferences() != null && preferencesMetaData.getPortletPreferences().size() > 0) - { - for (PortletPreferenceMetaData preference : preferencesMetaData.getPortletPreferences().values()) - { - List<String> preferenceValues = preference.getValue(); - changes.add(PropertyChange.newUpdate(preference.getName(), preferenceValues.toArray(new String[preferenceValues.size()]))); - } - } - - if (changes.size() > 0) - { - instance.setProperties(changes.toArray(new PropertyChange[changes.size()])); - } - - // Configure security - SecurityConstraintsMetaData securityConstraints = metaData.getSecurityConstraints(); - if (securityConstraints == null) - { - securityConstraints = new SecurityConstraintsMetaData(); - securityConstraints.getConstraints().add(new RoleSecurityBinding("view", SecurityConstants.UNCHECKED_ROLE_NAME)); - } - AuthorizationDomain authDomain = instance.getContainer().getAuthorizationDomain(); - DomainConfigurator domainConfigurator = authDomain.getConfigurator(); - domainConfigurator.setSecurityBindings(instance.getId(), securityConstraints.getConstraints()); - } - - private void createInstance(InstanceMetaData metaData) throws PortletInvokerException, DuplicateInstanceException, SecurityConfigurationException - { - log.debug("Creating portlet instance " + metaData.getId()); - - // Resolve the portlet ref - metaData.setPortletRef(resolvePortletRef(metaData.getPortletRef())); - - // Create the instance - Instance instance = factory.getInstanceContainer().createDefinition(metaData); - - // Configure - configureInstance(instance, metaData); - } - - - private String resolvePortletRef(String ref) - { - return "local." + getAppId() + "." + ref; - } - - private class InstanceMetaDataContext - { - /** . */ - private InstanceMetaData metaData; - - /** . */ - private int ifExists; - - public InstanceMetaDataContext(InstanceMetaData metaData, int ifExists) - { - this.metaData = metaData; - this.ifExists = ifExists; - } - } -} Added: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentContainer.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentContainer.java (rev 0) +++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentContainer.java 2009-03-06 21:21:08 UTC (rev 12967) @@ -0,0 +1,277 @@ +//package org.jboss.portal.core.deployment.jboss; +// +//import java.net.URL; +//import java.util.ArrayList; +//import java.util.HashSet; +//import java.util.List; +// +//import javax.management.MBeanServer; +//import javax.management.ObjectName; +//import javax.servlet.ServletContext; +// +//import org.hibernate.cfg.ExtendsQueueEntry; +//import org.jboss.logging.Logger; +//import org.jboss.portal.core.model.instance.DuplicateInstanceException; +//import org.jboss.portal.core.model.instance.Instance; +//import org.jboss.portal.core.model.instance.InstanceContainer; +//import org.jboss.portal.metadata.portlet.PolicyPermissionMetaData; +//import org.jboss.portal.metadata.portlet.PortletDeploymentInstanceMetaData; +//import org.jboss.portal.metadata.portlet.PortletDeploymentInstancesMetaData; +//import org.jboss.portal.metadata.portlet.PortletPreferencesMetaData; +//import org.jboss.portal.metadata.portlet.SecurityConstrainMetaData; +//import org.jboss.portal.portlet.PortletInvoker; +//import org.jboss.portal.portlet.PortletInvokerException; +//import org.jboss.portal.portlet.container.ContainerPortletInvoker; +//import org.jboss.portal.portlet.container.PortletApplicationContext; +//import org.jboss.portal.portlet.container.PortletContainer; +//import org.jboss.portal.portlet.container.PortletContainerContext; +//import org.jboss.portal.portlet.container.PortletFilterContext; +//import org.jboss.portal.portlet.container.managed.LifeCycleStatus; +//import org.jboss.portal.portlet.container.managed.ManagedObject; +//import org.jboss.portal.portlet.container.managed.ManagedObjectEvent; +//import org.jboss.portal.portlet.container.managed.ManagedObjectLifeCycleEvent; +//import org.jboss.portal.portlet.container.managed.ManagedObjectRegistryEvent; +//import org.jboss.portal.portlet.container.managed.ManagedObjectRegistryEventListener; +//import org.jboss.portal.portlet.container.object.PortletApplicationObject; +//import org.jboss.portal.portlet.container.object.PortletContainerObject; +//import org.jboss.portal.portlet.container.object.PortletFilterObject; +//import org.jboss.portal.portlet.deployment.jboss.InfoBuilder; +//import org.jboss.portal.portlet.deployment.jboss.InfoBuilderFactory; +//import org.jboss.portal.portlet.deployment.jboss.PortletApplicationContextImpl; +//import org.jboss.portal.portlet.deployment.jboss.PortletContainerContextImpl; +//import org.jboss.portal.portlet.deployment.jboss.PortletFilterContextImpl; +//import org.jboss.portal.portlet.deployment.jboss.metadata.JBossApplicationMetaData; +//import org.jboss.portal.portlet.impl.container.PortletApplicationLifeCycle; +//import org.jboss.portal.portlet.impl.container.PortletContainerLifeCycle; +//import org.jboss.portal.portlet.impl.container.PortletFilterLifeCycle; +//import org.jboss.portal.portlet.impl.info.ContainerFilterInfo; +//import org.jboss.portal.portlet.impl.info.ContainerPortletInfo; +//import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl; +//import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl; +//import org.jboss.portal.portlet.impl.jsr168.PortletFilterImpl; +//import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; +//import org.jboss.portal.portlet.impl.metadata.portlet.PortletPreferenceMetaData; +//import org.jboss.portal.portlet.info.PortletInfo; +//import org.jboss.portal.portlet.security.PortletSecurityService; +//import org.jboss.portal.portlet.state.PropertyChange; +//import org.jboss.portal.portlet.state.PropertyMap; +//import org.jboss.portal.security.RoleSecurityBinding; +//import org.jboss.portal.security.SecurityConstants; +//import org.jboss.portal.security.spi.provider.AuthorizationDomain; +//import org.jboss.portal.security.spi.provider.DomainConfigurator; +//import org.jboss.portal.server.config.ServerConfig; +//import org.jboss.portal.server.deployment.PortalWebApp; +//import org.jboss.portal.server.deployment.PortalWebTomcat4App; +//import org.jboss.web.WebApplication; +// +//public class PortletAppDeploymentContainer { +// +// protected final Logger log = Logger.getLogger(getClass()); +// +// private InfoBuilderFactory coreInfoBuilderFactory; +// private PortletInvoker portletContainerInvoker; +// protected ServerConfig config; +// protected PortletSecurityService portletSecurityService; +// protected InstanceContainer instanceContainer; +// +// protected PortletApplicationLifeCycle portletApplicationLifeCycle; +// protected MBeanServer mbeanServer; +// protected String appId; +// +// protected final ManagedObjectRegistryEventListener bridgeToInvoker = new ManagedObjectRegistryEventListener() +// { +// public void onEvent(ManagedObjectRegistryEvent event) +// { +// if (event instanceof ManagedObjectEvent) +// { +// ManagedObjectEvent managedObjectEvent = (ManagedObjectEvent)event; +// ManagedObject managedObject = managedObjectEvent.getManagedObject(); +// +// // +// if (managedObject instanceof PortletContainerLifeCycle) +// { +// PortletContainerLifeCycle portletContainerLifeCycle = (PortletContainerLifeCycle)managedObject; +// PortletContainer portletContainer = portletContainerLifeCycle.getPortletContainer(); +// +// // +// if (managedObjectEvent instanceof ManagedObjectLifeCycleEvent) +// { +// ManagedObjectLifeCycleEvent lifeCycleEvent = (ManagedObjectLifeCycleEvent)managedObjectEvent; +// +// // +// LifeCycleStatus status = lifeCycleEvent.getStatus(); +// // +// if (status == LifeCycleStatus.STARTED) +// { +// ((ContainerPortletInvoker)portletContainerInvoker).addPortletContainer(portletContainer); +// } +// else +// { +// ((ContainerPortletInvoker)portletContainerInvoker).removePortletContainer(portletContainer); +// } +// } +// } +// } +// } +// }; +// +// private ManagedObjectRegistryEventListener listener = bridgeToInvoker; +// +// public void setCoreInfoBuilderFactory(InfoBuilderFactory coreInfoBuilderFactory) +// { +// this.coreInfoBuilderFactory = coreInfoBuilderFactory; +// } +// +// public InfoBuilderFactory getCoreInfoBuilderFactory() +// { +// return coreInfoBuilderFactory; +// } +// +// public PortletInvoker getPortletContainerInvoker() +// { +// return portletContainerInvoker; +// } +// +// public void setPortletContainerInvoker(PortletInvoker portletContainerInvoker) +// { +// this.portletContainerInvoker = portletContainerInvoker; +// } +// +// public ServerConfig getConfig() +// { +// return config; +// } +// +// public void setConfig(ServerConfig config) +// { +// this.config = config; +// } +// +// public PortletSecurityService getPortletSecurityService() +// { +// return portletSecurityService; +// } +// +// public void setPortletSecurityService(PortletSecurityService portletSecurityService) +// { +// this.portletSecurityService = portletSecurityService; +// } +// +// public InstanceContainer getInstanceContainer() +// { +// return instanceContainer; +// } +// +// public void setInstanceContainer(InstanceContainer instanceContainer) +// { +// this.instanceContainer = instanceContainer; +// } +// +// public void setMBeanServer (MBeanServer mbeanServer) +// { +// this.mbeanServer =mbeanServer; +// } +// +// public void deployPortlets (WebApplication webApp, org.jboss.portal.core.metadata.portlet.JBossApplicationMetaData jbossAppMD, PortletApplication10MetaData portletAppMD) throws Exception +// { +// +// this.appId = jbossAppMD.getId(); +// +// PortalWebApp pwa = new PortalWebApplication (webApp); +// InfoBuilder infoBuilder = coreInfoBuilderFactory.createInfoBuilder(pwa, jbossAppMD, portletAppMD); +// infoBuilder.build(); +// +// PortletApplicationObject portletApplicationObject = new PortletApplicationImpl(infoBuilder.getApplication()); +// PortletApplicationContext portletApplicationContext = new PortletApplicationContextImpl(pwa); +// +// // +// portletApplicationLifeCycle = new PortletApplicationLifeCycle( +// listener, +// portletApplicationContext, +// portletApplicationObject); +// +// // +// for (ContainerFilterInfo filterInfo : infoBuilder.getApplication().getFilters().values()) +// { +// PortletFilterObject portletFilterObject = new PortletFilterImpl(filterInfo); +// PortletFilterContext portletFilterContext = new PortletFilterContextImpl(); +// +// // +// portletApplicationLifeCycle.addPortletFilter(portletFilterContext, portletFilterObject); +// System.out.println("ADDING FILTERINFO : " + portletFilterContext + " : " + portletFilterObject ); +// } +// +// // +// for (PortletInfo portletInfo : infoBuilder.getPortlets()) +// { +// System.out.println("PORTLETINFO : " + portletInfo); +// ContainerPortletInfo cpi = (ContainerPortletInfo)portletInfo; +// PortletContainerObject portletContainerObject = new PortletContainerImpl(cpi); +// PortletContainerContext portletContainerContext = new PortletContainerContextImpl(); +// +// // +// PortletContainerLifeCycle portletContainerLifeCycle = portletApplicationLifeCycle.addPortletContainer(portletContainerContext, portletContainerObject); +// +// // Now create deps +// for (String filterRef : cpi.getFilterRefs()) +// { +// PortletFilterLifeCycle portletFilterLifeCycle = portletApplicationLifeCycle.getManagedPortletFilter(filterRef); +// +// // +// if (portletFilterLifeCycle != null) +// { +// portletApplicationLifeCycle.addDependency(portletFilterLifeCycle, portletContainerLifeCycle); +// } +// else +// { +// // todo +// } +// } +// } +// +// // +// portletApplicationLifeCycle.create(); +// +// // +// portletApplicationLifeCycle.managedStart(); +// +// System.out.println("DONE DEPLOYING PORTLETS"); +// } +// +//class PortalWebApplication extends PortalWebApp +//{ +// +// public PortalWebApplication(WebApplication webapp) throws Exception +// { +// +// ObjectName objectName = (ObjectName) webapp.getAppData(); +// Object standardContext = mbeanServer.getAttribute(objectName, "managedResource"); +// +// String contextPath = PortalWebTomcat4App.getContextPath(standardContext); +// ServletContext servletContext = PortalWebTomcat4App.getServletContext(standardContext); +// URL url = webapp.getURL(); +// ClassLoader loader = webapp.getClassLoader(); +// +// init(servletContext, url, loader, contextPath); +// } +// +// @Override +// public void instrument() throws Exception +// { +// //do nothing +// } +// +//} +// +//} +// +// +// +// +// +// +// +// +// +// +// Deleted: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory.java 2009-03-06 21:08:48 UTC (rev 12966) +++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory.java 2009-03-06 21:21:08 UTC (rev 12967) @@ -1,115 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.core.deployment.jboss; - -import java.net.URL; - -import javax.management.MBeanServer; - -import org.jboss.deployment.DeploymentException; -import org.jboss.portal.core.deployment.JBossApplicationMetaDataFactory; -import org.jboss.portal.core.model.instance.InstanceContainer; -import org.jboss.portal.server.deployment.PortalWebApp; -import org.jboss.portal.server.deployment.jboss.Deployment; -import org.xml.sax.EntityResolver; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ - */ -public class PortletAppDeploymentFactory extends org.jboss.portal.portlet.deployment.jboss.PortletAppDeploymentFactory -{ - - /** . */ - protected InstanceContainer instanceContainer; - - /** . */ - protected boolean createInstances; - - /** . */ - protected EntityResolver portletInstancesEntityResolver; - - /** . */ - protected EntityResolver portalObjectEntityResolver; - - public Deployment newInstance(URL url, PortalWebApp pwa, MBeanServer mbeanServer) throws DeploymentException - { - return new PortletAppDeployment(url, pwa, bridgeToInvoker, mbeanServer, this); - } - - public EntityResolver getPortalObjectEntityResolver() - { - return portalObjectEntityResolver; - } - - public void setPortalObjectEntityResolver(EntityResolver portalObjectEntityResolver) - { - this.portalObjectEntityResolver = portalObjectEntityResolver; - } - - public EntityResolver getPortletInstancesEntityResolver() - { - return portletInstancesEntityResolver; - } - - public void setPortletInstancesEntityResolver(EntityResolver portletInstancesEntityResolver) - { - this.portletInstancesEntityResolver = portletInstancesEntityResolver; - } - - public InstanceContainer getInstanceContainer() - { - return instanceContainer; - } - - public void setInstanceContainer(InstanceContainer instanceContainer) - { - this.instanceContainer = instanceContainer; - } - - /** Return a subclass that does more. */ - public org.jboss.portal.portlet.deployment.jboss.JBossApplicationMetaDataFactory createJBossApplicationMetaDataFactory() - { - return new JBossApplicationMetaDataFactory(); - } - - public void enableCreateInstances() - { - createInstances = true; - } - - public void disableCreateInstances() - { - createInstances = false; - } - - public boolean getCreateInstances() - { - return createInstances; - } - - public void setCreateInstances(boolean createInstances) - { - this.createInstances = createInstances; - } -} Added: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletDeploymentImpl.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletDeploymentImpl.java (rev 0) +++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletDeploymentImpl.java 2009-03-06 21:21:08 UTC (rev 12967) @@ -0,0 +1,234 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.core.deployment.jboss; + +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.ServletContext; + +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.logging.Logger; +import org.jboss.portal.deployer.container.PortletDeployment; +import org.jboss.portal.metadata.jboss.portlet.JBossPortletAppMetaData; +import org.jboss.portal.metadata.portlet.PortletApplication10MetaData; +import org.jboss.portal.portlet.PortletInvoker; +import org.jboss.portal.portlet.container.ContainerPortletInvoker; +import org.jboss.portal.portlet.container.PortletApplicationContext; +import org.jboss.portal.portlet.container.PortletContainer; +import org.jboss.portal.portlet.container.PortletContainerContext; +import org.jboss.portal.portlet.container.PortletFilterContext; +import org.jboss.portal.portlet.container.managed.LifeCycleStatus; +import org.jboss.portal.portlet.container.managed.ManagedObject; +import org.jboss.portal.portlet.container.managed.ManagedObjectEvent; +import org.jboss.portal.portlet.container.managed.ManagedObjectLifeCycleEvent; +import org.jboss.portal.portlet.container.managed.ManagedObjectRegistryEvent; +import org.jboss.portal.portlet.container.managed.ManagedObjectRegistryEventListener; +import org.jboss.portal.portlet.container.object.PortletApplicationObject; +import org.jboss.portal.portlet.container.object.PortletContainerObject; +import org.jboss.portal.portlet.container.object.PortletFilterObject; +import org.jboss.portal.portlet.deployment.jboss.InfoBuilder; +import org.jboss.portal.portlet.deployment.jboss.InfoBuilderFactory; +import org.jboss.portal.portlet.deployment.jboss.PortletApplicationContextImpl; +import org.jboss.portal.portlet.deployment.jboss.PortletContainerContextImpl; +import org.jboss.portal.portlet.deployment.jboss.PortletFilterContextImpl; +import org.jboss.portal.portlet.impl.container.PortletApplicationLifeCycle; +import org.jboss.portal.portlet.impl.container.PortletContainerLifeCycle; +import org.jboss.portal.portlet.impl.container.PortletFilterLifeCycle; +import org.jboss.portal.portlet.impl.info.ContainerFilterInfo; +import org.jboss.portal.portlet.impl.info.ContainerPortletInfo; +import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl; +import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl; +import org.jboss.portal.portlet.impl.jsr168.PortletFilterImpl; +import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.server.deployment.PortalWebApp; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class PortletDeploymentImpl implements PortletDeployment +{ + protected final Logger log = Logger.getLogger(this.getClass()); + + protected InfoBuilderFactory coreInfoBuilderFactory; + protected PortletInvoker portletContainerInvoker; + + protected Map<URL, PortletApplicationLifeCycle> portletApplicationLifeCycles = new HashMap<URL, PortletApplicationLifeCycle>(); + + public void setPortletContainerInvoker (PortletInvoker portletContainerInvoker) + { + this.portletContainerInvoker = portletContainerInvoker; + } + + public void setCoreInfoBuilderFactory (InfoBuilderFactory coreInfoBuilderFactory) + { + this.coreInfoBuilderFactory = coreInfoBuilderFactory; + } + + public void deployPortlets(ServletContext servletContext, URL url, ClassLoader classloader, String contextPath, + JBossPortletAppMetaData jbossPortletAppMetaData, PortletApplication10MetaData portletAppMetaData) + throws DeploymentException + { + System.out.println("DEPLOY PORTLETS"); + PortalWebApplication portalWebApp = new PortalWebApplication(servletContext, url, classloader, contextPath); + deployPortlets(portalWebApp, jbossPortletAppMetaData, portletAppMetaData); + } + + public void deployPortlets(PortalWebApp pwa, JBossPortletAppMetaData jbossAppMD, PortletApplication10MetaData portletAppMD) + { + System.out.println("DEPLOY PORTLETS PWA"); + InfoBuilder infoBuilder = coreInfoBuilderFactory.createInfoBuilder(pwa, jbossAppMD, portletAppMD); + infoBuilder.build(); + + System.out.println("GETAPPLICATION : " + infoBuilder.getApplication().getId()); + PortletApplicationObject portletApplicationObject = new PortletApplicationImpl(infoBuilder.getApplication()); + PortletApplicationContext portletApplicationContext = new PortletApplicationContextImpl(pwa); + + System.out.println("INFOBUILDER : " + infoBuilder.getPortlets() + " : " + infoBuilder.getPortlets().size()); + + // + PortletApplicationLifeCycle portletApplicationLifeCycle = new PortletApplicationLifeCycle(bridgeToInvoker, portletApplicationContext, + portletApplicationObject); + + portletApplicationLifeCycles.put(pwa.getURL(), portletApplicationLifeCycle); + + // + for (ContainerFilterInfo filterInfo : infoBuilder.getApplication().getFilters().values()) + { + PortletFilterObject portletFilterObject = new PortletFilterImpl(filterInfo); + PortletFilterContext portletFilterContext = new PortletFilterContextImpl(); + + // + portletApplicationLifeCycle.addPortletFilter(portletFilterContext, portletFilterObject); + System.out.println("ADDING FILTERINFO : " + portletFilterContext + " : " + portletFilterObject); + } + + // + for (PortletInfo portletInfo : infoBuilder.getPortlets()) + { + System.out.println("PORTLETINFO : " + portletInfo); + ContainerPortletInfo cpi = (ContainerPortletInfo) portletInfo; + PortletContainerObject portletContainerObject = new PortletContainerImpl(cpi); + PortletContainerContext portletContainerContext = new PortletContainerContextImpl(); + + // + PortletContainerLifeCycle portletContainerLifeCycle = portletApplicationLifeCycle.addPortletContainer( + portletContainerContext, portletContainerObject); + + // Now create deps + for (String filterRef : cpi.getFilterRefs()) + { + PortletFilterLifeCycle portletFilterLifeCycle = portletApplicationLifeCycle + .getManagedPortletFilter(filterRef); + + // + if (portletFilterLifeCycle != null) + { + portletApplicationLifeCycle.addDependency(portletFilterLifeCycle, portletContainerLifeCycle); + } + else + { + // todo + } + } + } + + // + portletApplicationLifeCycle.create(); + + // + portletApplicationLifeCycle.managedStart(); + } + + public void undeployPortlets(URL url) + { + PortletApplicationLifeCycle lifecycle = portletApplicationLifeCycles.get(url); + if (lifecycle != null) + { + lifecycle.destroy(); + } + else + { + log.warn("Could not find portlet lifecycle for " + url + ". Portlets may not have been undeployed"); + } + } + + /** Bridge managed object event to add/remove portlet container in portlet container invoker. */ + protected final ManagedObjectRegistryEventListener bridgeToInvoker = new ManagedObjectRegistryEventListener() + { + public void onEvent(ManagedObjectRegistryEvent event) + { + if (event instanceof ManagedObjectEvent) + { + ManagedObjectEvent managedObjectEvent = (ManagedObjectEvent)event; + ManagedObject managedObject = managedObjectEvent.getManagedObject(); + + // + if (managedObject instanceof PortletContainerLifeCycle) + { + PortletContainerLifeCycle portletContainerLifeCycle = (PortletContainerLifeCycle)managedObject; + PortletContainer portletContainer = portletContainerLifeCycle.getPortletContainer(); + + // + if (managedObjectEvent instanceof ManagedObjectLifeCycleEvent) + { + ManagedObjectLifeCycleEvent lifeCycleEvent = (ManagedObjectLifeCycleEvent)managedObjectEvent; + + // + LifeCycleStatus status = lifeCycleEvent.getStatus(); + // + if (status == LifeCycleStatus.STARTED) + { + ((ContainerPortletInvoker)portletContainerInvoker).addPortletContainer(portletContainer); + } + else + { + ((ContainerPortletInvoker)portletContainerInvoker).removePortletContainer(portletContainer); + } + } + } + } + } + }; + + + class PortalWebApplication extends PortalWebApp + { + + public PortalWebApplication(ServletContext servletContext, URL url, ClassLoader classloader, String contextPath) + { + init(servletContext, url, classloader, contextPath); + } + + @Override + public void instrument() throws Exception + { + //do nothing + } + + } + +} + Modified: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/AjaxInfoImpl.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/AjaxInfoImpl.java 2009-03-06 21:08:48 UTC (rev 12966) +++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/AjaxInfoImpl.java 2009-03-06 21:21:08 UTC (rev 12967) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.core.impl.portlet.info; -import org.jboss.portal.core.metadata.portlet.AjaxMetaData; import org.jboss.portal.core.portlet.info.AjaxInfo; +import org.jboss.portal.metadata.jboss.portlet.AjaxMetaData; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -37,7 +37,7 @@ public AjaxInfoImpl(AjaxMetaData ajaxMD) { - partialRefresh = !Boolean.FALSE.equals(ajaxMD.getPartialRefresh()); + partialRefresh = !Boolean.FALSE.equals(ajaxMD.isPartialRefresh()); } public boolean getPartialRefresh() Modified: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilder.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilder.java 2009-03-06 21:08:48 UTC (rev 12966) +++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilder.java 2009-03-06 21:21:08 UTC (rev 12967) @@ -23,10 +23,6 @@ package org.jboss.portal.core.impl.portlet.info; import org.jboss.portal.common.transaction.Transactions; -import org.jboss.portal.core.metadata.portlet.AjaxMetaData; -import org.jboss.portal.core.metadata.portlet.HeaderContentMetaData; -import org.jboss.portal.core.metadata.portlet.JBossPortletMetaData; -import org.jboss.portal.core.metadata.portlet.PortletInfoMetaData; import org.jboss.portal.core.portlet.info.AjaxInfo; import org.jboss.portal.core.portlet.info.MarkupHeaderInfo; import org.jboss.portal.core.portlet.info.PortletInfoInfo; @@ -36,13 +32,18 @@ import org.jboss.portal.portlet.deployment.jboss.PortletApplicationContextImpl; import org.jboss.portal.portlet.deployment.jboss.info.SessionInfo; import org.jboss.portal.portlet.deployment.jboss.info.impl.SessionInfoImpl; -import org.jboss.portal.portlet.deployment.jboss.metadata.JBossApplicationMetaData; import org.jboss.portal.portlet.impl.info.ContainerInfoBuilder; import org.jboss.portal.portlet.impl.info.ContainerInfoBuilderContext; import org.jboss.portal.portlet.impl.info.ContainerPortletApplicationInfo; import org.jboss.portal.portlet.impl.info.ContainerPortletInfo; import org.jboss.portal.portlet.impl.jsr168.ContainerInfoBuilderContextImpl; -import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; +import org.jboss.portal.metadata.jboss.portlet.AjaxMetaData; +import org.jboss.portal.metadata.jboss.portlet.HeaderContentMetaData; +import org.jboss.portal.metadata.jboss.portlet.JBossPortletAppMetaData; +import org.jboss.portal.metadata.jboss.portlet.JBossPortletMetaData; +import org.jboss.portal.metadata.jboss.portlet.PortletInfoMetaData; +import org.jboss.portal.metadata.jboss.portlet.TransactionMetaData; +import org.jboss.portal.metadata.portlet.PortletApplication10MetaData; import org.jboss.portal.portlet.info.PortletInfo; import org.apache.log4j.Logger; @@ -60,7 +61,7 @@ private static final Logger log = Logger.getLogger(CoreInfoBuilder.class); /** . */ - private JBossApplicationMetaData jbossApplicationMetaData; + private JBossPortletAppMetaData jbossApplicationMetaData; /** . */ private PortletApplication10MetaData portletApplicationMD; @@ -75,7 +76,7 @@ private ContainerPortletApplicationInfo application; public CoreInfoBuilder( - JBossApplicationMetaData jbossApplicationMetaData, + JBossPortletAppMetaData jbossApplicationMetaData, PortletApplication10MetaData portletApplicationMD, CoreInfoBuilderContext builderContext) { @@ -100,7 +101,7 @@ // String contextPath = builderContext.getWebApp().getContextPath(); - String id = jbossApplicationMetaData.getId(); + String id = jbossApplicationMetaData.getAppId(); // log.debug("Going to build portlet application metadata for application with context path '" + contextPath + "' with id '" + id + "'"); @@ -117,7 +118,7 @@ for (ContainerPortletInfo containerInfo : builder.getPortlets()) { String name = containerInfo.getName(); - org.jboss.portal.portlet.deployment.jboss.metadata.JBossPortletMetaData jbPortletMD = jbossApplicationMetaData.getPortlets().get(name); + JBossPortletMetaData jbPortletMD = jbossApplicationMetaData.getPortlets().get(name); if (jbPortletMD instanceof JBossPortletMetaData) { JBossPortletMetaData jbossPortletMD = (JBossPortletMetaData)jbPortletMD; @@ -140,23 +141,61 @@ containerInfo.setAttachment(PortletInfoInfo.class, new PortletInfoInfoImpl(new PortletApplicationContextImpl(builderContext.getWebApp()), portletInfoMD)); } - Transactions.Type txType = jbossPortletMD.getTxType(); - if (txType != null) + //Transactions.Type txType = jbossPortletMD.getTransaction().getTransAttribute(); getTxType(); + TransactionMetaData transactionMetaData = jbossPortletMD.getTransaction(); + if (transactionMetaData != null && transactionMetaData.getTransAttribute() != null) { - containerInfo.setAttachment(TransactionInfo.class, new TransactionInfoImpl(jbossPortletMD.getTxType())); - } + String transAttribute = transactionMetaData.getTransAttribute(); + Transactions.Type txType; + if ("Required".equalsIgnoreCase(transAttribute)) + { + txType = Transactions.TYPE_REQUIRED; + } + else if ("Mandatory".equals(transAttribute)) + { + txType = Transactions.TYPE_MANDATORY; + } + else if ("Never".equals(transAttribute)) + { + txType = (Transactions.TYPE_NEVER); + } + else if ("Supports".equals(transAttribute)) + { + txType = Transactions.TYPE_SUPPORTS; + } + else if ("NotSupported".equals(transAttribute)) + { + txType = Transactions.TYPE_NOT_SUPPORTED; + } + else if ("RequiresNew".equals(transAttribute)) + { + txType = Transactions.TYPE_REQUIRES_NEW; + } + else + { + throw new RuntimeException(); + } - Boolean distributed = jbossPortletMD.getDistributed(); - if (distributed != null) - { - containerInfo.setAttachment(SessionInfo.class, new SessionInfoImpl(distributed)); + if (txType != null) + { + containerInfo.setAttachment(TransactionInfo.class, new TransactionInfoImpl(txType)); + } + + if (jbossPortletMD.getSessionConfig() != null) + { + Boolean distributed = jbossPortletMD.getSessionConfig().isDistributed(); + if (distributed != null) + { + containerInfo.setAttachment(SessionInfo.class, new SessionInfoImpl(distributed)); + } + } + + Boolean remotable = jbossPortletMD.isRemotable(); + if (remotable != null) + { + containerInfo.setAttachment(WSRPInfo.class, new WSRPInfoImpl(remotable)); + } } - - Boolean remotable = jbossPortletMD.getRemotable(); - if (remotable != null) - { - containerInfo.setAttachment(WSRPInfo.class, new WSRPInfoImpl(remotable)); - } } portlets.put(name, containerInfo); Modified: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilderFactory.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilderFactory.java 2009-03-06 21:08:48 UTC (rev 12966) +++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilderFactory.java 2009-03-06 21:21:08 UTC (rev 12967) @@ -24,8 +24,8 @@ import org.jboss.portal.portlet.deployment.jboss.InfoBuilder; import org.jboss.portal.portlet.deployment.jboss.InfoBuilderFactory; -import org.jboss.portal.portlet.deployment.jboss.metadata.JBossApplicationMetaData; -import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; +import org.jboss.portal.metadata.jboss.portlet.JBossPortletAppMetaData; +import org.jboss.portal.metadata.portlet.PortletApplication10MetaData; import org.jboss.portal.server.deployment.PortalWebApp; /** @@ -35,10 +35,10 @@ public class CoreInfoBuilderFactory implements InfoBuilderFactory { - public InfoBuilder createInfoBuilder(PortalWebApp webApp, JBossApplicationMetaData jbossApplicationMetaData, PortletApplication10MetaData portletApplicationMD) + public InfoBuilder createInfoBuilder(PortalWebApp webApp, JBossPortletAppMetaData jbossPortletAppMetaData, PortletApplication10MetaData portletApplicationMetaData) { CoreInfoBuilderContext cibc = new CoreInfoBuilderContext(webApp); - CoreInfoBuilder cib = new CoreInfoBuilder(jbossApplicationMetaData, portletApplicationMD, cibc); + CoreInfoBuilder cib = new CoreInfoBuilder(jbossPortletAppMetaData, portletApplicationMetaData, cibc); return cib; } Modified: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/MarkupHeaderInfoImpl.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/MarkupHeaderInfoImpl.java 2009-03-06 21:08:48 UTC (rev 12966) +++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/MarkupHeaderInfoImpl.java 2009-03-06 21:21:08 UTC (rev 12967) @@ -23,9 +23,15 @@ package org.jboss.portal.core.impl.portlet.info; import org.jboss.portal.core.metadata.portlet.ElementMetaData; -import org.jboss.portal.core.metadata.portlet.HeaderContentMetaData; +import org.jboss.portal.core.metadata.portlet.LinkElementMetaData; +import org.jboss.portal.core.metadata.portlet.NamedMetaElementMetaData; +import org.jboss.portal.core.metadata.portlet.ScriptElementMetaData; import org.jboss.portal.core.metadata.portlet.MarkupElement; import org.jboss.portal.core.portlet.info.MarkupHeaderInfo; +import org.jboss.portal.metadata.jboss.portlet.HeaderContentMetaData; +import org.jboss.portal.metadata.jboss.portlet.LinkMetaData; +import org.jboss.portal.metadata.jboss.portlet.MetaMetaData; +import org.jboss.portal.metadata.jboss.portlet.ScriptMetaData; import java.util.ArrayList; import java.util.Collection; @@ -43,12 +49,29 @@ public MarkupHeaderInfoImpl(HeaderContentMetaData headerContentMD) { - ArrayList<MarkupElement> markupElements = new ArrayList<MarkupElement>(headerContentMD.getElements().size()); - for (ElementMetaData elementMetaData : headerContentMD.getElements()) + ArrayList<MarkupElement> markupElements = new ArrayList<MarkupElement>(); + if (headerContentMD.getLinks() != null) { - markupElements.add(elementMetaData.getElement()); + for (LinkMetaData linkMetaData : headerContentMD.getLinks()) + { + markupElements.add(getLinkMarkup(linkMetaData)); + } } - + if (headerContentMD.getScripts() != null) + { + for (ScriptMetaData scriptMetaData : headerContentMD.getScripts()) + { + markupElements.add(getScriptMarkup(scriptMetaData)); + } + } + if (headerContentMD.getMetas() != null) + { + for (MetaMetaData metaMetaData : headerContentMD.getMetas()) + { + markupElements.add(getMetaMarkup(metaMetaData)); + } + } + // this.markupElements = Collections.unmodifiableCollection(markupElements); } @@ -57,4 +80,33 @@ { return markupElements; } + + protected MarkupElement getLinkMarkup (LinkMetaData linkMetaData) + { + String type = linkMetaData.getType(); + String rel = linkMetaData.getRel(); + String href = linkMetaData.getHref(); + String media = linkMetaData.getMedia(); + String title = linkMetaData.getTitle(); + LinkElementMetaData linkElement = new LinkElementMetaData (rel, type, href, media, title); + return linkElement.buildElement(); + } + + protected MarkupElement getScriptMarkup (ScriptMetaData scriptMetaData) + { + String type = scriptMetaData.getType(); + String src = scriptMetaData.getSrc(); + ScriptElementMetaData scriptElement = new ScriptElementMetaData(type, src); + scriptElement.setBodyContent(scriptMetaData.getScript()); + return scriptElement.buildElement(); + } + + protected MarkupElement getMetaMarkup (MetaMetaData metaMetaData) + { + String name = metaMetaData.getName(); + String content = metaMetaData.getContent(); + NamedMetaElementMetaData metaElement = new NamedMetaElementMetaData(name, content); + return metaElement.buildElement(); + } + } Modified: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletIconInfoImpl.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletIconInfoImpl.java 2009-03-06 21:08:48 UTC (rev 12966) +++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletIconInfoImpl.java 2009-03-06 21:21:08 UTC (rev 12967) @@ -22,10 +22,11 @@ ******************************************************************************/ package org.jboss.portal.core.impl.portlet.info; -import org.jboss.portal.core.metadata.portlet.PortletIconMetaData; import org.jboss.portal.core.portlet.info.PortletIconInfo; +import org.jboss.portal.metadata.jboss.portlet.PortletIconMetaData; import org.jboss.portal.portlet.container.PortletApplicationContext; +import java.util.HashMap; import java.util.Map; /** @@ -42,7 +43,10 @@ public PortletIconInfoImpl(PortletApplicationContext portletApplicationContext, PortletIconMetaData portletIconMetaData) { - icons = portletIconMetaData.getIcons(); + icons = new HashMap<String, String>(); + icons.put("large", portletIconMetaData.getLargeIcon()); + icons.put("small", portletIconMetaData.getSmallIcon()); + this.portletApplicationContext = portletApplicationContext; } Modified: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java 2009-03-06 21:08:48 UTC (rev 12966) +++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java 2009-03-06 21:21:08 UTC (rev 12967) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.core.impl.portlet.info; -import org.jboss.portal.core.metadata.portlet.PortletInfoMetaData; import org.jboss.portal.core.portlet.info.PortletIconInfo; import org.jboss.portal.core.portlet.info.PortletInfoInfo; +import org.jboss.portal.metadata.jboss.portlet.PortletInfoMetaData; import org.jboss.portal.portlet.container.PortletApplicationContext; /** Modified: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/model/instance/metadata/InstanceMetaData.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/model/instance/metadata/InstanceMetaData.java 2009-03-06 21:08:48 UTC (rev 12966) +++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/model/instance/metadata/InstanceMetaData.java 2009-03-06 21:21:08 UTC (rev 12967) @@ -30,9 +30,9 @@ import org.jboss.portal.common.xml.XMLTools; import org.jboss.portal.core.model.MetaDataResourceBundleFactory; import org.jboss.portal.portlet.deployment.LocalizedStringBuilder; -import org.jboss.portal.portlet.impl.metadata.common.LocalizedDescriptionMetaData; -import org.jboss.portal.portlet.impl.metadata.portlet.PortletPreferenceMetaData; -import org.jboss.portal.portlet.impl.metadata.portlet.PortletPreferencesMetaData; +import org.jboss.portal.metadata.portlet.common.LocalizedDescriptionMetaData; +import org.jboss.portal.metadata.portlet.portlet.PortletPreferenceMetaData; +import org.jboss.portal.metadata.portlet.portlet.PortletPreferencesMetaData; import org.jboss.portal.security.metadata.SecurityConstraintsMetaData; import org.jboss.portal.server.deployment.PortalWebApp; import org.w3c.dom.Element; @@ -77,6 +77,8 @@ /** Supported locales */ private List supportedLocales; + + private LocalizedStringBuilder localizedStringMD = new LocalizedStringBuilder(); public InstanceMetaData() { @@ -131,6 +133,16 @@ { this.securityConstraints = securityConstraints; } + + public LocalizedStringBuilder getLocalizedStringBuilder() + { + return this.localizedStringMD; + } + + public void setLocalizedStringBuilder(LocalizedStringBuilder builder) + { + this.localizedStringMD = builder; + } public static InstanceMetaData buildMetaData(Element instanceElt, PortalWebApp pwa) { @@ -145,7 +157,7 @@ Iterator displayNamesIt = XMLTools.getChildrenIterator(instanceElt, "display-name"); // Configure preferences override - org.jboss.portal.portlet.impl.metadata.portlet.PortletPreferencesMetaData preferencesMD = new PortletPreferencesMetaData(); + org.jboss.portal.metadata.portlet.portlet.PortletPreferencesMetaData preferencesMD = new PortletPreferencesMetaData(); Element preferencesElt = XMLTools.getUniqueChild(instanceElt, "preferences", false); if (preferencesElt != null) { Modified: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalMetaData.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalMetaData.java 2009-03-06 21:08:48 UTC (rev 12966) +++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalMetaData.java 2009-03-06 21:21:08 UTC (rev 12967) @@ -30,9 +30,9 @@ import org.jboss.portal.core.model.portal.PortalContainer; import org.jboss.portal.core.model.portal.PortalObject; import org.jboss.portal.core.model.portal.metadata.coordination.CoordinationMetaData; -import org.jboss.portal.portlet.impl.metadata.portlet.PortletModeMetaData; -import org.jboss.portal.portlet.impl.metadata.portlet.SupportsMetaData; -import org.jboss.portal.portlet.impl.metadata.portlet.WindowStateMetaData; +import org.jboss.portal.metadata.portlet.portlet.PortletModeMetaData; +import org.jboss.portal.metadata.portlet.portlet.SupportsMetaData; +import org.jboss.portal.metadata.portlet.portlet.WindowStateMetaData; import org.w3c.dom.Element; import java.util.Iterator; @@ -53,30 +53,30 @@ { supportsMetaData = new SupportsMetaData(); PortletModeMetaData mode = new PortletModeMetaData(); - mode.setPortletMode(Mode.EDIT); + mode.setPortletMode(Mode.EDIT.toString()); supportsMetaData.addPortletMode(mode); mode = new PortletModeMetaData(); - mode.setPortletMode(Mode.VIEW); + mode.setPortletMode(Mode.VIEW.toString()); supportsMetaData.addPortletMode(mode); mode = new PortletModeMetaData(); - mode.setPortletMode(Mode.HELP); + mode.setPortletMode(Mode.HELP.toString()); supportsMetaData.addPortletMode(mode); mode = new PortletModeMetaData(); - mode.setPortletMode(Mode.ADMIN); + mode.setPortletMode(Mode.ADMIN.toString()); supportsMetaData.addPortletMode(mode); mode = new PortletModeMetaData(); - mode.setPortletMode(Mode.EDIT_DEFAULTS); + mode.setPortletMode(Mode.EDIT_DEFAULTS.toString()); supportsMetaData.addPortletMode(mode); WindowStateMetaData windowState = new WindowStateMetaData(); - windowState.setWindowState(WindowState.MAXIMIZED); + windowState.setWindowState(WindowState.MAXIMIZED.toString()); supportsMetaData.addWindowState(windowState); windowState = new WindowStateMetaData(); - windowState.setWindowState(WindowState.MINIMIZED); + windowState.setWindowState(WindowState.MINIMIZED.toString()); supportsMetaData.addWindowState(windowState); windowState = new WindowStateMetaData(); - windowState.setWindowState(WindowState.NORMAL); + windowState.setWindowState(WindowState.NORMAL.toString()); supportsMetaData.addWindowState(windowState); } @@ -120,14 +120,14 @@ // for (Iterator i = supportsMetaData.getPortletModes().iterator(); i.hasNext();) { - Mode mode = ((PortletModeMetaData)i.next()).getPortletMode(); + Mode mode = Mode.create(((PortletModeMetaData)i.next()).getPortletMode()); portal.getSupportedModes().add(mode); } // for (Iterator i = supportsMetaData.getWindowStates().iterator(); i.hasNext();) { - WindowState windowState = ((WindowStateMetaData)i.next()).getWindowState(); + WindowState windowState = WindowState.create(((WindowStateMetaData)i.next()).getWindowState()); portal.getSupportedWindowStates().add(windowState); } @@ -203,7 +203,7 @@ Element modeElt = (Element)modeElts.get(i); String modeAsString = XMLTools.asString(modeElt); PortletModeMetaData mode = new PortletModeMetaData(); - mode.setPortletMode(new Mode(modeAsString)); + mode.setPortletMode(modeAsString); portalMD.getSupportsMetaData().addPortletMode(mode); } } @@ -216,7 +216,7 @@ Element windowStateElt = (Element)windowStates.get(i); String windowStateAsString = XMLTools.asString(windowStateElt); WindowStateMetaData windowState = new WindowStateMetaData(); - windowState.setWindowState(new WindowState(windowStateAsString)); + windowState.setWindowState(windowStateAsString); portalMD.getSupportsMetaData().addWindowState(windowState); } } Modified: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/test/core/deployment/PortletInstancesMetaDataFactoryTestCase.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/test/core/deployment/PortletInstancesMetaDataFactoryTestCase.java 2009-03-06 21:08:48 UTC (rev 12966) +++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/test/core/deployment/PortletInstancesMetaDataFactoryTestCase.java 2009-03-06 21:21:08 UTC (rev 12967) @@ -1,116 +1,116 @@ -/****************************************************************************** - * 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. * - ******************************************************************************/ - -package org.jboss.portal.test.core.deployment; - -import junit.framework.TestCase; -import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.common.io.IOTools; -import org.jboss.portal.common.net.URLTools; -import org.jboss.portal.common.xml.NullEntityResolver; -import org.jboss.portal.common.xml.XMLTools; -import org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory; -import org.jboss.portal.core.model.instance.metadata.InstanceMetaData; -//import org.jboss.portal.portlet.impl.jsr168.info.Utils; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.xml.sax.EntityResolver; - -import javax.xml.parsers.DocumentBuilder; -import java.io.InputStream; -import java.net.URL; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; - -public class PortletInstancesMetaDataFactoryTestCase extends TestCase -{ - - public void testLocalizedDisplayNameMetadata() throws Exception - { - // Get instances from portlet-instances.xml - InputStream in = null; - List instancesMetadata = new ArrayList(); - try - { - - URL jbossPortletXML = Thread.currentThread().getContextClassLoader().getResource("test/deployment/jboss-portlet.xml"); - assertTrue(URLTools.exists(jbossPortletXML)); - - in = Thread.currentThread().getContextClassLoader().getResourceAsStream("test/deployment/portlet-instances.xml"); -// in = IOTools.safeBufferedWrapper(in); - - - assertNotNull(in); - - PortletAppDeploymentFactory factory = new PortletAppDeploymentFactory(); - - if (in != null) - { - DocumentBuilder builder = XMLTools.getDocumentBuilderFactory().newDocumentBuilder(); - EntityResolver entityResolver = factory.getPortletInstancesEntityResolver(); - if (entityResolver == null) - { - entityResolver = new NullEntityResolver(); - } - - builder.setEntityResolver(entityResolver); - Document doc = builder.parse(in); - - // - for (Iterator i = XMLTools.getChildrenIterator(doc.getDocumentElement(), "deployment"); i.hasNext();) - { - Element deploymentElt = (Element)i.next(); - - // - Element instanceElt = XMLTools.getUniqueChild(deploymentElt, "instance", true); - - // - InstanceMetaData metaData = InstanceMetaData.buildMetaData(instanceElt, null); - instancesMetadata.add(metaData); - } - } - } - finally - { - IOTools.safeClose(in); - } - - assertEquals(4, instancesMetadata.size()); - - InstanceMetaData instanceMD = (InstanceMetaData)instancesMetadata.get(0); - assertEquals("UserPortletInstance", instanceMD.getId()); - LocalizedString lString = instanceMD.getDisplayName(); - assertEquals("Mon instance de User portlet", lString.getString(Locale.FRENCH, false)); - assertEquals("My User portlet instance", lString.getString(Locale.ENGLISH, false)); - assertEquals("My User portlet instance", lString.getDefaultString()); - instanceMD = (InstanceMetaData)instancesMetadata.get(1); - assertEquals("RolePortletInstance", instanceMD.getId()); - instanceMD = (InstanceMetaData)instancesMetadata.get(2); - assertEquals("CatalogPortletInstance", instanceMD.getId()); - instanceMD = (InstanceMetaData)instancesMetadata.get(3); - assertEquals("PortletContentEditorInstance", instanceMD.getId()); - - } -} +///****************************************************************************** +// * 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. * +// ******************************************************************************/ +// +//package org.jboss.portal.test.core.deployment; +// +//import junit.framework.TestCase; +//import org.jboss.portal.common.i18n.LocalizedString; +//import org.jboss.portal.common.io.IOTools; +//import org.jboss.portal.common.net.URLTools; +//import org.jboss.portal.common.xml.NullEntityResolver; +//import org.jboss.portal.common.xml.XMLTools; +//import org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory; +//import org.jboss.portal.core.model.instance.metadata.InstanceMetaData; +////import org.jboss.portal.portlet.impl.jsr168.info.Utils; +//import org.w3c.dom.Document; +//import org.w3c.dom.Element; +//import org.xml.sax.EntityResolver; +// +//import javax.xml.parsers.DocumentBuilder; +//import java.io.InputStream; +//import java.net.URL; +//import java.util.ArrayList; +//import java.util.Iterator; +//import java.util.List; +//import java.util.Locale; +// +//public class PortletInstancesMetaDataFactoryTestCase extends TestCase +//{ +// +// public void testLocalizedDisplayNameMetadata() throws Exception +// { +// // Get instances from portlet-instances.xml +// InputStream in = null; +// List instancesMetadata = new ArrayList(); +// try +// { +// +// URL jbossPortletXML = Thread.currentThread().getContextClassLoader().getResource("test/deployment/jboss-portlet.xml"); +// assertTrue(URLTools.exists(jbossPortletXML)); +// +// in = Thread.currentThread().getContextClassLoader().getResourceAsStream("test/deployment/portlet-instances.xml"); +//// in = IOTools.safeBufferedWrapper(in); +// +// +// assertNotNull(in); +// +// PortletAppDeploymentFactory factory = new PortletAppDeploymentFactory(); +// +// if (in != null) +// { +// DocumentBuilder builder = XMLTools.getDocumentBuilderFactory().newDocumentBuilder(); +// EntityResolver entityResolver = factory.getPortletInstancesEntityResolver(); +// if (entityResolver == null) +// { +// entityResolver = new NullEntityResolver(); +// } +// +// builder.setEntityResolver(entityResolver); +// Document doc = builder.parse(in); +// +// // +// for (Iterator i = XMLTools.getChildrenIterator(doc.getDocumentElement(), "deployment"); i.hasNext();) +// { +// Element deploymentElt = (Element)i.next(); +// +// // +// Element instanceElt = XMLTools.getUniqueChild(deploymentElt, "instance", true); +// +// // +// InstanceMetaData metaData = InstanceMetaData.buildMetaData(instanceElt, null); +// instancesMetadata.add(metaData); +// } +// } +// } +// finally +// { +// IOTools.safeClose(in); +// } +// +// assertEquals(4, instancesMetadata.size()); +// +// InstanceMetaData instanceMD = (InstanceMetaData)instancesMetadata.get(0); +// assertEquals("UserPortletInstance", instanceMD.getId()); +// LocalizedString lString = instanceMD.getDisplayName(); +// assertEquals("Mon instance de User portlet", lString.getString(Locale.FRENCH, false)); +// assertEquals("My User portlet instance", lString.getString(Locale.ENGLISH, false)); +// assertEquals("My User portlet instance", lString.getDefaultString()); +// instanceMD = (InstanceMetaData)instancesMetadata.get(1); +// assertEquals("RolePortletInstance", instanceMD.getId()); +// instanceMD = (InstanceMetaData)instancesMetadata.get(2); +// assertEquals("CatalogPortletInstance", instanceMD.getId()); +// instanceMD = (InstanceMetaData)instancesMetadata.get(3); +// assertEquals("PortletContentEditorInstance", instanceMD.getId()); +// +// } +//} Added: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/META-INF/aliases.txt =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/META-INF/aliases.txt (rev 0) +++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/META-INF/aliases.txt 2009-03-06 21:21:08 UTC (rev 12967) @@ -0,0 +1 @@ +jboss-portal-sar Copied: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/META-INF/default-object.xml (from rev 12272, branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/data/default-object.xml) =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/META-INF/default-object.xml (rev 0) +++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/META-INF/default-object.xml 2009-03-06 21:21:08 UTC (rev 12967) @@ -0,0 +1,412 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE deployments PUBLIC + "-//JBoss Portal//DTD Portal Object 2.6//EN" + "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd"> + +<deployments> + <deployment> + <context> + <context-name/> + <properties> +  + <property> + <name>layout.id</name> + <value>generic</value> + </property> +  + <property> + <name>theme.id</name> + <value>renewal</value> + </property> +  + <property> + <name>theme.renderSetId</name> + <value>divRenderer</value> + </property> +  + <property> + <name>portal.defaultObjectName</name> + <value>default</value> + </property> + +  + <property> + <name>control.portal.access_denied</name> + <value>ignore</value> + </property> + <property> + <name>control.portal.unavailable</name> + <value>ignore</value> + </property> + <property> + <name>control.portal.not_found</name> + <value>ignore</value> + </property> + <property> + <name>control.portal.internal_error</name> + <value>jsp</value> + </property> + <property> + <name>control.portal.error</name> + <value>jsp</value> + </property> + <property> + <name>control.portal.resource_uri</name> + <value>/WEB-INF/jsp/error/portal.jsp</value> + </property> + <property> + <name>control.page.access_denied</name> + <value>hide</value> + </property> + <property> + <name>control.page.unavailable</name> + <value>hide</value> + </property> + <property> + <name>control.page.not_found</name> + <value>hide</value> + </property> + <property> + <name>control.page.internal_error</name> + <value>jsp</value> + </property> + <property> + <name>control.page.error</name> + <value>jsp</value> + </property> + <property> + <name>control.page.resource_uri</name> + <value>/WEB-INF/jsp/error/page.jsp</value> + </property> + </properties> + </context> + </deployment> + <deployment> + <parent-ref/> + <if-exists>keep</if-exists> + <portal> + <portal-name>default</portal-name> + <supported-modes> + <mode>view</mode> + <mode>edit</mode> + <mode>help</mode> + </supported-modes> + <supported-window-states> + <window-state>normal</window-state> + <window-state>minimized</window-state> + <window-state>maximized</window-state> + </supported-window-states> + <security-constraint> + <policy-permission> + <action-name>viewrecursive</action-name> + <action-name>personalizerecursive</action-name> + <unchecked/> + </policy-permission> + </security-constraint> + <coordination> + <wirings> + <implicit-mode>TRUE</implicit-mode> + </wirings> + <bindings> + <implicit-mode>TRUE</implicit-mode> + </bindings> + </coordination> + <page> + <page-name>default</page-name> + <display-name xml:lang="en">Home</display-name> + <display-name xml:lang="it">Home</display-name> + <display-name xml:lang="es">Home</display-name> + <display-name xml:lang="fr">Accueil</display-name> + <display-name xml:lang="ru">Домой</display-name> + <properties> + <property> + <name>order</name> + <value>1</value> + </property> + </properties> + <window> + <window-name>JSPPortletWindow</window-name> + <instance-ref>JSPPortletInstance</instance-ref> + <region>left</region> + <height>0</height> + </window> + <window> + <window-name>CMSWindow</window-name> + <content> + <content-type>cms</content-type> + <content-uri>/default/index.html</content-uri> + </content> + <region>center</region> + <height>1</height> + </window> + <window> + <window-name>IdentityUserPortletWindow</window-name> + <instance-ref>IdentityUserPortletInstance</instance-ref> + <region>left</region> + <height>1</height> + </window> + <window> + <window-name>CurrentUsersPortletWindow</window-name> + <instance-ref>CurrentUsersPortletInstance</instance-ref> + <region>left</region> + <height>2</height> + </window> + </page> + </portal> + </deployment> + <deployment> + <if-exists>keep</if-exists> + <context> + <context-name>dashboard</context-name> + <properties> + +  + <property> + <name>layout.id</name> + <value>generic</value> + </property> + +  + <property> + <name>theme.id</name> + <value>renewal</value> + </property> + +  + <property> + <name>theme.renderSetId</name> + <value>divRenderer</value> + </property> + +  + <property> + <name>theme.dyna.dnd_enabled</name> + <value>true</value> + </property> + +  + <property> + <name>theme.dyna.partial_refresh_enabled</name> + <value>false</value> + </property> + +  + <property> + <name>control.portal.access_denied</name> + <value>ignore</value> + </property> + <property> + <name>control.portal.unavailable</name> + <value>ignore</value> + </property> + <property> + <name>control.portal.not_found</name> + <value>ignore</value> + </property> + <property> + <name>control.portal.internal_error</name> + <value>jsp</value> + </property> + <property> + <name>control.portal.error</name> + <value>jsp</value> + </property> + <property> + <name>control.portal.resource_uri</name> + <value>/WEB-INF/jsp/error/portal.jsp</value> + </property> + <property> + <name>control.page.access_denied</name> + <value>hide</value> + </property> + <property> + <name>control.page.unavailable</name> + <value>hide</value> + </property> + <property> + <name>control.page.not_found</name> + <value>hide</value> + </property> + <property> + <name>control.page.internal_error</name> + <value>jsp</value> + </property> + <property> + <name>control.page.error</name> + <value>jsp</value> + </property> + <property> + <name>control.page.resource_uri</name> + <value>/WEB-INF/jsp/error/page.jsp</value> + </property> + </properties> + </context> + </deployment> + <deployment> + <parent-ref/> + <if-exists>keep</if-exists> + <portal> + <portal-name>template</portal-name> + <supported-modes> + <mode>view</mode> + <mode>edit</mode> + <mode>help</mode> + </supported-modes> + <supported-window-states> + <window-state>normal</window-state> + <window-state>minimized</window-state> + <window-state>maximized</window-state> + </supported-window-states> + <page> + <page-name>default</page-name> + <display-name xml:lang="en">Home</display-name> + <display-name xml:lang="it">Home</display-name> + <display-name xml:lang="es">Home</display-name> + <display-name xml:lang="fr">Accueil</display-name> + <display-name xml:lang="ru">Домой</display-name> + <properties> + <property> + <name>order</name> + <value>1</value> + </property> + </properties> + <window> + <window-name>JSPPortletWindow</window-name> + <instance-ref>JSPPortletInstance</instance-ref> + <region>left</region> + <height>0</height> + </window> + <window> + <window-name>CMSWindow</window-name> + <content> + <content-type>cms</content-type> + <content-uri>/default/index.html</content-uri> + </content> + <region>center</region> + <height>0</height> + </window> + <window> + <window-name>IdentityUserPortletWindow</window-name> + <instance-ref>IdentityUserPortletInstance</instance-ref> + <region>left</region> + <height>1</height> + </window> + </page> + </portal> + </deployment> + <deployment> + <parent-ref/> + <if-exists>keep</if-exists> + <portal> + <portal-name>admin</portal-name> + <supported-modes> + <mode>view</mode> + <mode>edit</mode> + <mode>help</mode> + <mode>admin</mode> + </supported-modes> + <supported-window-states> + <window-state>normal</window-state> + <window-state>minimized</window-state> + <window-state>maximized</window-state> + </supported-window-states> + <security-constraint> + <policy-permission> + <action-name>viewrecursive</action-name> + <role-name>Admin</role-name> + </policy-permission> + </security-constraint> + <page> + <page-name>default</page-name> + <display-name xml:lang="en">Admin</display-name> + <display-name xml:lang="it">Amministrazione</display-name> + <display-name xml:lang="es">Administración</display-name> + <display-name xml:lang="fr">Administration</display-name> + <display-name xml:lang="ru">Администрирование</display-name> + <window> + <window-name>AdminPortletWindow</window-name> + <instance-ref>AdminPortletInstance</instance-ref> + <region>center</region> + <height>0</height> + <properties> + <property> + <name>theme.renderSetId</name> + <value>emptyRenderer</value> + </property> + </properties> + </window> + <properties> + <property> + <name>layout.id</name> + <value>1column</value> + </property> + </properties> + </page> + <page> + <page-name>Members</page-name> + <display-name xml:lang="en">Members</display-name> + <display-name xml:lang="it">Membri</display-name> + <display-name xml:lang="fr">Utilisateurs</display-name> + <window> + <window-name>IdentityAdminPortletWindow</window-name> + <instance-ref>IdentityAdminPortletInstance</instance-ref> + <region>center</region> + <height>0</height> + <properties> + <property> + <name>theme.renderSetId</name> + <value>emptyRenderer</value> + </property> + </properties> + </window> + <properties> + <property> + <name>layout.id</name> + <value>1column</value> + </property> + </properties> + </page> + </portal> + </deployment> +</deployments> Added: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/META-INF/jboss-dependency.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/META-INF/jboss-dependency.xml (rev 0) +++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/META-INF/jboss-dependency.xml 2009-03-06 21:21:08 UTC (rev 12967) @@ -0,0 +1,3 @@ +<dependency xmlns="urn:jboss:dependency:1.0"> + <item whenRequired="Real" dependentState="Create">TransactionManager</item> +</dependency> Modified: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2009-03-06 21:08:48 UTC (rev 12966) +++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2009-03-06 21:21:08 UTC (rev 12967) @@ -1124,14 +1124,14 @@ </mbean> @portal.single.xml.open@ --> - <mbean code="org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory" +  - <depends>portal:service=PortletInvokerRegistration,id=local</depends> +  - <attribute name="CreateInstances">@portal.single@</attribute> + + + + <mbean code="org.jboss.portal.core.deployment.jboss.ObjectDeploymentImpl" name="portal:deployer=ObjectDeployment" + xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <depends optional-attribute-name="PortalObjectContainer" proxy-type="attribute">portal:container=PortalObject</depends> + <depends optional-attribute-name="ContentProviderRegistry" proxy-type="attribute">portal:service=ContentProviderRegistry</depends> + <depends optional-attribute-name="CoordinationConfigurator" proxy-type="attribute">portal:service=CoordinationService</depends> </mbean> + + <mbean code="org.jboss.portal.core.deployment.jboss.InstanceDeploymentImpl" name="portal:deployer=InstanceDeployment" + xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <depends optional-attribute-name="InstanceContainer" proxy-type="attribute">portal:container=Instance</depends> + </mbean> + + <mbean code="org.jboss.portal.core.deployment.jboss.PortletDeploymentImpl" name="portal:deployer=PortletDeployment" + xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <depends optional-attribute-name="PortletContainerInvoker" proxy-type="attribute">portal:service=PortletInvoker,type=Container</depends> + <depends optional-attribute-name="CoreInfoBuilderFactory" proxy-type="attribute">portal:service=InfoBuilderFactory,type=Core</depends> + </mbean> + + + + <mbean code="org.jboss.portal.theme.deployment.jboss.LayoutDeploymentFactory" name="portal:deploymentFactory=Layout" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> Deleted: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/data/default-object.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/data/default-object.xml 2009-03-06 21:08:48 UTC (rev 12966) +++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/data/default-object.xml 2009-03-06 21:21:08 UTC (rev 12967) @@ -1,412 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE deployments PUBLIC - "-//JBoss Portal//DTD Portal Object 2.6//EN" - "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd"> - -<deployments> - <deployment> - <context> - <context-name/> - <properties> -  - <property> - <name>layout.id</name> - <value>generic</value> - </property> -  - <property> - <name>theme.id</name> - <value>renewal</value> - </property> -  - <property> - <name>theme.renderSetId</name> - <value>divRenderer</value> - </property> -  - <property> - <name>portal.defaultObjectName</name> - <value>default</value> - </property> - -  - <property> - <name>control.portal.access_denied</name> - <value>ignore</value> - </property> - <property> - <name>control.portal.unavailable</name> - <value>ignore</value> - </property> - <property> - <name>control.portal.not_found</name> - <value>ignore</value> - </property> - <property> - <name>control.portal.internal_error</name> - <value>jsp</value> - </property> - <property> - <name>control.portal.error</name> - <value>jsp</value> - </property> - <property> - <name>control.portal.resource_uri</name> - <value>/WEB-INF/jsp/error/portal.jsp</value> - </property> - <property> - <name>control.page.access_denied</name> - <value>hide</value> - </property> - <property> - <name>control.page.unavailable</name> - <value>hide</value> - </property> - <property> - <name>control.page.not_found</name> - <value>hide</value> - </property> - <property> - <name>control.page.internal_error</name> - <value>jsp</value> - </property> - <property> - <name>control.page.error</name> - <value>jsp</value> - </property> - <property> - <name>control.page.resource_uri</name> - <value>/WEB-INF/jsp/error/page.jsp</value> - </property> - </properties> - </context> - </deployment> - <deployment> - <parent-ref/> - <if-exists>keep</if-exists> - <portal> - <portal-name>default</portal-name> - <supported-modes> - <mode>view</mode> - <mode>edit</mode> - <mode>help</mode> - </supported-modes> - <supported-window-states> - <window-state>normal</window-state> - <window-state>minimized</window-state> - <window-state>maximized</window-state> - </supported-window-states> - <security-constraint> - <policy-permission> - <action-name>viewrecursive</action-name> - <action-name>personalizerecursive</action-name> - <unchecked/> - </policy-permission> - </security-constraint> - <coordination> - <wirings> - <implicit-mode>TRUE</implicit-mode> - </wirings> - <bindings> - <implicit-mode>TRUE</implicit-mode> - </bindings> - </coordination> - <page> - <page-name>default</page-name> - <display-name xml:lang="en">Home</display-name> - <display-name xml:lang="it">Home</display-name> - <display-name xml:lang="es">Home</display-name> - <display-name xml:lang="fr">Accueil</display-name> - <display-name xml:lang="ru">Домой</display-name> - <properties> - <property> - <name>order</name> - <value>1</value> - </property> - </properties> - <window> - <window-name>JSPPortletWindow</window-name> - <instance-ref>JSPPortletInstance</instance-ref> - <region>left</region> - <height>0</height> - </window> - <window> - <window-name>CMSWindow</window-name> - <content> - <content-type>cms</content-type> - <content-uri>/default/index.html</content-uri> - </content> - <region>center</region> - <height>1</height> - </window> - <window> - <window-name>IdentityUserPortletWindow</window-name> - <instance-ref>IdentityUserPortletInstance</instance-ref> - <region>left</region> - <height>1</height> - </window> - <window> - <window-name>CurrentUsersPortletWindow</window-name> - <instance-ref>CurrentUsersPortletInstance</instance-ref> - <region>left</region> - <height>2</height> - </window> - </page> - </portal> - </deployment> - <deployment> - <if-exists>keep</if-exists> - <context> - <context-name>dashboard</context-name> - <properties> - -  - <property> - <name>layout.id</name> - <value>generic</value> - </property> - -  - <property> - <name>theme.id</name> - <value>renewal</value> - </property> - -  - <property> - <name>theme.renderSetId</name> - <value>divRenderer</value> - </property> - -  - <property> - <name>theme.dyna.dnd_enabled</name> - <value>true</value> - </property> - -  - <property> - <name>theme.dyna.partial_refresh_enabled</name> - <value>false</value> - </property> - -  - <property> - <name>control.portal.access_denied</name> - <value>ignore</value> - </property> - <property> - <name>control.portal.unavailable</name> - <value>ignore</value> - </property> - <property> - <name>control.portal.not_found</name> - <value>ignore</value> - </property> - <property> - <name>control.portal.internal_error</name> - <value>jsp</value> - </property> - <property> - <name>control.portal.error</name> - <value>jsp</value> - </property> - <property> - <name>control.portal.resource_uri</name> - <value>/WEB-INF/jsp/error/portal.jsp</value> - </property> - <property> - <name>control.page.access_denied</name> - <value>hide</value> - </property> - <property> - <name>control.page.unavailable</name> - <value>hide</value> - </property> - <property> - <name>control.page.not_found</name> - <value>hide</value> - </property> - <property> - <name>control.page.internal_error</name> - <value>jsp</value> - </property> - <property> - <name>control.page.error</name> - <value>jsp</value> - </property> - <property> - <name>control.page.resource_uri</name> - <value>/WEB-INF/jsp/error/page.jsp</value> - </property> - </properties> - </context> - </deployment> - <deployment> - <parent-ref/> - <if-exists>keep</if-exists> - <portal> - <portal-name>template</portal-name> - <supported-modes> - <mode>view</mode> - <mode>edit</mode> - <mode>help</mode> - </supported-modes> - <supported-window-states> - <window-state>normal</window-state> - <window-state>minimized</window-state> - <window-state>maximized</window-state> - </supported-window-states> - <page> - <page-name>default</page-name> - <display-name xml:lang="en">Home</display-name> - <display-name xml:lang="it">Home</display-name> - <display-name xml:lang="es">Home</display-name> - <display-name xml:lang="fr">Accueil</display-name> - <display-name xml:lang="ru">Домой</display-name> - <properties> - <property> - <name>order</name> - <value>1</value> - </property> - </properties> - <window> - <window-name>JSPPortletWindow</window-name> - <instance-ref>JSPPortletInstance</instance-ref> - <region>left</region> - <height>0</height> - </window> - <window> - <window-name>CMSWindow</window-name> - <content> - <content-type>cms</content-type> - <content-uri>/default/index.html</content-uri> - </content> - <region>center</region> - <height>0</height> - </window> - <window> - <window-name>IdentityUserPortletWindow</window-name> - <instance-ref>IdentityUserPortletInstance</instance-ref> - <region>left</region> - <height>1</height> - </window> - </page> - </portal> - </deployment> - <deployment> - <parent-ref/> - <if-exists>keep</if-exists> - <portal> - <portal-name>admin</portal-name> - <supported-modes> - <mode>view</mode> - <mode>edit</mode> - <mode>help</mode> - <mode>admin</mode> - </supported-modes> - <supported-window-states> - <window-state>normal</window-state> - <window-state>minimized</window-state> - <window-state>maximized</window-state> - </supported-window-states> - <security-constraint> - <policy-permission> - <action-name>viewrecursive</action-name> - <role-name>Admin</role-name> - </policy-permission> - </security-constraint> - <page> - <page-name>default</page-name> - <display-name xml:lang="en">Admin</display-name> - <display-name xml:lang="it">Amministrazione</display-name> - <display-name xml:lang="es">Administración</display-name> - <display-name xml:lang="fr">Administration</display-name> - <display-name xml:lang="ru">Администрирование</display-name> - <window> - <window-name>AdminPortletWindow</window-name> - <instance-ref>AdminPortletInstance</instance-ref> - <region>center</region> - <height>0</height> - <properties> - <property> - <name>theme.renderSetId</name> - <value>emptyRenderer</value> - </property> - </properties> - </window> - <properties> - <property> - <name>layout.id</name> - <value>1column</value> - </property> - </properties> - </page> - <page> - <page-name>Members</page-name> - <display-name xml:lang="en">Members</display-name> - <display-name xml:lang="it">Membri</display-name> - <display-name xml:lang="fr">Utilisateurs</display-name> - <window> - <window-name>IdentityAdminPortletWindow</window-name> - <instance-ref>IdentityAdminPortletInstance</instance-ref> - <region>center</region> - <height>0</height> - <properties> - <property> - <name>theme.renderSetId</name> - <value>emptyRenderer</value> - </property> - </properties> - </window> - <properties> - <property> - <name>layout.id</name> - <value>1column</value> - </property> - </properties> - </page> - </portal> - </deployment> -</deployments> Modified: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml 2009-03-06 21:08:48 UTC (rev 12966) +++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml 2009-03-06 21:21:08 UTC (rev 12967) @@ -89,7 +89,7 @@  <config> <option> - <name>jNDIName</name> + <name>JNDIName</name> <value>java:/portal/UserProfileModule</value> </option> <option> @@ -121,7 +121,7 @@ <value>java:/portal/IdentitySessionFactory</value> </option> <option> - <name>jNDIName</name> + <name>JNDIName</name> <value>java:/portal/UserModule</value> </option> </config> @@ -143,7 +143,7 @@ <value>java:/portal/IdentitySessionFactory</value> </option> <option> - <name>jNDIName</name> + <name>JNDIName</name> <value>java:/portal/RoleModule</value> </option> </config> @@ -165,7 +165,7 @@ <value>java:/portal/IdentitySessionFactory</value> </option> <option> - <name>jNDIName</name> + <name>JNDIName</name> <value>java:/portal/MembershipModule</value> </option> </config> @@ -187,7 +187,7 @@ <value>java:/portal/IdentitySessionFactory</value> </option> <option> - <name>jNDIName</name> + <name>JNDIName</name> <value>java:/portal/DBUserProfileModule</value> </option> </config> @@ -206,7 +206,7 @@  <config> <option> - <name>jNDIName</name> + <name>JNDIName</name> <value>java:/portal/UserModule</value> </option> <option> @@ -228,7 +228,7 @@  <config> <option> - <name>jNDIName</name> + <name>JNDIName</name> <value>java:/portal/RoleModule</value> </option> <option> @@ -250,7 +250,7 @@  <config> <option> - <name>jNDIName</name> + <name>JNDIName</name> <value>java:/portal/MembershipModule</value> </option> <option> @@ -272,7 +272,7 @@  <config> <option> - <name>jNDIName</name> + <name>JNDIName</name> <value>java:/portal/LDAPUserProfileModule</value> </option> <option> Deleted: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/dtd/jboss-app_2_6.dtd =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/dtd/jboss-app_2_6.dtd 2009-03-06 21:08:48 UTC (rev 12966) +++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/dtd/jboss-app_2_6.dtd 2009-03-06 21:21:08 UTC (rev 12967) @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> - - - - - -<!ELEMENT jboss-app (app-name?)> - - -<!ELEMENT app-name (#PCDATA)> \ No newline at end of file Added: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/dtd/jboss-portal-app_2_6.dtd =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/dtd/jboss-portal-app_2_6.dtd (rev 0) +++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/dtd/jboss-portal-app_2_6.dtd 2009-03-06 21:21:08 UTC (rev 12967) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + + + + +<!ELEMENT jboss-portal-app (app-name?)> + + +<!ELEMENT app-name (#PCDATA)> Modified: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/portal-aop.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/portal-aop.xml 2009-03-06 21:08:48 UTC (rev 12966) +++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/portal-aop.xml 2009-03-06 21:21:08 UTC (rev 12967) @@ -21,7 +21,7 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<aop xmlns="urn:jboss:aop-beans:1.0"> +<aop xmlns="urn:jboss:aop-beans:1.0"> <metadata tag="transaction" class="org.jboss.portal.core.aspects.server.TransactionInterceptor"> <method name="invoke"> <trans-attribute>RequiresNew</trans-attribute> @@ -68,6 +68,18 @@ <trans-attribute>Required</trans-attribute> </method> </metadata> + + <metadata tag="transaction" class="org.jboss.portal.core.deployment.jboss.ObjectDeploymentImpl"> + <method name="deployObjects"> + <trans-attribute>Required</trans-attribute> + </method> + </metadata> + <metadata tag="transaction" class="org.jboss.portal.core.deployment.jboss.InstanceDeploymentImpl"> + <method name="deployInstances"> + <trans-attribute>Required</trans-attribute> + </method> + </metadata> + <metadata tag="transaction" class="org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer"> <method name="createRootIfNotExist"> <trans-attribute>Required</trans-attribute> Deleted: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-war/WEB-INF/jboss-app.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-war/WEB-INF/jboss-app.xml 2009-03-06 21:08:48 UTC (rev 12966) +++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-war/WEB-INF/jboss-app.xml 2009-03-06 21:21:08 UTC (rev 12967) @@ -1,26 +0,0 @@ - - -<jboss-app> - <app-name>portal</app-name> -</jboss-app> \ No newline at end of file Added: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-war/WEB-INF/jboss-portal-app.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-war/WEB-INF/jboss-portal-app.xml (rev 0) +++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-war/WEB-INF/jboss-portal-app.xml 2009-03-06 21:21:08 UTC (rev 12967) @@ -0,0 +1,30 @@ + + +<!DOCTYPE jboss-portal-app PUBLIC + "-//JBoss Portal//DTD JBoss Portal Application 2.6//EN" + "http://www.jboss.org/portal/dtd/jboss-portal-app_2_6.dtd"> + +<jboss-portal-app> + <app-name>portal</app-name> +</jboss-portal-app>

17 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r12966 - in branches/JBoss_Portal_AS5_Deployer/portlet-server: src/main/org/jboss/portal/portlet/deployment and 3 other directories.

by portal-commits＠lists.jboss.org

Author: mwringe Date: 2009-03-06 16:08:48 -0500 (Fri, 06 Mar 2009) New Revision: 12966 Removed: branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java Modified: branches/JBoss_Portal_AS5_Deployer/portlet-server/build.xml branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/LocalizedStringBuilder.java branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/PortletApplicationModelFactory.java branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/InfoBuilderFactory.java branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/info/PortletInfoFactory.java branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/info/impl/CacheInfoImpl.java Log: Update to use the metadata module. Modified: branches/JBoss_Portal_AS5_Deployer/portlet-server/build.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/portlet-server/build.xml 2009-03-06 21:05:27 UTC (rev 12965) +++ branches/JBoss_Portal_AS5_Deployer/portlet-server/build.xml 2009-03-06 21:08:48 UTC (rev 12966) @@ -90,6 +90,7 @@ <path id="library.classpath"> <path refid="portlet.portlet.classpath"/> <path refid="jboss.portal/modules/common.classpath"/> + <path refid="jboss.portal/modules/metadata.classpath"/> <path refid="jboss.portal/modules/web.classpath"/> <path refid="jboss.portal/modules/portlet.classpath"/> <path refid="jboss.portal/modules/test.classpath"/> Modified: branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/LocalizedStringBuilder.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/LocalizedStringBuilder.java 2009-03-06 21:05:27 UTC (rev 12965) +++ branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/LocalizedStringBuilder.java 2009-03-06 21:08:48 UTC (rev 12966) @@ -25,8 +25,8 @@ import org.apache.log4j.Logger; import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.metadata.portlet.common.LocalizedDescriptionMetaData; import org.jboss.portal.portlet.impl.metadata.adapter.LocalizedStringAdapter; -import org.jboss.portal.portlet.impl.metadata.common.LocalizedDescriptionMetaData; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -70,6 +70,19 @@ } } + public List<LocalizedDescriptionMetaData> getLocalizedDescriptionMetaData(Object key) + { + try + { + return this.map.get(key) != null ? this.map.get(key).getLocalizedDescriptionMetaData() : null; + } + catch (Exception e) + { + log.error("could not generate localized string.", e); + return null; + } + } + private static class LocalizedMetaDataContainer { /** The list of localiezd meta data */ @@ -80,10 +93,15 @@ this.list.add(description); } + public List<LocalizedDescriptionMetaData> getLocalizedDescriptionMetaData() + { + return list; + } + public LocalizedString getLocalizedString() throws Exception { LocalizedStringAdapter adapter = new LocalizedStringAdapter(); - return adapter.unmarshal(list); + return adapter.getLocalizedString(list); } } } Modified: branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/PortletApplicationModelFactory.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/PortletApplicationModelFactory.java 2009-03-06 21:05:27 UTC (rev 12965) +++ branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/PortletApplicationModelFactory.java 2009-03-06 21:08:48 UTC (rev 12966) @@ -29,42 +29,43 @@ import org.jboss.portal.common.i18n.LocalizedString; import org.jboss.portal.portlet.LifeCyclePhase; import org.jboss.portal.portlet.TransportGuarantee; -import org.jboss.portal.portlet.impl.metadata.CustomPortletModeMetaData; -import org.jboss.portal.portlet.impl.metadata.CustomWindowStateMetaData; -import org.jboss.portal.portlet.impl.metadata.ListenerMetaData; -import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; -import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData; -import static org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants.DEFAULT_LOCALE; -import static org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants.PORTLET_JSR_286_NS; -import org.jboss.portal.portlet.impl.metadata.PublicRenderParameterMetaData; -import org.jboss.portal.portlet.impl.metadata.UserAttributeMetaData; -import org.jboss.portal.portlet.impl.metadata.common.ContainerRuntimeMetaData; -import org.jboss.portal.portlet.impl.metadata.common.DescribableMetaData; -import org.jboss.portal.portlet.impl.metadata.common.InitParamMetaData; -import org.jboss.portal.portlet.impl.metadata.common.LocalizedDescriptionMetaData; -import org.jboss.portal.portlet.impl.metadata.event.EventDefinitionMetaData; -import org.jboss.portal.portlet.impl.metadata.event.EventDefinitionReferenceMetaData; -import org.jboss.portal.portlet.impl.metadata.filter.FilterMappingMetaData; -import org.jboss.portal.portlet.impl.metadata.filter.FilterMetaData; -import org.jboss.portal.portlet.impl.metadata.portlet.PortletCacheScopeEnum; -import org.jboss.portal.portlet.impl.metadata.portlet.PortletInfoMetaData; -import org.jboss.portal.portlet.impl.metadata.portlet.PortletMetaData; -import org.jboss.portal.portlet.impl.metadata.portlet.PortletModeMetaData; -import org.jboss.portal.portlet.impl.metadata.portlet.PortletPreferenceMetaData; -import org.jboss.portal.portlet.impl.metadata.portlet.PortletPreferencesMetaData; -import org.jboss.portal.portlet.impl.metadata.portlet.SecurityRoleRefMetaData; -import org.jboss.portal.portlet.impl.metadata.portlet.SupportedLocaleMetaData; -import org.jboss.portal.portlet.impl.metadata.portlet.SupportsMetaData; -import org.jboss.portal.portlet.impl.metadata.portlet.WindowStateMetaData; -import org.jboss.portal.portlet.impl.metadata.security.PortletCollectionMetaData; -import org.jboss.portal.portlet.impl.metadata.security.SecurityConstraintMetaData; -import org.jboss.portal.portlet.impl.metadata.security.UserDataConstraintMetaData; +import org.jboss.portal.metadata.portlet.CustomPortletModeMetaData; +import org.jboss.portal.metadata.portlet.CustomWindowStateMetaData; +import org.jboss.portal.metadata.portlet.ListenerMetaData; +import org.jboss.portal.metadata.portlet.PortletApplication10MetaData; +import org.jboss.portal.metadata.portlet.PortletApplication20MetaData; +import static org.jboss.portal.metadata.portlet.PortletMetaDataConstants.DEFAULT_LOCALE; +import static org.jboss.portal.metadata.portlet.PortletMetaDataConstants.PORTLET_JSR_286_NS; +import org.jboss.portal.metadata.portlet.PublicRenderParameterMetaData; +import org.jboss.portal.metadata.portlet.UserAttributeMetaData; +import org.jboss.portal.metadata.portlet.common.ContainerRuntimeMetaData; +import org.jboss.portal.metadata.portlet.common.DescribableMetaData; +import org.jboss.portal.metadata.portlet.common.InitParamMetaData; +import org.jboss.portal.metadata.portlet.common.LocalizedDescriptionMetaData; +import org.jboss.portal.metadata.portlet.event.EventDefinitionMetaData; +import org.jboss.portal.metadata.portlet.event.EventDefinitionReferenceMetaData; +import org.jboss.portal.metadata.portlet.filter.FilterMappingMetaData; +import org.jboss.portal.metadata.portlet.filter.FilterMetaData; +import org.jboss.portal.metadata.portlet.portlet.PortletCacheScopeEnum; +import org.jboss.portal.metadata.portlet.portlet.PortletInfoMetaData; +import org.jboss.portal.metadata.portlet.portlet.PortletMetaData; +import org.jboss.portal.metadata.portlet.portlet.PortletModeMetaData; +import org.jboss.portal.metadata.portlet.portlet.PortletPreferenceMetaData; +import org.jboss.portal.metadata.portlet.portlet.PortletPreferencesMetaData; +import org.jboss.portal.metadata.portlet.portlet.SecurityRoleRefMetaData; +import org.jboss.portal.metadata.portlet.portlet.SupportedLocaleMetaData; +import org.jboss.portal.metadata.portlet.portlet.SupportsMetaData; +import org.jboss.portal.metadata.portlet.portlet.WindowStateMetaData; +import org.jboss.portal.metadata.portlet.security.PortletCollectionMetaData; +import org.jboss.portal.metadata.portlet.security.SecurityConstraintMetaData; +import org.jboss.portal.metadata.portlet.security.UserDataConstraintMetaData; import org.jboss.xb.binding.GenericObjectModelFactory; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; import java.net.URI; import java.net.URISyntaxException; +import java.util.List; /** * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> @@ -302,7 +303,7 @@ if (child instanceof DescribableMetaData) { DescribableMetaData md = (DescribableMetaData)child; - LocalizedString d = this.descriptions.getLocalizedString(md); + List<LocalizedDescriptionMetaData> d = this.descriptions.getLocalizedDescriptionMetaData(md); md.setDescription(d); } @@ -314,7 +315,8 @@ if (child instanceof PortletMetaData) { PortletMetaData portlet = (PortletMetaData)child; - portlet.setDisplayName(this.displayNames.getLocalizedString(portlet)); + List<LocalizedDescriptionMetaData> displayName = this.displayNames.getLocalizedDescriptionMetaData(portlet); + portlet.setDisplayName(displayName); md.addPortlet(portlet); } // add custom-portlet-mode @@ -337,7 +339,8 @@ { SecurityConstraintMetaData security = (SecurityConstraintMetaData)child; // display-name - security.setDisplayName(this.displayNames.getLocalizedString(security)); + List<LocalizedDescriptionMetaData> displayName = this.displayNames.getLocalizedDescriptionMetaData(security); + security.setDisplayName(displayName); md.addSecurityConstraint(security); } } @@ -360,7 +363,8 @@ else if (child instanceof FilterMetaData) { FilterMetaData filter = (FilterMetaData)child; - filter.setDisplayName(this.displayNames.getLocalizedString(filter)); + List<LocalizedDescriptionMetaData> displayName = this.displayNames.getLocalizedDescriptionMetaData(filter); + filter.setDisplayName(displayName); md.addFilter(filter); } // add filter-mapping @@ -377,7 +381,8 @@ else if (child instanceof ListenerMetaData) { ListenerMetaData listener = (ListenerMetaData)child; - listener.setDisplayName(this.displayNames.getLocalizedString(listener)); + List<LocalizedDescriptionMetaData> displayName = this.displayNames.getLocalizedDescriptionMetaData(listener); + listener.setDisplayName(displayName); md.addListener(listener); } } @@ -584,7 +589,7 @@ PortletModeMetaData md = (PortletModeMetaData)object; if ("portlet-mode".equals(localName)) { - md.setPortletMode(Mode.create(value)); + md.setPortletMode(value); } } @@ -594,7 +599,7 @@ WindowStateMetaData md = (WindowStateMetaData)object; if ("window-state".equals(localName)) { - md.setWindowState(WindowState.create(value)); + md.setWindowState(value); } } @@ -716,7 +721,7 @@ UserDataConstraintMetaData md = (UserDataConstraintMetaData)object; if ("transport-guarantee".equals(localName)) { - md.setTransportQuarantee(TransportGuarantee.valueOf(value)); + md.setTransportQuarantee(value); } } @@ -748,7 +753,7 @@ String lifeCycle = value.substring(0, end > 0 ? end : 0); try { - md.addLifecycle(LifeCyclePhase.valueOf(lifeCycle)); + md.addLifecycle(lifeCycle); } catch (IllegalArgumentException e) { Modified: branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/InfoBuilderFactory.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/InfoBuilderFactory.java 2009-03-06 21:05:27 UTC (rev 12965) +++ branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/InfoBuilderFactory.java 2009-03-06 21:08:48 UTC (rev 12966) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.deployment.jboss; -import org.jboss.portal.portlet.deployment.jboss.metadata.JBossApplicationMetaData; -import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; +import org.jboss.portal.metadata.jboss.portlet.JBossPortletAppMetaData; +import org.jboss.portal.metadata.portlet.PortletApplication10MetaData; import org.jboss.portal.server.deployment.PortalWebApp; /** @@ -32,6 +32,6 @@ */ public interface InfoBuilderFactory { - public InfoBuilder createInfoBuilder(PortalWebApp webApp, JBossApplicationMetaData jbossApplicationMetaData, PortletApplication10MetaData portletApplicationMD); + public InfoBuilder createInfoBuilder(PortalWebApp webApp, JBossPortletAppMetaData jbossApplicationMetaData, PortletApplication10MetaData portletApplicationMD); } Deleted: branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java 2009-03-06 21:05:27 UTC (rev 12965) +++ branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java 2009-03-06 21:08:48 UTC (rev 12966) @@ -1,435 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.deployment.jboss; - -import org.jboss.deployment.DeploymentException; -import org.jboss.portal.common.io.IOTools; -import org.jboss.portal.common.xml.NullEntityResolver; -import org.jboss.portal.portlet.container.PortletApplicationContext; -import org.jboss.portal.portlet.container.PortletContainerContext; -import org.jboss.portal.portlet.container.PortletFilterContext; -import org.jboss.portal.portlet.container.managed.ManagedObjectRegistryEventListener; -import org.jboss.portal.portlet.container.object.PortletApplicationObject; -import org.jboss.portal.portlet.container.object.PortletContainerObject; -import org.jboss.portal.portlet.container.object.PortletFilterObject; -import org.jboss.portal.portlet.deployment.PortletApplicationModelFactory; -import org.jboss.portal.portlet.deployment.jboss.metadata.JBossApplicationMetaData; -import org.jboss.portal.portlet.deployment.jboss.metadata.JBossPortletMetaData; -import org.jboss.portal.portlet.impl.container.PortletApplicationLifeCycle; -import org.jboss.portal.portlet.impl.container.PortletContainerLifeCycle; -import org.jboss.portal.portlet.impl.container.PortletFilterLifeCycle; -import org.jboss.portal.portlet.impl.info.ContainerFilterInfo; -import org.jboss.portal.portlet.impl.info.ContainerPortletInfo; -import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl; -import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl; -import org.jboss.portal.portlet.impl.jsr168.PortletFilterImpl; -import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; -import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData; -import org.jboss.portal.portlet.impl.metadata.portlet.PortletMetaData; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.server.deployment.PortalWebApp; -import org.jboss.portal.server.deployment.jboss.Deployment; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; -import org.xml.sax.EntityResolver; - -import javax.management.MBeanServer; -import javax.servlet.ServletContext; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.util.Map; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ - */ -public class PortletAppDeployment extends Deployment -{ - - /** The existing configurations. */ - protected Map configurations; - - /** . */ - protected PortletApplication10MetaData portletAppMD; - - /** . */ - protected JBossApplicationMetaData jbossAppMD; - - /** . */ - protected PortletAppDeploymentFactory factory; - - /** . */ - protected PortletApplicationContextImpl portletApplicationContext; - - /** . */ - private PortletApplicationLifeCycle portletApplicationLifeCycle; - - /** . */ - private ManagedObjectRegistryEventListener listener; - - /** . */ - private String appId; - - public PortletAppDeployment(URL url, PortalWebApp pwa, ManagedObjectRegistryEventListener listener, MBeanServer mbeanServer, PortletAppDeploymentFactory factory) - { - super(url, pwa, mbeanServer); - this.factory = factory; - this.listener = listener; - } - - public void create() throws DeploymentException - { - //disable for now so we can use the new deployer - if (true) return; - - importTLD(); - - // - try - { - portletAppMD = buildPortletApplicationMetaData(); - jbossAppMD = buildJBossApplicationMetaData(); - - // - if (jbossAppMD.getId() == null) - { - log.debug("The portlet application does not have an explicit id value, will use the value provided by the jboss-portal-app.xml instead"); - jbossAppMD.setId(pwa.getId()); - } - - // - appId = jbossAppMD.getId(); - - // Merge or provide defaults - JBossApplicationMetaData standardJBossAppMD = factory.getStandardJBossApplicationMetaData(); - if (standardJBossAppMD != null) - { - log.debug("Found standard jboss app meta data"); - - JBossPortletMetaData defaultJBossPortletMD = standardJBossAppMD.getPortlets().get("DefaultPortlet"); - if (defaultJBossPortletMD != null) - { - log.debug("Found default jboss portlet meta data"); - for (PortletMetaData portletMD : portletAppMD.getPortlets().values()) - { - String name = portletMD.getPortletName(); - JBossPortletMetaData jbossPortletMD = jbossAppMD.getPortlets().get(name); - if (jbossPortletMD != null) - { - log.debug("Merging default jboss portlet meta data for " + name); - - // Merge with app settings -// jbossPortletMD.merge(jbossAppMD); // todo: remove since it shouldn't be needed anymore with the adding of merge in factory... - - // Merge with default portlet - jbossPortletMD.merge(defaultJBossPortletMD); - } - else - { - log.debug("Using default jboss portlet meta data for " + name); - jbossAppMD.getPortlets().put(name, (JBossPortletMetaData)defaultJBossPortletMD.clone()); - } - } - } - } - } - catch (Throwable e) - { - throw new DeploymentException("Cannot deploy portlet application", e); - } - } - - public void start() throws DeploymentException - { - //disable for now to use new deployer - if (true) return; - - log.debug("Starting installation"); - - // - InfoBuilder infoBuilder = factory.getCoreInfoBuilderFactory().createInfoBuilder(pwa, jbossAppMD, portletAppMD); - - infoBuilder.build(); - /* - ContainerInfoBuilderContext builderContext = new ContainerInfoBuilderContextImpl(portletAppMD, pwa); - ContainerInfoBuilder builder = new ContainerInfoBuilder(pwa.getContextPath(), portletAppMD, builderContext); - builder.build(); - */ - // - PortletApplicationObject portletApplicationObject = new PortletApplicationImpl(infoBuilder.getApplication()); - PortletApplicationContext portletApplicationContext = new PortletApplicationContextImpl(pwa); - - // - portletApplicationLifeCycle = new PortletApplicationLifeCycle( - listener, - portletApplicationContext, - portletApplicationObject); - - // - for (ContainerFilterInfo filterInfo : infoBuilder.getApplication().getFilters().values()) - { - PortletFilterObject portletFilterObject = new PortletFilterImpl(filterInfo); - PortletFilterContext portletFilterContext = new PortletFilterContextImpl(); - - // - portletApplicationLifeCycle.addPortletFilter(portletFilterContext, portletFilterObject); - } - - // - for (PortletInfo portletInfo : infoBuilder.getPortlets()) - { - ContainerPortletInfo cpi = (ContainerPortletInfo)portletInfo; - PortletContainerObject portletContainerObject = new PortletContainerImpl(cpi); - PortletContainerContext portletContainerContext = new PortletContainerContextImpl(); - - // - PortletContainerLifeCycle portletContainerLifeCycle = portletApplicationLifeCycle.addPortletContainer(portletContainerContext, portletContainerObject); - - // Now create deps - for (String filterRef : cpi.getFilterRefs()) - { - PortletFilterLifeCycle portletFilterLifeCycle = portletApplicationLifeCycle.getManagedPortletFilter(filterRef); - - // - if (portletFilterLifeCycle != null) - { - portletApplicationLifeCycle.addDependency(portletFilterLifeCycle, portletContainerLifeCycle); - } - else - { - // todo - } - } - } - - // - portletApplicationLifeCycle.create(); - - // - portletApplicationLifeCycle.managedStart(); - - // - - /* - try - { - portletApplicationContext = new PortletApplicationContextImpl( - factory.getWebAppRegistry(), - factory.getPortletAPIFactory(), - factory.getPortletInfoFactory(), - portletAppMD, - jbossAppMD, - pwa.getServletContext(), - pwa.getClassLoader(), - pwa.getContextPath() - ); - - // Install portlet containers - portletApplicationContext.startPortletApplication(); - } - catch (Throwable e) - { - throw new DeploymentException("Cannot deploy portlet application", e); - } - - // Configure security - PortletSecurityService portletSecurityService = factory.getPortletSecurityService(); - if (portletSecurityService != null) - { - AuthorizationDomain authDomain = portletSecurityService.getAuthorizationDomain(); - DomainConfigurator domainConfigurator = authDomain.getConfigurator(); - - // - for (Iterator i = jbossAppMD.getPortlets().values().iterator(); i.hasNext();) - { - JBossPortletMetaData portletMD = (JBossPortletMetaData)i.next(); - SecurityConstraintMetaData securityConstraintMD = portletMD.getSecurityConstraint(); - - // - if (securityConstraintMD == null) - { - securityConstraintMD = new SecurityConstraintMetaData(); - PolicyPermissionMetaData policyPermission = new PolicyPermissionMetaData(); - policyPermission.setRoleName(SecurityConstants.UNCHECKED_ROLE_NAME); - policyPermission.getActions().add("view"); - securityConstraintMD.getPolicyPermissions().put(SecurityConstants.UNCHECKED_ROLE_NAME, policyPermission); - } - - // - Set bindings = new HashSet(); - for (Iterator j = securityConstraintMD.getPolicyPermissions().values().iterator(); j.hasNext();) - { - PolicyPermissionMetaData policyPermissionMD = (PolicyPermissionMetaData)j.next(); - RoleSecurityBinding binding = new RoleSecurityBinding(policyPermissionMD.getActions(), policyPermissionMD.getRoleName()); - bindings.add(binding); - } - - // - try - { - String portletId = pwa.getId() + "." + portletMD.getName(); - domainConfigurator.setSecurityBindings(portletId, bindings); - } - catch (SecurityConfigurationException e) - { - log.error("Error in configuration", e); - } - } - } - - */ - // - super.start(); - } - - public void stop() throws DeploymentException - { - - /* - PortletSecurityService portletSecurityService = factory.getPortletSecurityService(); - if (portletSecurityService != null) - { - AuthorizationDomain authDomain = portletSecurityService.getAuthorizationDomain(); - DomainConfigurator domainConfigurator = authDomain.getConfigurator(); - for (Iterator i = portletAppMD.getPortlets().values().iterator(); i.hasNext();) - { - PortletMetaData portletMD = (PortletMetaData)i.next(); - - // - try - { - String portletId = pwa.getId() + "." + portletMD.getId(); - domainConfigurator.removeSecurityBindings(portletId); - } - catch (SecurityConfigurationException e) - { - log.error("Error in configuration", e); - } - } - } - */ - // - super.stop(); - } - - public void destroy() throws DeploymentException - { - //disable for now to use new deployer - if (true) return; - - portletApplicationLifeCycle.destroy(); - -// portletApplicationContext.stopPortletApplication(); - } - - /** Import the portlet jsp tag TLD in the deployed application. */ - protected void importTLD() - { - InputStream sourceTLD = null; - try - { - if (portletAppMD instanceof PortletApplication20MetaData) - { - sourceTLD = IOTools.safeBufferedWrapper(Thread.currentThread().getContextClassLoader().getResourceAsStream("META-INF/portlet_2_0.tld")); - } - else - { - sourceTLD = IOTools.safeBufferedWrapper(Thread.currentThread().getContextClassLoader().getResourceAsStream("META-INF/portlet.tld")); - } - pwa.importFile("/WEB-INF", "portlet.tld", sourceTLD, false); - } - catch (IOException e) - { - log.warn("Cannot copy TLD file to the portlet application", e); - } - finally - { - IOTools.safeClose(sourceTLD); - } - } - - protected PortletApplication10MetaData buildPortletApplicationMetaData() throws Exception - { - InputStream in = null; - try - { - in = IOTools.safeBufferedWrapper(url.openStream()); - PortletApplicationModelFactory factory = new PortletApplicationModelFactory(); - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - PortletApplication10MetaData portletAppMD = (PortletApplication10MetaData)unmarshaller.unmarshal(in, new ValueTrimmingFilter(factory), null); - portletAppMD.setId(pwa.getId()); - return portletAppMD; - } - finally - { - IOTools.safeClose(in); - } - } - - protected JBossApplicationMetaData buildJBossApplicationMetaData() - { - JBossApplicationMetaData jbossAppMD = new JBossApplicationMetaData(); - ServletContext servletContext = pwa.getServletContext(); - String contextPath = pwa.getContextPath(); - InputStream in = null; - try - { - in = IOTools.safeBufferedWrapper(servletContext.getResourceAsStream("/WEB-INF/jboss-portlet.xml")); - if (in != null) - { - log.info("Parsing " + contextPath + "/jboss-portlet.xml"); - - // - JBossApplicationMetaDataFactory factory = this.factory.createJBossApplicationMetaDataFactory(); - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - EntityResolver entityResolver = this.factory.getJBossPortletEntityResolver(); - if (entityResolver == null) - { - log.debug("Could not obtain entity resolver for jboss-portlet.xml"); - entityResolver = new NullEntityResolver(); - } - else - { - log.debug("Obtained entity resolver " + entityResolver + " for jboss-portlet.xml"); - } - unmarshaller.setEntityResolver(entityResolver); - jbossAppMD = (JBossApplicationMetaData)unmarshaller.unmarshal(in, new ValueTrimmingFilter(factory), null); - } - } - catch (Exception e) - { - e.printStackTrace(); - } - finally - { - IOTools.safeClose(in); - } - return jbossAppMD; - } - - public String getAppId() - { - return appId; - } -} Deleted: branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java 2009-03-06 21:05:27 UTC (rev 12965) +++ branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java 2009-03-06 21:08:48 UTC (rev 12966) @@ -1,245 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.deployment.jboss; - -import org.jboss.deployment.DeploymentException; -import org.jboss.portal.common.io.IOTools; -import org.jboss.portal.portlet.PortletInvoker; -import org.jboss.portal.portlet.container.PortletContainer; -import org.jboss.portal.portlet.container.ContainerPortletInvoker; -import org.jboss.portal.portlet.container.managed.LifeCycleStatus; -import org.jboss.portal.portlet.container.managed.ManagedObject; -import org.jboss.portal.portlet.container.managed.ManagedObjectEvent; -import org.jboss.portal.portlet.container.managed.ManagedObjectLifeCycleEvent; -import org.jboss.portal.portlet.container.managed.ManagedObjectRegistryEvent; -import org.jboss.portal.portlet.container.managed.ManagedObjectRegistryEventListener; -import org.jboss.portal.portlet.deployment.jboss.metadata.JBossApplicationMetaData; -import org.jboss.portal.portlet.impl.container.PortletContainerLifeCycle; -import org.jboss.portal.portlet.security.PortletSecurityService; -import org.jboss.portal.server.config.ServerConfig; -import org.jboss.portal.server.deployment.PortalWebApp; -import org.jboss.portal.server.deployment.jboss.AbstractDeploymentFactory; -import org.jboss.portal.server.deployment.jboss.Deployment; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; -import org.xml.sax.EntityResolver; - -import javax.management.MBeanServer; -import java.io.InputStream; -import java.net.URL; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * todo : remove unused ConfigService - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ - */ -public class PortletAppDeploymentFactory extends AbstractDeploymentFactory -{ - - /** . */ - protected static final Pattern urlPattern = Pattern.compile(".*/portlet\\.xml"); - - /** . */ - protected ServerConfig config; - - /** . */ - protected PortletSecurityService portletSecurityService; - - /** . */ - protected String standardJBossApplicationMetaDataLocation; - - /** . */ - protected JBossApplicationMetaData standardJBossApplicationMetaData; - - /** . */ - protected EntityResolver jbossPortletEntityResolver; - - private PortletInvoker portletContainerInvoker; - - private InfoBuilderFactory coreInfoBuilderFactory; - - public EntityResolver getJBossPortletEntityResolver() - { - return jbossPortletEntityResolver; - } - - public void setJBossPortletEntityResolver(EntityResolver jbossPortletEntityResolver) - { - this.jbossPortletEntityResolver = jbossPortletEntityResolver; - } - - public void setCoreInfoBuilderFactory(InfoBuilderFactory coreInfoBuilderFactory) - { - this.coreInfoBuilderFactory = coreInfoBuilderFactory; - } - - public InfoBuilderFactory getCoreInfoBuilderFactory() - { - return coreInfoBuilderFactory; - } - - public ServerConfig getConfig() - { - return config; - } - - public void setConfig(ServerConfig config) - { - this.config = config; - } - - public String getStandardJBossApplicationMetaDataLocation() - { - return standardJBossApplicationMetaDataLocation; - } - - public void setStandardJBossApplicationMetaDataLocation(String standardJBossApplicationMetaDataLocation) - { - this.standardJBossApplicationMetaDataLocation = standardJBossApplicationMetaDataLocation; - } - - public JBossApplicationMetaData getStandardJBossApplicationMetaData() - { - return standardJBossApplicationMetaData; - } - - public boolean acceptFile(URL url) - { - String urlAsFile = url.getFile(); - Matcher matcher = urlPattern.matcher(urlAsFile); - return matcher.matches(); - } - - public Deployment newInstance(URL url, PortalWebApp pwa, MBeanServer mbeanServer) throws DeploymentException - { - return new PortletAppDeployment(url, pwa, bridgeToInvoker, mbeanServer, this); - } - - public void start() throws Exception - { - // - loadStandardJBossApplicationMetaData(); - - // - super.start(); - } - - public void loadStandardJBossApplicationMetaData() - { - if (standardJBossApplicationMetaDataLocation != null) - { - InputStream in = null; - try - { - in = IOTools.safeBufferedWrapper(Thread.currentThread().getContextClassLoader().getResourceAsStream(standardJBossApplicationMetaDataLocation)); - if (in != null) - { - JBossApplicationMetaDataFactory factory = createJBossApplicationMetaDataFactory(); - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - standardJBossApplicationMetaData = (JBossApplicationMetaData)unmarshaller.unmarshal(in, new ValueTrimmingFilter(factory), null); - } - } - catch (Exception e) - { - e.printStackTrace(); - } - finally - { - IOTools.safeClose(in); - } - } - } - - public void stop() - { - super.stop(); - } - - public PortletSecurityService getPortletSecurityService() - { - return portletSecurityService; - } - - public void setPortletSecurityService(PortletSecurityService portletSecurityService) - { - this.portletSecurityService = portletSecurityService; - } - - /** Subclasses can provide a subclass of JBossApplicationMetaDataFactory. */ - public JBossApplicationMetaDataFactory createJBossApplicationMetaDataFactory() - { - return new JBossApplicationMetaDataFactory(); - } - - public PortletInvoker getPortletContainerInvoker() - { - return portletContainerInvoker; - } - - public void setPortletContainerInvoker(PortletInvoker portletContainerInvoker) - { - this.portletContainerInvoker = portletContainerInvoker; - } - - /** Bridge managed object event to add/remove portlet container in portlet container invoker. */ - protected final ManagedObjectRegistryEventListener bridgeToInvoker = new ManagedObjectRegistryEventListener() - { - public void onEvent(ManagedObjectRegistryEvent event) - { - if (event instanceof ManagedObjectEvent) - { - ManagedObjectEvent managedObjectEvent = (ManagedObjectEvent)event; - ManagedObject managedObject = managedObjectEvent.getManagedObject(); - - // - if (managedObject instanceof PortletContainerLifeCycle) - { - PortletContainerLifeCycle portletContainerLifeCycle = (PortletContainerLifeCycle)managedObject; - PortletContainer portletContainer = portletContainerLifeCycle.getPortletContainer(); - - // - if (managedObjectEvent instanceof ManagedObjectLifeCycleEvent) - { - ManagedObjectLifeCycleEvent lifeCycleEvent = (ManagedObjectLifeCycleEvent)managedObjectEvent; - - // - LifeCycleStatus status = lifeCycleEvent.getStatus(); - // - if (status == LifeCycleStatus.STARTED) - { - ((ContainerPortletInvoker)portletContainerInvoker).addPortletContainer(portletContainer); - } - else - { - ((ContainerPortletInvoker)portletContainerInvoker).removePortletContainer(portletContainer); - } - } - } - } - } - }; - -} Modified: branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/info/PortletInfoFactory.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/info/PortletInfoFactory.java 2009-03-06 21:05:27 UTC (rev 12965) +++ branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/info/PortletInfoFactory.java 2009-03-06 21:08:48 UTC (rev 12966) @@ -25,7 +25,7 @@ import org.jboss.portal.common.i18n.ResourceBundleManager; import org.jboss.portal.portlet.container.PortletApplicationContext; import org.jboss.portal.portlet.deployment.jboss.metadata.JBossPortletMetaData; -import org.jboss.portal.portlet.impl.metadata.portlet.PortletMetaData; +import org.jboss.portal.metadata.portlet.portlet.PortletMetaData; import org.jboss.portal.portlet.info.PortletInfo; /** Modified: branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/info/impl/CacheInfoImpl.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/info/impl/CacheInfoImpl.java 2009-03-06 21:05:27 UTC (rev 12965) +++ branches/JBoss_Portal_AS5_Deployer/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/info/impl/CacheInfoImpl.java 2009-03-06 21:08:48 UTC (rev 12966) @@ -24,7 +24,7 @@ import org.apache.log4j.Logger; import org.jboss.portal.portlet.deployment.jboss.metadata.JBossPortletMetaData; -import org.jboss.portal.portlet.impl.metadata.portlet.PortletMetaData; +import org.jboss.portal.metadata.portlet.portlet.PortletMetaData; import org.jboss.portal.portlet.info.CacheInfo; /**

17 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r12965 - in branches/JBoss_Portal_AS5_Deployer/server: src/main/org/jboss/portal/server/deployment and 1 other directories.

by portal-commits＠lists.jboss.org

Author: mwringe Date: 2009-03-06 16:05:27 -0500 (Fri, 06 Mar 2009) New Revision: 12965 Modified: branches/JBoss_Portal_AS5_Deployer/server/build.xml branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/PortalWebApp.java branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java Log: Update classpath to include the metadata and deployer jars. Add simple init option to the PortalWebApp class to just add needed variables. Modified: branches/JBoss_Portal_AS5_Deployer/server/build.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/server/build.xml 2009-03-06 20:30:12 UTC (rev 12964) +++ branches/JBoss_Portal_AS5_Deployer/server/build.xml 2009-03-06 21:05:27 UTC (rev 12965) @@ -99,6 +99,8 @@ <path refid="dom4j.dom4j.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="jbossas/core.libs.classpath"/> + <path refid="jboss/jboss.metadata.classpath"/> + <path refid="jboss/jboss.deployers.classpath"/> <path refid="apache.ant.classpath"/> <path refid="apache.collections.classpath"/> <path refid="apache.log4j.classpath"/> @@ -107,6 +109,7 @@ <path refid="apache.codec.classpath"/> <path refid="junit.junit.classpath"/> <path refid="jboss.test.classpath"/> + <path refid="sun.jaxb.classpath"/> <path refid="sun.servlet.classpath"/> <path refid="jboss.web.classpath"/> <pathelement location="jboss-bean-deployer.jar"/> Modified: branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/PortalWebApp.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/PortalWebApp.java 2009-03-06 20:30:12 UTC (rev 12964) +++ branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/PortalWebApp.java 2009-03-06 21:05:27 UTC (rev 12965) @@ -203,6 +203,19 @@ } } + protected final void init( + ServletContext servletContext, + URL url, + ClassLoader loader, + String contextPath) + { + this.servletContext = servletContext; + this.url = url; + this.loader = loader; + this.contextPath = contextPath; + this.id = contextPath; + } + /** * Read jboss-portal-app.xml deployment and fetch the overriden id if it exists. * Modified: branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java 2009-03-06 20:30:12 UTC (rev 12964) +++ branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java 2009-03-06 21:05:27 UTC (rev 12965) @@ -269,7 +269,16 @@ // Put it in the map infoContexts.put(pdi.url, new PortalDeploymentInfoContext(pdi)); - + + try + { + mainDeployer.setServiceController(new ObjectName("jboss.system:service=ServiceController")); + } + catch (Exception e) + { + e.printStackTrace(); + } + // And let JBoss deploy it mainDeployer.deploy(pdi); }

17 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r12964 - in branches/JBoss_Portal_Branch_2_7: theme/src/bin/portal-ajax-war/dyna and 1 other directory.

by portal-commits＠lists.jboss.org

Author: wesleyhales Date: 2009-03-06 15:30:12 -0500 (Fri, 06 Mar 2009) New Revision: 12964 Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/PortletSessionPortlet.java branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/dyna.js branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/prototype.js Log: JBPORTAL-2336 Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/PortletSessionPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/PortletSessionPortlet.java 2009-03-06 16:55:15 UTC (rev 12963) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/PortletSessionPortlet.java 2009-03-06 20:30:12 UTC (rev 12964) @@ -44,8 +44,7 @@ { String name = req.getParameter("name"); String value = req.getParameter("value"); - String scope = req.getParameter("scope"); - boolean portletScope = "portlet".equals(scope); + boolean portletScope = req.getParameter("portlet") != null; if (name != null && value != null) { req.getPortletSession().setAttribute(name, value, portletScope ? PortletSession.PORTLET_SCOPE : PortletSession.APPLICATION_SCOPE); @@ -86,19 +85,19 @@ } // - writer.println("<script type='text/javascript'>\n" + - "function processForm(value) {" + - "var form = document.getElementById('sessionForm');\n" + - "var hidden = document.getElementById('sessionHidden');\n" + - "hidden.value = value;\n" + - "form.submit();}\n" + - "</script>"); +// writer.println("<script type='text/javascript'>\n" + +// "function processForm(value) {" + +// "var form = document.getElementById('sessionForm');\n" + +// "var hidden = document.getElementById('sessionHidden');\n" + +// "hidden.value = value;\n" + +// "form.submit();}\n" + +// "</script>"); writer.println("<form id='sessionForm' action=\"" + purl.toString() + "\" method=\"post\">"); writer.println("<input type=\"text\" name=\"name\"/>"); writer.println("<input type=\"text\" name=\"value\"/>"); - writer.println("<input type=\"button\" name=\"portlet\" value=\"Add to portlet scope\" onclick=\"processForm('portlet')\"/>"); - writer.println("<input type=\"button\" name=\"application\" value=\"Add to application scope\" onclick=\"processForm('application')\"/>"); - writer.println("<input id='sessionHidden' name='scope' type='hidden'/>"); + writer.println("<input type=\"submit\" name=\"portlet\" value=\"Add to portlet scope\" />"); + writer.println("<input type=\"submit\" name=\"application\" value=\"Add to application scope\" />"); + // writer.println("<input id='sessionHidden' name='scope' type='hidden'/>"); writer.println("</form><br/>"); // Modified: branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/dyna.js =================================================================== --- branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/dyna.js 2009-03-06 16:55:15 UTC (rev 12963) +++ branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/dyna.js 2009-03-06 20:30:12 UTC (rev 12964) @@ -21,53 +21,8 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * ******************************************************************************/ -/*var currentSubmit = null; +var currentSubmit; - function decorateSubmits() - { - var submits = $$('input[type=submit]'); - for(var i = 0; i < submits.length; i++) - { - var submit = submits[i]; - var oldonclick = submit.onclick; - - if(typeof oldonclick != 'function') - { - submit.onclick = function() - { - currentSubmit = this.name; - }; - } - else - { - submit.onclick = function () - { - oldonclick(); - currentSubmit = this.name; - }; - } - } - } - - - function addLoadEvent(func) - { - var oldonload = window.onload; - if (typeof window.onload != 'function') - { - window.onload = func; - } - else - { - window.onload = function() - { - oldonload(); - func(); - }; - } - } - addLoadEvent(decorateSubmits());*/ - function sendData(action, windowId, fromPos, fromRegionId, toPos, toRegionId) { var options = { @@ -153,6 +108,11 @@ var source = Event.element(event); var container = Element.up(source, "div.dyna-window"); + //attach onclick observer to all submit buttons + $$('input[type=submit]').invoke('observe', 'click', function(e) { + currentSubmit = e.findElement(); + }); + // We found the window if (container != null) { @@ -205,7 +165,6 @@ // Check we can handle this URL if (isURLAccepted(current.action)) { - // Set URL url = current.action; @@ -213,9 +172,7 @@ options.enctype = enctype; options.asynchronous = false; options.method = "post" - // TODO: inject currentSubmit value in serialization instead of only getting the value of the first submit input - // see http://groups.google.com/group/prototype-core/browse_thread/thread/b3ced6... - options.postBody = Form.serialize(current); + options.postBody = Form.serialize(current,'',currentSubmit); } } } Modified: branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/prototype.js =================================================================== --- branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/prototype.js 2009-03-06 16:55:15 UTC (rev 12963) +++ branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/prototype.js 2009-03-06 20:30:12 UTC (rev 12964) @@ -2609,7 +2609,9 @@ "FORM": Object.clone(Form.Methods), "INPUT": Object.clone(Form.Element.Methods), "SELECT": Object.clone(Form.Element.Methods), - "TEXTAREA": Object.clone(Form.Element.Methods) + "TEXTAREA": Object.clone(Form.Element.Methods), + //[SERIALIZE_ERROR] + "BUTTON": Object.clone(Form.Element.Methods) }); } @@ -3475,8 +3477,21 @@ }; Form.Methods = { - serialize: function(form, options) { - return Form.serializeElements(Form.getElements(form), options); + serialize: function(form, options, buttonPressed) { + //[SERIALIZE_ERROR] Implements additional functionality to support <button> and ensure other button-type + // <inputs> are not serialized + var elements = Form.getElements(form); + if (buttonPressed) { + elements = elements.findAll( + function(element) { + return element == $(buttonPressed) || + (element.tagName.toLowerCase() != "button" && + (element.tagName.toLowerCase() != "input" || + (element.type != "submit" && element.type != "button" && element.type != "image" && element.type != "reset"))); + } + ); + }; + return Form.serializeElements(elements, options); }, getElements: function(form) { @@ -3657,6 +3672,11 @@ else element.value = value; }, + //[SERIALIZE_ERROR] + button: function(element) { + return element.value; + }, + select: function(element, value) { if (Object.isUndefined(value)) return this[element.type == 'select-one' ?

17 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r12963 - tags/JBoss_Portal_2_7_2/core-samples/src/resources/portal-basic-samples-war/WEB-INF.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2009-03-06 11:55:15 -0500 (Fri, 06 Mar 2009) New Revision: 12963 Modified: tags/JBoss_Portal_2_7_2/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml Log: - Page event test in TestWithAjax was not in synch with the non-AJAX version. Modified: tags/JBoss_Portal_2_7_2/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml =================================================================== --- tags/JBoss_Portal_2_7_2/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2009-03-06 16:50:23 UTC (rev 12962) +++ tags/JBoss_Portal_2_7_2/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2009-03-06 16:55:15 UTC (rev 12963) @@ -1,31 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?>  <!DOCTYPE deployments PUBLIC "-//JBoss Portal//DTD Portal Object 2.6//EN" "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd"> - + <deployments> <deployment> <parent-ref>default</parent-ref> @@ -424,38 +424,38 @@ <page-name>Page event test</page-name> <listener>window_event_listener</listener> <window> - <window-name>CatalogPortletWindow1</window-name> - <instance-ref>CatalogPortletInstance</instance-ref> + <window-name>EventPortletWindow1</window-name> + <instance-ref>EventPortletInstance</instance-ref> <region>left</region> <height>0</height> </window> <window> - <window-name>CatalogPortletWindow2</window-name> - <instance-ref>CatalogPortletInstance</instance-ref> + <window-name>EventPortletWindow2</window-name> + <instance-ref>EventPortletInstance</instance-ref> <region>left</region> <height>1</height> </window> <window> - <window-name>CatalogPortletWindow3</window-name> - <instance-ref>CatalogPortletInstance</instance-ref> + <window-name>EventPortletWindow3</window-name> + <instance-ref>EventPortletInstance</instance-ref> <region>left</region> <height>2</height> </window> <window> - <window-name>CatalogPortletWindow4</window-name> - <instance-ref>CatalogPortletInstance</instance-ref> + <window-name>EventPortletWindow4</window-name> + <instance-ref>EventPortletInstance</instance-ref> <region>center</region> <height>0</height> </window> <window> - <window-name>CatalogPortletWindow5</window-name> - <instance-ref>CatalogPortletInstance</instance-ref> + <window-name>EventPortletWindow5</window-name> + <instance-ref>EventPortletInstance</instance-ref> <region>center</region> <height>1</height> </window> <window> - <window-name>CatalogPortletWindow6</window-name> - <instance-ref>CatalogPortletInstance</instance-ref> + <window-name>EventPortletWindow6</window-name> + <instance-ref>EventPortletInstance</instance-ref> <region>center</region> <height>2</height> </window>

17 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r12962 - branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2009-03-06 11:50:23 -0500 (Fri, 06 Mar 2009) New Revision: 12962 Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml Log: - Page event test in TestWithAjax was not in synch with the non-AJAX version. Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2009-03-06 16:43:50 UTC (rev 12961) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2009-03-06 16:50:23 UTC (rev 12962) @@ -1,31 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?>  <!DOCTYPE deployments PUBLIC "-//JBoss Portal//DTD Portal Object 2.6//EN" "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd"> - + <deployments> <deployment> <parent-ref>default</parent-ref> @@ -424,38 +424,38 @@ <page-name>Page event test</page-name> <listener>window_event_listener</listener> <window> - <window-name>CatalogPortletWindow1</window-name> - <instance-ref>CatalogPortletInstance</instance-ref> + <window-name>EventPortletWindow1</window-name> + <instance-ref>EventPortletInstance</instance-ref> <region>left</region> <height>0</height> </window> <window> - <window-name>CatalogPortletWindow2</window-name> - <instance-ref>CatalogPortletInstance</instance-ref> + <window-name>EventPortletWindow2</window-name> + <instance-ref>EventPortletInstance</instance-ref> <region>left</region> <height>1</height> </window> <window> - <window-name>CatalogPortletWindow3</window-name> - <instance-ref>CatalogPortletInstance</instance-ref> + <window-name>EventPortletWindow3</window-name> + <instance-ref>EventPortletInstance</instance-ref> <region>left</region> <height>2</height> </window> <window> - <window-name>CatalogPortletWindow4</window-name> - <instance-ref>CatalogPortletInstance</instance-ref> + <window-name>EventPortletWindow4</window-name> + <instance-ref>EventPortletInstance</instance-ref> <region>center</region> <height>0</height> </window> <window> - <window-name>CatalogPortletWindow5</window-name> - <instance-ref>CatalogPortletInstance</instance-ref> + <window-name>EventPortletWindow5</window-name> + <instance-ref>EventPortletInstance</instance-ref> <region>center</region> <height>1</height> </window> <window> - <window-name>CatalogPortletWindow6</window-name> - <instance-ref>CatalogPortletInstance</instance-ref> + <window-name>EventPortletWindow6</window-name> + <instance-ref>EventPortletInstance</instance-ref> <region>center</region> <height>2</height> </window>

17 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r12961 - modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/adapter.

by portal-commits＠lists.jboss.org

Author: mwringe Date: 2009-03-06 11:43:50 -0500 (Fri, 06 Mar 2009) New Revision: 12961 Added: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/adapter/LifeCycleStringAdapter.java Log: Add new lifecycle adapter to prepend _PHASE to the lifecycle string. Added: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/adapter/LifeCycleStringAdapter.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/adapter/LifeCycleStringAdapter.java (rev 0) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/adapter/LifeCycleStringAdapter.java 2009-03-06 16:43:50 UTC (rev 12961) @@ -0,0 +1,51 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.metadata.portlet.adapter; + +import javax.xml.bind.annotation.adapters.XmlAdapter; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class LifeCycleStringAdapter extends XmlAdapter<String, String> +{ + + @Override + public String marshal(String v) throws Exception + { + throw new UnsupportedOperationException(); + } + + @Override + public String unmarshal(String lifeCycle) throws Exception + { + if (lifeCycle.toUpperCase().endsWith("_PHASE")) + { + return lifeCycle.substring(0, lifeCycle.toUpperCase().lastIndexOf("_PHASE")); + } + return lifeCycle; + } + +} +

17 years, 2 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits March 2009