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

[Julien Viet]

  User: julien  
  Date: 06/07/12 05:29:54

  Modified:    core/src/main/org/jboss/portal/core/deployment/jboss 
                        PortletAppDeployment.java
  Log:
  - encode properly meta parameter in a URL
  - take prefs metadata for instances and use them to personalize the portlet to instantiate
  
  Revision  Changes    Path
  1.62      +14 -46    jboss-portal/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PortletAppDeployment.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -b -r1.61 -r1.62
  --- PortletAppDeployment.java	11 Jul 2006 21:58:57 -0000	1.61
  +++ PortletAppDeployment.java	12 Jul 2006 09:29:54 -0000	1.62
  @@ -30,11 +30,14 @@
   import org.jboss.portal.core.metadata.InstanceMetaData;
   import org.jboss.portal.core.metadata.InstancesMetaData;
   import org.jboss.portal.core.metadata.ServiceMetaData;
  +import org.jboss.portal.core.metadata.PreferencesMetaData;
   import org.jboss.portal.core.metadata.portlet.JBossApplicationMetaData;
   import org.jboss.portal.core.model.instance.DuplicateInstanceException;
   import org.jboss.portal.core.model.instance.InstanceContainer;
   import org.jboss.portal.portlet.NoSuchPortletException;
  +import org.jboss.portal.portlet.impl.jsr168.metadata.PreferenceMetaData;
   import org.jboss.portal.security.spi.provider.SecurityConfigurationException;
  +import org.jboss.portal.security.metadata.SecurityConstraintsMetaData;
   import org.jboss.portal.server.deployment.PortalWebApp;
   import org.w3c.dom.Document;
   import org.w3c.dom.Element;
  @@ -51,7 +54,7 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.61 $
  + * @version $Revision: 1.62 $
    */
   public class PortletAppDeployment extends org.jboss.portal.portlet.deployment.jboss.PortletAppDeployment
   {
  @@ -163,6 +166,8 @@
                           {
                              Element deploymentElt = (Element)i.next();
                              Element instanceElt = XML.getUniqueChild(deploymentElt, "instance", false);
  +
  +                           //
                              if (instanceElt != null)
                              {
                                 if (!logged)
  @@ -170,47 +175,18 @@
                                    log.debug("Found -object.xml containing instances, you need to convert and move them to the file " + webInfPath + "/portlet-instances.xml");
                                    logged = true;
                                 }
  -                              Element instanceNameElt = XML.getUniqueChild(instanceElt, "instance-name", true);
  -                              Element componentRefElt = XML.getUniqueChild(instanceElt, "component-ref", true);
  -                              String instanceName = XML.asString(instanceNameElt);
  -                              String componentRef = XML.asString(componentRefElt);
  -                              int dotIndex = componentRef.indexOf('.');
  -                              if (dotIndex == -1)
  -                              {
  -                                 log.warn("Bad component ref " + componentRef);
  -                              }
  -                              else
  -                              {
  -                                 String appId = componentRef.substring(0, dotIndex);
  -                                 if (appId.equals(pwa.getId()) == false)
  -                                 {
  -                                    log.warn("The instance " + instanceName + " will not be created because the component referenced is outside of the same web app " + componentRef);
  -                                 }
  -                                 else
  -                                 {
  -                                    String portletRef = componentRef.substring(dotIndex + 1);
  -
  -                                    if (portletRef.length() == 0)
  -                                    {
  -                                       log.warn("Zero portlet ref length are not considered " + componentRef);
  -                                    }
  -                                    else
  -                                    {
  -                                       log.debug("Adding legacy instance " + instanceName);
   
                                          //
  -                                       InstanceMetaData instanceMD = new InstanceMetaData();
  -                                       instanceMD.setId(instanceName);
  -                                       instanceMD.setPortletRef(portletRef);
  +                              InstanceMetaData instanceMD = InstanceMetaData.buildLegacyMetaData(instanceElt, pwa.getId());
   
                                          //
  +                              if (instanceMD != null)
  +                              {
                                          instanceMDs.add(instanceMD);
                                       }
                                    }
                                 }
                              }
  -                        }
  -                     }
                        catch (Exception e)
                        {
                           e.printStackTrace();
  @@ -264,17 +240,9 @@
   
                     //
                     Element instanceElt = XML.getUniqueChild(deploymentElt, "instance", true);
  -                  Element instanceIdElt = XML.getUniqueChild(instanceElt, "instance-id", true);
  -                  Element portletRefElt = XML.getUniqueChild(instanceElt, "portlet-ref", true);
  -
  -                  //
  -                  String instanceId = XML.asString(instanceIdElt);
  -                  String portletRef = XML.asString(portletRefElt);
   
                     //
  -                  InstanceMetaData instanceMD = new InstanceMetaData();
  -                  instanceMD.setId(instanceId);
  -                  instanceMD.setPortletRef(portletRef);
  +                  InstanceMetaData instanceMD = InstanceMetaData.buildMetaData(instanceElt);
   
                     //
                     instanceMDs.add(instanceMD);