[portal-commits] JBoss Portal SVN: r13144 - in branches/JBoss_Portal_Branch_2_7_AS5/core: src/main/org/jboss/portal/core/deployment and 4 other directories.

Thursday, 2 April 2009

Author: mwringe
Date: 2009-04-02 19:22:22 -0400 (Thu, 02 Apr 2009)
New Revision: 13144

Added:
  
branches/JBoss_Portal_Branch_2_7_AS5/core/src/resources/portal-core-war/WEB-INF/portal-renderSet.xml
Removed:
  
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java
  
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java
  
branches/JBoss_Portal_Branch_2_7_AS5/core/src/resources/portal-core-war/WEB-INF/layout/
Modified:
   branches/JBoss_Portal_Branch_2_7_AS5/core/.classpath
   branches/JBoss_Portal_Branch_2_7_AS5/core/build.xml
  
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java
  
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/core/deployment/jboss/PortletDeploymentImpl.java
  
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/test/core/deployment/JBossApplicationMetaDataFactoryTestCase.java
  
branches/JBoss_Portal_Branch_2_7_AS5/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
Log:
Remove some of the old deployer classes.
Add theme deployment support.

Modified: branches/JBoss_Portal_Branch_2_7_AS5/core/.classpath
===================================================================

--- branches/JBoss_Portal_Branch_2_7_AS5/core/.classpath	2009-04-02 23:19:44 UTC (rev
13143)
+++ branches/JBoss_Portal_Branch_2_7_AS5/core/.classpath	2009-04-02 23:22:22 UTC (rev
13144)
@@ -12,17 +12,9 @@
 	<classpathentry kind="lib"
path="/thirdparty/dbunit/lib/dbunit.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/hibernate/lib/hibernate3.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss.jar"/>
-	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
-	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/>
-	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-jca.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/>
-	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-local-jdbc.jar"/>
-	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jbosssx.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
-	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-transaction.jar"/>
-	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-xml-binding.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/jgroups/lib/jgroups.jar"/>
-	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jnpserver.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/jwebunit/lib/jwebunit-1.2.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/apache-log4j/lib/log4j.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/junit/lib/junit.jar"/>
@@ -39,7 +31,6 @@
 	<classpathentry kind="lib"
path="/thirdparty/jboss-portal/modules/web/lib/portal-web-lib.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/jboss-portal/modules/identity/lib/portal-identity-lib.jar"/>
-	<classpathentry kind="lib"
path="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jbossha.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/>
@@ -48,20 +39,6 @@
 	<classpathentry kind="lib"
path="/thirdparty/portlet/lib/portlet-api.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-controller-lib.jar"
sourcepath="/module-portlet-2.0.0.CR2"/>
 	<classpathentry kind="lib"
path="/thirdparty/jboss/cache/lib/jboss-cache-jdk50.jar"/>
-	<classpathentry kind="lib"
path="/home/mwringe/Projects/workspaces/workspace-jbossas-trunk/build/output/jboss-5.0.0.GA/common/lib/jboss-transaction-aspects.jar"/>
-	<classpathentry kind="lib"
path="/home/mwringe/.m2/repository/org/jboss/portal/portlet/portlet-portal/2.1.0-SNAPSHOT/portlet-portal-2.1.0-SNAPSHOT.jar"/>
-	<classpathentry kind="lib"
path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-bridge-lib.jar"/>
-	<classpathentry kind="lib"
path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-bridge-lib-sources.jar"/>
-	<classpathentry kind="lib"
path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-controller-lib.jar"/>
-	<classpathentry kind="lib"
path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-controller-lib-sources.jar"/>
-	<classpathentry kind="lib"
path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-federation-lib.jar"/>
-	<classpathentry kind="lib"
path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-federation-lib-sources.jar"/>
-	<classpathentry kind="lib"
path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/>
-	<classpathentry kind="lib"
path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib-sources.jar"/>
-	<classpathentry kind="lib"
path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-management-lib.jar"/>
-	<classpathentry kind="lib"
path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-management-lib-sources.jar"/>
-	<classpathentry kind="lib"
path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-samples-lib.jar"/>
-	<classpathentry kind="lib"
path="/home/mwringe/Projects/workspaces/workspace-portal-2/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-samples-lib-sources.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/jboss-portal/modules/metadata/lib/portal-metadata-lib.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/glassfish/javamail/lib/mail.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/beanshell/lib/bsh.jar"/>
@@ -86,21 +63,24 @@
 	<classpathentry kind="lib"
path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-vfs-sources.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-vfs-spi.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-vfs-spi-sources.jar"/>
-	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jaxb-api.jar"/>
-	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-common-core.jar"/>
-	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-deployers-core-spi.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-ha-server-api.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-j2se.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-javaee.jar"/>
-	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-kernel.jar"/>
-	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-logging-log4j.jar"/>
-	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-logging-spi.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-mbeans.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-security-aspects.jar"/>
-	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-security-spi.jar"/>
-	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jbosssx-server.jar"/>
 	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-system-jmx.jar"/>
-	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jbossws-native-jaxrpc.jar"/>
-	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jbossws-native-saaj.jar"/>
+	<classpathentry kind="lib"
path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-bridge-lib.jar"/>
+	<classpathentry kind="lib"
path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-management-lib.jar"/>
+	<classpathentry kind="lib"
path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-samples-lib.jar"/>
+	<classpathentry kind="lib"
path="/thirdparty/jboss-portal/modules/deployer/lib/portal-deployer-portlet-lib.jar"/>
+	<classpathentry kind="lib"
path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+	<classpathentry kind="lib"
path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
+	<classpathentry kind="lib"
path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
+	<classpathentry kind="lib"
path="/thirdparty/sun-jaxb/lib/jaxb-api.jar"/>
+	<classpathentry kind="lib"
path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar"/>
+	<classpathentry kind="lib"
path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
+	<classpathentry kind="lib"
path="/thirdparty/jboss/jnp-client/lib/jnp-client.jar"/>
+	<classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jbosssx-as-client.jar"/>
+	<classpathentry kind="lib"
path="/thirdparty/jboss/jbosssx/lib/jbosssx.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: branches/JBoss_Portal_Branch_2_7_AS5/core/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/core/build.xml	2009-04-02 23:19:44 UTC (rev
13143)
+++ branches/JBoss_Portal_Branch_2_7_AS5/core/build.xml	2009-04-02 23:22:22 UTC (rev
13144)
@@ -99,7 +99,12 @@
          <path refid="jboss.portal/modules/test.classpath"/>
          <path refid="jboss.microcontainer.classpath"/>
          <path refid="jboss/jboss.deployers.classpath"/>
+         <path refid="jboss/common.logging.spi.classpath"/>
+         <path refid="jboss/common.logging.log4j.classpath"/>
+         <path refid="jboss/common.core.classpath"/>
+         <path refid="jboss/jboss.man.classpath"/>
          <path refid="jboss.jbossxb.classpath"/>
+         <path refid="jboss.jbosssx.classpath"/>
          <path refid="jboss.cache.classpath"/>
          <path refid="jbossas/core.libs.classpath"/>
          <path refid="hibernate.hibernate.classpath"/>
@@ -232,7 +237,11 @@
       <path id="bilto">
          <path refid="sun.servlet.classpath"/>
          <path refid="apache.log4j.classpath"/>
+         <path refid="jboss/common.logging.spi.classpath"/>
+         <path refid="jboss/common.logging.log4j.classpath"/> 
+         <path refid="jboss/common.core.classpath"/> 
          <path refid="jbossas/core.libs.classpath"/>
+         <path refid="jboss.jbosssx.classpath"/>
          <path refid="jboss.microcontainer.classpath"/>
          <path refid="jboss.serialization.classpath"/>
          <path refid="beanshell.beanshell.classpath"/>
@@ -243,7 +252,6 @@
          <path refid="jboss.portal/modules/identity.classpath"/>
          <path refid="jboss.portal/modules/metadata.classpath"/>
          <path refid="jboss/jboss.metadata.classpath"/>
-         <path refid="jbossas/core.libs.classpath"/>
          <path refid="jboss/jboss.deployers.classpath"/>
          <path refid="portlet.portlet.classpath"/>
 
@@ -279,6 +287,7 @@
          <include
name="org/jboss/portal/core/hibernate/SessionFactoryBinder.class"/>
       </aopc>
 
+
    </target>
 
    <!--+====================================================================+-->

Modified:
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java	2009-04-02
23:19:44 UTC (rev 13143)
+++
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java	2009-04-02
23:22:22 UTC (rev 13144)
@@ -1,228 +1,228 @@
-/******************************************************************************
- * JBoss, a division of Red Hat                                               *
- * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
- * contributors as indicated by the @authors tag. See the                     *
- * copyright.txt in the distribution for a full listing of                    *
- * individual contributors.                                                   *
- *                                                                            *
- * This is free software; you can redistribute it and/or modify it            *
- * under the terms of the GNU Lesser General Public License as                *
- * published by the Free Software Foundation; either version 2.1 of           *
- * the License, or (at your option) any later version.                        *
- *                                                                            *
- * This software is distributed in the hope that it will be useful,           *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
- * Lesser General Public License for more details.                            *
- *                                                                            *
- * You should have received a copy of the GNU Lesser General Public           *
- * License along with this software; if not, write to the Free                *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
- ******************************************************************************/
-package org.jboss.portal.core.deployment;
-
-import org.jboss.portal.core.metadata.ServiceMetaData;
-import org.jboss.portal.core.metadata.portlet.AjaxMetaData;
-import org.jboss.portal.core.metadata.portlet.ElementMetaData;
-import org.jboss.portal.core.metadata.portlet.HeaderContentMetaData;
-import org.jboss.portal.core.metadata.portlet.JBossApplicationMetaData;
-import org.jboss.portal.core.metadata.portlet.JBossPortletMetaData;
-import org.jboss.portal.core.metadata.portlet.PortletIconMetaData;
-import org.jboss.portal.core.metadata.portlet.PortletInfoMetaData;
-import org.jboss.xb.binding.UnmarshallingContext;
-import org.xml.sax.Attributes;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision$
- */
-public class JBossApplicationMetaDataFactory extends
org.jboss.portal.portlet.deployment.jboss.JBossApplicationMetaDataFactory
-{
-
-   public Object newRoot(Object root, UnmarshallingContext nav, String nsURI, String
localName, Attributes attrs)
-   {
-      if (root == null)
-      {
-         root = new JBossApplicationMetaData();
-      }
-      root = super.newRoot(root, nav, nsURI, localName, attrs);
-      if (root instanceof JBossApplicationMetaData == false)
-      {
-         throw new IllegalArgumentException();
-      }
-      return root;
-   }
-
-   public Object newChild(Object object, UnmarshallingContext nav, String nsURI, String
localName, Attributes attrs)
-   {
-      Object child = null;
-      if (object instanceof JBossApplicationMetaData)
-      {
-         if ("service".equals(localName))
-         {
-            child = new ServiceMetaData();
-         }
-      }
-      else if (object instanceof JBossPortletMetaData)
-      {
-         if ("header-content".equals(localName))
-         {
-            child = new HeaderContentMetaData();
-         }
-         else if ("ajax".equals(localName))
-         {
-            child = new AjaxMetaData();
-         }
-         else if ("portlet-info".equals(localName))
-         {
-            child = new PortletInfoMetaData();
-         }
-      }
-      else if (object instanceof PortletInfoMetaData)
-      {
-         if ("icon".equals(localName))
-         {
-            child = new PortletIconMetaData();
-         }
-      }
-      else if (object instanceof HeaderContentMetaData)
-      {
-         if ("link".equalsIgnoreCase(localName))
-         {
-            String href = attrs.getValue("href");
-            String type = attrs.getValue("type");
-            String media = attrs.getValue("media");
-            String rel = attrs.getValue("rel");
-            String title = attrs.getValue("title");
-            ElementMetaData elt = ElementMetaData.createLinkElement(type, rel, href,
media, title);
-            elt.init();
-            child = elt;
-         }
-         else if ("script".equalsIgnoreCase(localName))
-         {
-            String src = attrs.getValue("src");
-            String type = attrs.getValue("type");
-            ElementMetaData elt = ElementMetaData.createScriptElement(type, src);
-            elt.init();
-            child = elt;
-         }
-         else if ("meta".equalsIgnoreCase(localName))
-         {
-            String name = attrs.getValue("name");
-            String content = attrs.getValue("content");
-            ElementMetaData elt = ElementMetaData.createNamedMetaElement(name, content);
-            elt.init();
-            child = elt;
-         }
-      }
-      if (child == null)
-      {
-         child = super.newChild(object, nav, nsURI, localName, attrs);
-      }
-      return child;
-   }
-
-   public void addChild(Object parent, Object child, UnmarshallingContext nav, String
nsURI, String localName)
-   {
-      if (child instanceof ServiceMetaData)
-      {
-         ServiceMetaData service = (ServiceMetaData)child;
-         JBossApplicationMetaData app = (JBossApplicationMetaData)parent;
-         app.getServices().put(service.getName(), service);
-      }
-      else if (child instanceof HeaderContentMetaData)
-      {
-         HeaderContentMetaData headerContent = (HeaderContentMetaData)child;
-         JBossPortletMetaData portlet = (JBossPortletMetaData)parent;
-         portlet.setHeaderContent(headerContent);
-      }
-      else if (child instanceof AjaxMetaData)
-      {
-         AjaxMetaData ajax = (AjaxMetaData)child;
-         JBossPortletMetaData portlet = (JBossPortletMetaData)parent;
-         portlet.setAjax(ajax);
-      }
-      else if (child instanceof PortletInfoMetaData)
-      {
-         PortletInfoMetaData portletInfo = (PortletInfoMetaData)child;
-         JBossPortletMetaData portlet = (JBossPortletMetaData)parent;
-         portlet.setPortletInfo(portletInfo);
-      }
-      else if (child instanceof PortletIconMetaData)
-      {
-         PortletIconMetaData portletIcon = (PortletIconMetaData)child;
-         PortletInfoMetaData portletInfo = (PortletInfoMetaData)parent;
-         portletInfo.setPortletIcon(portletIcon);
-      }
-      else if (child instanceof ElementMetaData)
-      {
-         ElementMetaData element = (ElementMetaData)child;
-         HeaderContentMetaData headerContent = (HeaderContentMetaData)parent;
-         headerContent.getElements().add(element);
-      }
-      else
-      {
-         super.addChild(parent, child, nav, nsURI, localName);
-      }
-   }
-
-   public void setValue(Object object, UnmarshallingContext nav, String nsURI, String
localName, String value)
-   {
-      if (object instanceof ServiceMetaData)
-      {
-         ServiceMetaData service = (ServiceMetaData)object;
-         if ("service-name".equals(localName))
-         {
-            service.setName(value);
-         }
-         else if ("service-class".equals(localName))
-         {
-            service.setClassName(value);
-         }
-         else if ("service-ref".equals(localName))
-         {
-            service.setRef(value);
-         }
-      }
-      else if (object instanceof ElementMetaData)
-      {
-         if ("script".equals(localName))
-         {
-            ElementMetaData elt = (ElementMetaData)object;
-            elt.setBodyContent(value);
-            elt.init();
-         }
-      }
-      else if (object instanceof AjaxMetaData)
-      {
-         if ("partial-refresh".equals(localName))
-         {
-            AjaxMetaData ajax = (AjaxMetaData)object;
-            ajax.setPartialRefresh(Boolean.valueOf(value));
-         }
-      }
-      else if (object instanceof PortletIconMetaData)
-      {
-         if ("small-icon".equals(localName))
-         {
-            PortletIconMetaData portletIcon = (PortletIconMetaData)object;
-            portletIcon.setIconLocation(value, PortletIconMetaData.SMALL);
-         }
-         else if ("large-icon".equals(localName))
-         {
-            PortletIconMetaData portletIcon = (PortletIconMetaData)object;
-            portletIcon.setIconLocation(value, PortletIconMetaData.LARGE);
-         }
-      }
-      else
-      {
-         super.setValue(object, nav, nsURI, localName, value);
-      }
-   }
-
-   protected org.jboss.portal.portlet.deployment.jboss.metadata.JBossPortletMetaData
createJBossPortlet()
-   {
-      return new JBossPortletMetaData();
-   }
-}
+///******************************************************************************
+// * JBoss, a division of Red Hat                                               *
+// * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+// * contributors as indicated by the @authors tag. See the                     *
+// * copyright.txt in the distribution for a full listing of                    *
+// * individual contributors.                                                   *
+// *                                                                            *
+// * This is free software; you can redistribute it and/or modify it            *
+// * under the terms of the GNU Lesser General Public License as                *
+// * published by the Free Software Foundation; either version 2.1 of           *
+// * the License, or (at your option) any later version.                        *
+// *                                                                            *
+// * This software is distributed in the hope that it will be useful,           *
+// * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+// * Lesser General Public License for more details.                            *
+// *                                                                            *
+// * You should have received a copy of the GNU Lesser General Public           *
+// * License along with this software; if not, write to the Free                *
+// * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+// * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+// ******************************************************************************/
+//package org.jboss.portal.core.deployment;
+//
+//import org.jboss.portal.core.metadata.ServiceMetaData;
+//import org.jboss.portal.core.metadata.portlet.AjaxMetaData;
+//import org.jboss.portal.core.metadata.portlet.ElementMetaData;
+//import org.jboss.portal.core.metadata.portlet.HeaderContentMetaData;
+//import org.jboss.portal.core.metadata.portlet.JBossApplicationMetaData;
+//import org.jboss.portal.core.metadata.portlet.JBossPortletMetaData;
+//import org.jboss.portal.core.metadata.portlet.PortletIconMetaData;
+//import org.jboss.portal.core.metadata.portlet.PortletInfoMetaData;
+//import org.jboss.xb.binding.UnmarshallingContext;
+//import org.xml.sax.Attributes;
+//
+///**
+// * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+// * @version $Revision$
+// */
+//public class JBossApplicationMetaDataFactory extends
org.jboss.portal.portlet.deployment.jboss.JBossApplicationMetaDataFactory
+//{
+//
+//   public Object newRoot(Object root, UnmarshallingContext nav, String nsURI, String
localName, Attributes attrs)
+//   {
+//      if (root == null)
+//      {
+//         root = new JBossApplicationMetaData();
+//      }
+//      root = super.newRoot(root, nav, nsURI, localName, attrs);
+//      if (root instanceof JBossApplicationMetaData == false)
+//      {
+//         throw new IllegalArgumentException();
+//      }
+//      return root;
+//   }
+//
+//   public Object newChild(Object object, UnmarshallingContext nav, String nsURI, String
localName, Attributes attrs)
+//   {
+//      Object child = null;
+//      if (object instanceof JBossApplicationMetaData)
+//      {
+//         if ("service".equals(localName))
+//         {
+//            child = new ServiceMetaData();
+//         }
+//      }
+//      else if (object instanceof JBossPortletMetaData)
+//      {
+//         if ("header-content".equals(localName))
+//         {
+//            child = new HeaderContentMetaData();
+//         }
+//         else if ("ajax".equals(localName))
+//         {
+//            child = new AjaxMetaData();
+//         }
+//         else if ("portlet-info".equals(localName))
+//         {
+//            child = new PortletInfoMetaData();
+//         }
+//      }
+//      else if (object instanceof PortletInfoMetaData)
+//      {
+//         if ("icon".equals(localName))
+//         {
+//            child = new PortletIconMetaData();
+//         }
+//      }
+//      else if (object instanceof HeaderContentMetaData)
+//      {
+//         if ("link".equalsIgnoreCase(localName))
+//         {
+//            String href = attrs.getValue("href");
+//            String type = attrs.getValue("type");
+//            String media = attrs.getValue("media");
+//            String rel = attrs.getValue("rel");
+//            String title = attrs.getValue("title");
+//            ElementMetaData elt = ElementMetaData.createLinkElement(type, rel, href,
media, title);
+//            elt.init();
+//            child = elt;
+//         }
+//         else if ("script".equalsIgnoreCase(localName))
+//         {
+//            String src = attrs.getValue("src");
+//            String type = attrs.getValue("type");
+//            ElementMetaData elt = ElementMetaData.createScriptElement(type, src);
+//            elt.init();
+//            child = elt;
+//         }
+//         else if ("meta".equalsIgnoreCase(localName))
+//         {
+//            String name = attrs.getValue("name");
+//            String content = attrs.getValue("content");
+//            ElementMetaData elt = ElementMetaData.createNamedMetaElement(name,
content);
+//            elt.init();
+//            child = elt;
+//         }
+//      }
+//      if (child == null)
+//      {
+//         child = super.newChild(object, nav, nsURI, localName, attrs);
+//      }
+//      return child;
+//   }
+//
+//   public void addChild(Object parent, Object child, UnmarshallingContext nav, String
nsURI, String localName)
+//   {
+//      if (child instanceof ServiceMetaData)
+//      {
+//         ServiceMetaData service = (ServiceMetaData)child;
+//         JBossApplicationMetaData app = (JBossApplicationMetaData)parent;
+//         app.getServices().put(service.getName(), service);
+//      }
+//      else if (child instanceof HeaderContentMetaData)
+//      {
+//         HeaderContentMetaData headerContent = (HeaderContentMetaData)child;
+//         JBossPortletMetaData portlet = (JBossPortletMetaData)parent;
+//         portlet.setHeaderContent(headerContent);
+//      }
+//      else if (child instanceof AjaxMetaData)
+//      {
+//         AjaxMetaData ajax = (AjaxMetaData)child;
+//         JBossPortletMetaData portlet = (JBossPortletMetaData)parent;
+//         portlet.setAjax(ajax);
+//      }
+//      else if (child instanceof PortletInfoMetaData)
+//      {
+//         PortletInfoMetaData portletInfo = (PortletInfoMetaData)child;
+//         JBossPortletMetaData portlet = (JBossPortletMetaData)parent;
+//         portlet.setPortletInfo(portletInfo);
+//      }
+//      else if (child instanceof PortletIconMetaData)
+//      {
+//         PortletIconMetaData portletIcon = (PortletIconMetaData)child;
+//         PortletInfoMetaData portletInfo = (PortletInfoMetaData)parent;
+//         portletInfo.setPortletIcon(portletIcon);
+//      }
+//      else if (child instanceof ElementMetaData)
+//      {
+//         ElementMetaData element = (ElementMetaData)child;
+//         HeaderContentMetaData headerContent = (HeaderContentMetaData)parent;
+//         headerContent.getElements().add(element);
+//      }
+//      else
+//      {
+//         super.addChild(parent, child, nav, nsURI, localName);
+//      }
+//   }
+//
+//   public void setValue(Object object, UnmarshallingContext nav, String nsURI, String
localName, String value)
+//   {
+//      if (object instanceof ServiceMetaData)
+//      {
+//         ServiceMetaData service = (ServiceMetaData)object;
+//         if ("service-name".equals(localName))
+//         {
+//            service.setName(value);
+//         }
+//         else if ("service-class".equals(localName))
+//         {
+//            service.setClassName(value);
+//         }
+//         else if ("service-ref".equals(localName))
+//         {
+//            service.setRef(value);
+//         }
+//      }
+//      else if (object instanceof ElementMetaData)
+//      {
+//         if ("script".equals(localName))
+//         {
+//            ElementMetaData elt = (ElementMetaData)object;
+//            elt.setBodyContent(value);
+//            elt.init();
+//         }
+//      }
+//      else if (object instanceof AjaxMetaData)
+//      {
+//         if ("partial-refresh".equals(localName))
+//         {
+//            AjaxMetaData ajax = (AjaxMetaData)object;
+//            ajax.setPartialRefresh(Boolean.valueOf(value));
+//         }
+//      }
+//      else if (object instanceof PortletIconMetaData)
+//      {
+//         if ("small-icon".equals(localName))
+//         {
+//            PortletIconMetaData portletIcon = (PortletIconMetaData)object;
+//            portletIcon.setIconLocation(value, PortletIconMetaData.SMALL);
+//         }
+//         else if ("large-icon".equals(localName))
+//         {
+//            PortletIconMetaData portletIcon = (PortletIconMetaData)object;
+//            portletIcon.setIconLocation(value, PortletIconMetaData.LARGE);
+//         }
+//      }
+//      else
+//      {
+//         super.setValue(object, nav, nsURI, localName, value);
+//      }
+//   }
+//
+//   protected org.jboss.portal.portlet.deployment.jboss.metadata.JBossPortletMetaData
createJBossPortlet()
+//   {
+//      return new JBossPortletMetaData();
+//   }
+//}

Deleted:
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java	2009-04-02
23:19:44 UTC (rev 13143)
+++
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java	2009-04-02
23:22:22 UTC (rev 13144)
@@ -1,321 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat                                               *
- * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
- * contributors as indicated by the @authors tag. See the                     *
- * copyright.txt in the distribution for a full listing of                    *
- * individual contributors.                                                   *
- *                                                                            *
- * This is free software; you can redistribute it and/or modify it            *
- * under the terms of the GNU Lesser General Public License as                *
- * published by the Free Software Foundation; either version 2.1 of           *
- * the License, or (at your option) any later version.                        *
- *                                                                            *
- * This software is distributed in the hope that it will be useful,           *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
- * Lesser General Public License for more details.                            *
- *                                                                            *
- * You should have received a copy of the GNU Lesser General Public           *
- * License along with this software; if not, write to the Free                *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
- ******************************************************************************/
-package org.jboss.portal.core.deployment.jboss;
-
-import org.jboss.deployment.DeploymentException;
-import org.jboss.logging.Logger;
-import org.jboss.portal.common.io.IOTools;
-import org.jboss.portal.common.xml.NullEntityResolver;
-import org.jboss.portal.common.xml.XMLTools;
-import org.jboss.portal.core.controller.coordination.CoordinationConfigurator;
-import org.jboss.portal.core.model.content.ContentType;
-import org.jboss.portal.core.model.content.spi.ContentProvider;
-import org.jboss.portal.core.model.content.spi.handler.ContentHandler;
-import org.jboss.portal.core.model.portal.PortalObject;
-import org.jboss.portal.core.model.portal.PortalObjectContainer;
-import org.jboss.portal.core.model.portal.PortalObjectId;
-import org.jboss.portal.core.model.portal.PortalObjectPath;
-import org.jboss.portal.core.model.portal.metadata.BuildContext;
-import org.jboss.portal.core.model.portal.metadata.PortalObjectMetaData;
-import org.jboss.portal.server.deployment.PortalWebApp;
-import org.jboss.portal.server.deployment.jboss.Deployment;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.EntityResolver;
-
-import javax.management.MBeanServer;
-import javax.transaction.TransactionManager;
-import javax.xml.parsers.DocumentBuilder;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot
com">Boleslaw Dawidowicz</a>
- * @version $Revision$
- */
-public class ObjectDeployment extends Deployment
-{
-
-   /** . */
-   public static final int OVERWRITE_IF_EXISTS = 0;
-
-   /** . */
-   public static final int KEEP_IF_EXISTS = 1;
-
-   /** The logger. */
-   protected static final Logger log = Logger.getLogger(ObjectDeployment.class);
-
-   /** . */
-   protected boolean isTrace = log.isTraceEnabled();
-
-   /** . */
-   protected TransactionManager tm;
-
-   /** The factory that created this deployment. */
-   protected ObjectDeploymentFactory factory;
-
-   /** What we have deployed. */
-   protected ArrayList<Unit> units;
-
-   public ObjectDeployment(URL url,
-                           MBeanServer mbeanServer,
-                           TransactionManager tm,
-                           PortalWebApp pwa,
-                           ObjectDeploymentFactory factory)
-   {
-      super(url, pwa, mbeanServer);
-      this.tm = tm;
-      this.factory = factory;
-   }
-
-   public void start() throws DeploymentException
-   {
-      if (true) {return;}
-      try
-      {
-         doStart();
-      }
-      catch (Exception e)
-      {
-         // And rethrow the exception for the deployer
-         throw new DeploymentException(e);
-      }
-   }
-
-   // @org.jboss.aspects.tx.Tx(org.jboss.aspects.tx.TxType.REQUIRED)
-   protected void doStart() throws Exception
-   {
-      if(true){return;}
-      InputStream in = null;
-      try
-      {
-         // Load xml document
-         log.debug("Loading portal metadata from " + url);
-         in = IOTools.safeBufferedWrapper(url.openStream());
-
-         DocumentBuilder builder =
XMLTools.getDocumentBuilderFactory().newDocumentBuilder();
-         EntityResolver entityResolver = factory.getPortalObjectEntityResolver();
-         if (entityResolver == null)
-         {
-            log.debug("Coult not obtain entity resolver for " + url);
-            entityResolver = new NullEntityResolver();
-         }
-         else
-         {
-            log.debug("Obtained entity resolver " + entityResolver + " for
" + url);
-         }
-         builder.setEntityResolver(entityResolver);
-         Document doc = builder.parse(in);
-         Element deploymentsElt = doc.getDocumentElement();
-
-         // Build the list of deployment units
-         List<Element> deploymentElts = XMLTools.getChildren(deploymentsElt,
"deployment");
-         units = new ArrayList<Unit>(deploymentElts.size());
-         for (Element deploymentElt : deploymentElts)
-         {
-            Unit unit = new Unit();
-
-            //
-            Element parentRefElt = XMLTools.getUniqueChild(deploymentElt,
"parent-ref", false);
-            unit.parentRef = parentRefElt == null ? null :
PortalObjectId.parse(XMLTools.asString(parentRefElt), PortalObjectPath.LEGACY_FORMAT);
-
-            //
-            Element ifExistsElt = XMLTools.getUniqueChild(deploymentElt,
"if-exists", false);
-            unit.ifExists = KEEP_IF_EXISTS;
-            if (ifExistsElt != null)
-            {
-               String ifExists = XMLTools.asString(ifExistsElt);
-               if ("overwrite".equals(ifExists))
-               {
-                  unit.ifExists = OVERWRITE_IF_EXISTS;
-               }
-               else if ("keep".equals(ifExists))
-               {
-                  unit.ifExists = KEEP_IF_EXISTS;
-               }
-            }
-
-            // The object to create
-            PortalObjectMetaData metaData = null;
-
-            //
-            Element metaDataElt = XMLTools.getUniqueChild(deploymentElt,
"portal", false);
-            if (metaDataElt == null)
-            {
-               metaDataElt = XMLTools.getUniqueChild(deploymentElt, "page",
false);
-               if (metaDataElt == null)
-               {
-                  metaDataElt = XMLTools.getUniqueChild(deploymentElt,
"window", false);
-                  if (metaDataElt == null)
-                  {
-                     metaDataElt = XMLTools.getUniqueChild(deploymentElt,
"context", false);
-                  }
-               }
-            }
-            if (metaDataElt != null)
-            {
-               metaData =
PortalObjectMetaData.buildMetaData(factory.contentProviderRegistry, metaDataElt);
-            }
-            else
-            {
-               log.debug("Instances element in -object.xml is not supported
anymore");
-            }
-
-            //
-            if (metaData != null)
-            {
-               unit.metaData = metaData;
-               units.add(unit);
-            }
-         }
-
-         // Resolve against ref in the same deployment
-         BuildContext portalObjectBuildContext = new BuildContext()
-         {
-            public PortalObjectContainer getContainer()
-            {
-               return factory.portalObjectContainer;
-            }
-
-            public ContentHandler getContentHandler(ContentType contentType)
-            {
-               ContentProvider contentProvider =
factory.contentProviderRegistry.getContentProvider(contentType);
-               return contentProvider != null ? contentProvider.getHandler() : null;
-            }
-            
-            public PortalWebApp getPortalWebApp()
-            {
-               return pwa;
-            }
-
-            public CoordinationConfigurator getCoordinationConfigurator()
-            {
-               return factory.getCoordinationConfigurator();
-            }
-         };
-
-         // Create all objects
-         for (Unit unit : units)
-         {
-            if (isTrace)
-            {
-               log.trace(unit);
-            }
-            if (unit.metaData instanceof PortalObjectMetaData)
-            {
-
-               PortalObjectContainer portalObjectContainer =
factory.getPortalObjectContainer();
-               PortalObjectMetaData portalObjectMD =
(PortalObjectMetaData)unit.metaData;
-
-               if (unit.parentRef != null)
-               {
-                  log.debug("Checking existence of parent portal object '"
+ unit.parentRef + "'");
-                  Object o = portalObjectContainer.getObject(unit.parentRef);
-                  if (o instanceof PortalObject)
-                  {
-                     PortalObject parent = (PortalObject)o;
-                     boolean create = true;
-                     if (parent.getChild(portalObjectMD.getName()) != null)
-                     {
-                        switch (unit.ifExists)
-                        {
-                           case OVERWRITE_IF_EXISTS:
-                              parent.destroyChild(portalObjectMD.getName());
-                              break;
-                           case KEEP_IF_EXISTS:
-                              create = false;
-                              break;
-                        }
-                     }
-                     if (create)
-                     {
-                        log.debug("Building portal object");
-                        PortalObject po = portalObjectMD.create(portalObjectBuildContext,
parent);
-                        unit.ref = po.getId();
-                     }
-                  }
-                  else if (o == null)
-                  {
-                     log.warn("Cannot create portal object " + unit.metaData +
" because the parent '" + unit.parentRef + "' that the deployment
descriptor references does not exist");
-                  }
-               }
-               else
-               {
-                  if (portalObjectContainer.getContext(portalObjectMD.getName()) ==
null)
-                  {
-                     log.debug("Building portal object");
-                     PortalObject po = portalObjectMD.create(portalObjectBuildContext,
null);
-                     unit.ref = po.getId();
-                  }
-               }
-            }
-         }
-      }
-      finally
-      {
-         IOTools.safeClose(in);
-      }
-   }
-
-   public void stop() throws DeploymentException
-   {
-   }
-
-   /**
-    * Return factory
-    *
-    * @return @see ObjectDeploymentFactory
-    */
-   public ObjectDeploymentFactory getFactory()
-   {
-      return factory;
-   }
-
-   /** A unit of deployment in the deployment descriptor. */
-   private static class Unit
-   {
-      /** The strategy to use when the root object already exists. */
-      protected int ifExists;
-
-      /** The parent ref. */
-      protected PortalObjectId parentRef;
-
-      /** Meta data of the deployed portal object. */
-      protected Object metaData;
-
-      /** The handle of the deployed object if not null. */
-      protected PortalObjectId ref;
-
-      public String toString()
-      {
-         StringBuffer buffer = new StringBuffer("Unit[::ifExists=" +
ifExists);
-         buffer.append(":parentRef=").append(parentRef);
-        
buffer.append(":Metadata=").append(metaData).append(":ref=").append(ref).append("]");
-         return buffer.toString();
-      }
-   }
-
-}

Deleted:
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java	2009-04-02
23:19:44 UTC (rev 13143)
+++
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java	2009-04-02
23:22:22 UTC (rev 13144)
@@ -1,126 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat                                               *
- * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
- * contributors as indicated by the @authors tag. See the                     *
- * copyright.txt in the distribution for a full listing of                    *
- * individual contributors.                                                   *
- *                                                                            *
- * This is free software; you can redistribute it and/or modify it            *
- * under the terms of the GNU Lesser General Public License as                *
- * published by the Free Software Foundation; either version 2.1 of           *
- * the License, or (at your option) any later version.                        *
- *                                                                            *
- * This software is distributed in the hope that it will be useful,           *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
- * Lesser General Public License for more details.                            *
- *                                                                            *
- * You should have received a copy of the GNU Lesser General Public           *
- * License along with this software; if not, write to the Free                *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
- ******************************************************************************/
-package org.jboss.portal.core.deployment.jboss;
-
-import org.jboss.deployment.DeploymentException;
-import org.jboss.portal.common.transaction.TransactionManagerProvider;
-import org.jboss.portal.core.model.content.spi.ContentProviderRegistry;
-import org.jboss.portal.core.model.portal.PortalObjectContainer;
-import org.jboss.portal.core.controller.coordination.CoordinationConfigurator;
-import org.jboss.portal.server.deployment.PortalWebApp;
-import org.jboss.portal.server.deployment.jboss.AbstractDeploymentFactory;
-import org.jboss.portal.server.deployment.jboss.Deployment;
-import org.xml.sax.EntityResolver;
-
-import javax.management.MBeanServer;
-import javax.transaction.TransactionManager;
-import java.net.URL;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot
com">Boleslaw Dawidowicz</a>
- * @version $Revision$
- */
-public class ObjectDeploymentFactory extends AbstractDeploymentFactory
-{
-
-	//object.xml
-   protected static final Pattern URL_PATTERN =
Pattern.compile(".*-object\\.xml");
-
-   /** . */
-   protected URL setupURL;
-
-   /** . */
-   protected PortalObjectContainer portalObjectContainer;
-
-   /** . */
-   protected ContentProviderRegistry contentProviderRegistry;
-
-   /** . */
-   protected EntityResolver portalObjectEntityResolver;
-
-   /** . */
-   protected CoordinationConfigurator coordinationConfigurator;
-
-   public boolean acceptFile(URL url)
-   {
-      String urlAsFile = url.getFile();
-      Matcher matcher = URL_PATTERN.matcher(urlAsFile);
-      return matcher.matches();
-   }
-
-   public Deployment newInstance(URL url, PortalWebApp pwa, MBeanServer mbeanServer)
throws DeploymentException
-   {
-      try
-      {
-         TransactionManager tm =
TransactionManagerProvider.JBOSS_PROVIDER.getTransactionManager();
-         return new ObjectDeployment(url, mbeanServer, tm, pwa, this);
-      }
-      catch (Exception e)
-      {
-         throw new DeploymentException(e);
-      }
-   }
-
-   public EntityResolver getPortalObjectEntityResolver()
-   {
-      return portalObjectEntityResolver;
-   }
-
-   public void setPortalObjectEntityResolver(EntityResolver portalObjectEntityResolver)
-   {
-      this.portalObjectEntityResolver = portalObjectEntityResolver;
-   }
-
-   public PortalObjectContainer getPortalObjectContainer()
-   {
-      return portalObjectContainer;
-   }
-
-   public void setPortalObjectContainer(PortalObjectContainer portalObjectContainer)
-   {
-      this.portalObjectContainer = portalObjectContainer;
-   }
-
-   public ContentProviderRegistry getContentProviderRegistry()
-   {
-      return contentProviderRegistry;
-   }
-
-   public void setContentProviderRegistry(ContentProviderRegistry
contentProviderRegistry)
-   {
-      this.contentProviderRegistry = contentProviderRegistry;
-   }
-
-   public CoordinationConfigurator getCoordinationConfigurator()
-   {
-      return coordinationConfigurator;
-   }
-
-   public void setCoordinationConfigurator(CoordinationConfigurator
coordinationConfigurator)
-   {
-      this.coordinationConfigurator = coordinationConfigurator;
-   }
-}

Modified:
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/core/deployment/jboss/PortletDeploymentImpl.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/core/deployment/jboss/PortletDeploymentImpl.java	2009-04-02
23:19:44 UTC (rev 13143)
+++
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/core/deployment/jboss/PortletDeploymentImpl.java	2009-04-02
23:22:22 UTC (rev 13144)
@@ -22,10 +22,13 @@
  ******************************************************************************/
 package org.jboss.portal.core.deployment.jboss;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.mail.MethodNotSupportedException;
 import javax.servlet.ServletContext;
 
 import org.jboss.deployers.spi.DeploymentException;
@@ -215,11 +218,16 @@
        init(servletContext, url, classloader, contextPath);
     }
     
-    @Override
     public void instrument() throws Exception
     {
        //do nothing
     }
+
+   public boolean importFile(String parentDirRelativePath, String name, InputStream
source, boolean overwrite)
+         throws IOException
+   {
+      throw new IOException();
+   }
     
  }
 

Modified:
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/test/core/deployment/JBossApplicationMetaDataFactoryTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/test/core/deployment/JBossApplicationMetaDataFactoryTestCase.java	2009-04-02
23:19:44 UTC (rev 13143)
+++
branches/JBoss_Portal_Branch_2_7_AS5/core/src/main/org/jboss/portal/test/core/deployment/JBossApplicationMetaDataFactoryTestCase.java	2009-04-02
23:22:22 UTC (rev 13144)
@@ -1,166 +1,166 @@
-/******************************************************************************
- * JBoss, a division of Red Hat                                               *
- * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
- * contributors as indicated by the @authors tag. See the                     *
- * copyright.txt in the distribution for a full listing of                    *
- * individual contributors.                                                   *
- *                                                                            *
- * This is free software; you can redistribute it and/or modify it            *
- * under the terms of the GNU Lesser General Public License as                *
- * published by the Free Software Foundation; either version 2.1 of           *
- * the License, or (at your option) any later version.                        *
- *                                                                            *
- * This software is distributed in the hope that it will be useful,           *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
- * Lesser General Public License for more details.                            *
- *                                                                            *
- * You should have received a copy of the GNU Lesser General Public           *
- * License along with this software; if not, write to the Free                *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
- ******************************************************************************/
-
-package org.jboss.portal.test.core.deployment;
-
-import junit.framework.TestCase;
-import org.jboss.portal.common.net.URLTools;
-import org.jboss.portal.core.deployment.JBossApplicationMetaDataFactory;
-import org.jboss.portal.core.metadata.portlet.HeaderContentMetaData;
-import org.jboss.portal.core.metadata.portlet.JBossApplicationMetaData;
-import org.jboss.portal.core.metadata.portlet.JBossPortletMetaData;
-import org.jboss.portal.core.metadata.portlet.LinkElementMetaData;
-import org.jboss.portal.core.metadata.portlet.NamedMetaElementMetaData;
-import org.jboss.portal.core.metadata.portlet.PortletIconMetaData;
-import org.jboss.portal.core.metadata.portlet.PortletInfoMetaData;
-import org.jboss.portal.core.metadata.portlet.ScriptElementMetaData;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
-
-import java.net.URL;
-import java.util.List;
-
-/**
- * @author <a
href="mailto:chris.laprun@jboss.com?subject=org.jboss.portal.test.core.deployment.JBossApplicationMetaDataFactoryTestCase">Chris
- *         Laprun</a>
- * @version $Revision$
- * @since 2.4
- */
-public class JBossApplicationMetaDataFactoryTestCase extends TestCase
-{
-   public void testHeaderContentMetaData() throws Exception
-   {
-      URL jbossPortletXML =
Thread.currentThread().getContextClassLoader().getResource("test/deployment/jboss-portlet.xml");
-      assertTrue(URLTools.exists(jbossPortletXML));
-
-      //
-      JBossApplicationMetaDataFactory factory = new JBossApplicationMetaDataFactory();
-
-      //
-      Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
-
-      //
-      Object o = unmarshaller.unmarshal(jbossPortletXML.openStream(), factory, null);
-      assertNotNull(o);
-      assertTrue(o instanceof JBossApplicationMetaData);
-      JBossApplicationMetaData app = (JBossApplicationMetaData)o;
-
-      //
-      assertNotNull(app.getPortlets());
-      assertEquals(4, app.getPortlets().size());
-
-      //
-      JBossPortletMetaData portlet =
(JBossPortletMetaData)app.getPortlets().get("Portlet1");
-      assertNotNull(portlet);
-      assertEquals("Portlet1", portlet.getName());
-      assertEquals(Boolean.TRUE, portlet.getRemotable());
-      HeaderContentMetaData headerContent = portlet.getHeaderContent();
-      assertNotNull(headerContent);
-
-      List elements = headerContent.getElements();
-      assertEquals(3, elements.size());
-
-      LinkElementMetaData link = (LinkElementMetaData)elements.get(0);
-      assertEquals("text/css", link.getTypeAttribute());
-      assertEquals("stylesheet", link.getRelAttribute());
-      assertEquals("screen", link.getMediaAttribute());
-      assertEquals("test.css", link.getHrefAttribute());
-
-      ScriptElementMetaData script = (ScriptElementMetaData)elements.get(1);
-      assertEquals("text/javascript", script.getTypeAttribute());
-      assertEquals("test.js", script.getSrcAttribute());
-
-      NamedMetaElementMetaData meta = (NamedMetaElementMetaData)elements.get(2);
-      assertEquals("description", meta.getNameAttribute());
-      assertEquals("test content", meta.getContentAttribute());
-
-      portlet = (JBossPortletMetaData)app.getPortlets().get("Portlet2");
-      assertNotNull(portlet);
-      assertEquals("Portlet2", portlet.getName());
-      assertNull(portlet.getRemotable());
-   }
-
-   /** JBPORTAL-1621: "title" attribute of "link" tag */
-   public void testHeaderContentMetaDataTitleLink() throws Exception
-   {
-      URL jbossPortletXML =
Thread.currentThread().getContextClassLoader().getResource("test/deployment/jboss-portlet.xml");
-      assertTrue(URLTools.exists(jbossPortletXML));
-
-      //
-      JBossApplicationMetaDataFactory factory = new JBossApplicationMetaDataFactory();
-
-      //
-      Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
-
-      //
-      Object o = unmarshaller.unmarshal(jbossPortletXML.openStream(), factory, null);
-      assertNotNull(o);
-      assertTrue(o instanceof JBossApplicationMetaData);
-      JBossApplicationMetaData app = (JBossApplicationMetaData)o;
-
-      //
-      JBossPortletMetaData portlet =
(JBossPortletMetaData)app.getPortlets().get("Portlet3");
-      assertNotNull(portlet);
-      assertEquals("Portlet3", portlet.getName());
-
-      HeaderContentMetaData headerContent = portlet.getHeaderContent();
-      List elements = headerContent.getElements();
-
-      LinkElementMetaData link = (LinkElementMetaData)elements.get(0);
-      assertEquals("text/css", link.getTypeAttribute());
-      assertEquals("stylesheet", link.getRelAttribute());
-      assertEquals("screen", link.getMediaAttribute());
-      assertEquals("test.css", link.getHrefAttribute());
-      assertEquals("foo", link.getTitleAttribute());
-
-   }
-
-   public void testPortletInfoMetadata() throws Exception
-   {
-      URL jbossPortletXML =
Thread.currentThread().getContextClassLoader().getResource("test/deployment/jboss-portlet.xml");
-      assertTrue(URLTools.exists(jbossPortletXML));
-
-      //
-      JBossApplicationMetaDataFactory factory = new JBossApplicationMetaDataFactory();
-
-      //
-      Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
-
-      //
-      Object o = unmarshaller.unmarshal(jbossPortletXML.openStream(), factory, null);
-      assertNotNull(o);
-      assertTrue(o instanceof JBossApplicationMetaData);
-      JBossApplicationMetaData app = (JBossApplicationMetaData)o;
-
-      //
-      JBossPortletMetaData portlet =
(JBossPortletMetaData)app.getPortlets().get("Portlet4");
-      assertNotNull(portlet);
-      assertEquals("Portlet4", portlet.getName());
-
-      PortletInfoMetaData portletInfo = (PortletInfoMetaData)portlet.getPortletInfo();
-      System.out.println(">>>" + portletInfo.getPortletIcon());
-      assertEquals("/tmp/toto.png",
portletInfo.getPortletIcon().getIconLocation(PortletIconMetaData.SMALL));
-
-   }
-
-}
+///******************************************************************************
+// * JBoss, a division of Red Hat                                               *
+// * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+// * contributors as indicated by the @authors tag. See the                     *
+// * copyright.txt in the distribution for a full listing of                    *
+// * individual contributors.                                                   *
+// *                                                                            *
+// * This is free software; you can redistribute it and/or modify it            *
+// * under the terms of the GNU Lesser General Public License as                *
+// * published by the Free Software Foundation; either version 2.1 of           *
+// * the License, or (at your option) any later version.                        *
+// *                                                                            *
+// * This software is distributed in the hope that it will be useful,           *
+// * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+// * Lesser General Public License for more details.                            *
+// *                                                                            *
+// * You should have received a copy of the GNU Lesser General Public           *
+// * License along with this software; if not, write to the Free                *
+// * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+// * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+// ******************************************************************************/
+//
+//package org.jboss.portal.test.core.deployment;
+//
+//import junit.framework.TestCase;
+//import org.jboss.portal.common.net.URLTools;
+//import org.jboss.portal.core.deployment.JBossApplicationMetaDataFactory;
+//import org.jboss.portal.core.metadata.portlet.HeaderContentMetaData;
+//import org.jboss.portal.core.metadata.portlet.JBossApplicationMetaData;
+//import org.jboss.portal.core.metadata.portlet.JBossPortletMetaData;
+//import org.jboss.portal.core.metadata.portlet.LinkElementMetaData;
+//import org.jboss.portal.core.metadata.portlet.NamedMetaElementMetaData;
+//import org.jboss.portal.core.metadata.portlet.PortletIconMetaData;
+//import org.jboss.portal.core.metadata.portlet.PortletInfoMetaData;
+//import org.jboss.portal.core.metadata.portlet.ScriptElementMetaData;
+//import org.jboss.xb.binding.Unmarshaller;
+//import org.jboss.xb.binding.UnmarshallerFactory;
+//
+//import java.net.URL;
+//import java.util.List;
+//
+///**
+// * @author <a
href="mailto:chris.laprun@jboss.com?subject=org.jboss.portal.test.core.deployment.JBossApplicationMetaDataFactoryTestCase">Chris
+// *         Laprun</a>
+// * @version $Revision$
+// * @since 2.4
+// */
+//public class JBossApplicationMetaDataFactoryTestCase extends TestCase
+//{
+//   public void testHeaderContentMetaData() throws Exception
+//   {
+//      URL jbossPortletXML =
Thread.currentThread().getContextClassLoader().getResource("test/deployment/jboss-portlet.xml");
+//      assertTrue(URLTools.exists(jbossPortletXML));
+//
+//      //
+//      JBossApplicationMetaDataFactory factory = new JBossApplicationMetaDataFactory();
+//
+//      //
+//      Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
+//
+//      //
+//      Object o = unmarshaller.unmarshal(jbossPortletXML.openStream(), factory, null);
+//      assertNotNull(o);
+//      assertTrue(o instanceof JBossApplicationMetaData);
+//      JBossApplicationMetaData app = (JBossApplicationMetaData)o;
+//
+//      //
+//      assertNotNull(app.getPortlets());
+//      assertEquals(4, app.getPortlets().size());
+//
+//      //
+//      JBossPortletMetaData portlet =
(JBossPortletMetaData)app.getPortlets().get("Portlet1");
+//      assertNotNull(portlet);
+//      assertEquals("Portlet1", portlet.getName());
+//      assertEquals(Boolean.TRUE, portlet.getRemotable());
+//      HeaderContentMetaData headerContent = portlet.getHeaderContent();
+//      assertNotNull(headerContent);
+//
+//      List elements = headerContent.getElements();
+//      assertEquals(3, elements.size());
+//
+//      LinkElementMetaData link = (LinkElementMetaData)elements.get(0);
+//      assertEquals("text/css", link.getTypeAttribute());
+//      assertEquals("stylesheet", link.getRelAttribute());
+//      assertEquals("screen", link.getMediaAttribute());
+//      assertEquals("test.css", link.getHrefAttribute());
+//
+//      ScriptElementMetaData script = (ScriptElementMetaData)elements.get(1);
+//      assertEquals("text/javascript", script.getTypeAttribute());
+//      assertEquals("test.js", script.getSrcAttribute());
+//
+//      NamedMetaElementMetaData meta = (NamedMetaElementMetaData)elements.get(2);
+//      assertEquals("description", meta.getNameAttribute());
+//      assertEquals("test content", meta.getContentAttribute());
+//
+//      portlet = (JBossPortletMetaData)app.getPortlets().get("Portlet2");
+//      assertNotNull(portlet);
+//      assertEquals("Portlet2", portlet.getName());
+//      assertNull(portlet.getRemotable());
+//   }
+//
+//   /** JBPORTAL-1621: "title" attribute of "link" tag */
+//   public void testHeaderContentMetaDataTitleLink() throws Exception
+//   {
+//      URL jbossPortletXML =
Thread.currentThread().getContextClassLoader().getResource("test/deployment/jboss-portlet.xml");
+//      assertTrue(URLTools.exists(jbossPortletXML));
+//
+//      //
+//      JBossApplicationMetaDataFactory factory = new JBossApplicationMetaDataFactory();
+//
+//      //
+//      Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
+//
+//      //
+//      Object o = unmarshaller.unmarshal(jbossPortletXML.openStream(), factory, null);
+//      assertNotNull(o);
+//      assertTrue(o instanceof JBossApplicationMetaData);
+//      JBossApplicationMetaData app = (JBossApplicationMetaData)o;
+//
+//      //
+//      JBossPortletMetaData portlet =
(JBossPortletMetaData)app.getPortlets().get("Portlet3");
+//      assertNotNull(portlet);
+//      assertEquals("Portlet3", portlet.getName());
+//
+//      HeaderContentMetaData headerContent = portlet.getHeaderContent();
+//      List elements = headerContent.getElements();
+//
+//      LinkElementMetaData link = (LinkElementMetaData)elements.get(0);
+//      assertEquals("text/css", link.getTypeAttribute());
+//      assertEquals("stylesheet", link.getRelAttribute());
+//      assertEquals("screen", link.getMediaAttribute());
+//      assertEquals("test.css", link.getHrefAttribute());
+//      assertEquals("foo", link.getTitleAttribute());
+//
+//   }
+//
+//   public void testPortletInfoMetadata() throws Exception
+//   {
+//      URL jbossPortletXML =
Thread.currentThread().getContextClassLoader().getResource("test/deployment/jboss-portlet.xml");
+//      assertTrue(URLTools.exists(jbossPortletXML));
+//
+//      //
+//      JBossApplicationMetaDataFactory factory = new JBossApplicationMetaDataFactory();
+//
+//      //
+//      Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
+//
+//      //
+//      Object o = unmarshaller.unmarshal(jbossPortletXML.openStream(), factory, null);
+//      assertNotNull(o);
+//      assertTrue(o instanceof JBossApplicationMetaData);
+//      JBossApplicationMetaData app = (JBossApplicationMetaData)o;
+//
+//      //
+//      JBossPortletMetaData portlet =
(JBossPortletMetaData)app.getPortlets().get("Portlet4");
+//      assertNotNull(portlet);
+//      assertEquals("Portlet4", portlet.getName());
+//
+//      PortletInfoMetaData portletInfo = (PortletInfoMetaData)portlet.getPortletInfo();
+//      System.out.println(">>>" + portletInfo.getPortletIcon());
+//      assertEquals("/tmp/toto.png",
portletInfo.getPortletIcon().getIconLocation(PortletIconMetaData.SMALL));
+//
+//   }
+//
+//}

Modified:
branches/JBoss_Portal_Branch_2_7_AS5/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_7_AS5/core/src/resources/portal-core-sar/META-INF/jboss-service.xml	2009-04-02
23:19:44 UTC (rev 13143)
+++
branches/JBoss_Portal_Branch_2_7_AS5/core/src/resources/portal-core-sar/META-INF/jboss-service.xml	2009-04-02
23:22:22 UTC (rev 13144)
@@ -31,21 +31,6 @@
       <attribute name="ConfigLocation">conf/config.xml</attribute>
    </mbean>
 
-   <!-- DTD repository -->
-   <mbean code="org.jboss.portal.server.impl.xml.EntityResolverService"
name="portal:service=EntityResolver"
-          xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="DTDMapping">
-         <properties>
-            <entry key="-//JBoss Portal//DTD JBoss Portlet
2.6//EN">dtd/jboss-portlet_2_6.dtd</entry>
-            <entry key="-//JBoss Portal//DTD JBoss App
2.6//EN">dtd/jboss-app_2_6.dtd</entry>
-            <entry key="-//JBoss Portal//DTD Portal Object
2.6//EN">dtd/portal-object_2_6.dtd</entry>
-            <entry key="-//JBoss Portal//DTD Portlet Instances
2.6//EN">dtd/portlet-instances_2_6.dtd</entry>
-            <entry key="-//JBoss Portal//DTD JBoss Portal Application
2.6//EN">dtd/jboss-portal-app_2_6.dtd</entry>
-         </properties>
-      </attribute>
-   </mbean>
-
    <!-- Runtime context for running portlet container -->
    <mbean code="org.jboss.portal.web.jboss.JBossWebContext"
name="portal:service=ServletContainerFactory" xmbean-dd=""
          
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
@@ -1066,107 +1051,12 @@
       </depends>
    </mbean>
 
-   <!-- -->
-   <mbean code="org.jboss.portal.server.deployment.jboss.ServerDeployer"
name="portal:deployer=PortalWebApp">
-      <depends>jboss.system:service=MainDeployer</depends>
-      <depends>portal:container=PortalObject</depends>
-      <depends>portal:container=Instance</depends>
-      <depends optional-attribute-name="PortalServer"
proxy-type="attribute">portal:service=Server</depends>
-   </mbean>
-
-   <!-- Portal object deployment factory --><!--
-      | Uncomment in cluster mode : have the deployment of objects run as a clustered
singleton
-      @portal.single.xml.close@
-      <mbean
-      code="org.jboss.portal.jems.as.system.LifecycleInvoker"
-      name="portal:service=Controller,target=ObjectDeploymentFactory"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends>jboss.ha:service=HASingletonDeployer,type=Barrier</depends>
-     
<depends>jboss:service=${jboss.partition.name:DefaultPartition}</depends>
-      <depends>portal:container=PortalObject</depends>
-      <attribute
name="Target">portal:deploymentFactory=Object</attribute>
-      <attribute name="OnStart">registerFactory</attribute>
-      <attribute name="OnStop">unregisterFactory</attribute>
-      </mbean>
-   @portal.single.xml.open@
-   -->
-   <mbean
code="org.jboss.portal.core.deployment.jboss.ObjectDeploymentFactory"
name="portal:deploymentFactory=Object"
-          xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends optional-attribute-name="Deployer"
proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-      <depends optional-attribute-name="PortalObjectContainer"
proxy-type="attribute">portal:container=PortalObject
-      </depends>
-      <depends optional-attribute-name="ContentProviderRegistry"
proxy-type="attribute">
-         portal:service=ContentProviderRegistry
-      </depends>
-      <depends optional-attribute-name="PortalObjectEntityResolver"
proxy-type="attribute">portal:service=EntityResolver
-      </depends>
-      <depends optional-attribute-name="CoordinationConfigurator"
proxy-type="attribute">
-         portal:service=CoordinationService
-      </depends>
-      <attribute
name="SetupLocation">conf/data/default-object.xml</attribute>
-      <!-- Set to false in clustered mode, otherwise set to true -->
-      <attribute
name=&quot;RegistrationControlledByService&quot;&gt;@portal.single(a)&lt;/attribute&gt;
-   </mbean>
-
    <mbean
code="org.jboss.portal.core.impl.portlet.info.CoreInfoBuilderFactory"
           name="portal:service=InfoBuilderFactory,type=Core"
xmbean-dd=""
          
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
    </mbean>
 
-   <!--  --><!--
-      | Uncomment in cluster mode : have the creation of instances run as a clustered
singleton
-      @portal.single.xml.close@
-      <mbean
-      code="org.jboss.portal.jems.as.system.LifecycleInvoker"
-      name="portal:service=Controller,target=PortletAppDeploymentFactory"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends>jboss.ha:service=HASingletonDeployer,type=Barrier</depends>
-     
<depends>jboss:service=${jboss.partition.name:DefaultPartition}</depends>
-      <depends>portal:container=PortalObject</depends>
-      <attribute
name="Target">portal:deploymentFactory=PortletApp</attribute>
-      <attribute name="OnStart">enableCreateInstances</attribute>
-      <attribute name="OnStop">disableCreateInstances</attribute>
-      </mbean>
-   @portal.single.xml.open@
-   -->
-<!--   <mbean
code="org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory"
-          name="portal:deploymentFactory=PortletApp" xmbean-dd=""
-         
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/> -->
-      <!-- @portal.single.xml.close@
-      <depends>jboss.ha:service=HASingletonDeployer</depends>
-      @portal.single.xml.open@ -->
-<!--     
<depends>portal:service=PortletInvokerRegistration,id=local</depends>
-      <depends optional-attribute-name="Deployer"
proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-      <depends optional-attribute-name="CoreInfoBuilderFactory"
proxy-type="attribute">
-         portal:service=InfoBuilderFactory,type=Core
-      </depends>
-      <depends optional-attribute-name="PortletContainerInvoker"
proxy-type="attribute">
-         portal:service=PortletInvoker,type=Container
-      </depends>
-      <depends optional-attribute-name="Config"
proxy-type="attribute">portal:service=ServerConfig</depends>
-      <depends optional-attribute-name="PortletSecurityService"
proxy-type="attribute">
-         portal:service=PortletSecurityService
-      </depends>
-      <depends optional-attribute-name="InstanceContainer"
proxy-type="attribute">portal:container=Instance</depends>
-      <depends optional-attribute-name="JBossPortletEntityResolver"
proxy-type="attribute">portal:service=EntityResolver
-      </depends>
-      <depends optional-attribute-name="PortalObjectEntityResolver"
proxy-type="attribute">portal:service=EntityResolver
-      </depends>
-      <depends optional-attribute-name="PortletInstancesEntityResolver"
proxy-type="attribute">
-         portal:service=EntityResolver
-      </depends> -->
-      <!-- Set to false in clustered mode, otherwise set to true -->
-<!--      <attribute
name=&quot;CreateInstances&quot;&gt;@portal.single(a)&lt;/attribute&gt;
-   </mbean> -->
-
-
    <mbean code="org.jboss.portal.core.deployment.jboss.ObjectDeploymentImpl"
name="portal:deployer=ObjectDeployment"
           xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
@@ -1188,37 +1078,22 @@
       <depends optional-attribute-name="CoreInfoBuilderFactory"
proxy-type="attribute">portal:service=InfoBuilderFactory,type=Core</depends>
    </mbean>
 
+  <mbean code="org.jboss.portal.theme.deployment.jboss.ThemeDeploymentImpl"
name="portal:deployer=ThemeDeployment"
+         xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends optional-attribute-name="ThemeService"
proxy-type="attribute">portal:service=ThemeService</depends>   
+  </mbean>
 
+  <mbean code="org.jboss.portal.theme.deployment.jboss.LayoutDeploymentImpl"
name="portal:deployer=LayoutDeployment"
+         xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <depends optional-attribute-name="LayoutService"
proxy-type="attribute">portal:service=LayoutService</depends>
+  </mbean>
 
+  <mbean
code="org.jboss.portal.theme.deployment.jboss.RenderSetDeploymentImpl"
name="portal:deployer=RenderSetDeployment"
+         xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+       <xmbean/>
+       <depends optional-attribute-name="LayoutService"
proxy-type="attribute">portal:service=LayoutService</depends>
+  </mbean>
 
-   <mbean
code="org.jboss.portal.theme.deployment.jboss.LayoutDeploymentFactory"
name="portal:deploymentFactory=Layout"
-          xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends optional-attribute-name="Deployer"
proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-      <depends optional-attribute-name="LayoutService"
proxy-type="attribute">portal:service=LayoutService</depends>
-   </mbean>
-   <mbean
code="org.jboss.portal.theme.deployment.jboss.LayoutFeaturesDeploymentFactory"
-          name="portal:deploymentFactory=LayoutFeatures"
xmbean-dd=""
-         
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends optional-attribute-name="Deployer"
proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-      <depends optional-attribute-name="LayoutService"
proxy-type="attribute">portal:service=LayoutService</depends>
-   </mbean>
-   <mbean
code="org.jboss.portal.theme.deployment.jboss.ThemeDeploymentFactory"
name="portal:deploymentFactory=Theme"
-          xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <depends optional-attribute-name="Deployer"
proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-      <depends optional-attribute-name="ThemeService"
proxy-type="attribute">portal:service=ThemeService</depends>
-   </mbean>
-   <mbean code="org.jboss.portal.server.deployment.WebAppAdapter"
name="portal:deployer=Adapter" xmbean-dd=""
-         
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="PortalDeployer">
-        <inject bean="PortalPostWebDeployer"/>
-      </attribute>
-      <depends optional-attribute-name="Deployer"
proxy-type="attribute">portal:deployer=PortalWebApp</depends>
-      <depends optional-attribute-name="JBossAppEntityResolver"
proxy-type="attribute">portal:service=EntityResolver
-      </depends>
-   </mbean>
-   
 </server>

Added:
branches/JBoss_Portal_Branch_2_7_AS5/core/src/resources/portal-core-war/WEB-INF/portal-renderSet.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_7_AS5/core/src/resources/portal-core-war/WEB-INF/portal-renderSet.xml	
                       (rev 0)
+++
branches/JBoss_Portal_Branch_2_7_AS5/core/src/resources/portal-core-war/WEB-INF/portal-renderSet.xml	2009-04-02
23:22:22 UTC (rev 13144)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<portal-renderSet>
+   <renderSet name="divRenderer">
+      <set content-type="text/html">
+         <ajax-enabled>true</ajax-enabled>
+        
<region-renderer>org.jboss.portal.theme.impl.render.div.DivRegionRenderer</region-renderer>
+        
<window-renderer>org.jboss.portal.theme.impl.render.div.DivWindowRenderer</window-renderer>
+        
<portlet-renderer>org.jboss.portal.theme.impl.render.div.DivPortletRenderer</portlet-renderer>
+        
<decoration-renderer>org.jboss.portal.theme.impl.render.div.DivDecorationRenderer</decoration-renderer>
+      </set>
+   </renderSet>
+   <renderSet name="emptyRenderer">
+      <set content-type="text/html">
+         <ajax-enabled>true</ajax-enabled>
+        
<region-renderer>org.jboss.portal.theme.impl.render.empty.EmptyRegionRenderer</region-renderer>
+        
<window-renderer>org.jboss.portal.theme.impl.render.empty.EmptyWindowRenderer</window-renderer>
+        
<portlet-renderer>org.jboss.portal.theme.impl.render.empty.EmptyPortletRenderer</portlet-renderer>
+        
<decoration-renderer>org.jboss.portal.theme.impl.render.empty.EmptyDecorationRenderer</decoration-renderer>
+      </set>
+   </renderSet>
+   <renderSet name="divRendererNoAjax">
+      <set content-type="text/html">
+         <ajax-enabled>false</ajax-enabled>
+        
<region-renderer>org.jboss.portal.theme.impl.render.div.DivRegionRenderer</region-renderer>
+        
<window-renderer>org.jboss.portal.theme.impl.render.div.DivWindowRenderer</window-renderer>
+        
<portlet-renderer>org.jboss.portal.theme.impl.render.div.DivPortletRenderer</portlet-renderer>
+        
<decoration-renderer>org.jboss.portal.theme.impl.render.div.DivDecorationRenderer</decoration-renderer>
+      </set>
+   </renderSet>
+   <renderSet name="emptyRendererNoAjax">
+      <set content-type="text/html">
+         <ajax-enabled>false</ajax-enabled>
+        
<region-renderer>org.jboss.portal.theme.impl.render.empty.EmptyRegionRenderer</region-renderer>
+        
<window-renderer>org.jboss.portal.theme.impl.render.empty.EmptyWindowRenderer</window-renderer>
+        
<portlet-renderer>org.jboss.portal.theme.impl.render.empty.EmptyPortletRenderer</portlet-renderer>
+        
<decoration-renderer>org.jboss.portal.theme.impl.render.empty.EmptyDecorationRenderer</decoration-renderer>
+      </set>
+   </renderSet>
+</portal-renderSet>


Property changes on:
branches/JBoss_Portal_Branch_2_7_AS5/core/src/resources/portal-core-war/WEB-INF/portal-renderSet.xml
___________________________________________________________________
Name: svn:executable
   + *


    

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: r13144 - in branches/JBoss_Portal_Branch_2_7_AS5/core: src/main/org/jboss/portal/core/deployment and 4 other directories.