Return-Path: Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org Received: (qmail 52356 invoked from network); 6 Sep 2002 07:04:04 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 6 Sep 2002 07:04:04 -0000 Received: (qmail 19324 invoked by uid 97); 6 Sep 2002 07:04:47 -0000 Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org Received: (qmail 19308 invoked by uid 97); 6 Sep 2002 07:04:46 -0000 Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Avalon CVS List" Reply-To: "Avalon Developers List" Delivered-To: mailing list avalon-cvs@jakarta.apache.org Received: (qmail 19297 invoked by uid 97); 6 Sep 2002 07:04:46 -0000 X-Antivirus: nagoya (v4218 created Aug 14 2002) Date: 6 Sep 2002 07:03:58 -0000 Message-ID: <20020906070358.87876.qmail@icarus.apache.org> From: colus@apache.org To: jakarta-avalon-phoenix-cvs@apache.org Subject: cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces DeployerMBean.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N colus 2002/09/06 00:03:58 Modified: . build.xml src/java/org/apache/avalon/phoenix/components/deployer DefaultDeployer.java src/java/org/apache/avalon/phoenix/interfaces DeployerMBean.java Log: Add redeploy operation to DeployerMBean. Revision Changes Path 1.159 +1 -1 jakarta-avalon-phoenix/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-avalon-phoenix/build.xml,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- build.xml 3 Sep 2002 01:35:05 -0000 1.158 +++ build.xml 6 Sep 2002 07:03:57 -0000 1.159 @@ -251,7 +251,7 @@ - + 1.53 +29 -8 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java Index: DefaultDeployer.java =================================================================== RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- DefaultDeployer.java 31 Aug 2002 05:00:16 -0000 1.52 +++ DefaultDeployer.java 6 Sep 2002 07:03:58 -0000 1.53 @@ -54,8 +54,6 @@ /** * Deploy .sar files into a kernel using this class. * - * @phoenix:mx-topic name="Deployer" - * * @author Peter Donald */ public class DefaultDeployer @@ -184,10 +182,36 @@ } /** - * Undeploy an application. + * Redeploy an application. * - * @phoenix:mx-operation - * @phoenix:mx-description Undeploy an application. + * @param name the name of deployment + * @throws DeploymentException if an error occurs + */ + public void redeploy( final String name ) + throws DeploymentException + { + final Installation installation = + (Installation)m_installations.get( name ); + if( null == installation ) + { + final String message = + REZ.getString( "deploy.no-deployment.error", name ); + throw new DeploymentException( message ); + } + try + { + final URL location = installation.getSource().toURL(); + undeploy( name ); + deploy( name, location ); + } + catch( final Exception e ) + { + throw new DeploymentException( e.getMessage(), e ); + } + } + + /** + * Undeploy an application. * * @param name the name of deployment * @throws DeploymentException if an error occurs @@ -227,9 +251,6 @@ /** * Deploy an application from an installation. - * - * @phoenix:mx-operation - * @phoenix:mx-description Deploy an application from an installation. * * @param name the name of application * @param sarURL the location to deploy from represented as String 1.3 +19 -2 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/DeployerMBean.java Index: DeployerMBean.java =================================================================== RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/DeployerMBean.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DeployerMBean.java 7 Aug 2002 02:57:15 -0000 1.2 +++ DeployerMBean.java 6 Sep 2002 07:03:58 -0000 1.3 @@ -24,7 +24,7 @@ /** * Deploy an installation. - + * * @phoenix:mx-operation * * @param name the name of deployment @@ -32,6 +32,7 @@ * @throws DeploymentException if an error occurs * @see #deploy(String,String) * @see #undeploy(String) + * @see #redeploy(String) */ void deploy( String name, String sarURL ) throws DeploymentException; @@ -44,12 +45,13 @@ * @throws DeploymentException if an error occurs * @see #deploy(String,String) * @see #undeploy(String) + * @see #redeploy(String) */ void deploy( String name, URL location ) throws DeploymentException; /** - * Undeploy a resource from a location. + * Undeploy an installation. * * @phoenix:mx-operation * @@ -57,7 +59,22 @@ * @throws DeploymentException if an error occurs * @see #deploy(String,String) * @see #deploy(String,URL) + * @see #redeploy(String) */ void undeploy( String name ) + throws DeploymentException; + + /** + * Redeploy an installation. + * + * @phoenix:mx-operation + * + * @param name the name of deployment + * @throws DeploymentException if an error occurs + * @see #deploy(String,String) + * @see #deploy(String,URL) + * @see #undeploy(String) + */ + void redeploy( String name ) throws DeploymentException; } -- To unsubscribe, e-mail: For additional commands, e-mail: