[jbosstools-commits] JBoss Tools SVN: r30521 - in workspace/adietish: org.jboss.ide.eclipse.as7.deployment/META-INF and 9 other directories.

Author: adietish Date: 2011-04-12 12:23:19 -0400 (Tue, 12 Apr 2011) New Revision: 30521 Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/jboss-servlet-api_3.0_spec-1.0.0.Final.jar workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/shrinkwrap-api-1.0.0-alpha-12-sources.jar workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/shrinkwrap-api-1.0.0-alpha-12.jar workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/shrinkwrap-impl-base-1.0.0-alpha-12-sources.jar workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/shrinkwrap-impl-base-1.0.0-alpha-12.jar workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/shrinkwrap-spi-1.0.0-alpha-12-sources.jar workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/shrinkwrap-spi-1.0.0-alpha-12.jar workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/as/ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/as/demos/ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/as/demos/war/ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/as/demos/war/runner/ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/as/demos/war/runner/DeploymentUtilsIntegrationTest.java workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentUtils.java Removed: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/shrinkwrap-api-1.0.0-alpha-12-sources.jar workspace/adietish/org.jboss.ide.eclipse.as7.deployment/shrinkwrap-api-1.0.0-alpha-12.jar workspace/adietish/org.jboss.ide.eclipse.as7.deployment/shrinkwrap-impl-base-1.0.0-alpha-12-sources.jar workspace/adietish/org.jboss.ide.eclipse.as7.deployment/shrinkwrap-impl-base-1.0.0-alpha-12.jar workspace/adietish/org.jboss.ide.eclipse.as7.deployment/shrinkwrap-spi-1.0.0-alpha-12-sources.jar workspace/adietish/org.jboss.ide.eclipse.as7.deployment/shrinkwrap-spi-1.0.0-alpha-12.jar workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/DeploymentUtils.java Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/.classpath workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/META-INF/MANIFEST.MF workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/build.properties workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/StandaloneDeploymentIntegrationTest.java workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath workspace/adietish/org.jboss.ide.eclipse.as7.deployment/META-INF/MANIFEST.MF workspace/adietish/org.jboss.ide.eclipse.as7.deployment/build.properties Log: implemented DeploymentUtilsIntegrationTest Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath =================================================================== --- workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath 2011-04-12 14:46:47 UTC (rev 30520) +++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath 2011-04-12 16:23:19 UTC (rev 30521) @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry exported="true" kind="lib" path="shrinkwrap-spi-1.0.0-alpha-12.jar"/> - <classpathentry exported="true" kind="lib" path="shrinkwrap-api-1.0.0-alpha-12.jar"/> - <classpathentry exported="true" kind="lib" path="shrinkwrap-impl-base-1.0.0-alpha-12.jar" sourcepath="shrinkwrap-impl-base-1.0.0-alpha-12-sources.jar"/> <classpathentry exported="true" kind="lib" path="jboss-marshalling-1.3.0.CR8.jar"/> <classpathentry exported="true" kind="lib" path="jboss-logging-3.0.0.Beta5.jar"/> <classpathentry exported="true" kind="lib" path="jboss-dmr-1.0.0.Beta5.jar"/> @@ -20,8 +17,5 @@ <classpathentry kind="lib" path="jboss-as-controller-7.0.0.Beta3-SNAPSHOT-sources.jar"/> <classpathentry kind="lib" path="jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT-sources.jar"/> <classpathentry kind="lib" path="jboss-as-protocol-7.0.0.Beta3-SNAPSHOT-sources.jar"/> - <classpathentry kind="lib" path="shrinkwrap-api-1.0.0-alpha-12-sources.jar"/> - <classpathentry kind="lib" path="shrinkwrap-impl-base-1.0.0-alpha-12-sources.jar"/> - <classpathentry kind="lib" path="shrinkwrap-spi-1.0.0-alpha-12-sources.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/META-INF/MANIFEST.MF =================================================================== --- workspace/adietish/org.jboss.ide.eclipse.as7.deployment/META-INF/MANIFEST.MF 2011-04-12 14:46:47 UTC (rev 30520) +++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/META-INF/MANIFEST.MF 2011-04-12 16:23:19 UTC (rev 30521) @@ -16,9 +16,7 @@ jboss-logging-3.0.0.Beta5.jar, jboss-marshalling-1.3.0.CR8.jar, shrinkwrap-api-1.0.0-alpha-11.jar, - shrinkwrap-impl-base-1.0.0-alpha-12.jar, - shrinkwrap-api-1.0.0-alpha-12.jar, - shrinkwrap-spi-1.0.0-alpha-12.jar + shrinkwrap-impl-base-1.0.0-alpha-12.jar Export-Package: org.jboss.as.controller, org.jboss.as.controller.client, org.jboss.as.controller.client.helpers, @@ -44,31 +42,6 @@ org.jboss.marshalling.cloner, org.jboss.marshalling.reflect, org.jboss.marshalling.util, - org.jboss.shrinkwrap.api, - org.jboss.shrinkwrap.api.asset, - org.jboss.shrinkwrap.api.classloader, - org.jboss.shrinkwrap.api.container, - org.jboss.shrinkwrap.api.exporter, - org.jboss.shrinkwrap.api.formatter, - org.jboss.shrinkwrap.api.importer, - org.jboss.shrinkwrap.api.serialization, - org.jboss.shrinkwrap.api.spec, - org.jboss.shrinkwrap.impl.base, - org.jboss.shrinkwrap.impl.base.asset, - org.jboss.shrinkwrap.impl.base.container, - org.jboss.shrinkwrap.impl.base.exporter, - org.jboss.shrinkwrap.impl.base.exporter.tar, - org.jboss.shrinkwrap.impl.base.exporter.zip, - org.jboss.shrinkwrap.impl.base.filter, - org.jboss.shrinkwrap.impl.base.importer, - org.jboss.shrinkwrap.impl.base.importer.tar, - org.jboss.shrinkwrap.impl.base.importer.zip, - org.jboss.shrinkwrap.impl.base.io, - org.jboss.shrinkwrap.impl.base.io.tar, - org.jboss.shrinkwrap.impl.base.path, - org.jboss.shrinkwrap.impl.base.serialization, - org.jboss.shrinkwrap.impl.base.spec, - org.jboss.shrinkwrap.spi, org.jboss.threads, org.jboss.threads.management Bundle-Vendor: JBoss by Red Hat Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/build.properties =================================================================== --- workspace/adietish/org.jboss.ide.eclipse.as7.deployment/build.properties 2011-04-12 14:46:47 UTC (rev 30520) +++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/build.properties 2011-04-12 16:23:19 UTC (rev 30521) @@ -9,8 +9,7 @@ jboss-dmr-1.0.0.Beta5.jar,\ jboss-logging-3.0.0.Beta5.jar,\ jboss-marshalling-1.3.0.CR8.jar,\ - shrinkwrap-impl-base-1.0.0-alpha-12.jar,\ - shrinkwrap-api-1.0.0-alpha-12.jar + shrinkwrap-impl-base-1.0.0-alpha-12.jar src.includes = jboss-dmr-1.0.0.Beta5-sources.jar,\ jboss-dmr-1.0.0.Beta5.jar,\ jboss-marshalling-1.3.0.CR8-sources.jar,\ Deleted: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/shrinkwrap-api-1.0.0-alpha-12-sources.jar =================================================================== (Binary files differ) Deleted: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/shrinkwrap-api-1.0.0-alpha-12.jar =================================================================== (Binary files differ) Deleted: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/shrinkwrap-impl-base-1.0.0-alpha-12-sources.jar =================================================================== (Binary files differ) Deleted: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/shrinkwrap-impl-base-1.0.0-alpha-12.jar =================================================================== (Binary files differ) Deleted: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/shrinkwrap-spi-1.0.0-alpha-12-sources.jar =================================================================== (Binary files differ) Deleted: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/shrinkwrap-spi-1.0.0-alpha-12.jar =================================================================== (Binary files differ) Deleted: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/DeploymentUtils.java =================================================================== --- workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/DeploymentUtils.java 2011-04-12 14:46:47 UTC (rev 30520) +++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/DeploymentUtils.java 2011-04-12 16:23:19 UTC (rev 30521) @@ -1,345 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.ide.eclipse.as7.deployment; - -import static org.jboss.as.protocol.StreamUtils.safeClose; - -import java.io.Closeable; -import java.io.File; -import java.io.IOException; -import java.net.InetAddress; -import java.net.URISyntaxException; -import java.net.URL; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import javax.management.remote.JMXConnectorFactory; -import javax.management.remote.JMXServiceURL; - -import org.jboss.as.controller.client.ModelControllerClient; -import org.jboss.as.controller.client.helpers.standalone.DeploymentPlan; -import org.jboss.as.controller.client.helpers.standalone.DeploymentPlanBuilder; -import org.jboss.as.controller.client.helpers.standalone.DuplicateDeploymentNameException; -import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentManager; -import org.jboss.shrinkwrap.api.Archive; -import org.jboss.shrinkwrap.api.ArchivePath; -import org.jboss.shrinkwrap.api.ArchivePaths; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.container.ResourceContainer; -import org.jboss.shrinkwrap.api.exporter.ZipExporter; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.jboss.shrinkwrap.api.spec.WebArchive; - -/** - * Used to deploy/undeploy deployments to a running <b>standalone</b> application server - * - * TODO Use the real deployment API once that is complete - * - * @author <a href=&quot;kabir.khan(a)jboss.com&quot;&gt;Kabir Khan</a> - * @version $Revision: 1.1 $ - */ -public class DeploymentUtils implements Closeable { - - public static final long DEFAULT_TIMEOUT = 15000; - - private final List<AbstractDeployment> deployments = new ArrayList<AbstractDeployment>(); - private final ModelControllerClient client; - private final ServerDeploymentManager manager; - private long timeout = DEFAULT_TIMEOUT; - - public DeploymentUtils() throws UnknownHostException { - client = ModelControllerClient.Factory.create(InetAddress.getByName("localhost"), 9999); - manager = ServerDeploymentManager.Factory.create(client); - } - - public DeploymentUtils(String archiveName, Package... pkg) throws UnknownHostException { - this(); - addDeployment(archiveName, pkg); - } - - public DeploymentUtils(Archive<?> archive) throws UnknownHostException { - this(); - deployments.add(new ArbitraryDeployment(archive,false)); - } - - public DeploymentUtils(String archiveName, boolean show, Package... pkgs) throws UnknownHostException { - this(); - addDeployment(archiveName, show, pkgs); - } - - public synchronized void addDeployment(String archiveName, Package... pkgs) { - addDeployment(archiveName, false, pkgs); - } - - public synchronized void addDeployment(String archiveName, boolean show, Package... pkgs) { - deployments.add(new Deployment(archiveName, pkgs, show)); - } - - public synchronized void addWarDeployment(String archiveName, Package... pkgs) { - addWarDeployment(archiveName, false, pkgs); - } - - public synchronized void addWarDeployment(String archiveName, boolean show, Package... pkgs) { - deployments.add(new WarDeployment(archiveName, pkgs, show)); - } - - public synchronized void addWarFileDeployment(File file) { - deployments.add(new WarFileDeployment(file)); - } - - public synchronized void deploy() throws DuplicateDeploymentNameException, IOException, ExecutionException, InterruptedException, TimeoutException { - DeploymentPlanBuilder builder = manager.newDeploymentPlan().withRollback(); - for (AbstractDeployment deployment : deployments) { - builder = deployment.addDeployment(manager, builder); - } - - try { - manager.execute(builder.build()).get(timeout, TimeUnit.MILLISECONDS); - } finally { - markDeploymentsDeployed(); - } - } - - private void markDeploymentsDeployed() { - for (AbstractDeployment deployment : deployments) { - deployment.deployed = true; - } - } - - public synchronized void undeploy() throws ExecutionException, InterruptedException, TimeoutException { - DeploymentPlanBuilder builder = manager.newDeploymentPlan(); - for (AbstractDeployment deployment : deployments) { - builder = deployment.removeDeployment(builder); - } - DeploymentPlan plan = builder.build(); - if (plan.getDeploymentActions().size() > 0) { - manager.execute(builder.build()).get(timeout, TimeUnit.MILLISECONDS); - } - } - - public MBeanServerConnection getConnection() throws Exception { - return JMXConnectorFactory.connect(new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:1090/jmxrmi"), - new HashMap<String, Object>()).getMBeanServerConnection(); - } - - public String showJndi() throws Exception { - return (String)getConnection().invoke(new ObjectName("jboss:type=JNDIView"), "list", new Object[] {true}, new String[] {"boolean"}); - } - - public long getTimeout() { - return timeout; - } - - public void setTimeout(long timeout) { - this.timeout = timeout; - } - - @Override - public void close() throws IOException { - safeClose(client); - } - - private abstract class AbstractDeployment{ - - boolean deployed; - String deployment; - - public synchronized DeploymentPlanBuilder addDeployment(ServerDeploymentManager manager, DeploymentPlanBuilder builder) throws DuplicateDeploymentNameException, IOException, ExecutionException, InterruptedException { - deployment = getRealArchive().getName(); - System.out.println("Deploying " + deployment); - return builder.add(deployment, getRealArchive()).deploy(deployment); - } - - public synchronized DeploymentPlanBuilder removeDeployment(DeploymentPlanBuilder builder) { - if (deployed) { - System.out.println("Undeploying " + deployment); - return builder.undeploy(deployment).remove(deployment); - } - else { - return builder; - } - } - - protected void addFiles(ResourceContainer<?> archive, File dir, ArchivePath dest) { - for (String name : dir.list()) { - File file = new File(dir, name); - if (file.isDirectory()) { - addFiles(archive, file, ArchivePaths.create(dest, name)); - } else { - archive.addAsResource(file, ArchivePaths.create(dest, name)); - } - } - } - - protected File getSourceMetaInfDir(String archiveName) { - String name = "archives/" + archiveName + "/META-INF/MANIFEST.MF"; - - URL url = Thread.currentThread().getContextClassLoader().getResource(name); - if (url == null) { - throw new IllegalArgumentException("No resource called " + name); - } - try { - File file = new File(url.toURI()); - return file.getParentFile(); - } catch (URISyntaxException e) { - throw new RuntimeException("Could not get file for " + url); - } - } - - protected File getSourceWebInfDir(String archiveName) { - String name = "archives/" + archiveName + "/WEB-INF"; - - URL url = Thread.currentThread().getContextClassLoader().getResource(name); - if (url == null) { - return null; - } - try { - return new File(url.toURI()); - } catch (URISyntaxException e) { - throw new RuntimeException("Could not get file for " + url); - } - } - - protected File getOutputDir() { - File file = new File("target"); - if (!file.exists()) { - throw new IllegalStateException("target/ does not exist"); - } - if (!file.isDirectory()) { - throw new IllegalStateException("target/ is not a directory"); - } - file = new File(file, "archives"); - if (file.exists()) { - if (!file.isDirectory()) { - throw new IllegalStateException("target/archives/ already exists and is not a directory"); - } - } else { - file.mkdir(); - } - return file.getAbsoluteFile(); - } - - protected File createArchive(Archive<?> archive) { - File realArchive = new File(getOutputDir(), archive.getName()); - archive.as(ZipExporter.class).exportZip(realArchive, true); - return realArchive; - } - - protected abstract File getRealArchive(); - } - - private class Deployment extends AbstractDeployment { - final File realArchive; - - public Deployment(String archiveName, Package[] pkgs, boolean show) { - - ArchivePath metaInf = ArchivePaths.create("META-INF"); - - JavaArchive archive = ShrinkWrap.create(JavaArchive.class, archiveName); - for(Package pkg : pkgs) { - archive.addPackage(pkg); - } - - File sourceMetaInf = getSourceMetaInfDir(archiveName); - addFiles(archive, sourceMetaInf, metaInf); - - System.out.println(archive.toString(show)); - realArchive = createArchive(archive); - } - - @Override - protected File getRealArchive() { - return realArchive; - } - } - - - private class WarDeployment extends AbstractDeployment { - final File realArchive; - - public WarDeployment(String archiveName, Package[] pkgs, boolean show) { - - ArchivePath metaInf = ArchivePaths.create("META-INF"); - - - WebArchive archive = ShrinkWrap.create(WebArchive.class, archiveName); - for(Package pkg : pkgs) { - archive.addPackage(pkg); - } - - File sourceMetaInf = getSourceMetaInfDir(archiveName); - addFiles(archive, sourceMetaInf, metaInf); - - File sourceWebInf = getSourceWebInfDir(archiveName); - if (sourceWebInf != null) { - addFiles(archive, sourceWebInf, ArchivePaths.create("WEB-INF")); - } - - System.out.println(archive.toString(show)); - realArchive = createArchive(archive); - } - - @Override - protected File getRealArchive() { - return realArchive; - } - } - - private class ArbitraryDeployment extends AbstractDeployment { - final File realArchive; - - public ArbitraryDeployment(Archive archive, boolean show) { - - ArchivePath metaInf = ArchivePaths.create("META-INF"); - - System.out.println(archive.toString(show)); - realArchive = createArchive(archive); - } - - @Override - protected File getRealArchive() { - return realArchive; - } - } - - private class WarFileDeployment extends AbstractDeployment { - - private File file; - - public WarFileDeployment(File file) { - this.file = file; - } - - @Override - protected File getRealArchive() { - return file; - } - - } -} Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/.classpath =================================================================== --- workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/.classpath 2011-04-12 14:46:47 UTC (rev 30520) +++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/.classpath 2011-04-12 16:23:19 UTC (rev 30521) @@ -1,7 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry exported="true" kind="lib" path="shrinkwrap-api-1.0.0-alpha-12-sources.jar"/> + <classpathentry exported="true" kind="lib" path="shrinkwrap-api-1.0.0-alpha-12.jar"/> + <classpathentry exported="true" kind="lib" path="shrinkwrap-impl-base-1.0.0-alpha-12-sources.jar"/> + <classpathentry exported="true" kind="lib" path="shrinkwrap-impl-base-1.0.0-alpha-12.jar"/> + <classpathentry exported="true" kind="lib" path="shrinkwrap-spi-1.0.0-alpha-12-sources.jar"/> + <classpathentry exported="true" kind="lib" path="shrinkwrap-spi-1.0.0-alpha-12.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="wars"/> + <classpathentry kind="lib" path="jboss-servlet-api_3.0_spec-1.0.0.Final.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/META-INF/MANIFEST.MF =================================================================== --- workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/META-INF/MANIFEST.MF 2011-04-12 14:46:47 UTC (rev 30520) +++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/META-INF/MANIFEST.MF 2011-04-12 16:23:19 UTC (rev 30521) @@ -7,5 +7,12 @@ Require-Bundle: org.junit;bundle-version="[4.8.1,5.0.0)", org.eclipse.core.runtime;bundle-version="3.7.0", org.jboss.ide.eclipse.as7.deployment;bundle-version="0.0.1" -Bundle-ClassPath: wars/, - . +Bundle-ClassPath: ., + wars/, + shrinkwrap-api-1.0.0-alpha-12-sources.jar, + shrinkwrap-api-1.0.0-alpha-12.jar, + shrinkwrap-impl-base-1.0.0-alpha-12-sources.jar, + shrinkwrap-impl-base-1.0.0-alpha-12.jar, + shrinkwrap-spi-1.0.0-alpha-12-sources.jar, + shrinkwrap-spi-1.0.0-alpha-12.jar, + jboss-servlet-api_3.0_spec-1.0.0.Final.jar Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/build.properties =================================================================== --- workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/build.properties 2011-04-12 14:46:47 UTC (rev 30520) +++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/build.properties 2011-04-12 16:23:19 UTC (rev 30521) @@ -2,4 +2,11 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ - wars/ + wars/,\ + shrinkwrap-api-1.0.0-alpha-12-sources.jar,\ + shrinkwrap-api-1.0.0-alpha-12.jar,\ + shrinkwrap-impl-base-1.0.0-alpha-12-sources.jar,\ + shrinkwrap-impl-base-1.0.0-alpha-12.jar,\ + shrinkwrap-spi-1.0.0-alpha-12-sources.jar,\ + shrinkwrap-spi-1.0.0-alpha-12.jar,\ + jboss-servlet-api_3.0_spec-1.0.0.Final.jar Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/jboss-servlet-api_3.0_spec-1.0.0.Final.jar =================================================================== (Binary files differ) Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/jboss-servlet-api_3.0_spec-1.0.0.Final.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/shrinkwrap-api-1.0.0-alpha-12-sources.jar (from rev 30518, workspace/adietish/org.jboss.ide.eclipse.as7.deployment/shrinkwrap-api-1.0.0-alpha-12-sources.jar) =================================================================== (Binary files differ) Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/shrinkwrap-api-1.0.0-alpha-12-sources.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/shrinkwrap-api-1.0.0-alpha-12.jar (from rev 30518, workspace/adietish/org.jboss.ide.eclipse.as7.deployment/shrinkwrap-api-1.0.0-alpha-12.jar) =================================================================== (Binary files differ) Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/shrinkwrap-api-1.0.0-alpha-12.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/shrinkwrap-impl-base-1.0.0-alpha-12-sources.jar (from rev 30518, workspace/adietish/org.jboss.ide.eclipse.as7.deployment/shrinkwrap-impl-base-1.0.0-alpha-12-sources.jar) =================================================================== (Binary files differ) Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/shrinkwrap-impl-base-1.0.0-alpha-12-sources.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/shrinkwrap-impl-base-1.0.0-alpha-12.jar (from rev 30518, workspace/adietish/org.jboss.ide.eclipse.as7.deployment/shrinkwrap-impl-base-1.0.0-alpha-12.jar) =================================================================== (Binary files differ) Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/shrinkwrap-impl-base-1.0.0-alpha-12.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/shrinkwrap-spi-1.0.0-alpha-12-sources.jar (from rev 30518, workspace/adietish/org.jboss.ide.eclipse.as7.deployment/shrinkwrap-spi-1.0.0-alpha-12-sources.jar) =================================================================== (Binary files differ) Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/shrinkwrap-spi-1.0.0-alpha-12-sources.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/shrinkwrap-spi-1.0.0-alpha-12.jar (from rev 30518, workspace/adietish/org.jboss.ide.eclipse.as7.deployment/shrinkwrap-spi-1.0.0-alpha-12.jar) =================================================================== (Binary files differ) Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/shrinkwrap-spi-1.0.0-alpha-12.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/as/demos/war/runner/DeploymentUtilsIntegrationTest.java =================================================================== --- workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/as/demos/war/runner/DeploymentUtilsIntegrationTest.java (rev 0) +++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/as/demos/war/runner/DeploymentUtilsIntegrationTest.java 2011-04-12 16:23:19 UTC (rev 30521) @@ -0,0 +1,113 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.as.demos.war.runner; + +import static org.jboss.as.protocol.StreamUtils.safeClose; +import static org.junit.Assert.assertTrue; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.IOException; +import java.io.StringWriter; +import java.net.HttpURLConnection; +import java.net.URISyntaxException; +import java.net.URL; +import java.text.MessageFormat; + +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.Platform; +import org.jboss.ide.eclipse.as7.deployment.tests.DeploymentUtils; +import org.junit.Test; +import org.osgi.framework.Bundle; + +/** + * + * @author <a href=&quot;kabir.khan(a)jboss.com&quot;&gt;Kabir Khan</a> + * @version $Revision: 1.1 $ + */ +public class DeploymentUtilsIntegrationTest { + + private static final String WAR_FOLDER = "/wars/"; + private static final String BUNDLE_ID = "org.jboss.ide.eclipse.as7.deployment.tests"; + + private static final int WEBAPP_RESPONSE_TIMEOUT = 10 * 1024; + + private static final String HOST = "localhost"; + private static final int WEB_PORT = 8080; + + @Test + public void canDeployUsingDeploymentUtils() throws Exception { + DeploymentUtils utils = null; + try { + utils = new DeploymentUtils(); +// File warFile = nonOsgiGetWarFile("minimalistic.war"); + File warFile = osgiGetWarFile("minimalistic.war"); + utils.addWarFileDeployment(warFile); + utils.deploy(); + + String response = getServerResponse(new URL( + MessageFormat.format("http://{0}:{1}/{2}", + HOST, + String.valueOf(WEB_PORT), + "minimalistic"))); + assertTrue(response.indexOf("minimalistic") >= 0); + + } finally { + utils.undeploy(); + safeClose(utils); + } + } + + private File osgiGetWarFile(String name) throws URISyntaxException, IOException { + Bundle bundle = Platform.getBundle(BUNDLE_ID); + URL entryUrl = bundle.getEntry(WAR_FOLDER + name); + return new File(FileLocator.resolve(entryUrl).toURI()); + } + + private static File nonOsgiGetWarFile(String path) { + URL url = Thread.currentThread().getContextClassLoader().getResource(path); + return new File(url.getFile()); + } + + private String getServerResponse(URL url) throws IOException { + HttpURLConnection connection = (HttpURLConnection) url.openConnection(); + connection.setUseCaches(false); + connection.setDoInput(true); + connection.setAllowUserInteraction(false); + connection.setConnectTimeout(WEBAPP_RESPONSE_TIMEOUT); + connection.setInstanceFollowRedirects(true); + connection.setDoOutput(false); + BufferedInputStream in = new BufferedInputStream(connection.getInputStream()); + return toString(in); + } + + private String toString(BufferedInputStream in) throws IOException { + StringWriter writer = new StringWriter(); + for (int data = -1; ((data = in.read()) != -1);) { + writer.write(data); + } + return writer.toString(); + } + + +} + Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/as/demos/war/runner/DeploymentUtilsIntegrationTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentUtils.java =================================================================== --- workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentUtils.java (rev 0) +++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentUtils.java 2011-04-12 16:23:19 UTC (rev 30521) @@ -0,0 +1,345 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.ide.eclipse.as7.deployment.tests; + +import static org.jboss.as.protocol.StreamUtils.safeClose; + +import java.io.Closeable; +import java.io.File; +import java.io.IOException; +import java.net.InetAddress; +import java.net.URISyntaxException; +import java.net.URL; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; +import javax.management.remote.JMXConnectorFactory; +import javax.management.remote.JMXServiceURL; + +import org.jboss.as.controller.client.ModelControllerClient; +import org.jboss.as.controller.client.helpers.standalone.DeploymentPlan; +import org.jboss.as.controller.client.helpers.standalone.DeploymentPlanBuilder; +import org.jboss.as.controller.client.helpers.standalone.DuplicateDeploymentNameException; +import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentManager; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ArchivePath; +import org.jboss.shrinkwrap.api.ArchivePaths; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.container.ResourceContainer; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; + +/** + * Used to deploy/undeploy deployments to a running <b>standalone</b> application server + * + * TODO Use the real deployment API once that is complete + * + * @author <a href=&quot;kabir.khan(a)jboss.com&quot;&gt;Kabir Khan</a> + * @version $Revision: 1.1 $ + */ +public class DeploymentUtils implements Closeable { + + public static final long DEFAULT_TIMEOUT = 15000; + + private final List<AbstractDeployment> deployments = new ArrayList<AbstractDeployment>(); + private final ModelControllerClient client; + private final ServerDeploymentManager manager; + private long timeout = DEFAULT_TIMEOUT; + + public DeploymentUtils() throws UnknownHostException { + client = ModelControllerClient.Factory.create(InetAddress.getByName("localhost"), 9999); + manager = ServerDeploymentManager.Factory.create(client); + } + + public DeploymentUtils(String archiveName, Package... pkg) throws UnknownHostException { + this(); + addDeployment(archiveName, pkg); + } + + public DeploymentUtils(Archive<?> archive) throws UnknownHostException { + this(); + deployments.add(new ArbitraryDeployment(archive,false)); + } + + public DeploymentUtils(String archiveName, boolean show, Package... pkgs) throws UnknownHostException { + this(); + addDeployment(archiveName, show, pkgs); + } + + public synchronized void addDeployment(String archiveName, Package... pkgs) { + addDeployment(archiveName, false, pkgs); + } + + public synchronized void addDeployment(String archiveName, boolean show, Package... pkgs) { + deployments.add(new Deployment(archiveName, pkgs, show)); + } + + public synchronized void addWarDeployment(String archiveName, Package... pkgs) { + addWarDeployment(archiveName, false, pkgs); + } + + public synchronized void addWarDeployment(String archiveName, boolean show, Package... pkgs) { + deployments.add(new WarDeployment(archiveName, pkgs, show)); + } + + public synchronized void addWarFileDeployment(File file) { + deployments.add(new WarFileDeployment(file)); + } + + public synchronized void deploy() throws DuplicateDeploymentNameException, IOException, ExecutionException, InterruptedException, TimeoutException { + DeploymentPlanBuilder builder = manager.newDeploymentPlan().withRollback(); + for (AbstractDeployment deployment : deployments) { + builder = deployment.addDeployment(manager, builder); + } + + try { + manager.execute(builder.build()).get(timeout, TimeUnit.MILLISECONDS); + } finally { + markDeploymentsDeployed(); + } + } + + private void markDeploymentsDeployed() { + for (AbstractDeployment deployment : deployments) { + deployment.deployed = true; + } + } + + public synchronized void undeploy() throws ExecutionException, InterruptedException, TimeoutException { + DeploymentPlanBuilder builder = manager.newDeploymentPlan(); + for (AbstractDeployment deployment : deployments) { + builder = deployment.removeDeployment(builder); + } + DeploymentPlan plan = builder.build(); + if (plan.getDeploymentActions().size() > 0) { + manager.execute(builder.build()).get(timeout, TimeUnit.MILLISECONDS); + } + } + + public MBeanServerConnection getConnection() throws Exception { + return JMXConnectorFactory.connect(new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:1090/jmxrmi"), + new HashMap<String, Object>()).getMBeanServerConnection(); + } + + public String showJndi() throws Exception { + return (String)getConnection().invoke(new ObjectName("jboss:type=JNDIView"), "list", new Object[] {true}, new String[] {"boolean"}); + } + + public long getTimeout() { + return timeout; + } + + public void setTimeout(long timeout) { + this.timeout = timeout; + } + + @Override + public void close() throws IOException { + safeClose(client); + } + + private abstract class AbstractDeployment{ + + boolean deployed; + String deployment; + + public synchronized DeploymentPlanBuilder addDeployment(ServerDeploymentManager manager, DeploymentPlanBuilder builder) throws DuplicateDeploymentNameException, IOException, ExecutionException, InterruptedException { + deployment = getRealArchive().getName(); + System.out.println("Deploying " + deployment); + return builder.add(deployment, getRealArchive()).deploy(deployment); + } + + public synchronized DeploymentPlanBuilder removeDeployment(DeploymentPlanBuilder builder) { + if (deployed) { + System.out.println("Undeploying " + deployment); + return builder.undeploy(deployment).remove(deployment); + } + else { + return builder; + } + } + + protected void addFiles(ResourceContainer<?> archive, File dir, ArchivePath dest) { + for (String name : dir.list()) { + File file = new File(dir, name); + if (file.isDirectory()) { + addFiles(archive, file, ArchivePaths.create(dest, name)); + } else { + archive.addAsResource(file, ArchivePaths.create(dest, name)); + } + } + } + + protected File getSourceMetaInfDir(String archiveName) { + String name = "archives/" + archiveName + "/META-INF/MANIFEST.MF"; + + URL url = Thread.currentThread().getContextClassLoader().getResource(name); + if (url == null) { + throw new IllegalArgumentException("No resource called " + name); + } + try { + File file = new File(url.toURI()); + return file.getParentFile(); + } catch (URISyntaxException e) { + throw new RuntimeException("Could not get file for " + url); + } + } + + protected File getSourceWebInfDir(String archiveName) { + String name = "archives/" + archiveName + "/WEB-INF"; + + URL url = Thread.currentThread().getContextClassLoader().getResource(name); + if (url == null) { + return null; + } + try { + return new File(url.toURI()); + } catch (URISyntaxException e) { + throw new RuntimeException("Could not get file for " + url); + } + } + + protected File getOutputDir() { + File file = new File("target"); + if (!file.exists()) { + throw new IllegalStateException("target/ does not exist"); + } + if (!file.isDirectory()) { + throw new IllegalStateException("target/ is not a directory"); + } + file = new File(file, "archives"); + if (file.exists()) { + if (!file.isDirectory()) { + throw new IllegalStateException("target/archives/ already exists and is not a directory"); + } + } else { + file.mkdir(); + } + return file.getAbsoluteFile(); + } + + protected File createArchive(Archive<?> archive) { + File realArchive = new File(getOutputDir(), archive.getName()); + archive.as(ZipExporter.class).exportZip(realArchive, true); + return realArchive; + } + + protected abstract File getRealArchive(); + } + + private class Deployment extends AbstractDeployment { + final File realArchive; + + public Deployment(String archiveName, Package[] pkgs, boolean show) { + + ArchivePath metaInf = ArchivePaths.create("META-INF"); + + JavaArchive archive = ShrinkWrap.create(JavaArchive.class, archiveName); + for(Package pkg : pkgs) { + archive.addPackage(pkg); + } + + File sourceMetaInf = getSourceMetaInfDir(archiveName); + addFiles(archive, sourceMetaInf, metaInf); + + System.out.println(archive.toString(show)); + realArchive = createArchive(archive); + } + + @Override + protected File getRealArchive() { + return realArchive; + } + } + + + private class WarDeployment extends AbstractDeployment { + final File realArchive; + + public WarDeployment(String archiveName, Package[] pkgs, boolean show) { + + ArchivePath metaInf = ArchivePaths.create("META-INF"); + + + WebArchive archive = ShrinkWrap.create(WebArchive.class, archiveName); + for(Package pkg : pkgs) { + archive.addPackage(pkg); + } + + File sourceMetaInf = getSourceMetaInfDir(archiveName); + addFiles(archive, sourceMetaInf, metaInf); + + File sourceWebInf = getSourceWebInfDir(archiveName); + if (sourceWebInf != null) { + addFiles(archive, sourceWebInf, ArchivePaths.create("WEB-INF")); + } + + System.out.println(archive.toString(show)); + realArchive = createArchive(archive); + } + + @Override + protected File getRealArchive() { + return realArchive; + } + } + + private class ArbitraryDeployment extends AbstractDeployment { + final File realArchive; + + public ArbitraryDeployment(Archive archive, boolean show) { + + ArchivePath metaInf = ArchivePaths.create("META-INF"); + + System.out.println(archive.toString(show)); + realArchive = createArchive(archive); + } + + @Override + protected File getRealArchive() { + return realArchive; + } + } + + private class WarFileDeployment extends AbstractDeployment { + + private File file; + + public WarFileDeployment(File file) { + this.file = file; + } + + @Override + protected File getRealArchive() { + return file; + } + + } +} Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentUtils.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/StandaloneDeploymentIntegrationTest.java =================================================================== --- workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/StandaloneDeploymentIntegrationTest.java 2011-04-12 14:46:47 UTC (rev 30520) +++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/StandaloneDeploymentIntegrationTest.java 2011-04-12 16:23:19 UTC (rev 30521) @@ -33,7 +33,6 @@ import org.eclipse.core.runtime.Platform; import org.jboss.ide.eclipse.as7.deployment.Deployable; import org.jboss.ide.eclipse.as7.deployment.DeploymentException; -import org.jboss.ide.eclipse.as7.deployment.DeploymentUtils; import org.jboss.ide.eclipse.as7.deployment.Session; import org.junit.Before; import org.junit.Ignore; @@ -75,18 +74,6 @@ } } - @Test - public void canDeployWithDemoUtils() throws URISyntaxException, IOException { - DeploymentUtils utils = new DeploymentUtils(); - utils.addWarFileDeployment(getWarFile("minimalistic.war")); - String response = getServerResponse(new URL( - MessageFormat.format("http://{0}:{1}/{2}", - HOST, - String.valueOf(WEB_PORT), - "test"))); - assertTrue(response.indexOf("minimalistic") >= 0); - } - @Ignore @Test public void canDeploy() throws DeploymentException, URISyntaxException, IOException {