[portal-commits] JBoss Portal SVN: r12965 - in branches/JBoss_Portal_AS5_Deployer/server: src/main/org/jboss/portal/server/deployment and 1 other directories.

Author: mwringe Date: 2009-03-06 16:05:27 -0500 (Fri, 06 Mar 2009) New Revision: 12965 Modified: branches/JBoss_Portal_AS5_Deployer/server/build.xml branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/PortalWebApp.java branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java Log: Update classpath to include the metadata and deployer jars. Add simple init option to the PortalWebApp class to just add needed variables. Modified: branches/JBoss_Portal_AS5_Deployer/server/build.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/server/build.xml 2009-03-06 20:30:12 UTC (rev 12964) +++ branches/JBoss_Portal_AS5_Deployer/server/build.xml 2009-03-06 21:05:27 UTC (rev 12965) @@ -99,6 +99,8 @@ <path refid="dom4j.dom4j.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="jbossas/core.libs.classpath"/> + <path refid="jboss/jboss.metadata.classpath"/> + <path refid="jboss/jboss.deployers.classpath"/> <path refid="apache.ant.classpath"/> <path refid="apache.collections.classpath"/> <path refid="apache.log4j.classpath"/> @@ -107,6 +109,7 @@ <path refid="apache.codec.classpath"/> <path refid="junit.junit.classpath"/> <path refid="jboss.test.classpath"/> + <path refid="sun.jaxb.classpath"/> <path refid="sun.servlet.classpath"/> <path refid="jboss.web.classpath"/> <pathelement location="jboss-bean-deployer.jar"/> Modified: branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/PortalWebApp.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/PortalWebApp.java 2009-03-06 20:30:12 UTC (rev 12964) +++ branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/PortalWebApp.java 2009-03-06 21:05:27 UTC (rev 12965) @@ -203,6 +203,19 @@ } } + protected final void init( + ServletContext servletContext, + URL url, + ClassLoader loader, + String contextPath) + { + this.servletContext = servletContext; + this.url = url; + this.loader = loader; + this.contextPath = contextPath; + this.id = contextPath; + } + /** * Read jboss-portal-app.xml deployment and fetch the overriden id if it exists. * Modified: branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java 2009-03-06 20:30:12 UTC (rev 12964) +++ branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java 2009-03-06 21:05:27 UTC (rev 12965) @@ -269,7 +269,16 @@ // Put it in the map infoContexts.put(pdi.url, new PortalDeploymentInfoContext(pdi)); - + + try + { + mainDeployer.setServiceController(new ObjectName("jboss.system:service=ServiceController")); + } + catch (Exception e) + { + e.printStackTrace(); + } + // And let JBoss deploy it mainDeployer.deploy(pdi); }