[portal-commits] JBoss Portal SVN: r13095 - in modules/deployer/trunk: portlet and 6 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Fri Mar 27 16:54:55 EDT 2009
Author: mwringe
Date: 2009-03-27 16:54:55 -0400 (Fri, 27 Mar 2009)
New Revision: 13095
Added:
modules/deployer/trunk/portlet/
modules/deployer/trunk/portlet/.classpath
modules/deployer/trunk/portlet/.cvsignore
modules/deployer/trunk/portlet/.project
modules/deployer/trunk/portlet/pom.xml
modules/deployer/trunk/portlet/src/
modules/deployer/trunk/portlet/src/main/
modules/deployer/trunk/portlet/src/main/java/
modules/deployer/trunk/portlet/src/main/resources/
modules/deployer/trunk/portlet/src/test/
Removed:
modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/PortalEntityResolver.java
modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/PortalResolverFactory.java
modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/PortalUnmarshallerFactory.java
modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/portal/
modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/webapp/
Modified:
modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/parsing/MergedPortletParsingDeployer.java
modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/parsing/PortalResolverDeployer.java
modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/portlet/InstanceDeployer.java
modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/portlet/PortletDependencyDeployer.java
modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/portlet/PortletDeployer.java
modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/portlet/ServiceInjectorDeployer.java
Log:
Create portlet submodule from main deployer module.
Added: modules/deployer/trunk/portlet/.classpath
===================================================================
--- modules/deployer/trunk/portlet/.classpath (rev 0)
+++ modules/deployer/trunk/portlet/.classpath 2009-03-27 20:54:55 UTC (rev 13095)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="/thirdparty/apache-ant/lib/ant.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
+ <classpathentry kind="lib" path="/tools/lib/xalan.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.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"/>
+ <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/apache-log4j/lib/log4j.jar"/>
+ <classpathentry kind="lib" path="/tools/lib/cargo-core-uberjar-0.8.jar"/>
+ <classpathentry kind="lib" path="/tools/lib/ant-junit.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/backport-concurrent/lib/jboss-backport-concurrent.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: modules/deployer/trunk/portlet/.classpath
___________________________________________________________________
Name: svn:executable
+ *
Added: modules/deployer/trunk/portlet/.cvsignore
===================================================================
--- modules/deployer/trunk/portlet/.cvsignore (rev 0)
+++ modules/deployer/trunk/portlet/.cvsignore 2009-03-27 20:54:55 UTC (rev 13095)
@@ -0,0 +1,2 @@
+output
+bin
Property changes on: modules/deployer/trunk/portlet/.cvsignore
___________________________________________________________________
Name: svn:executable
+ *
Added: modules/deployer/trunk/portlet/.project
===================================================================
--- modules/deployer/trunk/portlet/.project (rev 0)
+++ modules/deployer/trunk/portlet/.project 2009-03-27 20:54:55 UTC (rev 13095)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>common</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: modules/deployer/trunk/portlet/.project
___________________________________________________________________
Name: svn:executable
+ *
Added: modules/deployer/trunk/portlet/pom.xml
===================================================================
--- modules/deployer/trunk/portlet/pom.xml (rev 0)
+++ modules/deployer/trunk/portlet/pom.xml 2009-03-27 20:54:55 UTC (rev 13095)
@@ -0,0 +1,81 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.portal.deployer</groupId>
+ <artifactId>module-parent</artifactId>
+ <version>trunk-SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>deployer-portlet</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Portal Modules Deployer</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.portal.deployer</groupId>
+ <artifactId>deployer-portal</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-spi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>saxon</groupId>
+ <artifactId>saxon</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portal.metadata</groupId>
+ <artifactId>metadata-metadata</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portal.metadata</groupId>
+ <artifactId>metadata-theme</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+
+<pluginManagement>
+<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+</plugin>
+</plugins>
+</pluginManagement>
+
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <encoding>iso-8859-1</encoding>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
Copied: modules/deployer/trunk/portlet/src/main/java (from rev 13058, modules/deployer/trunk/deployer/src/main/java)
Property changes on: modules/deployer/trunk/portlet/src/main/java
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/PortalEntityResolver.java
===================================================================
--- modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/PortalEntityResolver.java 2009-03-20 16:16:17 UTC (rev 13058)
+++ modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/PortalEntityResolver.java 2009-03-27 20:54:55 UTC (rev 13095)
@@ -1,84 +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.deployer;
-
-import org.jboss.logging.Logger;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-public class PortalEntityResolver implements org.xml.sax.EntityResolver
-{
- Logger log = Logger.getLogger(PortalEntityResolver.class);
-
- /** . */
- private Properties dtdMapping;
-
- public Properties getDTDMapping()
- {
- return dtdMapping;
- }
-
- public void setDTDMapping(Properties dtdMapping)
- {
- this.dtdMapping = dtdMapping;
- }
-
- public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException
- {
- // Let the parser open a regular URI connection to systemId
- if (publicId == null)
- {
- //return null;
- }
-
- //
- String dtdResourceName = (String) dtdMapping.get(publicId);
- if (dtdResourceName != null)
- {
-
- log.debug("Looking up resource " + dtdResourceName + " for dtd publicId=" + publicId + ", systemId=" + systemId);
- InputStream dtdStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(dtdResourceName);
- if (dtdStream != null)
- {
- return new InputSource(dtdStream);
- }
- else
- {
- log.debug("No resource found for dtd publicId=" + publicId + ", systemId=" + systemId);
- }
- }
- else
- {
- log.debug("No resource name found for dtd publicId=" + publicId + ", systemId=" + systemId);
- }
-
- //
- return null;
- }
-
-}
Deleted: modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/PortalResolverFactory.java
===================================================================
--- modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/PortalResolverFactory.java 2009-03-20 16:16:17 UTC (rev 13058)
+++ modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/PortalResolverFactory.java 2009-03-27 20:54:55 UTC (rev 13095)
@@ -1,112 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.deployer;
-
-import java.util.Enumeration;
-import java.util.Properties;
-
-import org.jboss.logging.Logger;
-import org.jboss.util.xml.JBossEntityResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaResolverFactory;
-import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory;
-
-/**
- * @author <a href="mailto:mwringe at redhat.com">Matt Wringe</a>
- * @version $Revision$
- */
-public class PortalResolverFactory implements SchemaResolverFactory
-{
-
- private static final Logger log = Logger.getLogger(PortalResolverFactory.class);
-
- protected static SchemaResolverFactory factory = new PortalResolverFactory();
-
- private final DefaultSchemaResolver resolver = new DefaultSchemaResolver();
-
- public static SchemaResolverFactory getInstance()
- {
- return factory;
- }
-
- public SchemaBindingResolver getSchemaBindingResolver()
- {
- return (SchemaBindingResolver) resolver;
- }
-
- private PortalResolverFactory()
- {
- }
-
- /**
- * Get the DTD mappings and set the resolver to use them.
- * @param mapping The mapping to use
- */
- public void setDTDMapping(Properties mapping)
- {
- ClassLoader classloader = Thread.currentThread().getContextClassLoader();
- if (mapping != null && mapping.size() > 0)
- {
- Enumeration enumer = mapping.keys();
- while (enumer.hasMoreElements())
- {
- String location = (String) enumer.nextElement();
- String classname = (String) mapping.get(location);
- try
- {
- Class clazz = classloader.loadClass(classname);
- resolver.addClassBindingForLocation(location, clazz);
- }
- catch (ClassNotFoundException e)
- {
- log.warn("Could not find class " + classname);
- }
- }
- }
- }
-
- public void setXSDMapping(Properties mapping)
- {
- ClassLoader classloader = Thread.currentThread().getContextClassLoader();
- if (mapping != null && mapping.size() > 0)
- {
- Enumeration enumer = mapping.keys();
- while (enumer.hasMoreElements())
- {
- String location = (String) enumer.nextElement();
- String classname = (String) mapping.get(location);
- try
- {
- Class clazz = classloader.loadClass(classname);
- resolver.addClassBinding(location, clazz);
- }
- catch (ClassNotFoundException e)
- {
- log.warn("Could not find class " + classname);
- }
- }
- }
- }
-
-}
Deleted: modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/PortalUnmarshallerFactory.java
===================================================================
--- modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/PortalUnmarshallerFactory.java 2009-03-20 16:16:17 UTC (rev 13058)
+++ modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/PortalUnmarshallerFactory.java 2009-03-27 20:54:55 UTC (rev 13095)
@@ -1,102 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.deployer;
-
-import org.jboss.xb.binding.JBossXBException;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
-import org.xml.sax.EntityResolver;
-
-/**
- * @author <a href="mailto:mwringe at redhat.com">Matt Wringe</a>
- * @version $Revision$
- */
-public class PortalUnmarshallerFactory
-{
-
- protected static PortalUnmarshallerFactory factory = new PortalUnmarshallerFactory();
-
- protected Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
-
- protected EntityResolver entityResolver;
-
- protected boolean schemaValidation;
-
- protected boolean validation;
-
- public static PortalUnmarshallerFactory getInstance()
- {
- return factory;
- }
-
- private PortalUnmarshallerFactory()
- {
- //set the default validation values.
- this.schemaValidation = false;
- this.validation = false;
- }
-
- public Unmarshaller getUnmarshaller()
- {
- // add the entityresolver if it exists
- if (entityResolver != null)
- {
- try
- {
- unmarshaller.setEntityResolver(entityResolver);
- }
- catch (JBossXBException exception)
- {
- exception.printStackTrace();
- }
- }
-
- // try and set the validations for the unmarshaller
- try
- {
- unmarshaller.setSchemaValidation(schemaValidation);
- unmarshaller.setValidation(validation);
- }
- catch (JBossXBException exception)
- {
- exception.printStackTrace();
- }
- return unmarshaller;
- }
-
- public void setEntityResolver(EntityResolver entityResolver)
- {
- this.entityResolver = entityResolver;
- }
-
- public void setSchemaValidation(boolean validate)
- {
- this.schemaValidation = validate;
- }
-
- public void setValidation(boolean validate)
- {
- this.validation = validate;
- }
-
-}
Modified: modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/parsing/MergedPortletParsingDeployer.java
===================================================================
--- modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/parsing/MergedPortletParsingDeployer.java 2009-03-20 16:16:17 UTC (rev 13058)
+++ modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/parsing/MergedPortletParsingDeployer.java 2009-03-27 20:54:55 UTC (rev 13095)
@@ -30,10 +30,10 @@
import org.jboss.deployers.spi.deployer.helpers.AbstractDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
-import org.jboss.portal.deployer.PortalEntityResolver;
-import org.jboss.portal.deployer.PortalResolverFactory;
-import org.jboss.portal.deployer.PortalUnmarshallerFactory;
-import org.jboss.portal.deployer.webapp.WebAppContextDeployer;
+import org.jboss.portal.deployer.portal.PortalEntityResolver;
+import org.jboss.portal.deployer.portal.PortalResolverFactory;
+import org.jboss.portal.deployer.portal.PortalUnmarshallerFactory;
+import org.jboss.portal.deployer.portal.webapp.WebAppContextDeployer;
import org.jboss.portal.metadata.jboss.app.PortalAppMetaData;
import org.jboss.portal.metadata.jboss.portlet.JBossPortletAppMetaData;
import org.jboss.portal.metadata.jboss.portlet.JBossPortletMetaData;
Modified: modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/parsing/PortalResolverDeployer.java
===================================================================
--- modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/parsing/PortalResolverDeployer.java 2009-03-20 16:16:17 UTC (rev 13058)
+++ modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/parsing/PortalResolverDeployer.java 2009-03-27 20:54:55 UTC (rev 13095)
@@ -27,9 +27,9 @@
import org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.portal.deployer.PortalEntityResolver;
-import org.jboss.portal.deployer.PortalResolverFactory;
-import org.jboss.portal.deployer.PortalUnmarshallerFactory;
+import org.jboss.portal.deployer.portal.PortalEntityResolver;
+import org.jboss.portal.deployer.portal.PortalResolverFactory;
+import org.jboss.portal.deployer.portal.PortalUnmarshallerFactory;
import org.jboss.portal.metadata.jboss.app.PortalAppMetaData;
import org.jboss.virtual.VirtualFile;
import org.jboss.xb.binding.Unmarshaller;
Modified: modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/portlet/InstanceDeployer.java
===================================================================
--- modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/InstanceDeployer.java 2009-03-20 16:16:17 UTC (rev 13058)
+++ modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/portlet/InstanceDeployer.java 2009-03-27 20:54:55 UTC (rev 13095)
@@ -29,7 +29,7 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.portal.deployer.container.InstanceDeployment;
import org.jboss.portal.deployer.parsing.MergedPortletParsingDeployer;
-import org.jboss.portal.deployer.webapp.WebAppContextDeployer;
+import org.jboss.portal.deployer.portal.webapp.WebAppContextDeployer;
import org.jboss.portal.metadata.jboss.portlet.JBossPortletAppMetaData;
import org.jboss.portal.metadata.portlet.instances.PortletDeploymentInstancesMetaData;
Modified: modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/portlet/PortletDependencyDeployer.java
===================================================================
--- modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/PortletDependencyDeployer.java 2009-03-20 16:16:17 UTC (rev 13058)
+++ modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/portlet/PortletDependencyDeployer.java 2009-03-27 20:54:55 UTC (rev 13095)
@@ -73,25 +73,25 @@
public void deploy(DeploymentUnit unit) throws DeploymentException
{
ControllerContext context = unit.getAttachment(ControllerContext.class);
-
+
if (context != null)
{
-
- if (dependencies != null)
- {
- for (int i = 0; i < dependencies.size(); i++)
+
+ if (dependencies != null)
{
- String dependency = dependencies.get(i);
+ for (int i = 0; i < dependencies.size(); i++)
+ {
+ String dependency = dependencies.get(i);
- // the controller state must be set to Real to make sure that the deployable is not initalized before the dependencies.
- // TODO: use ControllerState.REAL if it gets added as an option to the ControllerState class.
- DependencyItem dependItem = new AbstractDependencyItem(context.getName(), dependency, new ControllerState(
- "Real"), ControllerState.CREATE);
+ // the controller state must be set to Real to make sure that the deployable is not initalized before the dependencies.
+ // TODO: use ControllerState.REAL if it gets added as an option to the ControllerState class.
+ DependencyItem dependItem = new AbstractDependencyItem(context.getName(), dependency,
+ new ControllerState("Real"), ControllerState.CREATE);
- unit.addIDependOn(dependItem);
+ unit.addIDependOn(dependItem);
+ }
}
}
- }
}
}
Modified: modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/portlet/PortletDeployer.java
===================================================================
--- modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/PortletDeployer.java 2009-03-20 16:16:17 UTC (rev 13058)
+++ modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/portlet/PortletDeployer.java 2009-03-27 20:54:55 UTC (rev 13095)
@@ -35,7 +35,7 @@
import org.jboss.logging.Logger;
import org.jboss.portal.deployer.container.PortletDeployment;
import org.jboss.portal.deployer.parsing.MergedPortletParsingDeployer;
-import org.jboss.portal.deployer.webapp.WebAppContextDeployer;
+import org.jboss.portal.deployer.portal.webapp.WebAppContextDeployer;
import org.jboss.portal.metadata.jboss.portlet.JBossPortletAppMetaData;
import org.jboss.portal.metadata.jboss.portlet.JBossPortletMetaData;
import org.jboss.portal.metadata.portlet.PortletApplication10MetaData;
Modified: modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/portlet/ServiceInjectorDeployer.java
===================================================================
--- modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/ServiceInjectorDeployer.java 2009-03-20 16:16:17 UTC (rev 13058)
+++ modules/deployer/trunk/portlet/src/main/java/org/jboss/portal/deployer/portlet/ServiceInjectorDeployer.java 2009-03-27 20:54:55 UTC (rev 13095)
@@ -32,7 +32,7 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.portal.deployer.parsing.MergedPortletParsingDeployer;
-import org.jboss.portal.deployer.webapp.WebAppContextDeployer;
+import org.jboss.portal.deployer.portal.webapp.WebAppContextDeployer;
import org.jboss.portal.metadata.jboss.portlet.JBossPortletAppMetaData;
import org.jboss.portal.metadata.jboss.portlet.ServiceMetaData;
More information about the portal-commits
mailing list