[portal-commits] JBoss Portal SVN: r12970 - in branches/JBoss_Portal_AS5_Deployer/core-wsrp: src/main/org/jboss/portal/test/wsrp/other and 4 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Fri Mar 6 18:21:04 EST 2009
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 @@
<!-- Classes loaded by Portal's specific JSF wrapper. Note that it looks for classes in WEB-INF/lib2 -->
<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"/>
<!--<fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.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 at 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"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
- ~ Copyright 2007, 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 ~
+ ~ 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. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<!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"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ 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 ~
+ ~ 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. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
@@ -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>
-
- <!--When turned on, it changes ViewHandler.restoreView() to build the view before asking the StateManager for help.-->
- <context-param>
- <param-name>facelets.BUILD_BEFORE_RESTORE</param-name>
- <param-value>true</param-value>
- </context-param>
-
<!-- Facelet configuration -->
<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 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<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/>
+
<!-- Consumers list -->
<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>
More information about the portal-commits
mailing list