[jboss-cvs] JBossAS SVN: r70715 - projects/test/trunk/src/main/java/org/jboss/ant/taskdefs/server.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2008-03-10 23:17:19 -0400 (Mon, 10 Mar 2008)
New Revision: 70715

Modified:
   projects/test/trunk/src/main/java/org/jboss/ant/taskdefs/server/ConfigManagerTask.java
Log:
[EJBTHREE-1211] Don't use one ServerManager per instance, but per JVM; attach new configurations to existing if already defined.  Allows for more than one server:config block

Modified: projects/test/trunk/src/main/java/org/jboss/ant/taskdefs/server/ConfigManagerTask.java
===================================================================
--- projects/test/trunk/src/main/java/org/jboss/ant/taskdefs/server/ConfigManagerTask.java	2008-03-11 01:55:00 UTC (rev 70714)
+++ projects/test/trunk/src/main/java/org/jboss/ant/taskdefs/server/ConfigManagerTask.java	2008-03-11 03:17:19 UTC (rev 70715)
@@ -36,7 +36,7 @@
    /** The key for the project reference **/
    protected static final String MANAGER_REF = "serverManager";
 
-   ServerManager manager = null;
+   static ServerManager manager = null;
 
    /**
     * Create a new ConfigManagerTask.
@@ -45,7 +45,10 @@
     */
    public ConfigManagerTask()
    {
-       manager = new ServerManager();
+      if (ConfigManagerTask.manager == null)
+      {
+         ConfigManagerTask.manager = new ServerManager();
+      }
    }
    
    /**
@@ -53,9 +56,9 @@
     */
    public void execute() throws BuildException
    {
-      if (getProject() != null && manager != null)
+      if (getProject().getReference(ConfigManagerTask.MANAGER_REF)==null)
       {
-         getProject().addReference(MANAGER_REF, manager);
+         getProject().addReference(MANAGER_REF, ConfigManagerTask.manager);
       }
    }
 
@@ -66,7 +69,7 @@
     */
    public void addServer(Server server)
    {
-      manager.addServer(server);
+      ConfigManagerTask.manager.addServer(server);
    }
 
    /** 
@@ -75,7 +78,7 @@
     */
    public void setJavaHome(String javaHome)
    {
-      manager.setJavaHome(javaHome);
+      ConfigManagerTask.manager.setJavaHome(javaHome);
    }
 
    /**
@@ -84,7 +87,7 @@
     */
    public void setJbossHome(String jbossHome)
    {
-      manager.setJbossHome(jbossHome);
+      ConfigManagerTask.manager.setJbossHome(jbossHome);
    }
 
    /**
@@ -93,7 +96,7 @@
     */
    public void setJvm(String jvm)
    {
-      manager.setJvm(jvm);
+      ConfigManagerTask.manager.setJvm(jvm);
    }
    
    /**
@@ -104,6 +107,6 @@
     */
    public void setUdpGroup(String udpGroup)
    {
-      manager.setUdpGroup(udpGroup);
+      ConfigManagerTask.manager.setUdpGroup(udpGroup);
    }
 }
\ No newline at end of file