[portal-commits] JBoss Portal SVN: r11984 - in branches/JBoss_Portal_Branch_2_7: core-admin/src/resources/portal-admin-war/WEB-INF and 8 other directories.

Thursday, 25 September 2008


Author: chris.laprun(a)jboss.com
Date: 2008-09-25 11:47:41 -0400 (Thu, 25 Sep 2008)
New Revision: 11984

Added:
  
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties
  
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties
   branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/
  
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java
  
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/JSFBeanContext.java
  
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java
Removed:
  
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/BeanContext.java
  
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/JSFBeanContext.java
  
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ManagedBean.java
  
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
  
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
Modified:
  
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java
  
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java
  
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java
  
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/QNameSelectItem.java
  
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml
  
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
  
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerBeanTestCase.java
  
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
  
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java
  
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java
  
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/StatusConverter.java
  
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml
  
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/common/template.xhtml
Log:
- JBPORTAL-2148:
  + Moved ManagedBean and BeanContext to faces module.
  + Extracted methods to ManagedBean
- Coordination GUI: 
  + Fixed localization of parameterized messages.
  + Removed value change listener that wasn't used

Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java	2008-09-25
14:53:22 UTC (rev 11983)
+++
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java	2008-09-25
15:47:41 UTC (rev 11984)
@@ -22,7 +22,6 @@
 
 package org.jboss.portal.core.admin.ui.coordination;
 
-import org.jboss.portal.common.util.ParameterValidation;
 import org.jboss.portal.core.admin.ui.PortalObjectManagerBean;
 import org.jboss.portal.core.controller.coordination.CoordinationConfigurator;
 import org.jboss.portal.core.controller.coordination.IllegalCoordinationException;
@@ -36,6 +35,7 @@
 import org.jboss.portal.core.model.portal.PortalObjectId;
 import org.jboss.portal.core.model.portal.PortalObjectPath;
 import org.jboss.portal.core.model.portal.Window;
+import org.jboss.portal.faces.gui.ManagedBean;
 import org.jboss.portal.portlet.info.PortletInfo;
 
 import javax.faces.context.FacesContext;
@@ -50,7 +50,7 @@
  * @author <a href="mailto:chris.laprun@jboss.com">Chris
Laprun</a>
  * @version $Revision$
  */
-public class CoordinationManagerBean
+public class CoordinationManagerBean extends ManagedBean
 {
    private PortalObjectManagerBean pomb;
 
@@ -68,21 +68,24 @@
 
    private enum CoordinationType
    {
-      wiring() {
-         String localizationKey()
-         {
-            return "COORDINATION_WIRING";
-         }},
-      parameter() {
-         String localizationKey()
-         {
-            return "COORDINATION_PARAMETER";
-         }},
-       alias() {
-          String localizationKey()
-          {
-             return "COORDINATION_ALIAS";
-          }};
+      wiring()
+              {
+                 String localizationKey()
+                 {
+                    return "COORDINATION_WIRING";
+                 }},
+      parameter()
+              {
+                 String localizationKey()
+                 {
+                    return "COORDINATION_PARAMETER";
+                 }},
+      alias()
+              {
+                 String localizationKey()
+                 {
+                    return "COORDINATION_ALIAS";
+                 }};
 
       private CoordinationBean bean;
 
@@ -99,7 +102,7 @@
       abstract String localizationKey();
    }
 
-   abstract static class CoordinationBean
+   abstract static class CoordinationBean extends ManagedBean
    {
       protected CoordinationManagerBean managerBean;
 
@@ -272,11 +275,14 @@
          // reset the different managers as they are in session scope but need to be
re-initialized each time a new
          // page is reloaded
          AliasBindingManagerBean aliasManager = new AliasBindingManagerBean(this);
+         aliasManager.setBeanContext(beanContext);
          EventWiringManagerBean eventManager = new EventWiringManagerBean(this);
+         eventManager.setBeanContext(beanContext);
          ParameterBindingManagerBean parameterManager = new
ParameterBindingManagerBean(this);
-         managers.put(CoordinationType.alias.name(),
replaceInSession("aliasManager", aliasManager));
-         managers.put(CoordinationType.wiring.name(),
replaceInSession("eventManager", eventManager));
-         managers.put(CoordinationType.parameter.name(),
replaceInSession("parameterManager", parameterManager));
+         parameterManager.setBeanContext(beanContext);
+         managers.put(CoordinationType.alias.name(),
beanContext.replaceInSession("aliasManager", aliasManager));
+         managers.put(CoordinationType.wiring.name(),
beanContext.replaceInSession("eventManager", eventManager));
+         managers.put(CoordinationType.parameter.name(),
beanContext.replaceInSession("parameterManager", parameterManager));
 
          Page selectedPage = getSelectedPage();
 
@@ -335,86 +341,7 @@
       return EDIT_COORDINATION;
    }
 
-   // JSF helper methods
-
    /**
-    * Purges a session bean from the session so that it will be recreated by JSF when
needed.
-    * todo: JSF COMMON
-    *
-    * @param beanName   name of the bean to be purged, must match an entry in
<code>faces-config.xml</code>
-    * @param otherNames additional names of beans to be purged
-    */
-   void purgeFromSession(String beanName, String... otherNames)
-   {
-      Map<String, Object> sessionMap = getFacesSessionMap();
-      sessionMap.remove(beanName);
-      if (otherNames != null)
-      {
-         for (String name : otherNames)
-         {
-            sessionMap.remove(name);
-         }
-      }
-   }
-
-   /**
-    * Retrieves the JSF session map.
-    * todo: JSF COMMON
-    *
-    * @return the JSF session map
-    */
-   Map<String, Object> getFacesSessionMap()
-   {
-      return FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
-   }
-
-   /**
-    * Replaces the bean identified by the given name by the specified new one. Passing
<code>null</code> for the new
-    * bean value will remove the bean reference from the session. If a bean was
previously assigned to this name, then
-    * only a bean of the same type (as defined by {@link Class#isAssignableFrom(Class)})
can be assigned to this name.
-    * todo: JSF COMMON
-    *
-    * @param beanName the name identifying the bean to be replaced
-    * @param newBean  the new value for the bean to be replaced or
<code>null</code> if the bean is to be removed
-    * @param <T>      the type of the given bean
-    * @return the new value for the bean or <code>null</code> if the remove
semantics was used
-    */
-   <T> T replaceInSession(String beanName, T newBean)
-   {
-      ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(beanName, "bean
Name", "replaceInSession");
-      Map<String, Object> sessionMap = getFacesSessionMap();
-
-      // if we passed null, use the remove semantics
-      if (newBean == null)
-      {
-         sessionMap.remove(beanName);
-         return null;
-      }
-
-      Object current = sessionMap.get(beanName);
-      // check that the new bean is compatible with the previously assigned
-      if (current != null &&
!newBean.getClass().isAssignableFrom(current.getClass()))
-      {
-         throw new IllegalArgumentException("Provided bean: " + newBean +
" is not compatible with previously assigned '"
-                 + beanName + "' bean: " + current);
-      }
-      sessionMap.put(beanName, newBean);
-      return newBean;
-   }
-
-   /**
-    * Retrieves the value of the parameter which name is given from the JSF request.
-    * todo: JSF COMMON
-    *
-    * @param name name of the parameter which value we want to retrieve
-    * @return
-    */
-   public String getFacesParam(String name)
-   {
-      return
FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get(name);
-   }
-
-   /**
     * Util: Parse PortalObjectId for given portlet object.
     *
     * @param id
@@ -429,8 +356,8 @@
 
    public void select(ActionEvent event)
    {
-      selectedName = getFacesParam(SELECTED_NAME);
-      selectedType = CoordinationType.valueOf(getFacesParam(SELECTED_TYPE));
+      selectedName = beanContext.getParameter(SELECTED_NAME);
+      selectedType = CoordinationType.valueOf(beanContext.getParameter(SELECTED_TYPE));
       selectedType.setBean(managers.get(selectedType.name()));
    }
 
@@ -467,9 +394,7 @@
       return EDIT_COORDINATION;
    }
 
-   /**
-    * Refreshes the page data.
-    */
+   /** Refreshes the page data. */
    public void refresh()
    {
       editCoordination();

Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java	2008-09-25
14:53:22 UTC (rev 11983)
+++
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java	2008-09-25
15:47:41 UTC (rev 11984)
@@ -31,7 +31,6 @@
 import org.jboss.portal.portlet.info.EventingInfo;
 import org.jboss.portal.portlet.info.PortletInfo;
 
-import javax.faces.event.ValueChangeEvent;
 import javax.faces.model.SelectItem;
 import javax.xml.namespace.QName;
 import java.util.ArrayList;
@@ -110,34 +109,16 @@
       return existing;
    }
 
-   public void selectSourceEvent(ValueChangeEvent event)
+   public String getStep2Message()
    {
-      System.out.println("selectSourceEvent");
-      System.out.println("old value = " + event.getOldValue());
-      System.out.println("new value = " + event.getNewValue());
+      return
beanContext.getMessageFromBundle("COORDINATION_EVENT_CREATE_STEP2",
selectedSourceEvent);
    }
 
-   public void selectSourceWindows(ValueChangeEvent event)
+   public String getStep4Message()
    {
-      System.out.println("selectSourceWindows");
-      System.out.println("old value = " + event.getOldValue());
-      System.out.println("new value = " + event.getNewValue());
+      return
beanContext.getMessageFromBundle("COORDINATION_EVENT_CREATE_STEP4",
selectedDestinationEvent);
    }
 
-   public void selectDestinationEvent(ValueChangeEvent event)
-   {
-      System.out.println("selectDestinationEvent");
-      System.out.println("old value = " + event.getOldValue());
-      System.out.println("new value = " + event.getNewValue());
-   }
-
-   public void selectDestinationWindows(ValueChangeEvent event)
-   {
-      System.out.println("selectDestinationWindows");
-      System.out.println("old value = " + event.getOldValue());
-      System.out.println("new value = " + event.getNewValue());
-   }
-
    public Collection<DisplayEventWiring> getDisplayEventWirings()
    {
       if (displayEventWirings == null)

Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java	2008-09-25
14:53:22 UTC (rev 11983)
+++
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java	2008-09-25
15:47:41 UTC (rev 11984)
@@ -23,8 +23,8 @@
 package org.jboss.portal.core.admin.ui.coordination;
 
 import org.jboss.portal.core.controller.coordination.IllegalCoordinationException;
+import org.jboss.portal.core.controller.coordination.Utils;
 import org.jboss.portal.core.controller.coordination.WindowBindingInfo;
-import org.jboss.portal.core.controller.coordination.Utils;
 import org.jboss.portal.core.model.portal.Page;
 import org.jboss.portal.core.model.portal.PortalObject;
 import org.jboss.portal.core.model.portal.Window;

Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/QNameSelectItem.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/QNameSelectItem.java	2008-09-25
14:53:22 UTC (rev 11983)
+++
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/QNameSelectItem.java	2008-09-25
15:47:41 UTC (rev 11984)
@@ -27,8 +27,8 @@
 
 /**
  * @author <a href="mailto:chris.laprun@jboss.com">Chris
Laprun</a>
-* @version $Revision$
-*/
+ * @version $Revision$
+ */
 public class QNameSelectItem extends SelectItem implements Comparable
 {
    public QNameSelectItem(QName qName)

Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml	2008-09-25
14:53:22 UTC (rev 11983)
+++
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml	2008-09-25
15:47:41 UTC (rev 11984)
@@ -51,6 +51,13 @@
      
<converter-class>org.jboss.portal.core.admin.ui.conversion.PortalObjectIdConverter</converter-class>
    </converter>
 
+   <!-- bean context for managed beans -->
+   <managed-bean>
+      <managed-bean-name>beanContext</managed-bean-name>
+     
<managed-bean-class>org.jboss.portal.faces.gui.JSFBeanContext</managed-bean-class>
+      <managed-bean-scope>application</managed-bean-scope>
+   </managed-bean>
+
    <!-- The portal object manager bean -->
    <managed-bean>
       <managed-bean-name>portalobjectmgr</managed-bean-name>
@@ -421,21 +428,41 @@
          <property-name>aliasManager</property-name>
          <value>#{aliasManager}</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>eventManager</managed-bean-name>
      
<managed-bean-class>org.jboss.portal.core.admin.ui.coordination.EventWiringManagerBean</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-bean>
    <managed-bean>
       <managed-bean-name>parameterManager</managed-bean-name>
      
<managed-bean-class>org.jboss.portal.core.admin.ui.coordination.ParameterBindingManagerBean</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-bean>
    <managed-bean>
       <managed-bean-name>aliasManager</managed-bean-name>
      
<managed-bean-class>org.jboss.portal.core.admin.ui.coordination.AliasBindingManagerBean</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-bean>
 
 

Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml	2008-09-25
14:53:22 UTC (rev 11983)
+++
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml	2008-09-25
15:47:41 UTC (rev 11984)
@@ -186,15 +186,15 @@
          <h:panelGroup>
             #{bundle.COORDINATION_EVENT_CREATE_STEP1}
             <h:selectOneListbox id="sourceEvent" size="5"
value="#{eventManager.selectedSourceEvent}" immediate="true"
-                               
valueChangeListener="#{eventManager.selectSourceEvent}"
onchange="this.form.submit()">
+                                onchange="this.form.submit()">
                <f:selectItems value="#{eventManager.sourceEvents}"/>
             </h:selectOneListbox>
          </h:panelGroup>
 
          <h:panelGroup rendered="#{!empty
eventManager.selectedSourceEvent}">
-            #{bundle.COORDINATION_EVENT_CREATE_STEP2}
+            #{eventManager.step2Message} <!-- this uses
bundle.COORDINATION_EVENT_CREATE_STEP2 -->
             <h:selectManyListbox id="sourceWindows" size="5"
value="#{eventManager.selectedSourceWindows}" immediate="true"
-                                
valueChangeListener="#{eventManager.selectSourceWindows}"
onchange="this.form.submit()">
+                                 onchange="this.form.submit()">
                <f:selectItems value="#{eventManager.sourceWindows}"/>
             </h:selectManyListbox>
          </h:panelGroup>
@@ -202,15 +202,15 @@
          <h:panelGroup rendered="#{!empty
eventManager.selectedSourceWindows}">
             #{bundle.COORDINATION_EVENT_CREATE_STEP3}
             <h:selectOneListbox id="destEvent" size="5"
value="#{eventManager.selectedDestinationEvent}" immediate="true"
-                               
valueChangeListener="#{eventManager.selectDestinationEvent}"
onchange="this.form.submit()">
+                                onchange="this.form.submit()">
                <f:selectItems
value="#{eventManager.destinationEvents}"/>
             </h:selectOneListbox>
          </h:panelGroup>
 
          <h:panelGroup rendered="#{!empty
eventManager.selectedDestinationEvent}">
-            #{bundle.COORDINATION_EVENT_CREATE_STEP4}
+            #{eventManager.step4Message} <!-- this uses
bundle.COORDINATION_EVENT_CREATE_STEP4 -->
             <h:selectManyListbox id="destWindows" size="5"
value="#{eventManager.selectedDestinationWindows}" immediate="true"
-                                
valueChangeListener="#{eventManager.selectDestinationWindows}"
onchange="this.form.submit()">
+                                 onchange="this.form.submit()">
                <f:selectItems
value="#{eventManager.destinationWindows}"/>
             </h:selectManyListbox>
          </h:panelGroup>

Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerBeanTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerBeanTestCase.java	2008-09-25
14:53:22 UTC (rev 11983)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerBeanTestCase.java	2008-09-25
15:47:41 UTC (rev 11984)
@@ -25,11 +25,12 @@
 
 import junit.framework.TestCase;
 import org.jboss.portal.common.NotYetImplemented;
+import org.jboss.portal.faces.gui.BeanContext;
 import org.jboss.portal.test.wsrp.framework.support.MockConsumerRegistry;
-import org.jboss.portal.wsrp.admin.ui.BeanContext;
 import org.jboss.portal.wsrp.admin.ui.ConsumerBean;
 
 import java.util.Locale;
+import java.util.Map;
 
 /**
  * @author <a href="mailto:chris.laprun@jboss.com">Chris
Laprun</a>
@@ -74,7 +75,7 @@
 
    private static class TestBeanContext extends BeanContext
    {
-      protected String getParameter(String key)
+      public String getParameter(String key)
       {
          throw new NotYetImplemented();
       }
@@ -98,5 +99,10 @@
       {
          return Locale.getDefault();
       }
+
+      public Map<String, Object> getSessionMap()
+      {
+         throw new NotYetImplemented();
+      }
    }
 }

Deleted:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/BeanContext.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/BeanContext.java	2008-09-25
14:53:22 UTC (rev 11983)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/BeanContext.java	2008-09-25
15:47:41 UTC (rev 11984)
@@ -1,111 +0,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         *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
- ******************************************************************************/
-
-package org.jboss.portal.wsrp.admin.ui;
-
-import java.text.MessageFormat;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-/**
- * todo: JSF COMMON
- * @author <a href="mailto:chris.laprun@jboss.com">Chris
Laprun</a>
- * @version $Revision$
- * @since 2.6
- */
-public abstract class BeanContext
-{
-   protected static final String STATUS = "status";
-   private static final String RESOURCE_NAME = "WSRPConfigurationResource";
-   private static final String UNEXPECTED_ERROR =
"bean_support_unexpected_error";
-   private static final String CAUSE = "bean_support_cause";
-
-   protected abstract String getParameter(String key);
-
-   protected abstract void createMessage(String target, String message, Object
severity);
-
-   protected abstract Object getErrorSeverity();
-
-   protected abstract Object getInfoSeverity();
-
-   protected abstract Locale getLocale();
-
-   protected void createErrorMessage(String message, Object... params)
-   {
-      createLocalizedMessage(STATUS, message, getErrorSeverity(), params);
-   }
-
-   protected void createErrorMessage(String target, String message, Object... params)
-   {
-      createLocalizedMessage(target, message, getErrorSeverity(), params);
-   }
-
-   protected void createLocalizedMessage(String target, String message, Object severity,
Object... params)
-   {
-      createMessage(target, getMessageFromBundle(message, params), severity);
-   }
-
-   protected String getMessageFromBundle(String message, Object... params)
-   {
-      return getLocalizedMessage(message, getLocale(), params);
-   }
-
-   public static String getLocalizedMessage(String localizationKey, Locale locale,
Object... params)
-   {
-      ResourceBundle rb = ResourceBundle.getBundle(RESOURCE_NAME, locale);
-      return MessageFormat.format(rb.getString(localizationKey), params);
-   }
-
-   protected void createErrorMessageFrom(Exception e)
-   {
-      createErrorMessageFrom(STATUS, e);
-   }
-
-   protected void createErrorMessageFrom(String target, Exception e)
-   {
-      Throwable cause = e.getCause();
-      String localizedMessage = getLocalizedMessageOrExceptionName(e);
-      String message = localizedMessage + (cause != null ? "\n" +
getMessageFromBundle(CAUSE) + getLocalizedMessageOrExceptionName(cause) : "");
-      createMessage(target, message, getErrorSeverity());
-   }
-
-   private String getLocalizedMessageOrExceptionName(Throwable e)
-   {
-      String localizedMessage = e.getLocalizedMessage();
-      if (localizedMessage == null)
-      {
-         localizedMessage = getMessageFromBundle(UNEXPECTED_ERROR) +
e.getClass().getName();
-      }
-      return localizedMessage;
-   }
-
-   protected void createInfoMessage(String target, String message)
-   {
-      createLocalizedMessage(target, message, getInfoSeverity());
-   }
-
-   protected void createInfoMessage(String message)
-   {
-      createInfoMessage(STATUS, message);
-   }
-}

Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java	2008-09-25
14:53:22 UTC (rev 11983)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java	2008-09-25
15:47:41 UTC (rev 11984)
@@ -23,6 +23,7 @@
 
 package org.jboss.portal.wsrp.admin.ui;
 
+import org.jboss.portal.faces.gui.ManagedBean;
 import org.jboss.portal.wsrp.WSRPConsumer;
 import org.jboss.portal.wsrp.consumer.ConsumerRegistry;
 import org.jboss.portal.wsrp.consumer.EndpointConfigurationInfo;

Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java	2008-09-25
14:53:22 UTC (rev 11983)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java	2008-09-25
15:47:41 UTC (rev 11984)
@@ -23,6 +23,7 @@
 package org.jboss.portal.wsrp.admin.ui;
 
 import org.jboss.portal.common.util.ParameterValidation;
+import org.jboss.portal.faces.gui.ManagedBean;
 import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.wsrp.WSRPConsumer;
 import org.jboss.portal.wsrp.consumer.ConsumerRegistry;
@@ -333,8 +334,7 @@
 
    private void setConsumerIdInSession(boolean remove)
    {
-      // todo: JSF COMMON extract this behavior into common class
-      Map<String, Object> sessionMap =
FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
+      Map<String, Object> sessionMap = beanContext.getSessionMap();
       String consumerBeanName = "consumer"; // must match ConsumerBean name in
faces-config.xml
 
       // force recreation of ConsumerBean otherwise switching to the consumer view might
not show the proper consumer 

Deleted:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/JSFBeanContext.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/JSFBeanContext.java	2008-09-25
14:53:22 UTC (rev 11983)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/JSFBeanContext.java	2008-09-25
15:47:41 UTC (rev 11984)
@@ -1,74 +0,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         *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
- ******************************************************************************/
-
-package org.jboss.portal.wsrp.admin.ui;
-
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import java.util.Locale;
-import java.util.Map;
-
-/**
- * @author <a href="mailto:chris.laprun@jboss.com">Chris
Laprun</a>
- * @version $Revision$
- * @since 2.6
- */
-public class JSFBeanContext extends BeanContext
-{
-   protected String getParameter(String key)
-   {
-      Map pmap =
FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
-      return (String)pmap.get(key);
-   }
-
-   protected void createMessage(String target, String message, Object severity)
-   {
-      FacesMessage.Severity jsfSeverity;
-      if (severity instanceof FacesMessage.Severity)
-      {
-         jsfSeverity = (FacesMessage.Severity)severity;
-      }
-      else
-      {
-         jsfSeverity = FacesMessage.SEVERITY_ERROR;
-      }
-
-      FacesMessage msg = new FacesMessage(jsfSeverity, message, message);
-      FacesContext.getCurrentInstance().addMessage(target, msg);
-   }
-
-   protected Object getErrorSeverity()
-   {
-      return FacesMessage.SEVERITY_ERROR;
-   }
-
-   protected Object getInfoSeverity()
-   {
-      return FacesMessage.SEVERITY_INFO;
-   }
-
-   protected Locale getLocale()
-   {
-      return FacesContext.getCurrentInstance().getExternalContext().getRequestLocale();
-   }
-}

Deleted:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ManagedBean.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ManagedBean.java	2008-09-25
14:53:22 UTC (rev 11983)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ManagedBean.java	2008-09-25
15:47:41 UTC (rev 11984)
@@ -1,45 +0,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         *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
- ******************************************************************************/
-
-package org.jboss.portal.wsrp.admin.ui;
-
-import org.jboss.logging.Logger;
-
-
-/**
- * todo: JSF COMMON
- * @author <a href="mailto:chris.laprun@jboss.com">Chris
Laprun</a>
- * @version $Revision$
- * @since 2.6
- */
-public class ManagedBean
-{
-   protected Logger log = Logger.getLogger(getClass());
-
-   protected BeanContext beanContext;
-
-   public void setBeanContext(BeanContext beanContext)
-   {
-      this.beanContext = beanContext;
-   }
-}

Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java	2008-09-25
14:53:22 UTC (rev 11983)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java	2008-09-25
15:47:41 UTC (rev 11984)
@@ -23,6 +23,8 @@
 
 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;
 import org.jboss.portal.wsrp.producer.config.ProducerConfiguration;

Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/StatusConverter.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/StatusConverter.java	2008-09-25
14:53:22 UTC (rev 11983)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/StatusConverter.java	2008-09-25
15:47:41 UTC (rev 11984)
@@ -22,6 +22,7 @@
 
 package org.jboss.portal.wsrp.admin.ui;
 
+import org.jboss.portal.faces.gui.BeanContext;
 import org.jboss.portal.wsrp.consumer.RegistrationProperty;
 
 import javax.faces.component.UIComponent;

Copied:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties
(from rev 11967,
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties)
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties	
                       (rev 0)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties	2008-09-25
15:47:41 UTC (rev 11984)
@@ -0,0 +1,173 @@
+################################################################################
+# 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.WSRPConfigurationPortlet           = WSRP Configuration
+org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = WSRP Configuration
Portlet
+
+# Tabs
+nav_tabs_consumers = Consumers Configuration
+nav_tabs_producer_config = Producer Configuration
+nav_tabs_producer_management = Producer Management
+
+# Object path in consumer template
+path_consumers_root = Consumers
+path_consumers_consumer = Consumer ''{0}'' configuration
+path_consumers_active = active
+path_consumers_inactive = inactive
+path_consumers_refreshNeeded = (refresh needed)
+
+# Confirm deletion of a consumer screen
+confirm_delete_consumer_title = Delete ''{0}'' consumer?
+confirm_delete_consumer_message = You are about to delete the ''{0}''
consumer!
+confirm_detete_consumer_proceed = Are you sure you want to proceed?
+confirm_delete_consumer_submit = Delete consumer
+confirm_delete_consumer_cancel = Cancel
+
+# Confirm deletion of local registration information screen
+confirm_delete_registration_title = Delete local registration for ''{0}''
consumer?
+confirm_delete_registration_message = You are about to delete the local registration
information for the ''{0}'' consumer! \n\
+This is only needed if this consumer had previously registered with the remote producer
and this producer \n\
+has been modified to not require registration anymore. \n\
+Only erase local registration information if you experience errors with the producer due
to this \n\
+particular situation. Erasing local registration when not required might lead to
inability to work with \n\
+this producer anymore.
+confirm_delete_registration_proceed = Are you sure you want to proceed?
+confirm_delete_registration_submit = Erase local registration
+confirm_delete_registration_cancel = Cancel
+
+# Consumers screen
+consumers_title = Manage Consumers
+consumers_create_title = Create a consumer named:
+consumers_create_submit = Create Consumer
+
+# Consumers list
+consumers_table_column_consumer = Consumer
+consumers_table_column_consumer_status = status:
+consumers_table_column_actions = Actions
+consumers_table_action_configure = Configure
+consumers_table_action_refresh = Refresh
+consumers_table_action_activate = Activate
+consumers_table_action_deactivate = Deactivate
+consumers_table_action_register = Register
+consumers_table_action_deregister = Deregister
+consumers_table_action_delete = Delete
+
+# Consumer editing screen
+edit_consumer_producer = Producer id:
+edit_consumer_cache = Cache expiration:
+edit_consumer_cache_seconds = (seconds before expiration)
+edit_consumer_endpoint = Endpoint configuration: 
+edit_consumer_endpoint_wsdl = Use WSDL?
+edit_consumer_endpoint_sd = Service Description URL:
+edit_consumer_endpoint_m = Markup URL:
+edit_consumer_endpoint_r = Registration URL:
+edit_consumer_endpoint_pm = Portlet Management URL:
+edit_consumer_registration = Registration information:
+edit_consumer_registration_current = Current registration information:
+edit_consumer_prop_name = Name
+edit_consumer_prop_desc = Description
+edit_consumer_prop_value = Value
+edit_consumer_registration_update_props = Update properties
+edit_consumer_registration_no_props = Registration is indicated as required without
registration properties.
+edit_consumer_registration_modify = Modify registration
+edit_consumer_registration_modify_title = Modify the registration held with this
producer
+edit_consumer_registration_expected = Expected registration information:
+edit_consumer_no_registration = Producer doesn't require registration.
+edit_consumer_registration_context = Registration context:
+edit_consumer_registration_context_handle = Handle:
+edit_consumer_registration_context_erase = Erase local registration
+edit_consumer_registration_context_erase_title = Erase local registration information
(potentially dangerous!)
+edit_consumer_refresh = Refresh & Save
+edit_consumer_refresh_title = Save changes and refresh information from producer
+edit_consumer_cancel = Cancel
+
+# Confirm registration property deletion screen
+confirm_delete_reg_property_title = Delete ''{0}'' registration property
description?
+confirm_delete_reg_property_message = You are about to delete the ''{0}''
registration property description! \n\
+This will trigger invalidation of consumer registrations which will have to modify their
registration \n\
+information.
+confirm_delete_reg_property_proceed = Are you sure you want to proceed?
+confirm_delete_reg_property_submit = Delete property
+confirm_delete_reg_property_cancel = Cancel
+
+# Producer configuration screen
+producer_config_title = Producer configuration
+producer_config_sd_requires_reg = Access to full service description requires consumers
to be registered.
+producer_config_strict = Use strict WSRP compliance.
+producer_config_requires_reg = Requires registration. Modifying this information will
trigger invalidation of consumer registrations.
+producer_config_reg_policy = Registration policy class name:
+producer_config_reg_prop_validator = Registration property validator class name:
+producer_config_reg_props = Registration properties
+producer_config_reg_prop_name = Name
+producer_config_reg_prop_type = Type
+producer_config_reg_prop_label = Label
+producer_config_reg_prop_hint = Hint
+producer_config_reg_prop_action = Action
+producer_config_reg_prop_remove = Remove
+producer_config_no_reg_props = No specified required registration properties.
+producer_config_add_reg_prop = Add property
+producer_config_save = Save
+producer_config_cancel = Cancel
+
+## Localized messages in JSF beans
+
+bean_support_unexpected_error = An unexpected error occured:
+bean_support_cause = Cause:
+
+# ConsumerBean
+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!
+bean_consumer_invalid_modify = Invalid attempt to modify a registration that hasn't
been locally modified!
+bean_consumer_cannot_modify_reg = Couldn't modify registration!
+bean_consumer_cannot_erase_reg = Couldn't erase local registration!
+bean_consumer_malformed_url = ''{0}'' is not a valid URL: {1}
+bean_consumer_update_success = Successfully updated consumer!
+
+# ConsumerManagerBean
+bean_consumermanager_invalid_new_consumer_name = Need a non-null, non-empty name for the
new consumer!
+bean_consumermanager_no_consumer = No consumer was selected!
+bean_consumermanager_refresh_bypassed = Refresh was not necessary.
+bean_consumermanager_refresh_success = Refresh was successful.
+bean_consumermanager_refresh_failure = Refresh failed (probably because the registration
information was not valid).
+bean_consumermanager_refresh_exception = An unexpected error occurred.
+bean_consumermanager_refresh_modify = Either local or remote information has been
changed, you should modify your registration with the remote producer.
+
+# 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_save_success = Producer configuration successfully saved!
+bean_producer_cancel_success = All modifications made to the producer configuration have
been cancelled!
+
+## RegistrationProperty Status localization
+registration_property_status_inexistent = Inexistent on producer
+registration_property_status_missing = Missing
+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

Copied:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties
(from rev 11967,
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties)
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties	
                       (rev 0)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties	2008-09-25
15:47:41 UTC (rev 11984)
@@ -0,0 +1,143 @@
+################################################################################
+# 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 Portal display information
+org.jboss.portal.object.name.WSRPConfigurationPortlet           = Configuration WSRP
+org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = Portlet de
Configuration pour WSRP
+
+nav_tabs_consumers = Configuration Consommateurs
+nav_tabs_producer_config = Configuration Producteur
+nav_tabs_producer_management = Gestion Producteur
+
+path_consumers_root = Consommateurs
+path_consumers_consumer = Configuration du consommateur ''{0}''
+path_consumers_active = actif
+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_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_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}''?
+consumers_create_submit=Cr\u00e9er Consommateur
+consumers_create_title=Cr\u00e9er un consommateur nomm\u00e9:
+consumers_table_action_activate=Activer
+consumers_table_action_configure=Configurer
+consumers_table_action_deactivate=D\u00e9sactiver
+consumers_table_action_delete=Effacer
+consumers_table_action_deregister=D\u00e9senregistrer
+consumers_table_action_refresh=Rafra\u00eechir
+consumers_table_action_register=Enregister
+consumers_table_column_actions=Actions
+consumers_table_column_consumer=Consommateur
+consumers_table_column_consumer_status=status:
+consumers_title=Gestion des Consommateurs
+edit_consumer_cache=Expiration du cache:
+edit_consumer_cache_seconds=(secondes avant expiration)
+edit_consumer_cancel=Annuler
+edit_consumer_endpoint=Configuration du endpoint:
+edit_consumer_endpoint_m=URL Markup:
+edit_consumer_endpoint_pm=URL Portlet Management:
+edit_consumer_endpoint_r=URL Registration:
+edit_consumer_endpoint_sd=URL Service Description:
+edit_consumer_endpoint_wsdl=Utiliser WSDL?
+edit_consumer_no_registration=Enregistrement non-requis par le producteur.
+edit_consumer_producer=Identifiant du producteur:
+edit_consumer_prop_desc=Description
+edit_consumer_prop_name=Nom
+edit_consumer_prop_value=Valeur
+edit_consumer_refresh=Rafra\u00eechir & Sauvegarder
+edit_consumer_refresh_title=Sauvegarde des changements et rafra\u00eechissement \u00e0
partir du producteur
+edit_consumer_registration=Information d'enregistrement:
+edit_consumer_registration_context=Contexte d'enregistrement:
+edit_consumer_registration_context_erase=Effacer enregistrement local
+edit_consumer_registration_context_erase_title=Effacer l'information locale
d'enregistrement (potentiellement dangereux!)
+edit_consumer_registration_context_handle=Identifiant:
+edit_consumer_registration_current=Information actuelle d'enregistrement:
+edit_consumer_registration_expected=Information attendue d'enregistrement:
+edit_consumer_registration_modify=Modifier l'enregistrement
+edit_consumer_registration_modify_title=Modifier l'enregistrement avec ce producteur
+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_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_modify_reg_success=Enregistrement modifi\u00e9!
+bean_support_cause=Cause:
+bean_support_unexpected_error=Une erreur inattendue s'est produite:
+bean_consumermanager_invalid_new_consumer_name=Un consommateur requiert un nom non-nul et
non-vide!
+bean_consumermanager_no_consumer=Aucun consommateur n'a \u00e9t\u00e9
s\u00e9lectionn\u00e9!
+bean_producer_cannot_reload=Le rechargement de la configuration du producteur a
\u00e9chou\u00e9. Cause: {0}
+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\
+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}''?
+confirm_delete_reg_property_proceed=\u00cates-vous certains de vouloir proc\u00e9der?
+producer_config_add_reg_prop=Ajouter une propri\u00e9t\u00e9
+producer_config_cancel=Annuler
+producer_config_no_reg_props=Aucune propri\u00e9t\u00e9 d'enregistrement
sp\u00e9cifi\u00e9e.
+producer_config_reg_policy=Nom de la classe de la politique d'enregistrement:
+producer_config_reg_prop_action=Action
+producer_config_reg_prop_hint=Indice
+producer_config_reg_prop_label=\u00c9tiquette
+producer_config_reg_prop_name=Nom
+producer_config_reg_prop_remove=Enlever
+producer_config_reg_prop_type=Type
+producer_config_reg_prop_validator=Nom de la classe de validation des
propri\u00e9t\u00e9s d'enregistrement:
+producer_config_reg_props=Propri\u00e9t\u00e9s d'enregistrement
+producer_config_requires_reg=N\u00e9cessite l'enregistrement. Modifier cette
information entra\u00eene l'invalidation des enregistrements consommateurs.
+producer_config_save=Sauvegarder
+producer_config_sd_requires_reg=L'acc\u00e8s \u00e0 la description compl\u00e8te des
services requiert l'enregistrement.
+producer_config_strict=Utiliser la validation WSRP stricte.
+producer_config_title=Configuration producteur
+bean_consumermanager_refresh_bypassed=Le rafra\u00eechissement n'\u00e9tait pas
requis.
+bean_consumermanager_refresh_exception=Une erreur inattendue s'est produite.
+bean_consumermanager_refresh_failure=Le rafra\u00eechissement a \u00e9chou\u00e9
(probablement \u00e0 cause d'informations d'enregistrement non valides)
+bean_consumermanager_refresh_success=Le rafra\u00eechissement a r\u00e9ussi.
+bean_producer_cancel_success=Toutes les modifications faites \u00e0 la configuration du
producteur ont \u00e9t\u00e9 annull\u00e9es!
+bean_producer_save_success=La configuration du producteur a bien \u00e9t\u00e9
sauvegard\u00e9e!
+bean_consumermanager_refresh_modify=Les informations locales ou distantes ont
chang\u00e9, vous devriez modifier votre enregistrement avec le producteur.
+bean_consumer_update_success=Consommateur mis \u00e0 jour!
+registration_property_status_inexistent=Inexistant sur le producteur
+registration_property_status_invalid_value=Invalide valeur
+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

Deleted:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties	2008-09-25
14:53:22 UTC (rev 11983)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties	2008-09-25
15:47:41 UTC (rev 11984)
@@ -1,173 +0,0 @@
-################################################################################
-# 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.WSRPConfigurationPortlet           = WSRP Configuration
-org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = WSRP Configuration
Portlet
-
-# Tabs
-nav_tabs_consumers = Consumers Configuration
-nav_tabs_producer_config = Producer Configuration
-nav_tabs_producer_management = Producer Management
-
-# Object path in consumer template
-path_consumers_root = Consumers
-path_consumers_consumer = Consumer ''{0}'' configuration
-path_consumers_active = active
-path_consumers_inactive = inactive
-path_consumers_refreshNeeded = (refresh needed)
-
-# Confirm deletion of a consumer screen
-confirm_delete_consumer_title = Delete ''{0}'' consumer?
-confirm_delete_consumer_message = You are about to delete the ''{0}''
consumer!
-confirm_detete_consumer_proceed = Are you sure you want to proceed?
-confirm_delete_consumer_submit = Delete consumer
-confirm_delete_consumer_cancel = Cancel
-
-# Confirm deletion of local registration information screen
-confirm_delete_registration_title = Delete local registration for ''{0}''
consumer?
-confirm_delete_registration_message = You are about to delete the local registration
information for the ''{0}'' consumer! \n\
-This is only needed if this consumer had previously registered with the remote producer
and this producer \n\
-has been modified to not require registration anymore. \n\
-Only erase local registration information if you experience errors with the producer due
to this \n\
-particular situation. Erasing local registration when not required might lead to
inability to work with \n\
-this producer anymore.
-confirm_delete_registration_proceed = Are you sure you want to proceed?
-confirm_delete_registration_submit = Erase local registration
-confirm_delete_registration_cancel = Cancel
-
-# Consumers screen
-consumers_title = Manage Consumers
-consumers_create_title = Create a consumer named:
-consumers_create_submit = Create Consumer
-
-# Consumers list
-consumers_table_column_consumer = Consumer
-consumers_table_column_consumer_status = status:
-consumers_table_column_actions = Actions
-consumers_table_action_configure = Configure
-consumers_table_action_refresh = Refresh
-consumers_table_action_activate = Activate
-consumers_table_action_deactivate = Deactivate
-consumers_table_action_register = Register
-consumers_table_action_deregister = Deregister
-consumers_table_action_delete = Delete
-
-# Consumer editing screen
-edit_consumer_producer = Producer id:
-edit_consumer_cache = Cache expiration:
-edit_consumer_cache_seconds = (seconds before expiration)
-edit_consumer_endpoint = Endpoint configuration: 
-edit_consumer_endpoint_wsdl = Use WSDL?
-edit_consumer_endpoint_sd = Service Description URL:
-edit_consumer_endpoint_m = Markup URL:
-edit_consumer_endpoint_r = Registration URL:
-edit_consumer_endpoint_pm = Portlet Management URL:
-edit_consumer_registration = Registration information:
-edit_consumer_registration_current = Current registration information:
-edit_consumer_prop_name = Name
-edit_consumer_prop_desc = Description
-edit_consumer_prop_value = Value
-edit_consumer_registration_update_props = Update properties
-edit_consumer_registration_no_props = Registration is indicated as required without
registration properties.
-edit_consumer_registration_modify = Modify registration
-edit_consumer_registration_modify_title = Modify the registration held with this
producer
-edit_consumer_registration_expected = Expected registration information:
-edit_consumer_no_registration = Producer doesn't require registration.
-edit_consumer_registration_context = Registration context:
-edit_consumer_registration_context_handle = Handle:
-edit_consumer_registration_context_erase = Erase local registration
-edit_consumer_registration_context_erase_title = Erase local registration information
(potentially dangerous!)
-edit_consumer_refresh = Refresh & Save
-edit_consumer_refresh_title = Save changes and refresh information from producer
-edit_consumer_cancel = Cancel
-
-# Confirm registration property deletion screen
-confirm_delete_reg_property_title = Delete ''{0}'' registration property
description?
-confirm_delete_reg_property_message = You are about to delete the ''{0}''
registration property description! \n\
-This will trigger invalidation of consumer registrations which will have to modify their
registration \n\
-information.
-confirm_delete_reg_property_proceed = Are you sure you want to proceed?
-confirm_delete_reg_property_submit = Delete property
-confirm_delete_reg_property_cancel = Cancel
-
-# Producer configuration screen
-producer_config_title = Producer configuration
-producer_config_sd_requires_reg = Access to full service description requires consumers
to be registered.
-producer_config_strict = Use strict WSRP compliance.
-producer_config_requires_reg = Requires registration. Modifying this information will
trigger invalidation of consumer registrations.
-producer_config_reg_policy = Registration policy class name:
-producer_config_reg_prop_validator = Registration property validator class name:
-producer_config_reg_props = Registration properties
-producer_config_reg_prop_name = Name
-producer_config_reg_prop_type = Type
-producer_config_reg_prop_label = Label
-producer_config_reg_prop_hint = Hint
-producer_config_reg_prop_action = Action
-producer_config_reg_prop_remove = Remove
-producer_config_no_reg_props = No specified required registration properties.
-producer_config_add_reg_prop = Add property
-producer_config_save = Save
-producer_config_cancel = Cancel
-
-## Localized messages in JSF beans
-
-bean_support_unexpected_error = An unexpected error occured:
-bean_support_cause = Cause:
-
-# ConsumerBean
-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!
-bean_consumer_invalid_modify = Invalid attempt to modify a registration that hasn't
been locally modified!
-bean_consumer_cannot_modify_reg = Couldn't modify registration!
-bean_consumer_cannot_erase_reg = Couldn't erase local registration!
-bean_consumer_malformed_url = ''{0}'' is not a valid URL: {1}
-bean_consumer_update_success = Successfully updated consumer!
-
-# ConsumerManagerBean
-bean_consumermanager_invalid_new_consumer_name = Need a non-null, non-empty name for the
new consumer!
-bean_consumermanager_no_consumer = No consumer was selected!
-bean_consumermanager_refresh_bypassed = Refresh was not necessary.
-bean_consumermanager_refresh_success = Refresh was successful.
-bean_consumermanager_refresh_failure = Refresh failed (probably because the registration
information was not valid).
-bean_consumermanager_refresh_exception = An unexpected error occurred.
-bean_consumermanager_refresh_modify = Either local or remote information has been
changed, you should modify your registration with the remote producer.
-
-# 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_save_success = Producer configuration successfully saved!
-bean_producer_cancel_success = All modifications made to the producer configuration have
been cancelled!
-
-## RegistrationProperty Status localization
-registration_property_status_inexistent = Inexistent on producer
-registration_property_status_missing = Missing
-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

Deleted:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties	2008-09-25
14:53:22 UTC (rev 11983)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties	2008-09-25
15:47:41 UTC (rev 11984)
@@ -1,143 +0,0 @@
-################################################################################
-# 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 Portal display information
-org.jboss.portal.object.name.WSRPConfigurationPortlet           = Configuration WSRP
-org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = Portlet de
Configuration pour WSRP
-
-nav_tabs_consumers = Configuration Consommateurs
-nav_tabs_producer_config = Configuration Producteur
-nav_tabs_producer_management = Gestion Producteur
-
-path_consumers_root = Consommateurs
-path_consumers_consumer = Configuration du consommateur ''{0}''
-path_consumers_active = actif
-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_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_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}''?
-consumers_create_submit=Cr\u00e9er Consommateur
-consumers_create_title=Cr\u00e9er un consommateur nomm\u00e9:
-consumers_table_action_activate=Activer
-consumers_table_action_configure=Configurer
-consumers_table_action_deactivate=D\u00e9sactiver
-consumers_table_action_delete=Effacer
-consumers_table_action_deregister=D\u00e9senregistrer
-consumers_table_action_refresh=Rafra\u00eechir
-consumers_table_action_register=Enregister
-consumers_table_column_actions=Actions
-consumers_table_column_consumer=Consommateur
-consumers_table_column_consumer_status=status:
-consumers_title=Gestion des Consommateurs
-edit_consumer_cache=Expiration du cache:
-edit_consumer_cache_seconds=(secondes avant expiration)
-edit_consumer_cancel=Annuler
-edit_consumer_endpoint=Configuration du endpoint:
-edit_consumer_endpoint_m=URL Markup:
-edit_consumer_endpoint_pm=URL Portlet Management:
-edit_consumer_endpoint_r=URL Registration:
-edit_consumer_endpoint_sd=URL Service Description:
-edit_consumer_endpoint_wsdl=Utiliser WSDL?
-edit_consumer_no_registration=Enregistrement non-requis par le producteur.
-edit_consumer_producer=Identifiant du producteur:
-edit_consumer_prop_desc=Description
-edit_consumer_prop_name=Nom
-edit_consumer_prop_value=Valeur
-edit_consumer_refresh=Rafra\u00eechir & Sauvegarder
-edit_consumer_refresh_title=Sauvegarde des changements et rafra\u00eechissement \u00e0
partir du producteur
-edit_consumer_registration=Information d'enregistrement:
-edit_consumer_registration_context=Contexte d'enregistrement:
-edit_consumer_registration_context_erase=Effacer enregistrement local
-edit_consumer_registration_context_erase_title=Effacer l'information locale
d'enregistrement (potentiellement dangereux!)
-edit_consumer_registration_context_handle=Identifiant:
-edit_consumer_registration_current=Information actuelle d'enregistrement:
-edit_consumer_registration_expected=Information attendue d'enregistrement:
-edit_consumer_registration_modify=Modifier l'enregistrement
-edit_consumer_registration_modify_title=Modifier l'enregistrement avec ce producteur
-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_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_modify_reg_success=Enregistrement modifi\u00e9!
-bean_support_cause=Cause:
-bean_support_unexpected_error=Une erreur inattendue s'est produite:
-bean_consumermanager_invalid_new_consumer_name=Un consommateur requiert un nom non-nul et
non-vide!
-bean_consumermanager_no_consumer=Aucun consommateur n'a \u00e9t\u00e9
s\u00e9lectionn\u00e9!
-bean_producer_cannot_reload=Le rechargement de la configuration du producteur a
\u00e9chou\u00e9. Cause: {0}
-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\
-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}''?
-confirm_delete_reg_property_proceed=\u00cates-vous certains de vouloir proc\u00e9der?
-producer_config_add_reg_prop=Ajouter une propri\u00e9t\u00e9
-producer_config_cancel=Annuler
-producer_config_no_reg_props=Aucune propri\u00e9t\u00e9 d'enregistrement
sp\u00e9cifi\u00e9e.
-producer_config_reg_policy=Nom de la classe de la politique d'enregistrement:
-producer_config_reg_prop_action=Action
-producer_config_reg_prop_hint=Indice
-producer_config_reg_prop_label=\u00c9tiquette
-producer_config_reg_prop_name=Nom
-producer_config_reg_prop_remove=Enlever
-producer_config_reg_prop_type=Type
-producer_config_reg_prop_validator=Nom de la classe de validation des
propri\u00e9t\u00e9s d'enregistrement:
-producer_config_reg_props=Propri\u00e9t\u00e9s d'enregistrement
-producer_config_requires_reg=N\u00e9cessite l'enregistrement. Modifier cette
information entra\u00eene l'invalidation des enregistrements consommateurs.
-producer_config_save=Sauvegarder
-producer_config_sd_requires_reg=L'acc\u00e8s \u00e0 la description compl\u00e8te des
services requiert l'enregistrement.
-producer_config_strict=Utiliser la validation WSRP stricte.
-producer_config_title=Configuration producteur
-bean_consumermanager_refresh_bypassed=Le rafra\u00eechissement n'\u00e9tait pas
requis.
-bean_consumermanager_refresh_exception=Une erreur inattendue s'est produite.
-bean_consumermanager_refresh_failure=Le rafra\u00eechissement a \u00e9chou\u00e9
(probablement \u00e0 cause d'informations d'enregistrement non valides)
-bean_consumermanager_refresh_success=Le rafra\u00eechissement a r\u00e9ussi.
-bean_producer_cancel_success=Toutes les modifications faites \u00e0 la configuration du
producteur ont \u00e9t\u00e9 annull\u00e9es!
-bean_producer_save_success=La configuration du producteur a bien \u00e9t\u00e9
sauvegard\u00e9e!
-bean_consumermanager_refresh_modify=Les informations locales ou distantes ont
chang\u00e9, vous devriez modifier votre enregistrement avec le producteur.
-bean_consumer_update_success=Consommateur mis \u00e0 jour!
-registration_property_status_inexistent=Inexistant sur le producteur
-registration_property_status_invalid_value=Invalide valeur
-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

Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml	2008-09-25
14:53:22 UTC (rev 11983)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml	2008-09-25
15:47:41 UTC (rev 11984)
@@ -52,7 +52,7 @@
 
    <managed-bean>
       <managed-bean-name>beanContext</managed-bean-name>
-     
<managed-bean-class>org.jboss.portal.wsrp.admin.ui.JSFBeanContext</managed-bean-class>
+     
<managed-bean-class>org.jboss.portal.faces.gui.JSFBeanContext</managed-bean-class>
       <managed-bean-scope>application</managed-bean-scope>
    </managed-bean>
    <managed-bean>
@@ -66,7 +66,7 @@
       </managed-property>
       <managed-property>
          <property-name>beanContext</property-name>
-        
<property-class>org.jboss.portal.wsrp.admin.ui.BeanContext</property-class>
+        
<property-class>org.jboss.portal.faces.gui.BeanContext</property-class>
          <value>#{beanContext}</value>
       </managed-property>
    </managed-bean>
@@ -89,7 +89,7 @@
       </managed-property>
       <managed-property>
          <property-name>beanContext</property-name>
-        
<property-class>org.jboss.portal.wsrp.admin.ui.BeanContext</property-class>
+        
<property-class>org.jboss.portal.faces.gui.BeanContext</property-class>
          <value>#{beanContext}</value>
       </managed-property>
    </managed-bean>
@@ -104,7 +104,7 @@
       </managed-property>
       <managed-property>
          <property-name>beanContext</property-name>
-        
<property-class>org.jboss.portal.wsrp.admin.ui.BeanContext</property-class>
+        
<property-class>org.jboss.portal.faces.gui.BeanContext</property-class>
          <value>#{beanContext}</value>
       </managed-property>
    </managed-bean>

Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/common/template.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/common/template.xhtml	2008-09-25
14:53:22 UTC (rev 11983)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/common/template.xhtml	2008-09-25
15:47:41 UTC (rev 11984)
@@ -1,7 +1,7 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
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:ui="http://java.sun.com/jsf/facelets">
-   <f:loadBundle basename="WSRPConfigurationResource"
var="i18n"/>
+   <f:loadBundle basename="Resource" var="i18n"/>
    <div class="wsrp-consumers-ui">
       <ui:insert name="topnav">Top navigation</ui:insert>
 

Copied:
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java
(from rev 11963,
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/BeanContext.java)
===================================================================
---
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java	
                       (rev 0)
+++
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java	2008-09-25
15:47:41 UTC (rev 11984)
@@ -0,0 +1,183 @@
+/******************************************************************************
+ * 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         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
+package org.jboss.portal.faces.gui;
+
+import org.jboss.portal.common.util.ParameterValidation;
+
+import java.text.MessageFormat;
+import java.util.Locale;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris
Laprun</a>
+ * @version $Revision$
+ * @since 2.6
+ */
+public abstract class BeanContext
+{
+   public static final String STATUS = "status";
+   private static final String RESOURCE_NAME = "Resource";
+   private static final String UNEXPECTED_ERROR =
"bean_support_unexpected_error";
+   private static final String CAUSE = "bean_support_cause";
+
+
+   /**
+    * Retrieves the value of the parameter which name is given from the JSF request.
+    *
+    * @param key name of the parameter which value we want to retrieve
+    * @return
+    */
+   public abstract String getParameter(String key);
+
+   protected abstract void createMessage(String target, String message, Object
severity);
+
+   protected abstract Object getErrorSeverity();
+
+   protected abstract Object getInfoSeverity();
+
+   protected abstract Locale getLocale();
+
+   public void createErrorMessage(String message, Object... params)
+   {
+      createLocalizedMessage(STATUS, message, getErrorSeverity(), params);
+   }
+
+   protected void createErrorMessage(String target, String message, Object... params)
+   {
+      createLocalizedMessage(target, message, getErrorSeverity(), params);
+   }
+
+   protected void createLocalizedMessage(String target, String message, Object severity,
Object... params)
+   {
+      createMessage(target, getMessageFromBundle(message, params), severity);
+   }
+
+   public String getMessageFromBundle(String message, Object... params)
+   {
+      return getLocalizedMessage(message, getLocale(), params);
+   }
+
+   public static String getLocalizedMessage(String localizationKey, Locale locale,
Object... params)
+   {
+      ResourceBundle rb = ResourceBundle.getBundle(RESOURCE_NAME, locale);
+      return MessageFormat.format(rb.getString(localizationKey), params);
+   }
+
+   public void createErrorMessageFrom(Exception e)
+   {
+      createErrorMessageFrom(STATUS, e);
+   }
+
+   public void createErrorMessageFrom(String target, Exception e)
+   {
+      Throwable cause = e.getCause();
+      String localizedMessage = getLocalizedMessageOrExceptionName(e);
+      String message = localizedMessage + (cause != null ? "\n" +
getMessageFromBundle(CAUSE) + getLocalizedMessageOrExceptionName(cause) : "");
+      createMessage(target, message, getErrorSeverity());
+   }
+
+   private String getLocalizedMessageOrExceptionName(Throwable e)
+   {
+      String localizedMessage = e.getLocalizedMessage();
+      if (localizedMessage == null)
+      {
+         localizedMessage = getMessageFromBundle(UNEXPECTED_ERROR) +
e.getClass().getName();
+      }
+      return localizedMessage;
+   }
+
+   protected void createInfoMessage(String target, String message)
+   {
+      createLocalizedMessage(target, message, getInfoSeverity());
+   }
+
+   public void createInfoMessage(String message)
+   {
+      createInfoMessage(STATUS, message);
+   }
+
+   /**
+    * Removes the object identified by the specified name(s) from the session. For a JSF
backed implementation, this
+    * will allow for the object/bean (defined as session-scoped in
<code>faces-config.xml</code>) to be recreated by JSF
+    * when needed.
+    *
+    * @param name       name of the object to be removed
+    * @param otherNames additional names of objects to be removed
+    */
+   public void removeFromSession(String name, String... otherNames)
+   {
+      Map<String, Object> sessionMap = getSessionMap();
+      sessionMap.remove(name);
+      if (otherNames != null)
+      {
+         for (String other : otherNames)
+         {
+            sessionMap.remove(other);
+         }
+      }
+   }
+
+   /**
+    * Retrieves the session map where "session" is a concept left up to
implementations (for JSF, the session
+    * corresponds quite logically to the HTTP session)
+    *
+    * @return the session map
+    */
+   public abstract Map<String, Object> getSessionMap();
+
+   /**
+    * Replaces the session object identified by the given name by the specified new one.
Passing <code>null</code> for
+    * the new value will remove the object reference from the session. If an object was
previously assigned to this
+    * name, then only an object of the same type (as defined by {@link
Class#isAssignableFrom(Class)}) can be assigned
+    * to this name.
+    *
+    * @param name    the name identifying the object to be replaced
+    * @param newValue the new value for the object to be replaced or
<code>null</code> if the object is to be removed
+    * @param <T>     the type of the object to be replaced
+    * @return the new value for the object or <code>null</code> if the remove
semantics is used
+    */
+   public <T> T replaceInSession(String name, T newValue)
+   {
+      ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(name, "name",
"replaceInSession");
+      Map<String, Object> sessionMap = getSessionMap();
+
+      // if we passed null, use the remove semantics
+      if (newValue == null)
+      {
+         sessionMap.remove(name);
+         return null;
+      }
+
+      Object current = sessionMap.get(name);
+      // check that the new bean is compatible with the previously assigned
+      if (current != null &&
!newValue.getClass().isAssignableFrom(current.getClass()))
+      {
+         throw new IllegalArgumentException("Provided object: " + newValue +
" is not compatible with previously assigned '"
+                 + name + "' object: " + current);
+      }
+      sessionMap.put(name, newValue);
+      return newValue;
+   }
+}


Property changes on:
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java
___________________________________________________________________
Name: svn:keywords
   + LastChangedDate LastChangedBy LastChangedRevision Id

Copied:
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/JSFBeanContext.java
(from rev 11963,
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/JSFBeanContext.java)
===================================================================
---
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/JSFBeanContext.java	
                       (rev 0)
+++
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/JSFBeanContext.java	2008-09-25
15:47:41 UTC (rev 11984)
@@ -0,0 +1,79 @@
+/******************************************************************************
+ * 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         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
+package org.jboss.portal.faces.gui;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris
Laprun</a>
+ * @version $Revision$
+ * @since 2.6
+ */
+public class JSFBeanContext extends BeanContext
+{
+   public String getParameter(String key)
+   {
+      Map pmap =
FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
+      return (String)pmap.get(key);
+   }
+
+   public Map<String, Object> getSessionMap()
+   {
+      return FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
+   }
+
+   protected void createMessage(String target, String message, Object severity)
+   {
+      FacesMessage.Severity jsfSeverity;
+      if (severity instanceof FacesMessage.Severity)
+      {
+         jsfSeverity = (FacesMessage.Severity)severity;
+      }
+      else
+      {
+         jsfSeverity = FacesMessage.SEVERITY_ERROR;
+      }
+
+      FacesMessage msg = new FacesMessage(jsfSeverity, message, message);
+      FacesContext.getCurrentInstance().addMessage(target, msg);
+   }
+
+   protected Object getErrorSeverity()
+   {
+      return FacesMessage.SEVERITY_ERROR;
+   }
+
+   protected Object getInfoSeverity()
+   {
+      return FacesMessage.SEVERITY_INFO;
+   }
+
+   protected Locale getLocale()
+   {
+      return FacesContext.getCurrentInstance().getExternalContext().getRequestLocale();
+   }
+}


Property changes on:
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/JSFBeanContext.java
___________________________________________________________________
Name: svn:keywords
   + LastChangedDate LastChangedBy LastChangedRevision Id

Copied:
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java
(from rev 11963,
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ManagedBean.java)
===================================================================
---
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java	
                       (rev 0)
+++
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java	2008-09-25
15:47:41 UTC (rev 11984)
@@ -0,0 +1,44 @@
+/******************************************************************************
+ * 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         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
+package org.jboss.portal.faces.gui;
+
+import org.apache.log4j.Logger;
+
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris
Laprun</a>
+ * @version $Revision$
+ * @since 2.6
+ */
+public class ManagedBean
+{
+   protected Logger log = Logger.getLogger(getClass());
+
+   protected BeanContext beanContext;
+
+   public void setBeanContext(BeanContext beanContext)
+   {
+      this.beanContext = beanContext;
+   }
+}


Property changes on:
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java
___________________________________________________________________
Name: svn:keywords
   + LastChangedDate LastChangedBy LastChangedRevision Id


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

[portal-commits] JBoss Portal SVN: r11984 - in branches/JBoss_Portal_Branch_2_7: core-admin/src/resources/portal-admin-war/WEB-INF and 8 other directories.