[jbosstools-commits] JBoss Tools SVN: r30562 - in workspace/adietish: org.jboss.ide.eclipse.as7.deployment.detyped and 2 other directories.

Author: adietish Date: 2011-04-13 13:45:07 -0400 (Wed, 13 Apr 2011) New Revision: 30562 Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.detyped/src/org/jboss/ide/eclipse/as7/deployment/detyped/MinimalisticStandaloneDeployer.java workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/MinimalisticDeployerIntegrationTest.java Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.detyped/.classpath workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath Log: added minimalistic deployer which does not use deployment plan nor is able to accumulate operations Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath =================================================================== --- workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath 2011-04-13 17:40:25 UTC (rev 30561) +++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath 2011-04-13 17:45:07 UTC (rev 30562) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry exported="true" kind="lib" path="jboss-threads-2.0.0.CR8.jar" sourcepath="jboss-threads-2.0.0.CR8-sources.jar"/> + <classpathentry exported="true" kind="lib" path="jboss-threads-2.0.0.CR8.jar" sourcepath="/home/adietish/jboss-workspaces/jboss-tools/jbosstools-src/jboss-threads-2.0.0.CR8-sources.jar"/> <classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT.jar" sourcepath="/jboss-as-controller-client"/> <classpathentry exported="true" kind="lib" path="jboss-as-protocol-7.0.0.Beta3-SNAPSHOT.jar" sourcepath="/jboss-as-protocol"/> - <classpathentry exported="true" kind="lib" path="jboss-dmr-1.0.0.Beta5.jar"/> + <classpathentry exported="true" kind="lib" path="jboss-dmr-1.0.0.Beta5.jar" sourcepath="/home/adietish/jboss-workspaces/jboss-tools/jbosstools-src/jboss-dmr-1.0.0.Beta5-sources.jar"/> <classpathentry exported="true" kind="lib" path="jboss-logging-3.0.0.Beta3.jar"/> <classpathentry exported="true" kind="lib" path="jboss-marshalling-1.3.0.CR8.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.detyped/.classpath =================================================================== --- workspace/adietish/org.jboss.ide.eclipse.as7.deployment.detyped/.classpath 2011-04-13 17:40:25 UTC (rev 30561) +++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.detyped/.classpath 2011-04-13 17:45:07 UTC (rev 30562) @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry exported="true" kind="lib" path="jboss-logging-3.0.0.Beta3.jar"/> - <classpathentry exported="true" kind="lib" path="jboss-as-cli-7.0.0.Beta3-SNAPSHOT.jar"/> - <classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT.jar"/> + <classpathentry exported="true" kind="lib" path="jboss-as-cli-7.0.0.Beta3-SNAPSHOT.jar" sourcepath="/jboss-as-cli"/> + <classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT.jar" sourcepath="/jboss-as-controller-client"/> <classpathentry exported="true" kind="lib" path="jboss-as-protocol-7.0.0.Beta3-SNAPSHOT.jar"/> - <classpathentry exported="true" kind="lib" path="jboss-dmr-1.0.0.Beta5.jar"/> + <classpathentry exported="true" kind="lib" path="jboss-dmr-1.0.0.Beta5.jar" sourcepath="/home/adietish/jboss-workspaces/jboss-tools/jbosstools-src/jboss-dmr-1.0.0.Beta5-sources.jar"/> <classpathentry exported="true" kind="lib" path="jboss-marshalling-1.3.0.CR8.jar"/> <classpathentry exported="true" kind="lib" path="jboss-threads-2.0.0.CR8.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.detyped/src/org/jboss/ide/eclipse/as7/deployment/detyped/MinimalisticStandaloneDeployer.java =================================================================== --- workspace/adietish/org.jboss.ide.eclipse.as7.deployment.detyped/src/org/jboss/ide/eclipse/as7/deployment/detyped/MinimalisticStandaloneDeployer.java (rev 0) +++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.detyped/src/org/jboss/ide/eclipse/as7/deployment/detyped/MinimalisticStandaloneDeployer.java 2011-04-13 17:45:07 UTC (rev 30562) @@ -0,0 +1,80 @@ +/* + * 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.detyped; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.concurrent.CancellationException; + +import org.jboss.as.controller.client.ModelControllerClient; +import org.jboss.as.controller.client.OperationBuilder; +import org.jboss.as.protocol.StreamUtils; +import org.jboss.dmr.ModelNode; + +/** + * @author André Dietisheim + */ +public class MinimalisticStandaloneDeployer { + + public static void undeploy(File file, String host, int port) throws CancellationException, IOException { + ModelControllerClient client = ModelControllerClient.Factory.create(host, port); + + String name = file.getName(); + + // undeploy + ModelNode request = new ModelNode(); + request.get("operation").set("undeploy"); + request.get("address").add("deployment", name); + ModelNode result = client.execute(request); + + // remove + request = new ModelNode(); + request.get("operation").set("remove"); + request.get("address").add("deployment", name); + result = client.execute(request); + + StreamUtils.safeClose(client); + } + + public static void deploy(File file, String host, int port) throws CancellationException, IOException { + ModelControllerClient client = ModelControllerClient.Factory.create(host, port); + + String name = file.getName(); + + + ModelNode request = new ModelNode(); + request.get("operation").set("add"); + request.get("address").add("deployment", name); + request.get("enabled").set(true); + + OperationBuilder op = OperationBuilder.Factory.create(request); + op.addInputStream(new BufferedInputStream(new FileInputStream(file))); + request.get("input-stream-index").set(0); + + ModelNode result = client.execute(op.build()); + + StreamUtils.safeClose(client); + } + +} Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.detyped/src/org/jboss/ide/eclipse/as7/deployment/detyped/MinimalisticStandaloneDeployer.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/MinimalisticDeployerIntegrationTest.java =================================================================== --- workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/MinimalisticDeployerIntegrationTest.java (rev 0) +++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/MinimalisticDeployerIntegrationTest.java 2011-04-13 17:45:07 UTC (rev 30562) @@ -0,0 +1,122 @@ +/* + * 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.junit.Assert.assertTrue; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +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.DeployerException; +import org.jboss.ide.eclipse.as7.deployment.StandaloneTypedOperations; +import org.jboss.ide.eclipse.as7.deployment.detyped.MinimalisticStandaloneDeployer; +import org.junit.Test; +import org.osgi.framework.Bundle; + +/** + * + * @author André Dietisheim + */ +public class MinimalisticDeployerIntegrationTest { + + 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 MGMT_PORT = 9999; + private static final int WEB_PORT = 8080; + + @Test + public void canDeploy() throws Exception { + File warFile = getWarFile("minimalistic.war"); + try { + MinimalisticStandaloneDeployer.deploy(warFile, HOST, MGMT_PORT); + + String response = getServerResponse(new URL( + MessageFormat.format( + "http://{0}:{1}/{2}", HOST, String.valueOf(WEB_PORT), "minimalistic"))); + assertTrue(response.indexOf("minimalistic") >= 0); + + } finally { + quietlyUndeploy(warFile); + } + } + + @Test(expected = DeployerException.class) + public void cannotDeployWarTwice() throws Exception { + StandaloneTypedOperations deployer = null; + File warFile = getWarFile("minimalistic.war"); + try { + deployer = new StandaloneTypedOperations(HOST, MGMT_PORT); + deployer.deploy(warFile).execute(); + deployer.deploy(warFile).execute(); + } finally { + quietlyUndeploy(warFile); + } + } + + private File getWarFile(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 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(InputStream in) throws IOException { + StringWriter writer = new StringWriter(); + for (int data = -1; ((data = in.read()) != -1);) { + writer.write(data); + } + return writer.toString(); + } + + private void quietlyUndeploy(File file) { + try { + MinimalisticStandaloneDeployer.undeploy(file, HOST, MGMT_PORT); + } catch (Exception e) { + e.printStackTrace(); + // ignore + } + } +} Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/MinimalisticDeployerIntegrationTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain