[portal-commits] JBoss Portal SVN: r12993 - modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet.

[portal-commits at lists.jboss.org]

Author: mwringe
Date: 2009-03-09 00:53:58 -0400 (Mon, 09 Mar 2009)
New Revision: 12993

Modified:
   modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/PortletDeployer.java
   modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/PortletTLDDeployer.java
   modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/ServiceInjectorDeployer.java
Log:
Fix the order of deployment for the service injector deployer.
Fix the tld deployer to name the tld to the proper file name.

Modified: modules/deployer/trunk/deployer/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-09 04:50:55 UTC (rev 12992)
+++ modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/PortletDeployer.java	2009-03-09 04:53:58 UTC (rev 12993)
@@ -56,6 +56,7 @@
       addInput(WebAppContextDeployer.PORTLET_APP_CONTEXT_PATH_ATTACHMENT);
       addInput(WebAppContextDeployer.PORTLET_APP_SERVLET_CONTEXT_ATTACHMENT);
       addInput(WebApplication.class);
+      addInput(ServiceInjectorDeployer.SERVICES_INJECTED);
       addOutput(PORLET_DEPLOYED);
       setStage(DeploymentStages.INSTALLED);
    }

Modified: modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/PortletTLDDeployer.java
===================================================================
--- modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/PortletTLDDeployer.java	2009-03-09 04:50:55 UTC (rev 12992)
+++ modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/PortletTLDDeployer.java	2009-03-09 04:53:58 UTC (rev 12993)
@@ -93,11 +93,11 @@
          PortletApplication10MetaData metaData = unit.getAttachment(PortletApplication10MetaData.class);
          if (metaData instanceof PortletApplication20MetaData)
          {
-            copyTld(tldDirectory + "/portlet_2_0.tld", docBase);
+            copyTld(tldDirectory + "/portlet_2_0.tld", "portlet_2_0.tld", docBase);
          }
          else
          {
-            copyTld(tldDirectory + "/portlet.tld", docBase);
+            copyTld(tldDirectory + "/portlet.tld", "portlet.tld", docBase);
          }
       }
       catch (Exception e)
@@ -106,7 +106,7 @@
       }
    }
 
-   protected void copyTld(String tldFileLocation, String webappDirectoryLocation) throws IOException
+   protected void copyTld(String tldFileLocation, String tldName, String webappDirectoryLocation) throws IOException
    {
       //the tld file will be copied to the web-inf directory of the webapp.
       File webappWebInfFile = new File(webappDirectoryLocation + "/WEB-INF");
@@ -121,7 +121,7 @@
          else if (webappWebInfFile.isDirectory())
          {
             InputStream fileInput = Thread.currentThread().getContextClassLoader().getResourceAsStream(tldFileLocation);
-            FileOutputStream fileOutput = new FileOutputStream(new File(webappWebInfFile, "portlet.tld"));
+            FileOutputStream fileOutput = new FileOutputStream(new File(webappWebInfFile, tldName));
 
             int in = fileInput.read();
             while (in > 0)

Modified: modules/deployer/trunk/deployer/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-09 04:50:55 UTC (rev 12992)
+++ modules/deployer/trunk/deployer/src/main/java/org/jboss/portal/deployer/portlet/ServiceInjectorDeployer.java	2009-03-09 04:53:58 UTC (rev 12993)
@@ -45,6 +45,8 @@
 public class ServiceInjectorDeployer extends AbstractDeployer
 {
 
+   public static final String SERVICES_INJECTED = "services.injected";
+   
    protected MBeanServer mbeanServer;
    protected String serverDomain = "portal";
    
@@ -63,6 +65,7 @@
       this.setAllInputs(false);
       this.setInput(JBossPortletAppMetaData.class);
       this.addInput(WebAppContextDeployer.PORTLET_APP_SERVLET_CONTEXT_ATTACHMENT);
+      this.addOutput(SERVICES_INJECTED);
       this.setStage(DeploymentStages.INSTALLED);
    }
 
@@ -79,6 +82,7 @@
          }
       }
       
+      unit.addAttachment(SERVICES_INJECTED, "services injected");
    }
 
    public void injectService (ServiceMetaData serviceMetaData ,ServletContext servletContext, ClassLoader classloader)