Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 22236 invoked from network); 17 Feb 2005 23:46:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 17 Feb 2005 23:46:22 -0000 Received: (qmail 19634 invoked by uid 500); 17 Feb 2005 23:46:21 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 19616 invoked by uid 500); 17 Feb 2005 23:46:21 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: dev@geronimo.apache.org Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 19603 invoked by uid 99); 17 Feb 2005 23:46:21 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 17 Feb 2005 15:46:21 -0800 Received: (qmail 22213 invoked by uid 65534); 17 Feb 2005 23:46:20 -0000 Message-ID: <20050217234620.22212.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Thu, 17 Feb 2005 23:46:19 -0000 Subject: svn commit: r154208 - in geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/plugin: jmx/JMXDeploymentManager.java local/AbstractDeployCommand.java local/DistributeCommand.java local/RedeployCommand.java To: scm@geronimo.apache.org From: djencks@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: djencks Date: Thu Feb 17 15:46:17 2005 New Revision: 154208 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D154208 Log: support both kinds of redeploy, as we claim Modified: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deploym= ent/plugin/jmx/JMXDeploymentManager.java geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deploym= ent/plugin/local/AbstractDeployCommand.java geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deploym= ent/plugin/local/DistributeCommand.java geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deploym= ent/plugin/local/RedeployCommand.java Modified: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/d= eployment/plugin/jmx/JMXDeploymentManager.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/j= ava/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java?vie= w=3Ddiff&r1=3D154207&r2=3D154208 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deploym= ent/plugin/jmx/JMXDeploymentManager.java (original) +++ geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deploym= ent/plugin/jmx/JMXDeploymentManager.java Thu Feb 17 15:46:17 2005 @@ -217,7 +217,13 @@ } =20 public ProgressObject redeploy(TargetModuleID[] moduleIDList, InputStr= eam moduleArchive, InputStream deploymentPlan) { - throw new UnsupportedOperationException(); + if (kernel =3D=3D null) { + throw new IllegalStateException("Disconnected"); + } + RedeployCommand command =3D new RedeployCommand(kernel, moduleIDLi= st, moduleArchive, deploymentPlan); + command.setLogErrors(logErrors); + new Thread(command).start(); + return command; } =20 public Locale[] getSupportedLocales() { Modified: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/d= eployment/plugin/local/AbstractDeployCommand.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/j= ava/org/apache/geronimo/deployment/plugin/local/AbstractDeployCommand.java?= view=3Ddiff&r1=3D154207&r2=3D154208 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deploym= ent/plugin/local/AbstractDeployCommand.java (original) +++ geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deploym= ent/plugin/local/AbstractDeployCommand.java Thu Feb 17 15:46:17 2005 @@ -18,6 +18,11 @@ =20 import java.util.Set; import java.util.Iterator; +import java.io.File; +import java.io.InputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.io.FileOutputStream; import javax.enterprise.deploy.shared.CommandType; import javax.management.ObjectName; =20 @@ -51,5 +56,18 @@ } return deployer; =20 + } + + protected void copyTo(File outfile, InputStream is) throws IOException= { + byte[] buffer =3D new byte[4096]; + int count; + OutputStream os =3D new FileOutputStream(outfile); + try { + while ((count =3D is.read(buffer)) > 0) { + os.write(buffer, 0, count); + } + } finally { + os.close(); + } } } Modified: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/d= eployment/plugin/local/DistributeCommand.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/j= ava/org/apache/geronimo/deployment/plugin/local/DistributeCommand.java?view= =3Ddiff&r1=3D154207&r2=3D154208 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deploym= ent/plugin/local/DistributeCommand.java (original) +++ geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deploym= ent/plugin/local/DistributeCommand.java Thu Feb 17 15:46:17 2005 @@ -112,16 +112,4 @@ } } =20 - private void copyTo(File outfile, InputStream is) throws IOException { - byte[] buffer =3D new byte[4096]; - int count; - OutputStream os =3D new FileOutputStream(outfile); - try { - while ((count =3D is.read(buffer)) > 0) { - os.write(buffer, 0, count); - } - } finally { - os.close(); - } - } } Modified: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/d= eployment/plugin/local/RedeployCommand.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/j= ava/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java?view= =3Ddiff&r1=3D154207&r2=3D154208 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deploym= ent/plugin/local/RedeployCommand.java (original) +++ geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deploym= ent/plugin/local/RedeployCommand.java Thu Feb 17 15:46:17 2005 @@ -17,6 +17,7 @@ package org.apache.geronimo.deployment.plugin.local; =20 import java.io.File; +import java.io.InputStream; import java.net.URI; import javax.enterprise.deploy.shared.CommandType; import javax.enterprise.deploy.spi.TargetModuleID; @@ -24,6 +25,7 @@ =20 import org.apache.geronimo.deployment.plugin.TargetImpl; import org.apache.geronimo.deployment.plugin.TargetModuleIDImpl; +import org.apache.geronimo.deployment.util.DeploymentUtil; import org.apache.geronimo.kernel.jmx.KernelMBean; =20 /** @@ -33,14 +35,26 @@ private static final String[] DEPLOY_SIG =3D {File.class.getName(), Fi= le.class.getName()}; private static final String[] UNINSTALL_SIG =3D {URI.class.getName()}; private final TargetModuleID[] modules; - private final File moduleArchive; - private final File deploymentPlan; + private File moduleArchive; + private File deploymentPlan; + private InputStream moduleStream; + private InputStream deploymentStream; + private final boolean spool; =20 public RedeployCommand(KernelMBean kernel, TargetModuleID modules[], F= ile moduleArchive, File deploymentPlan) { super(CommandType.START, kernel); this.modules =3D modules; this.moduleArchive =3D moduleArchive; this.deploymentPlan =3D deploymentPlan; + spool =3D false; + } + + public RedeployCommand(KernelMBean kernel, TargetModuleID[] moduleIDLi= st, InputStream moduleArchive, InputStream deploymentPlan) { + super(CommandType.START, kernel); + this.modules =3D moduleIDList; + moduleStream =3D moduleArchive; + deploymentStream =3D deploymentPlan; + spool =3D true; } =20 public void run() { @@ -50,6 +64,16 @@ } =20 try { + if (spool) { + if (moduleStream !=3D null) { + moduleArchive =3D DeploymentUtil.createTempFile(); + copyTo(moduleArchive, moduleStream); + } + if (deploymentStream !=3D null) { + deploymentPlan =3D DeploymentUtil.createTempFile(); + copyTo(deploymentPlan, deploymentStream); + } + } for (int i =3D 0; i < modules.length; i++) { TargetModuleIDImpl module =3D (TargetModuleIDImpl) modules= [i]; =20