JBoss Portal SVN: r13146 - in branches/JBoss_Portal_Branch_2_7_AS5/server: src/main/org/jboss/portal/server/deployment and 1 other directories.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2009-04-02 19:22:29 -0400 (Thu, 02 Apr 2009)
New Revision: 13146
Removed:
branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/CannotCreatePortletWebAppException.java
branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat4App.java
branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat5App.java
branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat6App.java
branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/WebAppAdapter.java
branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/WebAppEnhancer.java
branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/WebAppIntercepter.java
branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/jboss/
branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/impl/xml/
Modified:
branches/JBoss_Portal_Branch_2_7_AS5/server/.classpath
branches/JBoss_Portal_Branch_2_7_AS5/server/build.xml
branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/PortalWebApp.java
Log:
Remove some of the old deployer classes.
Add theme deployment support.
Modified: branches/JBoss_Portal_Branch_2_7_AS5/server/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/server/.classpath 2009-04-02 23:22:25 UTC (rev 13145)
+++ branches/JBoss_Portal_Branch_2_7_AS5/server/.classpath 2009-04-02 23:22:29 UTC (rev 13146)
@@ -5,7 +5,6 @@
<classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.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-jmx.jar"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
@@ -15,5 +14,9 @@
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/test/lib/portal-test-jboss-lib.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-j2se.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system-jmx.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_7_AS5/server/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/server/build.xml 2009-04-02 23:22:25 UTC (rev 13145)
+++ branches/JBoss_Portal_Branch_2_7_AS5/server/build.xml 2009-04-02 23:22:29 UTC (rev 13146)
@@ -99,8 +99,8 @@
<path refid="jboss.portal/modules/deployer.classpath"/>
<pathelement location="${jboss.portal/modules/test.lib}/portal-test-jboss-lib.jar"/>
<path refid="dom4j.dom4j.classpath"/>
- <path refid="oswego.concurrent.classpath"/>
<path refid="jbossas/core.libs.classpath"/>
+ <path refid="jboss/common.logging.spi.classpath"/>
<path refid="jboss/jboss.metadata.classpath"/>
<path refid="jboss/jboss.deployers.classpath"/>
<path refid="apache.ant.classpath"/>
@@ -114,10 +114,7 @@
<path refid="sun.jaxb.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="jboss.web.classpath"/>
- <pathelement location="jboss-bean-deployer.jar"/>
- <pathelement location="jboss-container.jar"/>
- <pathelement location="jboss-dependency.jar"/>
- <pathelement location="jboss-microcontainer.jar"/>
+ <path refid="jboss.microcontainer.classpath"/>
</path>
<!-- Configure modules -->
Deleted: branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/CannotCreatePortletWebAppException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/CannotCreatePortletWebAppException.java 2009-04-02 23:22:25 UTC (rev 13145)
+++ branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/CannotCreatePortletWebAppException.java 2009-04-02 23:22:29 UTC (rev 13146)
@@ -1,52 +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.server.deployment;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision$
- */
-public class CannotCreatePortletWebAppException extends Exception
-{
- /** The serialVersionUID */
- private static final long serialVersionUID = -6650792671320003420L;
-
- public CannotCreatePortletWebAppException()
- {
- }
-
- public CannotCreatePortletWebAppException(String message)
- {
- super(message);
- }
-
- public CannotCreatePortletWebAppException(String message, Throwable cause)
- {
- super(message, cause);
- }
-
- public CannotCreatePortletWebAppException(Throwable cause)
- {
- super(cause);
- }
-}
Modified: branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/PortalWebApp.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/PortalWebApp.java 2009-04-02 23:22:25 UTC (rev 13145)
+++ branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/PortalWebApp.java 2009-04-02 23:22:29 UTC (rev 13146)
@@ -22,26 +22,13 @@
******************************************************************************/
package org.jboss.portal.server.deployment;
-import org.apache.log4j.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.web.WebApp;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.SAXException;
+import java.net.URL;
import javax.servlet.ServletContext;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
+import org.apache.log4j.Logger;
+import org.jboss.portal.web.WebApp;
+
/**
* Encapsulate the infos needed by the portal deployment layer to create the application.
*
@@ -55,9 +42,6 @@
protected final Logger log = Logger.getLogger(getClass());
/** . */
- private Document descriptor;
-
- /** . */
private ServletContext servletContext;
/** . */
@@ -110,100 +94,7 @@
return servletContext;
}
- public final Document getDescriptor()
- {
- return descriptor;
- }
-
- /**
- * Import a file in the war file. The file could not be created for some reasons which are : <ul> <li>The parent dir
- * exists and is a file</li> <li>The parent dir does not exist and its creation failed</li> <li>An underlying
- * exception occurs when writing bytes from the source <code>Inputstream</code> to the target
- * <code>OutputStream</code></li> </ul>
- *
- * @param parentDirRelativePath the parent relative path in the web app starting from the app root
- * @param name the name the created file should have
- * @param source the data of the target file
- * @param overwrite if false and the file already exists nothing is done
- * @return true if the file has been created
- * @throws IOException if the file cannot be created
- */
- public final boolean importFile(String parentDirRelativePath, String name, InputStream source, boolean overwrite) throws IOException
- {
- ServletContext ctx = getServletContext();
- String contextPath = getContextPath();
-
- // Get the parent dir
- String parentAbsolutePath = ctx.getRealPath(parentDirRelativePath);
- File parentDir = new File(parentAbsolutePath);
-
- // We ensure it exists
- if (parentDir.exists())
- {
- if (parentDir.isFile())
- {
- throw new IOException("Target parent dir " + parentDirRelativePath + " already exists in the web application and is a file " + contextPath);
- }
- }
- else
- {
- if (!parentDir.mkdirs())
- {
- throw new IOException("Was not able to create the parent dir " + parentDirRelativePath + " in the web application " + contextPath);
- }
- }
-
- //
- boolean done = false;
- File targetFile = new File(parentDir, name);
- if (overwrite || !targetFile.exists())
- {
- OutputStream target = null;
- try
- {
- target = IOTools.safeBufferedWrapper(new FileOutputStream(new File(parentDir, name)));
- IOTools.copy(source, target);
- done = true;
- log.debug("Copied file" + name + " to location " + parentDirRelativePath);
- }
- finally
- {
- IOTools.safeClose(target);
- }
- }
- return done;
- }
-
protected final void init(
- ServletContext servletContext,
- URL url,
- ClassLoader loader,
- String contextPath,
- EntityResolver jbossAppEntityResolver) throws CannotCreatePortletWebAppException
- {
- this.servletContext = servletContext;
- this.url = url;
- this.loader = loader;
- this.contextPath = contextPath;
- this.id = contextPath;
-
- //
- readJBossAppDescriptor(jbossAppEntityResolver);
-
- // Override the id if not null
- if (descriptor != null)
- {
- Element jbossAppElt = descriptor.getDocumentElement();
- Element appNameElt = XMLTools.getUniqueChild(jbossAppElt, "app-name", false);
- if (appNameElt != null)
- {
- id = XMLTools.asString(appNameElt);
- log.debug("Detected explicit app name = " + id + " for application under path " + getContextPath());
- }
- }
- }
-
- protected final void init(
ServletContext servletContext,
URL url,
ClassLoader loader,
@@ -216,52 +107,6 @@
this.id = contextPath;
}
- /**
- * Read jboss-portal-app.xml deployment and fetch the overriden id if it exists.
- *
- * @return the app id or null if it does not exists
- */
- private void readJBossAppDescriptor(EntityResolver jbossAppEntityResolver)
- {
- // Look for jboss-app.xml override
- InputStream in = null;
- try
- {
- in = IOTools.safeBufferedWrapper(getServletContext().getResourceAsStream("/WEB-INF/jboss-portal-app.xml"));
- if (in != null)
- {
- DocumentBuilder builder = XMLTools.getDocumentBuilderFactory().newDocumentBuilder();
- if (jbossAppEntityResolver == null)
- {
- log.debug("Coult not obtain entity resolver for jboss-portal-app.xml");
- jbossAppEntityResolver = new NullEntityResolver();
- }
- else
- {
- log.debug("Obtained entity resolver " + jbossAppEntityResolver + " for jboss-portal-app.xml");
- }
- builder.setEntityResolver(jbossAppEntityResolver);
- descriptor = builder.parse(in);
- }
- }
- catch (IOException e)
- {
- log.debug("Cannot read jboss-portal-app.xml", e);
- }
- catch (ParserConfigurationException e)
- {
- log.debug("Cannot read jboss-portal-app.xml", e);
- }
- catch (SAXException e)
- {
- log.debug("Cannot read jboss-portal-app.xml", e);
- }
- finally
- {
- IOTools.safeClose(in);
- }
- }
-
public String toString()
{
return "WebApp[" + getContextPath() + "]";
Deleted: branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java 2009-04-02 23:22:25 UTC (rev 13145)
+++ branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java 2009-04-02 23:22:29 UTC (rev 13146)
@@ -1,139 +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.server.deployment;
-
-import org.apache.log4j.Logger;
-import org.jboss.web.WebApplication;
-import org.xml.sax.EntityResolver;
-
-import javax.management.MBeanServer;
-import java.lang.reflect.Method;
-
-/**
- * Creates the JBossWebApp according to the JBossWeb found.
- *
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision$
- */
-public class PortalWebAppFactory
-{
-
- private static Logger log = Logger.getLogger(PortalWebAppFactory.class);
-
- private static final Class[] EMPTY_CLASS_ARRAY = new Class[0];
- private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
-
- private static final int UNKNOWN = 0;
- private static final int TOMCAT4 = 1;
- private static final int TOMCAT5 = 2;
- private static final int TOMCAT6 = 3;
-
- private final MBeanServer server;
-
- public PortalWebAppFactory(MBeanServer server)
- {
- this.server = server;
- }
-
- /**
- * Create a portal web application.
- *
- * @return the portal web app or null if it cannot be created.
- */
- public PortalWebApp create(WebApplication webApp, EntityResolver jbossAppEntityResolver) throws CannotCreatePortletWebAppException
- {
- int version = getVersion();
- switch (version)
- {
- case TOMCAT4:
- return new PortalWebTomcat4App(webApp, jbossAppEntityResolver);
- case TOMCAT5:
- return new PortalWebTomcat5App(webApp, server, jbossAppEntityResolver);
- case TOMCAT6:
- return new PortalWebTomcat6App(webApp, server, jbossAppEntityResolver);
- default:
- throw new CannotCreatePortletWebAppException("JBossWeb cannot handle it : " + version);
- }
- }
-
- /**
- * Recognize the jbossweb container and returns its version.
- *
- * @return the jbossweb detected version or <code>UNKNOWN</code>
- */
- private static int getVersion()
- {
- try
- {
- // Get the classloader
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
- Class serverInfoClass = cl.loadClass("org.apache.catalina.util.ServerInfo");
- Method getServerInfoMethod = serverInfoClass.getMethod("getServerInfo", EMPTY_CLASS_ARRAY);
- String result = (String)getServerInfoMethod.invoke(null, EMPTY_OBJECT_ARRAY);
- if (result != null)
- {
- if (result.startsWith("Apache Tomcat/6"))
- {
- return TOMCAT6;
- }
- else if (result.startsWith("Apache Tomcat/5"))
- {
- return TOMCAT5;
- }
- else if (result.startsWith("Apache Tomcat/4"))
- {
- return TOMCAT4;
- }
- else if (result.startsWith("JBoss Web Server/1"))
- {
- return TOMCAT5;
- }
- else if (result.startsWith("JBossWeb/2"))
- {
- return TOMCAT6;
- }
- else if (result.startsWith("JBoss Web/2"))
- {
- return TOMCAT6;
- }
- else
- {
- log.error("Cannot handle tomcat version: " + result);
- }
- }
- }
- catch (ClassNotFoundException e)
- {
- log.error("Cannot getPortalObjectContext catalina ServerInfo class");
- }
- catch (NoSuchMethodException e)
- {
- log.error("Cannot invoke ServerInfo.getServerInfo()", e);
- }
- catch (Exception e)
- {
- log.error("Unexpected error", e);
- }
- return UNKNOWN;
- }
-}
Deleted: branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat4App.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat4App.java 2009-04-02 23:22:25 UTC (rev 13145)
+++ branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat4App.java 2009-04-02 23:22:29 UTC (rev 13146)
@@ -1,143 +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.server.deployment;
-
-import org.jboss.portal.web.command.CommandServlet;
-import org.jboss.web.WebApplication;
-import org.xml.sax.EntityResolver;
-
-import javax.servlet.ServletContext;
-import java.lang.reflect.Array;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URL;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision$
- */
-public class PortalWebTomcat4App extends PortalWebApp
-{
-
- private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
- private static final Class[] EMPTY_CLASS_ARRAY = new Class[0];
-
- private final WebApplication webApp;
-
- public PortalWebTomcat4App(WebApplication webApp, EntityResolver jbossAppEntityResolver) throws CannotCreatePortletWebAppException
- {
- try
- {
- this.webApp = webApp;
-
- //
- Object ctx = webApp.getAppData();
- String contextPath = getContextPath(ctx);
- ServletContext servletContext = getServletContext(ctx);
- URL url = webApp.getURL();
-
- //
- init(servletContext, url, null, contextPath, jbossAppEntityResolver);
- }
- catch (Exception e)
- {
- CannotCreatePortletWebAppException ex = null;
- if (e instanceof CannotCreatePortletWebAppException)
- {
- ex = (CannotCreatePortletWebAppException)e;
- }
- else
- {
- ex = new CannotCreatePortletWebAppException(e);
- }
- throw ex;
- }
- }
-
- public void instrument() throws Exception
- {
- Object ctx = webApp.getAppData();
- inject(ctx);
- }
-
- public static void inject(Object standardContext) throws Exception
- {
- try
- {
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
-
- Class standardContextClass = standardContext.getClass();
- Class containerBaseClass = standardContextClass.getSuperclass();
- Class containerItf = cl.loadClass("org.apache.catalina.Container");
- Class contextItf = cl.loadClass("org.apache.catalina.Context");
-
- // Inject the command servlet only one time, so we look if it exist already
- Method findChildMethod = containerItf.getMethod("findChild", new Class[]{String.class});
- Object commandServlet = findChildMethod.invoke(standardContext, new Object[]{"CommandServlet"});
- if (commandServlet == null)
- {
- Method createWrapperMethod = standardContextClass.getMethod("createWrapper", EMPTY_CLASS_ARRAY);
- Object wrapper = createWrapperMethod.invoke(standardContext, EMPTY_OBJECT_ARRAY);
- Class wrapperClass = wrapper.getClass();
- Object[] wrapperArray = (Object[])Array.newInstance(containerItf, 1);
- wrapperArray[0] = wrapper;
-
- Method setServletNameMethod = wrapperClass.getMethod("setServletName", new Class[]{String.class});
- setServletNameMethod.invoke(wrapper, new Object[]{"CommandServlet"});
-
- Method setServletClassMethod = wrapperClass.getMethod("setServletClass", new Class[]{String.class});
- setServletClassMethod.invoke(wrapper, new Object[]{CommandServlet.class.getName()});
-
- Method setLoadOnStartupMethod = wrapperClass.getMethod("setLoadOnStartup", new Class[]{int.class});
- setLoadOnStartupMethod.invoke(wrapper, new Object[]{new Integer(0)});
-
- Method addChildMethod = containerBaseClass.getMethod("addChild", new Class[]{containerItf});
- addChildMethod.invoke(standardContext, new Object[]{wrapper});
-
- Method addServletMapping = contextItf.getMethod("addServletMapping", new Class[]{String.class, String.class});
- addServletMapping.invoke(standardContext, new Object[]{"/jbossportlet", "CommandServlet"});
-
- Method loadOnStartupMethod = standardContextClass.getMethod("loadOnStartup", new Class[]{wrapperArray.getClass()});
- loadOnStartupMethod.invoke(standardContext, new Object[]{wrapperArray});
- }
- }
- catch (InvocationTargetException e)
- {
- e.getTargetException().printStackTrace();
- }
- }
-
- public static ServletContext getServletContext(Object standardContext) throws Exception
- {
- Class standardContextClass = standardContext.getClass();
- Method getServletContextMethod = standardContextClass.getMethod("getServletContext", EMPTY_CLASS_ARRAY);
- return (ServletContext)getServletContextMethod.invoke(standardContext, EMPTY_OBJECT_ARRAY);
- }
-
- public static String getContextPath(Object standardContext) throws Exception
- {
- Class standardContextClass = standardContext.getClass();
- Method getServletContextMethod = standardContextClass.getMethod("getPath", EMPTY_CLASS_ARRAY);
- return (String)getServletContextMethod.invoke(standardContext, EMPTY_OBJECT_ARRAY);
- }
-}
Deleted: branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat5App.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat5App.java 2009-04-02 23:22:25 UTC (rev 13145)
+++ branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat5App.java 2009-04-02 23:22:29 UTC (rev 13146)
@@ -1,175 +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.server.deployment;
-
-import org.jboss.portal.web.command.CommandServlet;
-import org.jboss.web.WebApplication;
-import org.xml.sax.EntityResolver;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import javax.servlet.ServletContext;
-import java.lang.reflect.Array;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.net.URL;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision$
- */
-public class PortalWebTomcat5App extends PortalWebApp
-{
-
- private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
- private static final Class[] EMPTY_CLASS_ARRAY = new Class[0];
-
- private final Object standardContext;
- private final WebApplication webApp;
-
- public PortalWebTomcat5App(WebApplication webApp, MBeanServer server, EntityResolver jbossAppEntityResolver) throws CannotCreatePortletWebAppException
- {
- try
- {
- ObjectName name = (ObjectName)webApp.getAppData();
-
- //
- this.webApp = webApp;
- this.standardContext = server.getAttribute(name, "managedResource");
-
- //
- String contextPath = PortalWebTomcat4App.getContextPath(standardContext);
- ServletContext servletContext = PortalWebTomcat4App.getServletContext(standardContext);
- ClassLoader loader = getClassLoader(server, name);
- URL url = webApp.getURL();
-
- //
- init(servletContext, url, loader, contextPath, jbossAppEntityResolver);
- }
- catch (Exception e)
- {
- CannotCreatePortletWebAppException ex = null;
- if (e instanceof CannotCreatePortletWebAppException)
- {
- ex = (CannotCreatePortletWebAppException)e;
- }
- else
- {
- ex = new CannotCreatePortletWebAppException(e);
- }
- throw ex;
- }
- }
-
- public void instrument() throws Exception
- {
- // Get class loader
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
-
- // Get some class
- Class containerItf = cl.loadClass("org.apache.catalina.Container");
-
- // Inject the command servlet only one time, so we look if it exist already
- Method findChildMethod = containerItf.getMethod("findChild", new Class[]{String.class});
- Object commandServlet = findChildMethod.invoke(standardContext, new Object[]{"CommandServlet"});
- if (commandServlet == null)
- {
- setRunAsListenerAssociation(webApp.getMetaData());
- try
- {
- addCommandServlet(cl);
- }
- finally
- {
- setRunAsListenerAssociation(null);
- }
- }
- }
-
- private void setRunAsListenerAssociation(Object o)
- {
- try
- {
- Class clazz = Thread.currentThread().getContextClassLoader().loadClass("org.jboss.web.tomcat.security.RunAsListener");
-
- //
- log.debug("RunAsListener detected");
- Field field = clazz.getDeclaredField("metaDataLocal");
- ThreadLocal threadLocal = (ThreadLocal)field.get(null);
- threadLocal.set(o);
- }
- catch (ClassNotFoundException e)
- {
- log.debug("RunAsListener not detected");
- }
- catch (IllegalAccessException e)
- {
- log.error("Cannot set the RunAsListener threadlocal because of a security manager", e);
- }
- catch (Exception e)
- {
- log.error("Unexpected exception");
- }
- }
-
- private void addCommandServlet(ClassLoader cl) throws Exception
- {
- //
- Class containerItf = cl.loadClass("org.apache.catalina.Container");
- Class standardContextClass = cl.loadClass("org.apache.catalina.core.StandardContext");
- Class containerBaseClass = cl.loadClass("org.apache.catalina.core.ContainerBase");
- Class contextItf = cl.loadClass("org.apache.catalina.Context");
-
- // Ask the context to create a wrapper
- Method createWrapperMethod = standardContextClass.getMethod("createWrapper", EMPTY_CLASS_ARRAY);
- Object wrapper = createWrapperMethod.invoke(standardContext, EMPTY_OBJECT_ARRAY);
- Class wrapperClass = wrapper.getClass();
- Object[] wrapperArray = (Object[])Array.newInstance(containerItf, 1);
- wrapperArray[0] = wrapper;
-
- Method setServletNameMethod = wrapperClass.getMethod("setServletName", new Class[]{String.class});
- setServletNameMethod.invoke(wrapper, new Object[]{"CommandServlet"});
-
- Method setServletClassMethod = wrapperClass.getMethod("setServletClass", new Class[]{String.class});
- setServletClassMethod.invoke(wrapper, new Object[]{CommandServlet.class.getName()});
-
- Method setLoadOnStartupMethod = wrapperClass.getMethod("setLoadOnStartup", new Class[]{int.class});
- setLoadOnStartupMethod.invoke(wrapper, new Object[]{new Integer(0)});
-
- Method addChildMethod = containerBaseClass.getMethod("addChild", new Class[]{containerItf});
- addChildMethod.invoke(standardContext, new Object[]{wrapper});
-
- Method addServletMapping = contextItf.getMethod("addServletMapping", new Class[]{String.class, String.class});
- addServletMapping.invoke(standardContext, new Object[]{"/jbossportlet", "CommandServlet"});
-
- Method loadOnStartupMethod = standardContextClass.getMethod("loadOnStartup", new Class[]{wrapperArray.getClass()});
- loadOnStartupMethod.invoke(standardContext, new Object[]{wrapperArray});
- }
-
- private ClassLoader getClassLoader(MBeanServer server, ObjectName name) throws Exception
- {
- Object loader = server.getAttribute(name, "loader");
- Method getClassLoaderMethod = loader.getClass().getMethod("getClassLoader", new Class[0]);
- return (ClassLoader)getClassLoaderMethod.invoke(loader, new Object[0]);
- }
-}
Deleted: branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat6App.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat6App.java 2009-04-02 23:22:25 UTC (rev 13145)
+++ branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat6App.java 2009-04-02 23:22:29 UTC (rev 13146)
@@ -1,180 +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.server.deployment;
-
-import org.apache.catalina.deploy.SessionCookie;
-import org.jboss.portal.web.command.CommandServlet;
-import org.jboss.web.WebApplication;
-import org.xml.sax.EntityResolver;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import javax.servlet.ServletContext;
-import java.lang.reflect.Array;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.net.URL;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision$
- */
-public class PortalWebTomcat6App extends PortalWebApp
-{
-
- private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
- private static final Class[] EMPTY_CLASS_ARRAY = new Class[0];
-
- private final Object standardContext;
- private final WebApplication webApp;
-
- public PortalWebTomcat6App(WebApplication webApp, MBeanServer server, EntityResolver jbossAppEntityResolver) throws CannotCreatePortletWebAppException
- {
- try
- {
- ObjectName name = (ObjectName)webApp.getAppData();
-
- //
- this.webApp = webApp;
- this.standardContext = server.getAttribute(name, "managedResource");
-
- //
- String contextPath = PortalWebTomcat4App.getContextPath(standardContext);
- ServletContext servletContext = PortalWebTomcat4App.getServletContext(standardContext);
- ClassLoader loader = getClassLoader(server, name);
- URL url = webApp.getURL();
-
- //
- init(servletContext, url, loader, contextPath, jbossAppEntityResolver);
- }
- catch (Exception e)
- {
- CannotCreatePortletWebAppException ex;
- if (e instanceof CannotCreatePortletWebAppException)
- {
- ex = (CannotCreatePortletWebAppException)e;
- }
- else
- {
- ex = new CannotCreatePortletWebAppException(e);
- }
- throw ex;
- }
- }
-
- public void instrument() throws Exception
- {
- // Get class loader
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
-
- // Get some class
- Class containerItf = cl.loadClass("org.apache.catalina.Container");
-
- // Inject the command servlet only one time, so we look if it exist already
- Method findChildMethod = containerItf.getMethod("findChild", new Class[]{String.class});
- Object commandServlet = findChildMethod.invoke(standardContext, new Object[]{"CommandServlet"});
- if (commandServlet == null)
- {
- setRunAsListenerAssociation(webApp.getMetaData());
- try
- {
- addCommandServlet(cl);
- }
- finally
- {
- setRunAsListenerAssociation(null);
- }
- }
- }
-
- private void setRunAsListenerAssociation(Object o)
- {
- try
- {
- Class clazz = Thread.currentThread().getContextClassLoader().loadClass("org.jboss.web.tomcat.security.RunAsListener");
-
- //
- log.debug("RunAsListener detected");
- Field field = clazz.getDeclaredField("metaDataLocal");
- ThreadLocal threadLocal = (ThreadLocal)field.get(null);
- threadLocal.set(o);
- }
- catch (ClassNotFoundException e)
- {
- log.debug("RunAsListener not detected");
- }
- catch (IllegalAccessException e)
- {
- log.error("Cannot set the RunAsListener threadlocal because of a security manager", e);
- }
- catch (Exception e)
- {
- log.error("Unexpected exception");
- }
- }
-
- private void addCommandServlet(ClassLoader cl) throws Exception
- {
- //
- Class containerItf = cl.loadClass("org.apache.catalina.Container");
- Class standardContextClass = cl.loadClass("org.apache.catalina.core.StandardContext");
- Class containerBaseClass = cl.loadClass("org.apache.catalina.core.ContainerBase");
- Class contextItf = cl.loadClass("org.apache.catalina.Context");
-
- // Ask the context to create a wrapper
- Method createWrapperMethod = standardContextClass.getMethod("createWrapper", EMPTY_CLASS_ARRAY);
- Object wrapper = createWrapperMethod.invoke(standardContext, EMPTY_OBJECT_ARRAY);
- Class wrapperClass = wrapper.getClass();
- Object[] wrapperArray = (Object[])Array.newInstance(containerItf, 1);
- wrapperArray[0] = wrapper;
-
- Method setServletNameMethod = wrapperClass.getMethod("setServletName", new Class[]{String.class});
- setServletNameMethod.invoke(wrapper, new Object[]{"CommandServlet"});
-
- Method setServletClassMethod = wrapperClass.getMethod("setServletClass", new Class[]{String.class});
- setServletClassMethod.invoke(wrapper, new Object[]{CommandServlet.class.getName()});
-
- Method setLoadOnStartupMethod = wrapperClass.getMethod("setLoadOnStartup", new Class[]{int.class});
- setLoadOnStartupMethod.invoke(wrapper, new Object[]{new Integer(0)});
-
- Method addChildMethod = containerBaseClass.getMethod("addChild", new Class[]{containerItf});
- addChildMethod.invoke(standardContext, new Object[]{wrapper});
-
- Method getSessionCookie = contextItf.getMethod("getSessionCookie", new Class[]{});
- SessionCookie cookie = (SessionCookie) getSessionCookie.invoke(standardContext, new Object[]{});
- cookie.setPath("/");
-
- Method addServletMapping = contextItf.getMethod("addServletMapping", new Class[]{String.class, String.class});
- addServletMapping.invoke(standardContext, new Object[]{"/jbossportlet", "CommandServlet"});
-
- Method loadOnStartupMethod = standardContextClass.getMethod("loadOnStartup", new Class[]{wrapperArray.getClass()});
- loadOnStartupMethod.invoke(standardContext, new Object[]{wrapperArray});
- }
-
- private ClassLoader getClassLoader(MBeanServer server, ObjectName name) throws Exception
- {
- Object loader = server.getAttribute(name, "loader");
- Method getClassLoaderMethod = loader.getClass().getMethod("getClassLoader", new Class[0]);
- return (ClassLoader)getClassLoaderMethod.invoke(loader, new Object[0]);
- }
-}
Deleted: branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/WebAppAdapter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/WebAppAdapter.java 2009-04-02 23:22:25 UTC (rev 13145)
+++ branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/WebAppAdapter.java 2009-04-02 23:22:29 UTC (rev 13146)
@@ -1,72 +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.server.deployment;
-
-import org.jboss.deployment.DeploymentException;
-import org.jboss.portal.server.deployment.jboss.ServerDeployerMBean;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision$
- */
-public class WebAppAdapter
- extends WebAppIntercepter
-{
-
- /** The specific portal web app deployer. */
- private ServerDeployerMBean deployer;
-
- public ServerDeployerMBean getDeployer()
- {
- return deployer;
- }
-
- public void setDeployer(ServerDeployerMBean deployer)
- {
- this.deployer = deployer;
- }
-
- protected void deploy(PortalWebApp pwa)
- {
- try
- {
- deployer.deploy(pwa);
- }
- catch (DeploymentException e)
- {
-// JBossTestAgent.record(e);
- }
- }
-
- protected void undeploy(PortalWebApp pwa)
- {
- try
- {
- deployer.undeploy(pwa);
- }
- catch (DeploymentException e)
- {
-// JBossTestAgent.record(e);
- }
- }
-}
Deleted: branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/WebAppEnhancer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/WebAppEnhancer.java 2009-04-02 23:22:25 UTC (rev 13145)
+++ branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/WebAppEnhancer.java 2009-04-02 23:22:29 UTC (rev 13146)
@@ -1,111 +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.server.deployment;
-
-import org.jboss.mx.util.MBeanProxy;
-import org.jboss.portal.common.xml.XMLTools;
-import org.jboss.portal.server.config.ServerConfig;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import javax.management.ObjectName;
-import java.util.Iterator;
-
-/**
- * The role of this object is to modify the web application so it is possible to invoke it by request distpatching.
- *
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision$
- */
-public class WebAppEnhancer extends WebAppIntercepter
-{
-
- /** . */
- private ServerConfig config;
-
- public ServerConfig getConfig()
- {
- return config;
- }
-
- public void setConfig(ServerConfig config)
- {
- this.config = config;
- }
-
- protected void deploy(PortalWebApp pwa)
- {
- try
- {
- // Instrument war file first
- pwa.instrument();
-
- // Inject proxies in the servlet context
- Document desc = pwa.getDescriptor();
- if (desc != null)
- {
- Element jbossAppElt = desc.getDocumentElement();
- for (Iterator i = XMLTools.getChildren(jbossAppElt, "service").iterator(); i.hasNext();)
- {
- Element serviceElt = (Element)i.next();
-
- //
- log.debug("About to inject a service in the servlet context of " + pwa.getURL());
-
- //
- Element serviceNameElt = XMLTools.getUniqueChild(serviceElt, "service-name", true);
- Element serviceClassElt = XMLTools.getUniqueChild(serviceElt, "service-class", true);
- Element serviceRefElt = XMLTools.getUniqueChild(serviceElt, "service-ref", true);
- String serviceName = XMLTools.asString(serviceNameElt);
- String serviceClass = XMLTools.asString(serviceClassElt);
- String serviceRef = XMLTools.asString(serviceRefElt);
-
- //
- if (serviceRef.startsWith(":"))
- {
- log.debug("Detecting a relative service reference " + serviceRef + " prepending it with " + config.getDomain());
- serviceRef = config.getDomain() + serviceRef;
- }
-
- //
- Class proxyClass = pwa.getClassLoader().loadClass(serviceClass);
- ObjectName objectName = ObjectName.getInstance(serviceRef);
- Object proxy = MBeanProxy.get(proxyClass, objectName, server);
-
- //
- log.debug("Want to inject " + serviceRef + " with class " + proxy + " and name " + serviceName);
- pwa.getServletContext().setAttribute(serviceName, proxy);
- }
- }
-
- }
- catch (Exception e)
- {
- log.error("Cannot instrument the web application", e);
- }
- }
-
- protected void undeploy(PortalWebApp jwa)
- {
- }
-}
Deleted: branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/WebAppIntercepter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/WebAppIntercepter.java 2009-04-02 23:22:25 UTC (rev 13145)
+++ branches/JBoss_Portal_Branch_2_7_AS5/server/src/main/org/jboss/portal/server/deployment/WebAppIntercepter.java 2009-04-02 23:22:29 UTC (rev 13146)
@@ -1,189 +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.server.deployment;
-
-import org.jboss.deployment.DeploymentInfo;
-import org.jboss.deployment.SubDeployer;
-import org.jboss.portal.deployer.portal.PortalPostWebDeployer;
-import org.jboss.portal.deployer.portal.WebDeploymentListener;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
-import org.jboss.web.WebApplication;
-import org.xml.sax.EntityResolver;
-
-import javax.management.Notification;
-import javax.management.NotificationListener;
-import javax.management.ObjectName;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * Relay web deployments. When a web deployment occurs, it is abstracted into a PortalWebApp object that provides a
- * consistent way to getPortalObjectContext informations and modify the web application.
- * <p/>
- * When this service stops it does not send undeployment notifications, therefore it is up to the client of this service
- * to perform any cleanup task associated to a deployment web application. The purpose of this is that most of the time
- * clients of this service will be stopped before this one and they would receive undeployments in a not started state.
- *
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision$
- */
-public abstract class WebAppIntercepter
- extends AbstractJBossService
- implements WebDeploymentListener
- //implements NotificationListener
-{
-
- /** WARDeployer. */
-
- /** The current deployements. */
- private Map deployments;
-
- /** The factory creating the portal web app objects. */
- private PortalWebAppFactory factory;
-
- /** The right classloader for fixing the issue with the fact that the classloader is not good on event notifications. */
- private ClassLoader classLoader;
-
- /** The entity resolver for jboss-app.xml. */
- private EntityResolver jbossAppEntityResolver;
-
- private PortalPostWebDeployer portalDeployer;
-
- public WebAppIntercepter()
- {
- deployments = Collections.synchronizedMap(new HashMap());
- classLoader = Thread.currentThread().getContextClassLoader();
- }
-
- public EntityResolver getJBossAppEntityResolver()
- {
- return jbossAppEntityResolver;
- }
-
- public void setJBossAppEntityResolver(EntityResolver jbossAppEntityResolver)
- {
- this.jbossAppEntityResolver = jbossAppEntityResolver;
- }
-
- public void setPortalDeployer(PortalPostWebDeployer portalDeployer)
- {
- this.portalDeployer = portalDeployer;
- }
- /** Set the deployer on this service. */
- public void portalDeployed(WebApplication webapp)
- {
- ClassLoader previousLoader = Thread.currentThread().getContextClassLoader();
- try
- {
- Thread.currentThread().setContextClassLoader(classLoader);
-
- PortalWebApp pwa = factory.create(webapp, jbossAppEntityResolver);
- deployments.put(webapp.getURL(), pwa);
- log.debug("Seen URL " + webapp.getURL() + " about to deploy");
- deploy(pwa);
- } catch (Exception e){
- e.printStackTrace();
- } finally
- {
- Thread.currentThread().setContextClassLoader(previousLoader);
- }
-
- /** Return the intercepted deployer. */
- }
-
- public void portalUndeployed(WebApplication webapp)
- {
-
- PortalWebApp pwa = (PortalWebApp)deployments.remove(webapp.getURL());
- if (pwa != null)
- {
- log.debug("Undeploying URL " + webapp.getURL());
- undeploy(pwa);
- }
- }
-
-// /** Set the deployer on this service. */
-// public void setInterceptedDeployer(ObjectName interceptedDeployer)
-// {
-// this.interceptedDeployer = interceptedDeployer;
-// }
-
- /** Return the intercepted deployer. */
- //public ObjectName getInterceptedDeployer()
- //{
- //return interceptedDeployer;
- //}
-
- /** Clone and return the deployed URLs. */
- public Collection getDeployedURLs()
- {
- return new ArrayList(deployments.keySet());
- }
-
-
- /** Start listening to the deployer notifications. */
- protected void startService() throws Exception
- {
- if (portalDeployer != null)
- {
- // Create factory
- factory = new PortalWebAppFactory(server);
- portalDeployer.addDeploymentListener(this);
- }
- else
- {
- throw new Exception ("PortalDeployer not present");
- }
- }
-
- /** Stop listening to the deployer notifications. */
- protected void stopService() throws Exception
- {
- if (portalDeployer != null)
- {
- for (Iterator i = deployments.entrySet().iterator(); i.hasNext();)
- {
- Map.Entry entry = (Map.Entry)i.next();
- URL keyURL = (URL)entry.getKey();
- PortalWebApp pwa = (PortalWebApp)entry.getValue();
- i.remove();
- log.debug("Removing web application with URL " + keyURL);
- undeploy(pwa);
- }
- portalDeployer.removeDeploymentListener(this);
- factory = null;
- }
- }
-
- /** Perform the deploy notification. */
- protected abstract void deploy(PortalWebApp pwa);
-
- /** Perform the undeploy notification. */
- protected abstract void undeploy(PortalWebApp pwa);
-
-}
15 years, 3 months
- 1
- 0
JBoss Portal SVN: r13145 - in branches/JBoss_Portal_Branch_2_7_AS5/portlet-server: src/main/org/jboss/portal/portlet/deployment and 1 other directories.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2009-04-02 19:22:25 -0400 (Thu, 02 Apr 2009)
New Revision: 13145
Modified:
branches/JBoss_Portal_Branch_2_7_AS5/portlet-server/.classpath
branches/JBoss_Portal_Branch_2_7_AS5/portlet-server/build.xml
branches/JBoss_Portal_Branch_2_7_AS5/portlet-server/src/main/org/jboss/portal/portlet/deployment/PortletApplicationModelFactory.java
branches/JBoss_Portal_Branch_2_7_AS5/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/JBossApplicationMetaDataFactory.java
branches/JBoss_Portal_Branch_2_7_AS5/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/ValueTrimmingFilter.java
Log:
Remove some of the old deployer classes.
Add theme deployment support.
Modified: branches/JBoss_Portal_Branch_2_7_AS5/portlet-server/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/portlet-server/.classpath 2009-04-02 23:22:22 UTC (rev 13144)
+++ branches/JBoss_Portal_Branch_2_7_AS5/portlet-server/.classpath 2009-04-02 23:22:25 UTC (rev 13145)
@@ -5,8 +5,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/server"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/api"/>
- <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
@@ -20,5 +18,10 @@
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/web/lib/portal-web-lib.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/jems"/>
<classpathentry kind="lib" path="/thirdparty/portlet/lib/portlet-api.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system-jmx.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-j2se.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/metadata/lib/portal-metadata-lib.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_7_AS5/portlet-server/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/portlet-server/build.xml 2009-04-02 23:22:22 UTC (rev 13144)
+++ branches/JBoss_Portal_Branch_2_7_AS5/portlet-server/build.xml 2009-04-02 23:22:25 UTC (rev 13145)
@@ -101,6 +101,8 @@
<path refid="jboss.serialization.classpath"/>
<path refid="oswego.concurrent.classpath"/>
<path refid="apache.httpclient.classpath"/>
+ <path refid="jboss.microcontainer.classpath"/>
+ <path refid="jboss/common.logging.spi.classpath"/>
<path refid="jbossas/core.libs.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="apache.codec.classpath"/>
Modified: branches/JBoss_Portal_Branch_2_7_AS5/portlet-server/src/main/org/jboss/portal/portlet/deployment/PortletApplicationModelFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/portlet-server/src/main/org/jboss/portal/portlet/deployment/PortletApplicationModelFactory.java 2009-04-02 23:22:22 UTC (rev 13144)
+++ branches/JBoss_Portal_Branch_2_7_AS5/portlet-server/src/main/org/jboss/portal/portlet/deployment/PortletApplicationModelFactory.java 2009-04-02 23:22:25 UTC (rev 13145)
@@ -1,847 +1,847 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-
-package org.jboss.portal.portlet.deployment;
-
-import org.apache.log4j.Logger;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.common.i18n.LocalizedString;
-import org.jboss.portal.portlet.LifeCyclePhase;
-import org.jboss.portal.portlet.TransportGuarantee;
-import org.jboss.portal.metadata.portlet.CustomPortletModeMetaData;
-import org.jboss.portal.metadata.portlet.CustomWindowStateMetaData;
-import org.jboss.portal.metadata.portlet.ListenerMetaData;
-import org.jboss.portal.metadata.portlet.PortletApplication10MetaData;
-import org.jboss.portal.metadata.portlet.PortletApplication20MetaData;
-import static org.jboss.portal.metadata.portlet.PortletMetaDataConstants.DEFAULT_LOCALE;
-import static org.jboss.portal.metadata.portlet.PortletMetaDataConstants.PORTLET_JSR_286_NS;
-import org.jboss.portal.metadata.portlet.PublicRenderParameterMetaData;
-import org.jboss.portal.metadata.portlet.UserAttributeMetaData;
-import org.jboss.portal.metadata.portlet.common.ContainerRuntimeMetaData;
-import org.jboss.portal.metadata.portlet.common.DescribableMetaData;
-import org.jboss.portal.metadata.portlet.common.InitParamMetaData;
-import org.jboss.portal.metadata.portlet.common.LocalizedDescriptionMetaData;
-import org.jboss.portal.metadata.portlet.event.EventDefinitionMetaData;
-import org.jboss.portal.metadata.portlet.event.EventDefinitionReferenceMetaData;
-import org.jboss.portal.metadata.portlet.filter.FilterMappingMetaData;
-import org.jboss.portal.metadata.portlet.filter.FilterMetaData;
-import org.jboss.portal.metadata.portlet.portlet.PortletCacheScopeEnum;
-import org.jboss.portal.metadata.portlet.portlet.PortletInfoMetaData;
-import org.jboss.portal.metadata.portlet.portlet.PortletMetaData;
-import org.jboss.portal.metadata.portlet.portlet.PortletModeMetaData;
-import org.jboss.portal.metadata.portlet.portlet.PortletPreferenceMetaData;
-import org.jboss.portal.metadata.portlet.portlet.PortletPreferencesMetaData;
-import org.jboss.portal.metadata.portlet.portlet.SecurityRoleRefMetaData;
-import org.jboss.portal.metadata.portlet.portlet.SupportedLocaleMetaData;
-import org.jboss.portal.metadata.portlet.portlet.SupportsMetaData;
-import org.jboss.portal.metadata.portlet.portlet.WindowStateMetaData;
-import org.jboss.portal.metadata.portlet.security.PortletCollectionMetaData;
-import org.jboss.portal.metadata.portlet.security.SecurityConstraintMetaData;
-import org.jboss.portal.metadata.portlet.security.UserDataConstraintMetaData;
-import org.jboss.xb.binding.GenericObjectModelFactory;
-import org.jboss.xb.binding.UnmarshallingContext;
-import org.xml.sax.Attributes;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
-
-/**
- * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public class PortletApplicationModelFactory implements GenericObjectModelFactory
-{
-
- /** LocalizedDescriptionMetaData container for descriptions */
- private LocalizedStringBuilder descriptions = new LocalizedStringBuilder();
-
- /** LocalizedDescriptionMetaData container for displayNames */
- private LocalizedStringBuilder displayNames = new LocalizedStringBuilder();
-
- /** Guess what? The logger. */
- private static final Logger log = Logger.getLogger(PortletApplicationModelFactory.class);
-
- public Object newRoot(Object root, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs)
- {
-
- String version = attrs.getValue("version");
- String id = attrs.getValue("id");
-
- // portlet-app 2.0 or 1.0
- PortletApplication10MetaData md = PORTLET_JSR_286_NS.equals(nsURI)
- ? new PortletApplication20MetaData()
- : new PortletApplication10MetaData();
-
- // Set portlet-app id
- md.setId(id);
- // Set portlet-app version
- md.setVersion(version);
- // return
- return md;
- }
-
- public Object completeRoot(Object root, UnmarshallingContext ctx, String nsURI, String name)
- {
- return root;
- }
-
- public Object newChild(Object object, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs)
- {
- String id = attrs.getValue("id");
- if (object instanceof DescribableMetaData)
- {
-
- if ("description".equals(localName))
- {
- String locale = attrs.getValue("xml:lang") != null ? attrs.getValue("xml:lang") : DEFAULT_LOCALE;
- LocalizedDescriptionMetaData localized = new LocalizedDescriptionMetaData(locale);
- this.descriptions.put(object, localized);
- return localized;
- }
- }
-
- // portlet-app
- if (object instanceof PortletApplication10MetaData)
- {
- if ("portlet".equals(localName))
- {
- return new PortletMetaData(id);
- }
- else if ("custom-portlet-mode".equals(localName))
- {
- return new CustomPortletModeMetaData(id);
- }
- else if ("custom-window-state".equals(localName))
- {
- return new CustomWindowStateMetaData(id);
- }
- else if ("user-attribute".equals(localName))
- {
- return new UserAttributeMetaData(id);
- }
- else if ("security-constraint".equals(localName))
- {
- return new SecurityConstraintMetaData(id);
- }
- }
-
- // portlet-app 2.0
- if (object instanceof PortletApplication20MetaData && PORTLET_JSR_286_NS.equals(nsURI))
- {
- if ("public-render-parameter".equals(localName))
- {
- return new PublicRenderParameterMetaData(id);
- }
- else if ("event-definition".equals(localName))
- {
- return new EventDefinitionMetaData(id);
- }
- else if ("filter".equals(localName))
- {
- return new FilterMetaData();
- }
- else if ("filter-mapping".equals(localName))
- {
- return new FilterMappingMetaData();
- }
- else if ("listener".equals(localName))
- {
- return new ListenerMetaData(id);
- }
- else if ("container-runtime-option".equals(localName))
- {
- return new ContainerRuntimeMetaData();
- }
- }
-
- // portlet
- if (object instanceof PortletMetaData)
- {
- if ("init-param".equals(localName))
- {
- return new InitParamMetaData(id);
- }
- else if ("display-name".equals(localName))
- {
- String locale = attrs.getValue("xml:lang") != null ? attrs.getValue("xml:lang") : DEFAULT_LOCALE;
- LocalizedDescriptionMetaData localized = new LocalizedDescriptionMetaData(locale);
- this.displayNames.put(object, localized);
- return localized;
- }
- else if ("supports".equals(localName))
- {
- return new SupportsMetaData(id);
- }
- else if ("supported-locale".equals(localName))
- {
- return new SupportedLocaleMetaData();
- }
- else if ("portlet-info".equals(localName))
- {
- return new PortletInfoMetaData(id);
- }
- else if ("portlet-preferences".equals(localName))
- {
- return new PortletPreferencesMetaData(id);
- }
- else if ("security-role-ref".equals(localName))
- {
- return new SecurityRoleRefMetaData(id);
- }
- else if ("supported-processing-event".equals(localName) && PORTLET_JSR_286_NS.equals(nsURI))
- {
- return new EventDefinitionReferenceMetaData(id);
- }
- else if ("supported-publishing-event".equals(localName) && PORTLET_JSR_286_NS.equals(nsURI))
- {
- return new EventDefinitionReferenceMetaData(id);
- }
- else if ("container-runtime-option".equals(localName) && PORTLET_JSR_286_NS.equals(nsURI))
- {
- return new ContainerRuntimeMetaData();
- }
- }
-
- // security-constraint
- if (object instanceof SecurityConstraintMetaData)
- {
- if ("portlet-collection".equals(localName))
- {
- return new PortletCollectionMetaData();
- }
- else if ("user-data-constraint".equals(localName))
- {
- return new UserDataConstraintMetaData(id);
- }
- else if ("display-name".equals(localName))
- {
- String locale = attrs.getValue("xml:lang") != null ? attrs.getValue("xml:lang") : DEFAULT_LOCALE;
- LocalizedDescriptionMetaData localized = new LocalizedDescriptionMetaData(locale);
- this.displayNames.put(object, localized);
- return localized;
- }
- }
-
- // supports
- if (object instanceof SupportsMetaData)
- {
- if ("portlet-mode".equals(localName))
- {
- return new PortletModeMetaData();
- }
- else if ("window-state".equals(localName) && PORTLET_JSR_286_NS.equals(nsURI))
- {
- return new WindowStateMetaData();
- }
- }
-
- // preference (in portlet-preferences)
- if (object instanceof PortletPreferencesMetaData)
- {
- if ("preference".equals(localName))
- {
- return new PortletPreferenceMetaData(id);
- }
- }
-
- // filter
- if (object instanceof FilterMetaData)
- {
- if ("init-param".equals(localName))
- {
- return new InitParamMetaData(id);
- }
- else if ("display-name".equals(localName))
- {
- String locale = attrs.getValue("xml:lang") != null ? attrs.getValue("xml:lang") : DEFAULT_LOCALE;
- LocalizedDescriptionMetaData localized = new LocalizedDescriptionMetaData(locale);
- this.displayNames.put(object, localized);
- return localized;
- }
- }
-
- // listener
- if (object instanceof ListenerMetaData)
- {
- if ("display-name".equals(localName))
- {
- String locale = attrs.getValue("xml:lang") != null ? attrs.getValue("xml:lang") : DEFAULT_LOCALE;
- LocalizedDescriptionMetaData localized = new LocalizedDescriptionMetaData(locale);
- this.displayNames.put(object, localized);
- return localized;
- }
- }
-
- return null;
- }
-
- public void addChild(Object parent, Object child, UnmarshallingContext nav, String nsURI, String localName)
- {
-
- if (child instanceof DescribableMetaData)
- {
- DescribableMetaData md = (DescribableMetaData)child;
- List<LocalizedDescriptionMetaData> d = this.descriptions.getLocalizedDescriptionMetaData(md);
- md.setDescription(d);
- }
-
- // portlet app
- if (parent instanceof PortletApplication10MetaData)
- {
- PortletApplication10MetaData md = (PortletApplication10MetaData)parent;
- // add portlet
- if (child instanceof PortletMetaData)
- {
- PortletMetaData portlet = (PortletMetaData)child;
- List<LocalizedDescriptionMetaData> displayName = this.displayNames.getLocalizedDescriptionMetaData(portlet);
- portlet.setDisplayName(displayName);
- md.addPortlet(portlet);
- }
- // add custom-portlet-mode
- else if (child instanceof CustomPortletModeMetaData)
- {
- md.addCustomPortletMode((CustomPortletModeMetaData)child);
- }
- // add custom window state
- else if (child instanceof CustomWindowStateMetaData)
- {
- md.addCustomWindowState((CustomWindowStateMetaData)child);
- }
- // add user-attribute
- else if (child instanceof UserAttributeMetaData)
- {
- md.addUserAttribute((UserAttributeMetaData)child);
- }
- // add security-constraint
- else if (child instanceof SecurityConstraintMetaData)
- {
- SecurityConstraintMetaData security = (SecurityConstraintMetaData)child;
- // display-name
- List<LocalizedDescriptionMetaData> displayName = this.displayNames.getLocalizedDescriptionMetaData(security);
- security.setDisplayName(displayName);
- md.addSecurityConstraint(security);
- }
- }
-
- // portlet-app 2.0
- if (parent instanceof PortletApplication20MetaData)
- {
- PortletApplication20MetaData md = (PortletApplication20MetaData)parent;
- // add public-render-parameter
- if (child instanceof PublicRenderParameterMetaData)
- {
- md.addPublicRenderParameter((PublicRenderParameterMetaData)child);
- }
- // add event-defintion
- else if (child instanceof EventDefinitionMetaData)
- {
- md.addEventDefinition((EventDefinitionMetaData)child);
- }
- // add filter
- else if (child instanceof FilterMetaData)
- {
- FilterMetaData filter = (FilterMetaData)child;
- List<LocalizedDescriptionMetaData> displayName = this.displayNames.getLocalizedDescriptionMetaData(filter);
- filter.setDisplayName(displayName);
- md.addFilter(filter);
- }
- // add filter-mapping
- else if (child instanceof FilterMappingMetaData)
- {
- md.addFilterMapping((FilterMappingMetaData)child);
- }
- // add container-runtime-option
- else if (child instanceof ContainerRuntimeMetaData)
- {
- md.addContainerRuntime((ContainerRuntimeMetaData)child);
- }
- // add listener
- else if (child instanceof ListenerMetaData)
- {
- ListenerMetaData listener = (ListenerMetaData)child;
- List<LocalizedDescriptionMetaData> displayName = this.displayNames.getLocalizedDescriptionMetaData(listener);
- listener.setDisplayName(displayName);
- md.addListener(listener);
- }
- }
-
- // portlet
- if (parent instanceof PortletMetaData)
- {
- PortletMetaData md = (PortletMetaData)parent;
- // init-param
- if (child instanceof InitParamMetaData)
- {
- md.addInitParam((InitParamMetaData)child);
- }
- // supports
- else if (child instanceof SupportsMetaData)
- {
- md.addSupport((SupportsMetaData)child);
- }
- // supported-locale
- else if (child instanceof SupportedLocaleMetaData)
- {
- md.addSupportedLocale((SupportedLocaleMetaData)child);
- }
- // portlet-info
- else if (child instanceof PortletInfoMetaData)
- {
- md.setPortletInfo((PortletInfoMetaData)child);
- }
- // portlet-preferences
- else if (child instanceof PortletPreferencesMetaData)
- {
- md.setPortletPreferences((PortletPreferencesMetaData)child);
- }
- // security-role-ref
- else if (child instanceof SecurityRoleRefMetaData)
- {
- md.addSecurityRoleRef((SecurityRoleRefMetaData)child);
- }
- // supported-events
- else if (child instanceof EventDefinitionReferenceMetaData)
- {
- if ("supported-processing-event".equals(localName))
- {
- md.addSupportedProcessingEvent((EventDefinitionReferenceMetaData)child);
- }
- else if ("supported-publishing-event".equals(localName))
- {
- md.addSupportedPublishingEvent((EventDefinitionReferenceMetaData)child);
- }
- }
- // container-runtime-option
- else if (child instanceof ContainerRuntimeMetaData)
- {
- md.addContainerRuntime((ContainerRuntimeMetaData)child);
- }
- }
-
- // adding user-data-constraint and portlet-name(s) to security-constraint
- if (parent instanceof SecurityConstraintMetaData)
- {
- SecurityConstraintMetaData md = (SecurityConstraintMetaData)parent;
- // add user-data-constraint
- if (child instanceof UserDataConstraintMetaData)
- {
- md.setUserDataConstraint((UserDataConstraintMetaData)child);
- }
- // add portlet-collection
- else if (child instanceof PortletCollectionMetaData)
- {
- md.setPortletList((PortletCollectionMetaData)child);
- }
- }
-
- // filter
- if (parent instanceof FilterMetaData)
- {
- FilterMetaData md = (FilterMetaData)parent;
- // add init-param
- if (child instanceof InitParamMetaData)
- {
- md.addInitParam((InitParamMetaData)child);
- }
- }
-
- // add portlet-mode and window-state
- if (parent instanceof SupportsMetaData)
- {
- SupportsMetaData md = (SupportsMetaData)parent;
- if (child instanceof PortletModeMetaData)
- {
- md.addPortletMode((PortletModeMetaData)child);
- }
- else if (child instanceof WindowStateMetaData)
- {
- md.addWindowState((WindowStateMetaData)child);
- }
- }
-
- // add preference
- if (parent instanceof PortletPreferencesMetaData)
- {
- PortletPreferencesMetaData md = (PortletPreferencesMetaData)parent;
- if (child instanceof PortletPreferenceMetaData)
- {
- md.addPortletPreference((PortletPreferenceMetaData)child);
- }
- }
- }
-
- public void setValue(Object object, UnmarshallingContext nav, String nsURI, String localName, String value)
- {
-
- // JSR 286 portlet-app attributes - default-namespace and resource-bundle.
- if (object instanceof PortletApplication20MetaData)
- {
- PortletApplication20MetaData md = (PortletApplication20MetaData)object;
- if ("resource-bundle".equals(localName))
- {
- md.setResourceBundle(value);
- }
- else if ("default-namespace".equals(localName))
- {
- try
- {
- md.setDefaultNamespace(new URI(value));
- }
- catch (URISyntaxException e)
- {
- log.error("Invalid syntax for default-namespace: " + value);
- }
- }
- }
-
- // portlet
- if (object instanceof PortletMetaData)
- {
- PortletMetaData md = (PortletMetaData)object;
- if ("portlet-name".equals(localName))
- {
- md.setPortletName(value);
- }
- else if ("portlet-class".equals(localName))
- {
- md.setPortletClass(value);
- }
- else if ("cache-scope".equals(localName) && PORTLET_JSR_286_NS.equals(nsURI))
- {
- md.setCacheScope(PortletCacheScopeEnum.valueOf(value));
- }
- else if ("expiration-cache".equals(localName))
- {
- md.setExpirationCache(Integer.valueOf(value));
- }
- else if ("resource-bundle".equals(localName))
- {
- md.setResourceBundle(value);
- }
- else if ("supported-public-render-parameter".equals(localName) && PORTLET_JSR_286_NS.equals(nsURI))
- {
- md.addSupportedPublicRenderParameter(value);
- }
- }
-
- if (object instanceof LocalizedDescriptionMetaData)
- {
- LocalizedDescriptionMetaData localized = (LocalizedDescriptionMetaData)object;
- if ("description".equals(localName))
- {
- localized.setDescription(value);
- }
- else if ("display-name".equals(localName))
- {
- localized.setDescription(value);
- }
- }
-
- // init-param
- if (object instanceof InitParamMetaData)
- {
- InitParamMetaData md = (InitParamMetaData)object;
- if ("name".equals(localName))
- {
- md.setName(value);
- }
- else if ("value".equals(localName))
- {
- md.setValue(value);
- }
- }
-
- // supports
- if (object instanceof SupportsMetaData)
- {
- SupportsMetaData md = (SupportsMetaData)object;
- if ("mime-type".equals(localName))
- {
- md.setMimeType(value);
- }
- }
-
- // supports --- portlet-mode
- if (object instanceof PortletModeMetaData)
- {
- PortletModeMetaData md = (PortletModeMetaData)object;
- if ("portlet-mode".equals(localName))
- {
- md.setPortletMode(value);
- }
- }
-
- // supports --- window-state
- if (object instanceof WindowStateMetaData)
- {
- WindowStateMetaData md = (WindowStateMetaData)object;
- if ("window-state".equals(localName))
- {
- md.setWindowState(value);
- }
- }
-
- // supported-locale
- if (object instanceof SupportedLocaleMetaData)
- {
- SupportedLocaleMetaData md = (SupportedLocaleMetaData)object;
- if ("supported-locale".equals(localName))
- {
- md.setLocale(value);
- }
- }
-
- // portlet-info
- if (object instanceof PortletInfoMetaData)
- {
- PortletInfoMetaData md = (PortletInfoMetaData)object;
- if ("title".equals(localName))
- {
- md.setTitle(value);
- }
- else if ("short-title".equals(localName))
- {
- md.setShortTitle(value);
- }
- else if ("keywords".equals(localName))
- {
- md.setKeywords(value);
- }
- }
-
- // portlet-preferences
- if (object instanceof PortletPreferencesMetaData)
- {
- PortletPreferencesMetaData md = (PortletPreferencesMetaData)object;
- if ("preferences-validator".equals(localName))
- {
- md.setPreferenceValidator(value);
- }
- }
-
- // preference
- if (object instanceof PortletPreferenceMetaData)
- {
- PortletPreferenceMetaData md = (PortletPreferenceMetaData)object;
- if ("name".equals(localName))
- {
- md.setName(value);
- }
- else if ("value".equals(localName))
- {
- md.addValue(value);
- }
- else if ("read-only".equals(localName))
- {
- md.setReadOnly(Boolean.valueOf(value));
- }
- }
-
- // security-role-ref
- if (object instanceof SecurityRoleRefMetaData)
- {
- SecurityRoleRefMetaData md = (SecurityRoleRefMetaData)object;
- if ("role-name".equals(localName))
- {
- md.setRoleName(value);
- }
- else if ("role-link".equals(localName))
- {
- md.setRoleLink(value);
- }
- }
-
- // supported events
- if (object instanceof EventDefinitionReferenceMetaData)
- {
- EventDefinitionReferenceMetaData md = (EventDefinitionReferenceMetaData)object;
-
- md.setQname(nav.resolveQName(value));
- }
-
- // custom-portlet-mode
- if (object instanceof CustomPortletModeMetaData)
- {
- CustomPortletModeMetaData mode = (CustomPortletModeMetaData)object;
- if ("portlet-mode".equals(localName))
- {
- mode.setPortletMode(value);
- }
- else if ("portal-managed".equals(localName) && PORTLET_JSR_286_NS.equals(nsURI))
- {
- mode.setPortalManaged(Boolean.parseBoolean(value));
- }
- }
-
- // custom-window-state
- if (object instanceof CustomWindowStateMetaData)
- {
- CustomWindowStateMetaData md = (CustomWindowStateMetaData)object;
- if ("window-state".equals(localName))
- {
- md.setWindowState(value);
- }
- }
-
- // user-attribute
- if (object instanceof UserAttributeMetaData)
- {
- UserAttributeMetaData md = (UserAttributeMetaData)object;
- if ("name".equals(localName))
- {
- md.setName(value);
- }
- }
-
- // user-data-constraint
- if (object instanceof UserDataConstraintMetaData)
- {
- UserDataConstraintMetaData md = (UserDataConstraintMetaData)object;
- if ("transport-guarantee".equals(localName))
- {
- md.setTransportQuarantee(value);
- }
- }
-
- // portlet-collection in security-constraint
- if (object instanceof PortletCollectionMetaData)
- {
- PortletCollectionMetaData md = (PortletCollectionMetaData)object;
- if ("portlet-name".equals(localName))
- {
- md.addPortletname(value);
- }
- }
-
- // filter
- if (object instanceof FilterMetaData && PORTLET_JSR_286_NS.equals(nsURI))
- {
- FilterMetaData md = (FilterMetaData)object;
- if ("filter-class".equals(localName))
- {
- md.setFilterClass(value);
- }
- else if ("filter-name".equals(localName))
- {
- md.setFilterName(value);
- }
- else if ("lifecycle".equals(localName))
- {
- int end = value.length() - "_PHASE".length();
- String lifeCycle = value.substring(0, end > 0 ? end : 0);
- try
- {
- md.addLifecycle(lifeCycle);
- }
- catch (IllegalArgumentException e)
- {
- throw new IllegalArgumentException("Invalid value for lifecycle. Valid values are [RENDER_PHASE, RESOURCE_PHASE, ACTION_PHASE, EVENT_PHASE]");
- }
- }
- }
-
- // filter-mapping
- if (object instanceof FilterMappingMetaData && PORTLET_JSR_286_NS.equals(nsURI))
- {
- FilterMappingMetaData md = (FilterMappingMetaData)object;
- if ("filter-name".equals(localName))
- {
- md.setName(value);
- }
- if ("portlet-name".equals(localName))
- {
- md.addPortletName(value);
- }
- }
-
- // event-defintion
- if (object instanceof EventDefinitionMetaData && PORTLET_JSR_286_NS.equals(nsURI))
- {
- EventDefinitionMetaData md = (EventDefinitionMetaData)object;
- if ("name".equals(localName))
- {
- md.setName(value);
- }
- else if ("qname".equals(localName))
- {
- md.setQname(nav.resolveQName(value));
- }
- else if ("value-type".equals(localName))
- {
- md.setValueType(value);
- }
- else if ("alias".equals(localName))
- {
- md.addAlias(nav.resolveQName(value));
- }
- }
-
- // public-render-parameter
- if (object instanceof PublicRenderParameterMetaData && PORTLET_JSR_286_NS.equals(nsURI))
- {
- PublicRenderParameterMetaData md = (PublicRenderParameterMetaData)object;
- if ("identifier".equals(localName))
- {
- md.setIdentifier(value);
- }
- else if ("name".equals(localName))
- {
- md.setName(value);
- }
- else if ("qname".equals(localName))
- {
- md.setQname(nav.resolveQName(value));
- }
- else if ("alias".equals(localName))
- {
- md.addAlias(nav.resolveQName(value));
- }
- }
-
- // container-runtime-option
- if (object instanceof ContainerRuntimeMetaData && PORTLET_JSR_286_NS.equals(nsURI))
- {
- ContainerRuntimeMetaData md = (ContainerRuntimeMetaData)object;
- if ("name".equals(localName))
- {
- md.setName(value);
- }
- else if ("value".equals(localName))
- {
- md.addValue(value);
- }
- }
-
- // listener
- if (object instanceof ListenerMetaData && PORTLET_JSR_286_NS.equals(nsURI))
- {
- ListenerMetaData md = (ListenerMetaData)object;
- if ("listener-class".equals(localName))
- {
- md.setListenerClass(value);
- }
- }
- }
-}
+///******************************************************************************
+// * JBoss, a division of Red Hat *
+// * Copyright 2008, Red Hat Middleware, LLC, and individual *
+// * contributors as indicated by the @authors tag. See the *
+// * copyright.txt in the distribution for a full listing of *
+// * individual contributors. *
+// * *
+// * This is free software; you can redistribute it and/or modify it *
+// * under the terms of the GNU Lesser General Public License as *
+// * published by the Free Software Foundation; either version 2.1 of *
+// * the License, or (at your option) any later version. *
+// * *
+// * This software is distributed in the hope that it will be useful, *
+// * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+// * Lesser General Public License for more details. *
+// * *
+// * You should have received a copy of the GNU Lesser General Public *
+// * License along with this software; if not, write to the Free *
+// * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+// * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+// ******************************************************************************/
+//
+//package org.jboss.portal.portlet.deployment;
+//
+//import org.apache.log4j.Logger;
+//import org.jboss.portal.Mode;
+//import org.jboss.portal.WindowState;
+//import org.jboss.portal.common.i18n.LocalizedString;
+//import org.jboss.portal.portlet.LifeCyclePhase;
+//import org.jboss.portal.portlet.TransportGuarantee;
+//import org.jboss.portal.metadata.portlet.CustomPortletModeMetaData;
+//import org.jboss.portal.metadata.portlet.CustomWindowStateMetaData;
+//import org.jboss.portal.metadata.portlet.ListenerMetaData;
+//import org.jboss.portal.metadata.portlet.PortletApplication10MetaData;
+//import org.jboss.portal.metadata.portlet.PortletApplication20MetaData;
+//import static org.jboss.portal.metadata.portlet.PortletMetaDataConstants.DEFAULT_LOCALE;
+//import static org.jboss.portal.metadata.portlet.PortletMetaDataConstants.PORTLET_JSR_286_NS;
+//import org.jboss.portal.metadata.portlet.PublicRenderParameterMetaData;
+//import org.jboss.portal.metadata.portlet.UserAttributeMetaData;
+//import org.jboss.portal.metadata.portlet.common.ContainerRuntimeMetaData;
+//import org.jboss.portal.metadata.portlet.common.DescribableMetaData;
+//import org.jboss.portal.metadata.portlet.common.InitParamMetaData;
+//import org.jboss.portal.metadata.portlet.common.LocalizedDescriptionMetaData;
+//import org.jboss.portal.metadata.portlet.event.EventDefinitionMetaData;
+//import org.jboss.portal.metadata.portlet.event.EventDefinitionReferenceMetaData;
+//import org.jboss.portal.metadata.portlet.filter.FilterMappingMetaData;
+//import org.jboss.portal.metadata.portlet.filter.FilterMetaData;
+//import org.jboss.portal.metadata.portlet.portlet.PortletCacheScopeEnum;
+//import org.jboss.portal.metadata.portlet.portlet.PortletInfoMetaData;
+//import org.jboss.portal.metadata.portlet.portlet.PortletMetaData;
+//import org.jboss.portal.metadata.portlet.portlet.PortletModeMetaData;
+//import org.jboss.portal.metadata.portlet.portlet.PortletPreferenceMetaData;
+//import org.jboss.portal.metadata.portlet.portlet.PortletPreferencesMetaData;
+//import org.jboss.portal.metadata.portlet.portlet.SecurityRoleRefMetaData;
+//import org.jboss.portal.metadata.portlet.portlet.SupportedLocaleMetaData;
+//import org.jboss.portal.metadata.portlet.portlet.SupportsMetaData;
+//import org.jboss.portal.metadata.portlet.portlet.WindowStateMetaData;
+//import org.jboss.portal.metadata.portlet.security.PortletCollectionMetaData;
+//import org.jboss.portal.metadata.portlet.security.SecurityConstraintMetaData;
+//import org.jboss.portal.metadata.portlet.security.UserDataConstraintMetaData;
+//import org.jboss.xb.binding.GenericObjectModelFactory;
+//import org.jboss.xb.binding.UnmarshallingContext;
+//import org.xml.sax.Attributes;
+//
+//import java.net.URI;
+//import java.net.URISyntaxException;
+//import java.util.List;
+//
+///**
+// * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
+// * @version $Revision$
+// */
+//public class PortletApplicationModelFactory implements GenericObjectModelFactory
+//{
+//
+// /** LocalizedDescriptionMetaData container for descriptions */
+// private LocalizedStringBuilder descriptions = new LocalizedStringBuilder();
+//
+// /** LocalizedDescriptionMetaData container for displayNames */
+// private LocalizedStringBuilder displayNames = new LocalizedStringBuilder();
+//
+// /** Guess what? The logger. */
+// private static final Logger log = Logger.getLogger(PortletApplicationModelFactory.class);
+//
+// public Object newRoot(Object root, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs)
+// {
+//
+// String version = attrs.getValue("version");
+// String id = attrs.getValue("id");
+//
+// // portlet-app 2.0 or 1.0
+// PortletApplication10MetaData md = PORTLET_JSR_286_NS.equals(nsURI)
+// ? new PortletApplication20MetaData()
+// : new PortletApplication10MetaData();
+//
+// // Set portlet-app id
+// md.setId(id);
+// // Set portlet-app version
+// md.setVersion(version);
+// // return
+// return md;
+// }
+//
+// public Object completeRoot(Object root, UnmarshallingContext ctx, String nsURI, String name)
+// {
+// return root;
+// }
+//
+// public Object newChild(Object object, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs)
+// {
+// String id = attrs.getValue("id");
+// if (object instanceof DescribableMetaData)
+// {
+//
+// if ("description".equals(localName))
+// {
+// String locale = attrs.getValue("xml:lang") != null ? attrs.getValue("xml:lang") : DEFAULT_LOCALE;
+// LocalizedDescriptionMetaData localized = new LocalizedDescriptionMetaData(locale);
+// this.descriptions.put(object, localized);
+// return localized;
+// }
+// }
+//
+// // portlet-app
+// if (object instanceof PortletApplication10MetaData)
+// {
+// if ("portlet".equals(localName))
+// {
+// return new PortletMetaData(id);
+// }
+// else if ("custom-portlet-mode".equals(localName))
+// {
+// return new CustomPortletModeMetaData(id);
+// }
+// else if ("custom-window-state".equals(localName))
+// {
+// return new CustomWindowStateMetaData(id);
+// }
+// else if ("user-attribute".equals(localName))
+// {
+// return new UserAttributeMetaData(id);
+// }
+// else if ("security-constraint".equals(localName))
+// {
+// return new SecurityConstraintMetaData(id);
+// }
+// }
+//
+// // portlet-app 2.0
+// if (object instanceof PortletApplication20MetaData && PORTLET_JSR_286_NS.equals(nsURI))
+// {
+// if ("public-render-parameter".equals(localName))
+// {
+// return new PublicRenderParameterMetaData(id);
+// }
+// else if ("event-definition".equals(localName))
+// {
+// return new EventDefinitionMetaData(id);
+// }
+// else if ("filter".equals(localName))
+// {
+// return new FilterMetaData();
+// }
+// else if ("filter-mapping".equals(localName))
+// {
+// return new FilterMappingMetaData();
+// }
+// else if ("listener".equals(localName))
+// {
+// return new ListenerMetaData(id);
+// }
+// else if ("container-runtime-option".equals(localName))
+// {
+// return new ContainerRuntimeMetaData();
+// }
+// }
+//
+// // portlet
+// if (object instanceof PortletMetaData)
+// {
+// if ("init-param".equals(localName))
+// {
+// return new InitParamMetaData(id);
+// }
+// else if ("display-name".equals(localName))
+// {
+// String locale = attrs.getValue("xml:lang") != null ? attrs.getValue("xml:lang") : DEFAULT_LOCALE;
+// LocalizedDescriptionMetaData localized = new LocalizedDescriptionMetaData(locale);
+// this.displayNames.put(object, localized);
+// return localized;
+// }
+// else if ("supports".equals(localName))
+// {
+// return new SupportsMetaData(id);
+// }
+// else if ("supported-locale".equals(localName))
+// {
+// return new SupportedLocaleMetaData();
+// }
+// else if ("portlet-info".equals(localName))
+// {
+// return new PortletInfoMetaData(id);
+// }
+// else if ("portlet-preferences".equals(localName))
+// {
+// return new PortletPreferencesMetaData(id);
+// }
+// else if ("security-role-ref".equals(localName))
+// {
+// return new SecurityRoleRefMetaData(id);
+// }
+// else if ("supported-processing-event".equals(localName) && PORTLET_JSR_286_NS.equals(nsURI))
+// {
+// return new EventDefinitionReferenceMetaData(id);
+// }
+// else if ("supported-publishing-event".equals(localName) && PORTLET_JSR_286_NS.equals(nsURI))
+// {
+// return new EventDefinitionReferenceMetaData(id);
+// }
+// else if ("container-runtime-option".equals(localName) && PORTLET_JSR_286_NS.equals(nsURI))
+// {
+// return new ContainerRuntimeMetaData();
+// }
+// }
+//
+// // security-constraint
+// if (object instanceof SecurityConstraintMetaData)
+// {
+// if ("portlet-collection".equals(localName))
+// {
+// return new PortletCollectionMetaData();
+// }
+// else if ("user-data-constraint".equals(localName))
+// {
+// return new UserDataConstraintMetaData(id);
+// }
+// else if ("display-name".equals(localName))
+// {
+// String locale = attrs.getValue("xml:lang") != null ? attrs.getValue("xml:lang") : DEFAULT_LOCALE;
+// LocalizedDescriptionMetaData localized = new LocalizedDescriptionMetaData(locale);
+// this.displayNames.put(object, localized);
+// return localized;
+// }
+// }
+//
+// // supports
+// if (object instanceof SupportsMetaData)
+// {
+// if ("portlet-mode".equals(localName))
+// {
+// return new PortletModeMetaData();
+// }
+// else if ("window-state".equals(localName) && PORTLET_JSR_286_NS.equals(nsURI))
+// {
+// return new WindowStateMetaData();
+// }
+// }
+//
+// // preference (in portlet-preferences)
+// if (object instanceof PortletPreferencesMetaData)
+// {
+// if ("preference".equals(localName))
+// {
+// return new PortletPreferenceMetaData(id);
+// }
+// }
+//
+// // filter
+// if (object instanceof FilterMetaData)
+// {
+// if ("init-param".equals(localName))
+// {
+// return new InitParamMetaData(id);
+// }
+// else if ("display-name".equals(localName))
+// {
+// String locale = attrs.getValue("xml:lang") != null ? attrs.getValue("xml:lang") : DEFAULT_LOCALE;
+// LocalizedDescriptionMetaData localized = new LocalizedDescriptionMetaData(locale);
+// this.displayNames.put(object, localized);
+// return localized;
+// }
+// }
+//
+// // listener
+// if (object instanceof ListenerMetaData)
+// {
+// if ("display-name".equals(localName))
+// {
+// String locale = attrs.getValue("xml:lang") != null ? attrs.getValue("xml:lang") : DEFAULT_LOCALE;
+// LocalizedDescriptionMetaData localized = new LocalizedDescriptionMetaData(locale);
+// this.displayNames.put(object, localized);
+// return localized;
+// }
+// }
+//
+// return null;
+// }
+//
+// public void addChild(Object parent, Object child, UnmarshallingContext nav, String nsURI, String localName)
+// {
+//
+// if (child instanceof DescribableMetaData)
+// {
+// DescribableMetaData md = (DescribableMetaData)child;
+// List<LocalizedDescriptionMetaData> d = this.descriptions.getLocalizedDescriptionMetaData(md);
+// md.setDescription(d);
+// }
+//
+// // portlet app
+// if (parent instanceof PortletApplication10MetaData)
+// {
+// PortletApplication10MetaData md = (PortletApplication10MetaData)parent;
+// // add portlet
+// if (child instanceof PortletMetaData)
+// {
+// PortletMetaData portlet = (PortletMetaData)child;
+// List<LocalizedDescriptionMetaData> displayName = this.displayNames.getLocalizedDescriptionMetaData(portlet);
+// portlet.setDisplayName(displayName);
+// md.addPortlet(portlet);
+// }
+// // add custom-portlet-mode
+// else if (child instanceof CustomPortletModeMetaData)
+// {
+// md.addCustomPortletMode((CustomPortletModeMetaData)child);
+// }
+// // add custom window state
+// else if (child instanceof CustomWindowStateMetaData)
+// {
+// md.addCustomWindowState((CustomWindowStateMetaData)child);
+// }
+// // add user-attribute
+// else if (child instanceof UserAttributeMetaData)
+// {
+// md.addUserAttribute((UserAttributeMetaData)child);
+// }
+// // add security-constraint
+// else if (child instanceof SecurityConstraintMetaData)
+// {
+// SecurityConstraintMetaData security = (SecurityConstraintMetaData)child;
+// // display-name
+// List<LocalizedDescriptionMetaData> displayName = this.displayNames.getLocalizedDescriptionMetaData(security);
+// security.setDisplayName(displayName);
+// md.addSecurityConstraint(security);
+// }
+// }
+//
+// // portlet-app 2.0
+// if (parent instanceof PortletApplication20MetaData)
+// {
+// PortletApplication20MetaData md = (PortletApplication20MetaData)parent;
+// // add public-render-parameter
+// if (child instanceof PublicRenderParameterMetaData)
+// {
+// md.addPublicRenderParameter((PublicRenderParameterMetaData)child);
+// }
+// // add event-defintion
+// else if (child instanceof EventDefinitionMetaData)
+// {
+// md.addEventDefinition((EventDefinitionMetaData)child);
+// }
+// // add filter
+// else if (child instanceof FilterMetaData)
+// {
+// FilterMetaData filter = (FilterMetaData)child;
+// List<LocalizedDescriptionMetaData> displayName = this.displayNames.getLocalizedDescriptionMetaData(filter);
+// filter.setDisplayName(displayName);
+// md.addFilter(filter);
+// }
+// // add filter-mapping
+// else if (child instanceof FilterMappingMetaData)
+// {
+// md.addFilterMapping((FilterMappingMetaData)child);
+// }
+// // add container-runtime-option
+// else if (child instanceof ContainerRuntimeMetaData)
+// {
+// md.addContainerRuntime((ContainerRuntimeMetaData)child);
+// }
+// // add listener
+// else if (child instanceof ListenerMetaData)
+// {
+// ListenerMetaData listener = (ListenerMetaData)child;
+// List<LocalizedDescriptionMetaData> displayName = this.displayNames.getLocalizedDescriptionMetaData(listener);
+// listener.setDisplayName(displayName);
+// md.addListener(listener);
+// }
+// }
+//
+// // portlet
+// if (parent instanceof PortletMetaData)
+// {
+// PortletMetaData md = (PortletMetaData)parent;
+// // init-param
+// if (child instanceof InitParamMetaData)
+// {
+// md.addInitParam((InitParamMetaData)child);
+// }
+// // supports
+// else if (child instanceof SupportsMetaData)
+// {
+// md.addSupport((SupportsMetaData)child);
+// }
+// // supported-locale
+// else if (child instanceof SupportedLocaleMetaData)
+// {
+// md.addSupportedLocale((SupportedLocaleMetaData)child);
+// }
+// // portlet-info
+// else if (child instanceof PortletInfoMetaData)
+// {
+// md.setPortletInfo((PortletInfoMetaData)child);
+// }
+// // portlet-preferences
+// else if (child instanceof PortletPreferencesMetaData)
+// {
+// md.setPortletPreferences((PortletPreferencesMetaData)child);
+// }
+// // security-role-ref
+// else if (child instanceof SecurityRoleRefMetaData)
+// {
+// md.addSecurityRoleRef((SecurityRoleRefMetaData)child);
+// }
+// // supported-events
+// else if (child instanceof EventDefinitionReferenceMetaData)
+// {
+// if ("supported-processing-event".equals(localName))
+// {
+// md.addSupportedProcessingEvent((EventDefinitionReferenceMetaData)child);
+// }
+// else if ("supported-publishing-event".equals(localName))
+// {
+// md.addSupportedPublishingEvent((EventDefinitionReferenceMetaData)child);
+// }
+// }
+// // container-runtime-option
+// else if (child instanceof ContainerRuntimeMetaData)
+// {
+// md.addContainerRuntime((ContainerRuntimeMetaData)child);
+// }
+// }
+//
+// // adding user-data-constraint and portlet-name(s) to security-constraint
+// if (parent instanceof SecurityConstraintMetaData)
+// {
+// SecurityConstraintMetaData md = (SecurityConstraintMetaData)parent;
+// // add user-data-constraint
+// if (child instanceof UserDataConstraintMetaData)
+// {
+// md.setUserDataConstraint((UserDataConstraintMetaData)child);
+// }
+// // add portlet-collection
+// else if (child instanceof PortletCollectionMetaData)
+// {
+// md.setPortletList((PortletCollectionMetaData)child);
+// }
+// }
+//
+// // filter
+// if (parent instanceof FilterMetaData)
+// {
+// FilterMetaData md = (FilterMetaData)parent;
+// // add init-param
+// if (child instanceof InitParamMetaData)
+// {
+// md.addInitParam((InitParamMetaData)child);
+// }
+// }
+//
+// // add portlet-mode and window-state
+// if (parent instanceof SupportsMetaData)
+// {
+// SupportsMetaData md = (SupportsMetaData)parent;
+// if (child instanceof PortletModeMetaData)
+// {
+// md.addPortletMode((PortletModeMetaData)child);
+// }
+// else if (child instanceof WindowStateMetaData)
+// {
+// md.addWindowState((WindowStateMetaData)child);
+// }
+// }
+//
+// // add preference
+// if (parent instanceof PortletPreferencesMetaData)
+// {
+// PortletPreferencesMetaData md = (PortletPreferencesMetaData)parent;
+// if (child instanceof PortletPreferenceMetaData)
+// {
+// md.addPortletPreference((PortletPreferenceMetaData)child);
+// }
+// }
+// }
+//
+// public void setValue(Object object, UnmarshallingContext nav, String nsURI, String localName, String value)
+// {
+//
+// // JSR 286 portlet-app attributes - default-namespace and resource-bundle.
+// if (object instanceof PortletApplication20MetaData)
+// {
+// PortletApplication20MetaData md = (PortletApplication20MetaData)object;
+// if ("resource-bundle".equals(localName))
+// {
+// md.setResourceBundle(value);
+// }
+// else if ("default-namespace".equals(localName))
+// {
+// try
+// {
+// md.setDefaultNamespace(new URI(value));
+// }
+// catch (URISyntaxException e)
+// {
+// log.error("Invalid syntax for default-namespace: " + value);
+// }
+// }
+// }
+//
+// // portlet
+// if (object instanceof PortletMetaData)
+// {
+// PortletMetaData md = (PortletMetaData)object;
+// if ("portlet-name".equals(localName))
+// {
+// md.setPortletName(value);
+// }
+// else if ("portlet-class".equals(localName))
+// {
+// md.setPortletClass(value);
+// }
+// else if ("cache-scope".equals(localName) && PORTLET_JSR_286_NS.equals(nsURI))
+// {
+// md.setCacheScope(PortletCacheScopeEnum.valueOf(value));
+// }
+// else if ("expiration-cache".equals(localName))
+// {
+// md.setExpirationCache(Integer.valueOf(value));
+// }
+// else if ("resource-bundle".equals(localName))
+// {
+// md.setResourceBundle(value);
+// }
+// else if ("supported-public-render-parameter".equals(localName) && PORTLET_JSR_286_NS.equals(nsURI))
+// {
+// md.addSupportedPublicRenderParameter(value);
+// }
+// }
+//
+// if (object instanceof LocalizedDescriptionMetaData)
+// {
+// LocalizedDescriptionMetaData localized = (LocalizedDescriptionMetaData)object;
+// if ("description".equals(localName))
+// {
+// localized.setDescription(value);
+// }
+// else if ("display-name".equals(localName))
+// {
+// localized.setDescription(value);
+// }
+// }
+//
+// // init-param
+// if (object instanceof InitParamMetaData)
+// {
+// InitParamMetaData md = (InitParamMetaData)object;
+// if ("name".equals(localName))
+// {
+// md.setName(value);
+// }
+// else if ("value".equals(localName))
+// {
+// md.setValue(value);
+// }
+// }
+//
+// // supports
+// if (object instanceof SupportsMetaData)
+// {
+// SupportsMetaData md = (SupportsMetaData)object;
+// if ("mime-type".equals(localName))
+// {
+// md.setMimeType(value);
+// }
+// }
+//
+// // supports --- portlet-mode
+// if (object instanceof PortletModeMetaData)
+// {
+// PortletModeMetaData md = (PortletModeMetaData)object;
+// if ("portlet-mode".equals(localName))
+// {
+// md.setPortletMode(value);
+// }
+// }
+//
+// // supports --- window-state
+// if (object instanceof WindowStateMetaData)
+// {
+// WindowStateMetaData md = (WindowStateMetaData)object;
+// if ("window-state".equals(localName))
+// {
+// md.setWindowState(value);
+// }
+// }
+//
+// // supported-locale
+// if (object instanceof SupportedLocaleMetaData)
+// {
+// SupportedLocaleMetaData md = (SupportedLocaleMetaData)object;
+// if ("supported-locale".equals(localName))
+// {
+// md.setLocale(value);
+// }
+// }
+//
+// // portlet-info
+// if (object instanceof PortletInfoMetaData)
+// {
+// PortletInfoMetaData md = (PortletInfoMetaData)object;
+// if ("title".equals(localName))
+// {
+// md.setTitle(value);
+// }
+// else if ("short-title".equals(localName))
+// {
+// md.setShortTitle(value);
+// }
+// else if ("keywords".equals(localName))
+// {
+// md.setKeywords(value);
+// }
+// }
+//
+// // portlet-preferences
+// if (object instanceof PortletPreferencesMetaData)
+// {
+// PortletPreferencesMetaData md = (PortletPreferencesMetaData)object;
+// if ("preferences-validator".equals(localName))
+// {
+// md.setPreferenceValidator(value);
+// }
+// }
+//
+// // preference
+// if (object instanceof PortletPreferenceMetaData)
+// {
+// PortletPreferenceMetaData md = (PortletPreferenceMetaData)object;
+// if ("name".equals(localName))
+// {
+// md.setName(value);
+// }
+// else if ("value".equals(localName))
+// {
+// md.addValue(value);
+// }
+// else if ("read-only".equals(localName))
+// {
+// md.setReadOnly(Boolean.valueOf(value));
+// }
+// }
+//
+// // security-role-ref
+// if (object instanceof SecurityRoleRefMetaData)
+// {
+// SecurityRoleRefMetaData md = (SecurityRoleRefMetaData)object;
+// if ("role-name".equals(localName))
+// {
+// md.setRoleName(value);
+// }
+// else if ("role-link".equals(localName))
+// {
+// md.setRoleLink(value);
+// }
+// }
+//
+// // supported events
+// if (object instanceof EventDefinitionReferenceMetaData)
+// {
+// EventDefinitionReferenceMetaData md = (EventDefinitionReferenceMetaData)object;
+//
+// md.setQname(nav.resolveQName(value));
+// }
+//
+// // custom-portlet-mode
+// if (object instanceof CustomPortletModeMetaData)
+// {
+// CustomPortletModeMetaData mode = (CustomPortletModeMetaData)object;
+// if ("portlet-mode".equals(localName))
+// {
+// mode.setPortletMode(value);
+// }
+// else if ("portal-managed".equals(localName) && PORTLET_JSR_286_NS.equals(nsURI))
+// {
+// mode.setPortalManaged(Boolean.parseBoolean(value));
+// }
+// }
+//
+// // custom-window-state
+// if (object instanceof CustomWindowStateMetaData)
+// {
+// CustomWindowStateMetaData md = (CustomWindowStateMetaData)object;
+// if ("window-state".equals(localName))
+// {
+// md.setWindowState(value);
+// }
+// }
+//
+// // user-attribute
+// if (object instanceof UserAttributeMetaData)
+// {
+// UserAttributeMetaData md = (UserAttributeMetaData)object;
+// if ("name".equals(localName))
+// {
+// md.setName(value);
+// }
+// }
+//
+// // user-data-constraint
+// if (object instanceof UserDataConstraintMetaData)
+// {
+// UserDataConstraintMetaData md = (UserDataConstraintMetaData)object;
+// if ("transport-guarantee".equals(localName))
+// {
+// md.setTransportQuarantee(value);
+// }
+// }
+//
+// // portlet-collection in security-constraint
+// if (object instanceof PortletCollectionMetaData)
+// {
+// PortletCollectionMetaData md = (PortletCollectionMetaData)object;
+// if ("portlet-name".equals(localName))
+// {
+// md.addPortletname(value);
+// }
+// }
+//
+// // filter
+// if (object instanceof FilterMetaData && PORTLET_JSR_286_NS.equals(nsURI))
+// {
+// FilterMetaData md = (FilterMetaData)object;
+// if ("filter-class".equals(localName))
+// {
+// md.setFilterClass(value);
+// }
+// else if ("filter-name".equals(localName))
+// {
+// md.setFilterName(value);
+// }
+// else if ("lifecycle".equals(localName))
+// {
+// int end = value.length() - "_PHASE".length();
+// String lifeCycle = value.substring(0, end > 0 ? end : 0);
+// try
+// {
+// md.addLifecycle(lifeCycle);
+// }
+// catch (IllegalArgumentException e)
+// {
+// throw new IllegalArgumentException("Invalid value for lifecycle. Valid values are [RENDER_PHASE, RESOURCE_PHASE, ACTION_PHASE, EVENT_PHASE]");
+// }
+// }
+// }
+//
+// // filter-mapping
+// if (object instanceof FilterMappingMetaData && PORTLET_JSR_286_NS.equals(nsURI))
+// {
+// FilterMappingMetaData md = (FilterMappingMetaData)object;
+// if ("filter-name".equals(localName))
+// {
+// md.setName(value);
+// }
+// if ("portlet-name".equals(localName))
+// {
+// md.addPortletName(value);
+// }
+// }
+//
+// // event-defintion
+// if (object instanceof EventDefinitionMetaData && PORTLET_JSR_286_NS.equals(nsURI))
+// {
+// EventDefinitionMetaData md = (EventDefinitionMetaData)object;
+// if ("name".equals(localName))
+// {
+// md.setName(value);
+// }
+// else if ("qname".equals(localName))
+// {
+// md.setQname(nav.resolveQName(value));
+// }
+// else if ("value-type".equals(localName))
+// {
+// md.setValueType(value);
+// }
+// else if ("alias".equals(localName))
+// {
+// md.addAlias(nav.resolveQName(value));
+// }
+// }
+//
+// // public-render-parameter
+// if (object instanceof PublicRenderParameterMetaData && PORTLET_JSR_286_NS.equals(nsURI))
+// {
+// PublicRenderParameterMetaData md = (PublicRenderParameterMetaData)object;
+// if ("identifier".equals(localName))
+// {
+// md.setIdentifier(value);
+// }
+// else if ("name".equals(localName))
+// {
+// md.setName(value);
+// }
+// else if ("qname".equals(localName))
+// {
+// md.setQname(nav.resolveQName(value));
+// }
+// else if ("alias".equals(localName))
+// {
+// md.addAlias(nav.resolveQName(value));
+// }
+// }
+//
+// // container-runtime-option
+// if (object instanceof ContainerRuntimeMetaData && PORTLET_JSR_286_NS.equals(nsURI))
+// {
+// ContainerRuntimeMetaData md = (ContainerRuntimeMetaData)object;
+// if ("name".equals(localName))
+// {
+// md.setName(value);
+// }
+// else if ("value".equals(localName))
+// {
+// md.addValue(value);
+// }
+// }
+//
+// // listener
+// if (object instanceof ListenerMetaData && PORTLET_JSR_286_NS.equals(nsURI))
+// {
+// ListenerMetaData md = (ListenerMetaData)object;
+// if ("listener-class".equals(localName))
+// {
+// md.setListenerClass(value);
+// }
+// }
+// }
+//}
Modified: branches/JBoss_Portal_Branch_2_7_AS5/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/JBossApplicationMetaDataFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/JBossApplicationMetaDataFactory.java 2009-04-02 23:22:22 UTC (rev 13144)
+++ branches/JBoss_Portal_Branch_2_7_AS5/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/JBossApplicationMetaDataFactory.java 2009-04-02 23:22:25 UTC (rev 13145)
@@ -1,267 +1,267 @@
-/******************************************************************************
- * 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.portlet.deployment.jboss;
-
-import org.jboss.portal.common.transaction.Transactions;
-import org.jboss.portal.portlet.deployment.jboss.info.impl.CacheInfoImpl;
-import org.jboss.portal.portlet.deployment.jboss.metadata.JBossApplicationMetaData;
-import org.jboss.portal.portlet.deployment.jboss.metadata.JBossPortletMetaData;
-import org.jboss.portal.portlet.deployment.jboss.metadata.PolicyPermissionMetaData;
-import org.jboss.xb.binding.GenericObjectModelFactory;
-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 implements GenericObjectModelFactory
-{
-
- public Object newRoot(Object root,
- UnmarshallingContext nav,
- String nsURI,
- String localName,
- Attributes attrs)
- {
- if (root == null)
- {
- root = new JBossApplicationMetaData();
- }
- return root;
- }
-
- public Object completeRoot(Object root, UnmarshallingContext nav, String uri, String name)
- {
- return root;
- }
-
- public Object newChild(Object object, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs)
- {
- if (object instanceof JBossApplicationMetaData)
- {
- if ("portlet".equals(localName))
- {
- return createJBossPortlet();
- }
- }
-// else if (object instanceof 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.portlet.deployment.jboss;
+//
+//import org.jboss.portal.common.transaction.Transactions;
+//import org.jboss.portal.portlet.deployment.jboss.info.impl.CacheInfoImpl;
+//import org.jboss.portal.portlet.deployment.jboss.metadata.JBossApplicationMetaData;
+//import org.jboss.portal.portlet.deployment.jboss.metadata.JBossPortletMetaData;
+//import org.jboss.portal.portlet.deployment.jboss.metadata.PolicyPermissionMetaData;
+//import org.jboss.xb.binding.GenericObjectModelFactory;
+//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 implements GenericObjectModelFactory
+//{
+//
+// public Object newRoot(Object root,
+// UnmarshallingContext nav,
+// String nsURI,
+// String localName,
+// Attributes attrs)
+// {
+// if (root == null)
// {
-// if ("security-constraint".equals(localName))
+// root = new JBossApplicationMetaData();
+// }
+// return root;
+// }
+//
+// public Object completeRoot(Object root, UnmarshallingContext nav, String uri, String name)
+// {
+// return root;
+// }
+//
+// public Object newChild(Object object, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs)
+// {
+// if (object instanceof JBossApplicationMetaData)
+// {
+// if ("portlet".equals(localName))
// {
-// return new SecurityConstraintMetaData();
+// return createJBossPortlet();
// }
// }
-// else if (object instanceof SecurityConstraintMetaData)
+//// else if (object instanceof JBossPortletMetaData)
+//// {
+//// if ("security-constraint".equals(localName))
+//// {
+//// return new SecurityConstraintMetaData();
+//// }
+//// }
+//// else if (object instanceof SecurityConstraintMetaData)
+//// {
+//// if ("policy-permission".equals(localName))
+//// {
+//// return new PolicyPermissionMetaData();
+//// }
+//// }
+// else if (object instanceof PolicyPermissionMetaData)
// {
-// if ("policy-permission".equals(localName))
+// if ("unchecked".equals(localName))
// {
-// return new PolicyPermissionMetaData();
+// return "unchecked";
// }
// }
- else if (object instanceof PolicyPermissionMetaData)
- {
- if ("unchecked".equals(localName))
- {
- return "unchecked";
- }
- }
- return null;
- }
-
- public void addChild(Object parent, Object child, UnmarshallingContext nav, String nsURI, String localName)
- {
- if (parent instanceof JBossApplicationMetaData)
- {
- JBossApplicationMetaData app = (JBossApplicationMetaData)parent;
- if (child instanceof JBossPortletMetaData)
- {
- JBossPortletMetaData portlet = (JBossPortletMetaData)child;
- app.getPortlets().put(portlet.getName(), portlet);
- portlet.merge(app);
- }
- }
-// else if (parent instanceof JBossPortletMetaData)
+// return null;
+// }
+//
+// public void addChild(Object parent, Object child, UnmarshallingContext nav, String nsURI, String localName)
+// {
+// if (parent instanceof JBossApplicationMetaData)
// {
-// JBossPortletMetaData portlet = (JBossPortletMetaData)parent;
-// if (child instanceof SecurityConstraintMetaData)
+// JBossApplicationMetaData app = (JBossApplicationMetaData)parent;
+// if (child instanceof JBossPortletMetaData)
// {
-// portlet.setSecurityConstraint((SecurityConstraintMetaData)child);
+// JBossPortletMetaData portlet = (JBossPortletMetaData)child;
+// app.getPortlets().put(portlet.getName(), portlet);
+// portlet.merge(app);
// }
// }
-// else if (parent instanceof SecurityConstraintMetaData)
+//// else if (parent instanceof JBossPortletMetaData)
+//// {
+//// JBossPortletMetaData portlet = (JBossPortletMetaData)parent;
+//// if (child instanceof SecurityConstraintMetaData)
+//// {
+//// portlet.setSecurityConstraint((SecurityConstraintMetaData)child);
+//// }
+//// }
+//// else if (parent instanceof SecurityConstraintMetaData)
+//// {
+//// SecurityConstraintMetaData securityConstraint = (SecurityConstraintMetaData)parent;
+//// if (child instanceof PolicyPermissionMetaData)
+//// {
+//// PolicyPermissionMetaData policyPermission = (PolicyPermissionMetaData)child;
+//// PolicyPermissionMetaData other = (PolicyPermissionMetaData)securityConstraint.getPolicyPermissions().get(policyPermission.getRoleName());
+//// if (other != null)
+//// {
+//// other.getActions().addAll(policyPermission.getActions());
+//// }
+//// else
+//// {
+//// securityConstraint.getPolicyPermissions().put(policyPermission.getRoleName(), policyPermission);
+//// }
+//// }
+//// }
+//// else if (parent instanceof PolicyPermissionMetaData)
+//// {
+//// PolicyPermissionMetaData policyPermission = (PolicyPermissionMetaData)parent;
+//// if ("unchecked".equals(child))
+//// {
+//// policyPermission.setRoleName(SecurityConstants.UNCHECKED_ROLE_NAME);
+//// }
+//// }
+// }
+//
+// public void setValue(Object object, UnmarshallingContext nav, String nsURI, String localName, String value)
+// {
+// if (object instanceof JBossApplicationMetaData)
// {
-// SecurityConstraintMetaData securityConstraint = (SecurityConstraintMetaData)parent;
-// if (child instanceof PolicyPermissionMetaData)
+// JBossApplicationMetaData app = (JBossApplicationMetaData)object;
+// if ("app-id".equals(localName))
// {
-// PolicyPermissionMetaData policyPermission = (PolicyPermissionMetaData)child;
-// PolicyPermissionMetaData other = (PolicyPermissionMetaData)securityConstraint.getPolicyPermissions().get(policyPermission.getRoleName());
-// if (other != null)
+// app.setId(value);
+// }
+// else if ("remotable".equals(localName))
+// {
+// if ("true".equalsIgnoreCase(value))
// {
-// other.getActions().addAll(policyPermission.getActions());
+// app.setRemotable(Boolean.TRUE);
// }
+// else if ("false".equalsIgnoreCase(value))
+// {
+// app.setRemotable(Boolean.FALSE);
+// }
// else
// {
-// securityConstraint.getPolicyPermissions().put(policyPermission.getRoleName(), policyPermission);
+// throw new RuntimeException();
// }
// }
// }
-// else if (parent instanceof PolicyPermissionMetaData)
+// else if (object instanceof JBossPortletMetaData)
// {
-// PolicyPermissionMetaData policyPermission = (PolicyPermissionMetaData)parent;
-// if ("unchecked".equals(child))
+// JBossPortletMetaData portlet = (JBossPortletMetaData)object;
+// if ("portlet-name".equals(localName))
// {
-// policyPermission.setRoleName(SecurityConstants.UNCHECKED_ROLE_NAME);
+// portlet.setName(value);
// }
+// else if ("remotable".equals(localName))
+// {
+// if ("true".equalsIgnoreCase(value))
+// {
+// portlet.setRemotable(Boolean.TRUE);
+// }
+// else if ("false".equalsIgnoreCase(value))
+// {
+// portlet.setRemotable(Boolean.FALSE);
+// }
+// else
+// {
+// throw new RuntimeException();
+// }
+// }
+// else if ("distributed".equals(localName))
+// {
+// if ("true".equalsIgnoreCase(value))
+// {
+// portlet.setDistributed(Boolean.TRUE);
+// }
+// else if ("false".equalsIgnoreCase(value))
+// {
+// portlet.setDistributed(Boolean.FALSE);
+// }
+// else
+// {
+// throw new RuntimeException();
+// }
+// }
+// else if ("ref-type".equals(localName))
+// {
+// if ("strong".equals(localName))
+// {
+// portlet.setCacheRefType(new Integer(CacheInfoImpl.REF_STRONG));
+// }
+// else if ("soft".equals(localName))
+// {
+// portlet.setCacheRefType(new Integer(CacheInfoImpl.REF_SOFT));
+// }
+// else
+// {
+// // log.warn("Unrecognized reference type " + refType);
+// }
+// }
+// else if ("trans-attribute".equals(localName))
+// {
+// if ("Required".equalsIgnoreCase(value))
+// {
+// portlet.setTxType(Transactions.TYPE_REQUIRED);
+// }
+// else if ("Mandatory".equals(value))
+// {
+// portlet.setTxType(Transactions.TYPE_MANDATORY);
+// }
+// else if ("Never".equals(value))
+// {
+// portlet.setTxType(Transactions.TYPE_NEVER);
+// }
+// else if ("Supports".equals(value))
+// {
+// portlet.setTxType(Transactions.TYPE_SUPPORTS);
+// }
+// else if ("NotSupported".equals(value))
+// {
+// portlet.setTxType(Transactions.TYPE_NOT_SUPPORTED);
+// }
+// else if ("RequiresNew".equals(value))
+// {
+// portlet.setTxType(Transactions.TYPE_REQUIRES_NEW);
+// }
+// else
+// {
+// throw new RuntimeException();
+// }
+// }
// }
- }
-
- public void setValue(Object object, UnmarshallingContext nav, String nsURI, String localName, String value)
- {
- if (object instanceof JBossApplicationMetaData)
- {
- JBossApplicationMetaData app = (JBossApplicationMetaData)object;
- if ("app-id".equals(localName))
- {
- app.setId(value);
- }
- else if ("remotable".equals(localName))
- {
- if ("true".equalsIgnoreCase(value))
- {
- app.setRemotable(Boolean.TRUE);
- }
- else if ("false".equalsIgnoreCase(value))
- {
- app.setRemotable(Boolean.FALSE);
- }
- else
- {
- throw new RuntimeException();
- }
- }
- }
- else if (object instanceof JBossPortletMetaData)
- {
- JBossPortletMetaData portlet = (JBossPortletMetaData)object;
- if ("portlet-name".equals(localName))
- {
- portlet.setName(value);
- }
- else if ("remotable".equals(localName))
- {
- if ("true".equalsIgnoreCase(value))
- {
- portlet.setRemotable(Boolean.TRUE);
- }
- else if ("false".equalsIgnoreCase(value))
- {
- portlet.setRemotable(Boolean.FALSE);
- }
- else
- {
- throw new RuntimeException();
- }
- }
- else if ("distributed".equals(localName))
- {
- if ("true".equalsIgnoreCase(value))
- {
- portlet.setDistributed(Boolean.TRUE);
- }
- else if ("false".equalsIgnoreCase(value))
- {
- portlet.setDistributed(Boolean.FALSE);
- }
- else
- {
- throw new RuntimeException();
- }
- }
- else if ("ref-type".equals(localName))
- {
- if ("strong".equals(localName))
- {
- portlet.setCacheRefType(new Integer(CacheInfoImpl.REF_STRONG));
- }
- else if ("soft".equals(localName))
- {
- portlet.setCacheRefType(new Integer(CacheInfoImpl.REF_SOFT));
- }
- else
- {
- // log.warn("Unrecognized reference type " + refType);
- }
- }
- else if ("trans-attribute".equals(localName))
- {
- if ("Required".equalsIgnoreCase(value))
- {
- portlet.setTxType(Transactions.TYPE_REQUIRED);
- }
- else if ("Mandatory".equals(value))
- {
- portlet.setTxType(Transactions.TYPE_MANDATORY);
- }
- else if ("Never".equals(value))
- {
- portlet.setTxType(Transactions.TYPE_NEVER);
- }
- else if ("Supports".equals(value))
- {
- portlet.setTxType(Transactions.TYPE_SUPPORTS);
- }
- else if ("NotSupported".equals(value))
- {
- portlet.setTxType(Transactions.TYPE_NOT_SUPPORTED);
- }
- else if ("RequiresNew".equals(value))
- {
- portlet.setTxType(Transactions.TYPE_REQUIRES_NEW);
- }
- else
- {
- throw new RuntimeException();
- }
- }
- }
- else if (object instanceof PolicyPermissionMetaData)
- {
- PolicyPermissionMetaData policyPermission = (PolicyPermissionMetaData)object;
- if ("role-name".equals(localName))
- {
- policyPermission.setRoleName(value);
- }
- else if ("action-name".equals(localName))
- {
- policyPermission.getActions().add(value);
- }
- }
- }
-
- /** Can be subclasses to allow sub class. */
- protected JBossPortletMetaData createJBossPortlet()
- {
- return new JBossPortletMetaData();
- }
-}
+// else if (object instanceof PolicyPermissionMetaData)
+// {
+// PolicyPermissionMetaData policyPermission = (PolicyPermissionMetaData)object;
+// if ("role-name".equals(localName))
+// {
+// policyPermission.setRoleName(value);
+// }
+// else if ("action-name".equals(localName))
+// {
+// policyPermission.getActions().add(value);
+// }
+// }
+// }
+//
+// /** Can be subclasses to allow sub class. */
+// protected JBossPortletMetaData createJBossPortlet()
+// {
+// return new JBossPortletMetaData();
+// }
+//}
Modified: branches/JBoss_Portal_Branch_2_7_AS5/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/ValueTrimmingFilter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/ValueTrimmingFilter.java 2009-04-02 23:22:22 UTC (rev 13144)
+++ branches/JBoss_Portal_Branch_2_7_AS5/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/ValueTrimmingFilter.java 2009-04-02 23:22:25 UTC (rev 13145)
@@ -1,75 +1,75 @@
-/******************************************************************************
- * 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.portlet.deployment.jboss;
-
-import org.jboss.xb.binding.GenericObjectModelFactory;
-import org.jboss.xb.binding.UnmarshallingContext;
-import org.xml.sax.Attributes;
-
-/**
- * Filter <code>setValue</code> method by doing a trimming before calling the next model.
- *
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision$
- */
-public class ValueTrimmingFilter implements GenericObjectModelFactory
-{
-
- private final GenericObjectModelFactory next;
-
- public ValueTrimmingFilter(GenericObjectModelFactory next) throws IllegalArgumentException
- {
- if (next == null)
- {
- throw new IllegalArgumentException("Cannot be null");
- }
- this.next = next;
- }
-
- public Object newChild(Object object, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs)
- {
- return next.newChild(object, nav, nsURI, localName, attrs);
- }
-
- public void addChild(Object parent, Object child, UnmarshallingContext nav, String nsURI, String localName)
- {
- next.addChild(parent, child, nav, nsURI, localName);
- }
-
- public void setValue(Object object, UnmarshallingContext nav, String nsURI, String localName, String value)
- {
- value = value.trim();
- next.setValue(object, nav, nsURI, localName, value);
- }
-
- public Object newRoot(Object root, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs)
- {
- return next.newRoot(root, nav, nsURI, localName, attrs);
- }
-
- public Object completeRoot(Object root, UnmarshallingContext nav, String nsURI, String localName)
- {
- return next.completeRoot(root, nav, nsURI, localName);
- }
-
-}
+///******************************************************************************
+// * 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.portlet.deployment.jboss;
+//
+//import org.jboss.xb.binding.GenericObjectModelFactory;
+//import org.jboss.xb.binding.UnmarshallingContext;
+//import org.xml.sax.Attributes;
+//
+///**
+// * Filter <code>setValue</code> method by doing a trimming before calling the next model.
+// *
+// * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+// * @version $Revision$
+// */
+//public class ValueTrimmingFilter implements GenericObjectModelFactory
+//{
+//
+// private final GenericObjectModelFactory next;
+//
+// public ValueTrimmingFilter(GenericObjectModelFactory next) throws IllegalArgumentException
+// {
+// if (next == null)
+// {
+// throw new IllegalArgumentException("Cannot be null");
+// }
+// this.next = next;
+// }
+//
+// public Object newChild(Object object, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs)
+// {
+// return next.newChild(object, nav, nsURI, localName, attrs);
+// }
+//
+// public void addChild(Object parent, Object child, UnmarshallingContext nav, String nsURI, String localName)
+// {
+// next.addChild(parent, child, nav, nsURI, localName);
+// }
+//
+// public void setValue(Object object, UnmarshallingContext nav, String nsURI, String localName, String value)
+// {
+// value = value.trim();
+// next.setValue(object, nav, nsURI, localName, value);
+// }
+//
+// public Object newRoot(Object root, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs)
+// {
+// return next.newRoot(root, nav, nsURI, localName, attrs);
+// }
+//
+// public Object completeRoot(Object root, UnmarshallingContext nav, String nsURI, String localName)
+// {
+// return next.completeRoot(root, nav, nsURI, localName);
+// }
+//
+//}
15 years, 3 months
- 1
- 0
JBoss Portal SVN: r13144 - in branches/JBoss_Portal_Branch_2_7_AS5/core: src/main/org/jboss/portal/core/deployment and 4 other directories.
by portal-commits＠lists.jboss.org
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="RegistrationControlledByService">@portal.single@</attribute>
- </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="CreateInstances">@portal.single@</attribute>
- </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
+ *
15 years, 3 months
- 1
- 0
JBoss Portal SVN: r13143 - branches/JBoss_Portal_Branch_2_7_AS5/widget.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2009-04-02 19:19:44 -0400 (Thu, 02 Apr 2009)
New Revision: 13143
Modified:
branches/JBoss_Portal_Branch_2_7_AS5/widget/.classpath
branches/JBoss_Portal_Branch_2_7_AS5/widget/build.xml
Log:
Split up some of the as core libs and use proper sub projects.
Update eclipse classpath files to find the jar file changes.
Modified: branches/JBoss_Portal_Branch_2_7_AS5/widget/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/widget/.classpath 2009-04-02 23:19:41 UTC (rev 13142)
+++ branches/JBoss_Portal_Branch_2_7_AS5/widget/.classpath 2009-04-02 23:19:44 UTC (rev 13143)
@@ -6,8 +6,21 @@
<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/api"/>
<classpathentry kind="lib" path="/thirdparty/portlet/lib/portlet-api.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-jmx.jar" sourcepath="/JBoss_AS_4.0.5/jmx/src/main"/>
+ <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-system-jmx.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar" sourcepath="/JBoss_AS_4.0.5/system/src/main"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jbossha.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.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-spi/lib/jboss-logging-spi-sources.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_7_AS5/widget/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/widget/build.xml 2009-04-02 23:19:41 UTC (rev 13142)
+++ branches/JBoss_Portal_Branch_2_7_AS5/widget/build.xml 2009-04-02 23:19:44 UTC (rev 13143)
@@ -94,7 +94,9 @@
<path refid="portlet.portlet.classpath"/>
<path refid="jboss.portal/modules/common.classpath"/>
<path refid="jboss.portal/modules/portlet.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
<path refid="jbossas/core.libs.classpath"/>
+ <path refid="jboss/common.logging.spi.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="junit.junit.classpath"/>
</path>
15 years, 3 months
- 1
- 0
JBoss Portal SVN: r13142 - branches/JBoss_Portal_Branch_2_7_AS5/registration.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2009-04-02 19:19:41 -0400 (Thu, 02 Apr 2009)
New Revision: 13142
Modified:
branches/JBoss_Portal_Branch_2_7_AS5/registration/.classpath
branches/JBoss_Portal_Branch_2_7_AS5/registration/build.xml
Log:
Split up some of the as core libs and use proper sub projects.
Update eclipse classpath files to find the jar file changes.
Modified: branches/JBoss_Portal_Branch_2_7_AS5/registration/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/registration/.classpath 2009-04-02 23:19:39 UTC (rev 13141)
+++ branches/JBoss_Portal_Branch_2_7_AS5/registration/.classpath 2009-04-02 23:19:41 UTC (rev 13142)
@@ -4,10 +4,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/jems"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system-jmx.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-j2se.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_7_AS5/registration/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/registration/build.xml 2009-04-02 23:19:39 UTC (rev 13141)
+++ branches/JBoss_Portal_Branch_2_7_AS5/registration/build.xml 2009-04-02 23:19:41 UTC (rev 13142)
@@ -94,6 +94,8 @@
<path refid="jboss.portal/modules/common.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="oswego.concurrent.classpath"/>
+ <path refid="jboss.microcontainer.classpath"/>
+ <path refid="jboss/common.logging.spi.classpath"/>
<path refid="jbossas/core.libs.classpath"/>
</path>
15 years, 3 months
- 1
- 0
JBoss Portal SVN: r13141 - branches/JBoss_Portal_Branch_2_7_AS5/jems.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2009-04-02 19:19:39 -0400 (Thu, 02 Apr 2009)
New Revision: 13141
Modified:
branches/JBoss_Portal_Branch_2_7_AS5/jems/.classpath
branches/JBoss_Portal_Branch_2_7_AS5/jems/build.xml
Log:
Split up some of the as core libs and use proper sub projects.
Update eclipse classpath files to find the jar file changes.
Modified: branches/JBoss_Portal_Branch_2_7_AS5/jems/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/jems/.classpath 2009-04-02 23:19:36 UTC (rev 13140)
+++ branches/JBoss_Portal_Branch_2_7_AS5/jems/.classpath 2009-04-02 23:19:39 UTC (rev 13141)
@@ -8,21 +8,26 @@
<classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/>
<classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.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/oswego-concurrent/lib/concurrent.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jbossha.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-jmx.jar" sourcepath="/JBoss_AS_4.0.5/jmx/src/main"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jmx-invoker-adaptor-client.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/cache/lib/jboss-cache-jdk50.jar"/>
<classpathentry kind="lib" path="/thirdparty/beanshell/lib/bsh.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-javaee.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system-jmx.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-j2se.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-mbeans.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jnp-client/lib/jnp-client.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_7_AS5/jems/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/jems/build.xml 2009-04-02 23:19:36 UTC (rev 13140)
+++ branches/JBoss_Portal_Branch_2_7_AS5/jems/build.xml 2009-04-02 23:19:39 UTC (rev 13141)
@@ -93,7 +93,12 @@
<path refid="jboss.portal/modules/common.classpath"/>
<path refid="jboss.portal/modules/test.classpath"/>
<path refid="beanshell.beanshell.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
<path refid="jboss.cache.classpath"/>
+ <path refid="jboss.microcontainer.classpath"/>
+ <path refid="jboss/common.core.classpath"/>
+ <path refid="jboss/common.logging.spi.classpath"/>
+ <path refid="jboss/jnp.client.classpath"/>
<path refid="jbossas/core.libs.classpath"/>
<path refid="hibernate.hibernate.classpath"/>
<path refid="apache.log4j.classpath"/>
15 years, 3 months
- 1
- 0
JBoss Portal SVN: r13140 - branches/JBoss_Portal_Branch_2_7_AS5/core-admin.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2009-04-02 19:19:36 -0400 (Thu, 02 Apr 2009)
New Revision: 13140
Modified:
branches/JBoss_Portal_Branch_2_7_AS5/core-admin/.classpath
branches/JBoss_Portal_Branch_2_7_AS5/core-admin/build.xml
Log:
Split up some of the as core libs and use proper sub projects.
Update eclipse classpath files to find the jar file changes.
Modified: branches/JBoss_Portal_Branch_2_7_AS5/core-admin/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/core-admin/.classpath 2009-04-02 23:19:34 UTC (rev 13139)
+++ branches/JBoss_Portal_Branch_2_7_AS5/core-admin/.classpath 2009-04-02 23:19:36 UTC (rev 13140)
@@ -6,7 +6,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/security"/>
<classpathentry combineaccessrules="false" kind="src" path="/api"/>
<classpathentry combineaccessrules="false" kind="src" path="/core"/>
- <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/theme"/>
<classpathentry combineaccessrules="false" kind="src" path="/jems"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
@@ -24,5 +23,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/portlet-server"/>
<classpathentry kind="lib" path="/thirdparty/portlet/lib/portlet-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/glassfish/jsf/lib/jsf-api.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
<classpathentry kind="output" path="output/classes"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_7_AS5/core-admin/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/core-admin/build.xml 2009-04-02 23:19:34 UTC (rev 13139)
+++ branches/JBoss_Portal_Branch_2_7_AS5/core-admin/build.xml 2009-04-02 23:19:36 UTC (rev 13140)
@@ -96,6 +96,7 @@
<path refid="jboss.jbossxb.classpath"/>
<path refid="jboss.cache.classpath"/>
<path refid="jbossas/core.libs.classpath"/>
+ <path refid="jboss/common.logging.spi.classpath"/>
<path refid="hibernate.hibernate.classpath"/>
<path refid="glassfish.jsf.classpath"/>
<path refid="apache.log4j.classpath"/>
15 years, 3 months
- 1
- 0
JBoss Portal SVN: r13139 - branches/JBoss_Portal_Branch_2_7_AS5/search.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2009-04-02 19:19:34 -0400 (Thu, 02 Apr 2009)
New Revision: 13139
Modified:
branches/JBoss_Portal_Branch_2_7_AS5/search/.classpath
branches/JBoss_Portal_Branch_2_7_AS5/search/build.xml
Log:
Split up some of the as core libs and use proper sub projects.
Update eclipse classpath files to find the jar file changes.
Modified: branches/JBoss_Portal_Branch_2_7_AS5/search/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/search/.classpath 2009-04-02 23:19:31 UTC (rev 13138)
+++ branches/JBoss_Portal_Branch_2_7_AS5/search/.classpath 2009-04-02 23:19:34 UTC (rev 13139)
@@ -5,11 +5,14 @@
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-lucene/lib/lucene.jar"/>
<classpathentry kind="lib" path="/thirdparty/jcr/lib/jcr-1.0.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/jems"/>
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/identity/lib/portal-identity-lib.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system-jmx.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-j2se.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_7_AS5/search/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/search/build.xml 2009-04-02 23:19:31 UTC (rev 13138)
+++ branches/JBoss_Portal_Branch_2_7_AS5/search/build.xml 2009-04-02 23:19:34 UTC (rev 13139)
@@ -70,6 +70,8 @@
<path refid="jboss.portal/modules/common.classpath"/>
<path refid="jboss.portal/modules/portlet.classpath"/>
<path refid="jboss.portal/modules/identity.classpath"/>
+ <path refid="jboss.microcontainer.classpath"/>
+ <path refid="jboss/common.logging.spi.classpath"/>
<path refid="jbossas/core.libs.classpath"/>
<path refid="apache.lucene.classpath"/>
<path refid="junit.junit.classpath"/>
15 years, 3 months
- 1
- 0
JBoss Portal SVN: r13138 - branches/JBoss_Portal_Branch_2_7_AS5/wsrp.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2009-04-02 19:19:31 -0400 (Thu, 02 Apr 2009)
New Revision: 13138
Modified:
branches/JBoss_Portal_Branch_2_7_AS5/wsrp/.classpath
branches/JBoss_Portal_Branch_2_7_AS5/wsrp/build.xml
Log:
Split up some of the as core libs and use proper sub projects.
Update eclipse classpath files to find the jar file changes.
Modified: branches/JBoss_Portal_Branch_2_7_AS5/wsrp/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/wsrp/.classpath 2009-04-02 23:19:28 UTC (rev 13137)
+++ branches/JBoss_Portal_Branch_2_7_AS5/wsrp/.classpath 2009-04-02 23:19:31 UTC (rev 13138)
@@ -10,17 +10,11 @@
<classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.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-jaxrpc.jar"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-saaj.jar"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/namespace.jar"/>
<classpathentry kind="lib" path="/thirdparty/ibm-wsdl4j/lib/wsdl4j.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-xml-binding.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/jems"/>
<classpathentry combineaccessrules="false" kind="src" path="/registration"/>
<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"/>
@@ -35,5 +29,14 @@
<classpathentry kind="lib" path="/thirdparty/portlet/lib/portlet-api.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/core"/>
<classpathentry kind="lib" path="/thirdparty/glassfish/javamail/lib/mail.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-javaee.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system-jmx.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-j2se.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-core-spi.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jboss-jaxrpc.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar"/>
<classpathentry kind="output" path="output/classes"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_7_AS5/wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/wsrp/build.xml 2009-04-02 23:19:28 UTC (rev 13137)
+++ branches/JBoss_Portal_Branch_2_7_AS5/wsrp/build.xml 2009-04-02 23:19:31 UTC (rev 13138)
@@ -114,15 +114,15 @@
<pathelement path="${jbossas/core.libs.lib}/jboss-jmx.jar"/>
<pathelement path="${jbossas/core.libs.lib}/jboss-system.jar"/>
<pathelement path="${jbossas/core.libs.lib}/jboss-javaee.jar"/>
- <pathelement path="${jbossas/core.libs.lib}/jboss-jaxrpc.jar"/>
<pathelement path="${jbossas/core.libs.lib}/jbossws-native-saaj.jar"/>
<pathelement path="${jbossas/core.libs.lib}/jboss-kernel.jar"/>
- <pathelement path="${jbossas/core.libs.lib}/jboss-logging-spi.jar"/>
<pathelement path="${jbossas/core.libs.lib}/jboss-system-jmx.jar"/>
<pathelement path="${jbossas/core.libs.lib}/jboss-j2se.jar"/>
- <pathelement path="${jbossas/core.libs.lib}/jbossws-native-jaxrpc.jar"/>
- <pathelement path="${jbossas/core.libs.lib}/jboss-deployers-core-spi.jar"/>
-
+ <path refid="jboss/common.core.classpath"/>
+ <path refid="jboss/common.logging.spi.classpath"/>
+ <path refid="jboss/jboss.deployers.classpath"/>
+ <path refid="jboss.microcontainer.classpath"/>
+ <path refid="jboss.jbossws.classpath"/>
<!-- needed to compile on JDK 1.4 -->
<pathelement path="${jbossas/core.libs.lib}/namespace.jar"/>
@@ -179,7 +179,6 @@
<path id="aop.classpath">
<!-- not directly available in AS -->
<pathelement path="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/>
-
<pathelement path="${jboss.aop.lib}/jboss-aop.jar"/>
<path refid="javassist.javassist.classpath"/>
<path refid="jboss/jboss.mdr.classpath"/>
@@ -255,6 +254,9 @@
<path id="aopc.classpath">
<path refid="jbossas/core.libs.classpath"/>
+ <path refid="jboss.microcontainer.classpath"/>
+ <path refid="jboss/common.core.classpath"/>
+ <path refid="jboss/common.logging.spi.classpath"/>
<path refid="dependentmodule.classpath"/>
<pathelement path="${build.classes}"/>
<path refid="hibernate.hibernate.classpath"/>
15 years, 3 months
- 1
- 0
JBoss Portal SVN: r13137 - branches/JBoss_Portal_Branch_2_7_AS5/core-management.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2009-04-02 19:19:28 -0400 (Thu, 02 Apr 2009)
New Revision: 13137
Modified:
branches/JBoss_Portal_Branch_2_7_AS5/core-management/.classpath
branches/JBoss_Portal_Branch_2_7_AS5/core-management/build.xml
Log:
Split up some of the as core libs and use proper sub projects.
Update eclipse classpath files to find the jar file changes.
Modified: branches/JBoss_Portal_Branch_2_7_AS5/core-management/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/core-management/.classpath 2009-04-02 23:19:25 UTC (rev 13136)
+++ branches/JBoss_Portal_Branch_2_7_AS5/core-management/.classpath 2009-04-02 23:19:28 UTC (rev 13137)
@@ -6,10 +6,13 @@
<classpathentry combineaccessrules="false" kind="src" path="/jems"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.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/jboss-portal/modules/portlet/lib/portal-portlet-federation-lib.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-management-lib.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-j2se.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system-jmx.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-javaee.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_Branch_2_7_AS5/core-management/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7_AS5/core-management/build.xml 2009-04-02 23:19:25 UTC (rev 13136)
+++ branches/JBoss_Portal_Branch_2_7_AS5/core-management/build.xml 2009-04-02 23:19:28 UTC (rev 13137)
@@ -95,7 +95,9 @@
<path refid="jboss.portal/modules/identity.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<path refid="jboss.cache.classpath"/>
+ <path refid="jboss.microcontainer.classpath"/>
<path refid="jbossas/core.libs.classpath"/>
+ <path refid="jboss/common.logging.spi.classpath"/>
<path refid="hibernate.hibernate.classpath"/>
<path refid="apache.ant.classpath"/>
<path refid="apache.log4j.classpath"/>
15 years, 3 months
- 1
- 0