[jboss-cvs] jboss-portal/core/src/main/org/jboss/portal/core/metadata ...

[Julien Viet]

  User: julien  
  Date: 06/07/10 18:51:45

  Modified:    core/src/main/org/jboss/portal/core/metadata 
                        InstanceMetaData.java
  Log:
  make instance preferences work from xml deployment descriptor
  
  Revision  Changes    Path
  1.28      +19 -11    jboss-portal/core/src/main/org/jboss/portal/core/metadata/InstanceMetaData.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InstanceMetaData.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/metadata/InstanceMetaData.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -b -r1.27 -r1.28
  --- InstanceMetaData.java	26 May 2006 14:12:53 -0000	1.27
  +++ InstanceMetaData.java	10 Jul 2006 22:51:45 -0000	1.28
  @@ -23,6 +23,10 @@
   
   import org.jboss.portal.common.metadata.MetaData;
   import org.jboss.portal.common.util.XML;
  +import org.jboss.portal.common.value.ValueMap;
  +import org.jboss.portal.common.value.StringValue;
  +import org.jboss.portal.common.value.Value;
  +import org.jboss.portal.common.value.SimpleValueMap;
   import org.jboss.portal.core.model.instance.Instance;
   import org.jboss.portal.core.model.instance.InstanceContainer;
   import org.jboss.portal.core.model.instance.DuplicateInstanceException;
  @@ -45,7 +49,7 @@
    * Represent metadata of an instance.
    *
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.27 $
  + * @version $Revision: 1.28 $
    */
   public class InstanceMetaData implements MetaData
   {
  @@ -192,23 +196,27 @@
   
      public Instance create(InstancesMetaData.BuildContext buildContext) throws PortletInvokerException, DuplicateInstanceException, SecurityConfigurationException
      {
  -      //
  +      // Resolve the portlet ref
         String resolvedRef = buildContext.resolvePortletRef(portletRef);
   
  +      // Get the instance container
         InstanceContainer instanceContainer = buildContext.getContainer();
  -      //
  +
  +      // Create the instance
         Instance instance = instanceContainer.createInstance(id, resolvedRef);
   
         // Configure preferences
  -/*
  -      ValueMap prefs = instance.getPreferences();
  +      if (preferences != null)
  +      {
  +         ValueMap prefs = new SimpleValueMap();
         for (Iterator i = preferences.iterator();i.hasNext();)
         {
            PreferenceMetaData preference = (PreferenceMetaData)i.next();
            Value value = new StringValue(preference.getValues());
            prefs.setValue(preference.getName(), value);
         }
  -*/
  +         instance.setPreferences(prefs);
  +      }
   
         // Configure security
         SecurityConstraintsMetaData securityConstraints = getSecurityConstraints();