? .nbintdb
Index: apichanges.xml
===================================================================
RCS file: /cvs/j2eeserver/apichanges.xml,v
retrieving revision 1.5
diff -u -b -r1.5 apichanges.xml
--- apichanges.xml	3 Jan 2005 20:27:38 -0000	1.5
+++ apichanges.xml	10 Jan 2005 14:02:30 -0000
@@ -240,6 +240,23 @@
             <class package="org.netbeans.modules.j2ee.deployment.devmodules.spi" name="J2eeModuleProvider"/>
             <class package="org.netbeans.modules.j2ee.deployment.devmodules.spi" name="OriginalMappingProvider"/>
          </change>
+        <change id="StartServer-Services-for-Target">
+            <api name="plugins"/>
+            <summary>StartServer methods call to manage states for target server instances</summary>
+            <version major="1" minor="5"/>
+            <date day="10" month="01" year="2005"/>
+            <author login="nnguyen"/>
+            <compatibility addition="yes"/>
+            <description>
+                <p>
+                    J2eeserver should be able to start target managed server instances
+		    which are not identical with admin server instance.
+                    Methods supportsStartTarget, isRunning, startTarget, stopTarget
+                    are added as optional to StartServer abstract class plugin SPI.
+                </p>
+            </description>
+            <class package="org.netbeans.modules.j2ee.deployment.plugins.api" name="StartServer"/>
+         </change>
     </changes>
 
     <!-- Now the surrounding HTML text and document structure: -->
Index: src/org/netbeans/modules/j2ee/deployment/config/DDFilesListener.java
===================================================================
RCS file: /cvs/j2eeserver/src/org/netbeans/modules/j2ee/deployment/config/DDFilesListener.java,v
retrieving revision 1.1
diff -u -b -r1.1 DDFilesListener.java
--- src/org/netbeans/modules/j2ee/deployment/config/DDFilesListener.java	24 Dec 2004 01:47:42 -0000	1.1
+++ src/org/netbeans/modules/j2ee/deployment/config/DDFilesListener.java	10 Jan 2005 14:02:30 -0000
@@ -48,7 +48,7 @@
         for (int i=0; i<pathNames.length; i++) {
             String fileName = pathNames[i];
             if (J2eeModule.WAR != provider.getJ2eeModule().getModuleType()) {
-                fileName = fileName.substring(pathNames[i].lastIndexOf('/')+1);
+                fileName = fileName.substring(pathNames[i].lastIndexOf('/')+1); //always forward
             }
             ddFiles[i] = new File(configFolder, fileName);
         }
Index: src/org/netbeans/modules/j2ee/deployment/impl/Bundle.properties
===================================================================
RCS file: /cvs/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/Bundle.properties,v
retrieving revision 1.28
diff -u -b -r1.28 Bundle.properties
--- src/org/netbeans/modules/j2ee/deployment/impl/Bundle.properties	22 Dec 2004 18:45:28 -0000	1.28
+++ src/org/netbeans/modules/j2ee/deployment/impl/Bundle.properties	10 Jan 2005 14:02:30 -0000
@@ -122,3 +122,5 @@
 Services/J2EEServers=J2EE Servers
 
 MSG_NoServerInstance=Cannot locate server instance {0} and there is no default instance.
+
+MSG_StartStopTargetNotSupported=Start or stop target server {0} is not supported.
\ No newline at end of file
Index: src/org/netbeans/modules/j2ee/deployment/impl/ServerInstance.java
===================================================================
RCS file: /cvs/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerInstance.java,v
retrieving revision 1.39
diff -u -b -r1.39 ServerInstance.java
--- src/org/netbeans/modules/j2ee/deployment/impl/ServerInstance.java	16 Dec 2004 16:46:40 -0000	1.39
+++ src/org/netbeans/modules/j2ee/deployment/impl/ServerInstance.java	10 Jan 2005 14:02:30 -0000
@@ -46,6 +46,7 @@
     private J2eePlatformImpl j2eePlatformImpl;
     private StartServer startServer;
     private FindJSPServlet findJSPServlet;
+    private final Set targetsStartedByIde = new HashSet(); // valued by target name
     private Map targets; // keyed by target name, valued by ServerTarget
     private boolean managerStartedByIde = false;
     private ServerTarget coTarget = null;
@@ -174,6 +175,14 @@
         String title = NbBundle.getMessage(ServerInstance.class, "LBL_StopServerProgressMonitor", displayName);
         DeployProgressUI ui = new DeployProgressMonitor(title, false, true);  // modeless with stop/cancel buttons
         
+        for (Iterator i=targetsStartedByIde.iterator(); i.hasNext(); ){
+            String targetName = (String) i.next();
+            ServerTarget serverTarget = getServerTarget(targetName);
+            if (serverTarget != null) {
+                _stop(serverTarget.getTarget(), ui);
+            }
+        }
+        
         stop(ui);
         ServerRegistry.getInstance().removeServerInstance(getUrl());
     }
@@ -304,6 +313,19 @@
         return managerStartedByIde;
     }
     
+    /**
+     * Return set of ServerTarget's that have been started from inside IDE.
+     * @return set of ServerTarget objects.
+     */
+    public Set getTargetsStartedByIde() {
+        Set ret = new HashSet();
+        for (Iterator i=targetsStartedByIde.iterator(); i.hasNext(); ) {
+            String targetName = (String) i.next();
+            ret.add(getServerTarget(targetName));
+        }
+        return ret;
+    }
+    
     //----------- State Transistion API's: ----------------------
     // Note: configuration needs
     /**
@@ -442,13 +464,12 @@
                 if (ss.isDebuggable(target)) {
                     return true;
                 }
-                //if (! _stop(target, ui)) {
-                //    return false;
-                //}
+                if (! _stop(target, ui)) {
+                    return false;
+                }
                 return _startDebug(target, ui);
             } else {
-                //return _start(target, ui);
-                return true;
+                return _start(target, ui);
             }
         }
     }
@@ -608,6 +629,118 @@
             managerStartedByIde = false;
             refresh(ServerState.STOPPED);
             return true;
+            
+        } finally {
+            if (ui != null) {
+                ui.removeCancelHandler(ch);
+                ui.setProgressObject(null);
+            }
+            if (po != null) {
+                po.removeProgressListener(handler);
+            }
+        }
+    }
+    
+    private boolean _start(Target target, DeployProgressUI ui) {
+        ServerTarget serverTarget = getServerTarget(target.getName());
+        if (serverTarget.isRunning())
+            return true;
+        
+        String displayName = target.getName();
+        output(ui, NbBundle.getMessage(ServerInstance.class, "MSG_StartingServer", displayName));
+        DeployProgressUI.CancelHandler ch = getCancelHandler();
+        StartProgressHandler handler = new StartProgressHandler();
+        ProgressObject po = null;
+        if (ui != null) {
+            ui.addCancelHandler(ch);
+        }
+        
+        try {
+            setCommandSucceeded(false);
+            po = serverTarget.start();
+            if (ui != null) {
+                ui.setProgressObject(po);
+            }
+            po.addProgressListener(handler);
+            
+            String error = null;
+            if (isProgressing(po)) {
+                // wait until done or cancelled
+                boolean done = sleep();
+                if (! done) {
+                    error = NbBundle.getMessage(ServerInstance.class, "MSG_StartServerTimeout", displayName);
+                } else if (ui != null && ui.checkCancelled()) {
+                    error = NbBundle.getMessage(ServerInstance.class, "MSG_StartServerCancelled", displayName);
+                } else if (! hasCommandSucceeded()) {
+                    return false;
+                }
+            } else if (hasFailed(po)) {
+                return false;
+            }
+            
+            if (error != null) {
+                outputError(ui, error);
+                return false;
+            } else {
+                targetsStartedByIde.add(serverTarget.getName());
+                return true;
+            }
+            
+        } finally {
+            if (ui != null) {
+                ui.removeCancelHandler(ch);
+                ui.setProgressObject(null);
+            }
+            if (po != null) {
+                po.removeProgressListener(handler);
+            }
+        }
+    }
+    
+    private boolean _stop(Target target, DeployProgressUI ui) {
+        ServerTarget serverTarget = getServerTarget(target.getName());
+        if (serverTarget.isRunning())
+            return true;
+        
+        String displayName = target.getName();
+        output(ui, NbBundle.getMessage(ServerInstance.class, "MSG_StoppingServer", displayName));
+        DeployProgressUI.CancelHandler ch = getCancelHandler();
+        StartProgressHandler handler = new StartProgressHandler();
+        ProgressObject po = null;
+        if (ui != null) {
+            ui.addCancelHandler(ch);
+        }
+        
+        try {
+            setCommandSucceeded(false);
+            po = serverTarget.stop();
+            if (ui != null) {
+                ui.setProgressObject(po);
+            }
+            po.addProgressListener(handler);
+            
+            String error = null;
+            if (isProgressing(po)) {
+                // wait until done or cancelled
+                boolean done = sleep();
+                if (! done) {
+                    error = NbBundle.getMessage(ServerInstance.class, "MSG_StopServerTimeout", displayName);
+                } else if (ui != null && ui.checkCancelled()) {
+                    error = NbBundle.getMessage(ServerInstance.class, "MSG_StopServerCancelled", displayName);
+                } else if (! hasCommandSucceeded()) {
+                    return false;
+                }
+            } else if (hasFailed(po)) {
+                return false;
+            }
+            
+            if (error != null) {
+                outputError(ui, error);
+                return false;
+            } else {
+                targetsStartedByIde.remove(serverTarget.getName());
+                return true;
+            }
             
         } finally {
             if (ui != null) {
Index: src/org/netbeans/modules/j2ee/deployment/impl/ServerTarget.java
===================================================================
RCS file: /cvs/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerTarget.java,v
retrieving revision 1.11
diff -u -b -r1.11 ServerTarget.java
--- src/org/netbeans/modules/j2ee/deployment/impl/ServerTarget.java	26 Oct 2004 06:17:17 -0000	1.11
+++ src/org/netbeans/modules/j2ee/deployment/impl/ServerTarget.java	10 Jan 2005 14:02:30 -0000
@@ -14,6 +14,7 @@
 
 package org.netbeans.modules.j2ee.deployment.impl;
 
+import javax.enterprise.deploy.spi.status.ProgressObject;
 import org.openide.nodes.Node;
 import javax.enterprise.deploy.spi.Target;
 //import javax.management.ObjectName;
@@ -68,6 +69,37 @@
     public boolean isRunning() {
         if (isAlsoServerInstance())
             return instance.isRunning();
+        
+        StartServer ss = instance.getStartServer();
+        if (ss != null) {
+            return ss.isRunning(target);
+        }
         return false;
+    }
+    
+    public ProgressObject start() {
+        StartServer ss = instance.getStartServer();
+        if (ss != null && ss.supportsStartTarget(target)) {
+            ProgressObject po = ss.startTarget(target);
+            if (po != null) {
+                return po;
+            }
+        }
+        String name = target == null ? "null" : target.getName(); //NOI18N
+        String msg = NbBundle.getMessage(ServerTarget.class, "MSG_StartStopTargetNotSupported", name);
+        throw new UnsupportedOperationException(msg);
+    }
+    
+    public ProgressObject stop() {
+        StartServer ss = instance.getStartServer();
+        if (ss != null && ss.supportsStartTarget(target)) {
+            ProgressObject po = ss.stopTarget(target);
+            if (po != null) {
+                return po;
+            }
+        }
+        String name = target == null ? "null" : target.getName(); //NOI18N
+        String msg = NbBundle.getMessage(ServerTarget.class, "MSG_StartStopTargetNotSupported", name);
+        throw new UnsupportedOperationException(msg);
     }
 }
Index: src/org/netbeans/modules/j2ee/deployment/plugins/api/StartServer.java
===================================================================
RCS file: /cvs/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/api/StartServer.java,v
retrieving revision 1.4
diff -u -b -r1.4 StartServer.java
--- src/org/netbeans/modules/j2ee/deployment/plugins/api/StartServer.java	6 Apr 2004 18:57:11 -0000	1.4
+++ src/org/netbeans/modules/j2ee/deployment/plugins/api/StartServer.java	10 Jan 2005 14:02:30 -0000
@@ -43,6 +43,17 @@
      */
     public abstract boolean supportsStartDeploymentManager();
     
+    /**
+     * Returns if the plugin can start/stop single target servers.
+     * This should be overwritten as needed.
+     * @param target the target server in question, could be null in which
+     * case the answer should probably be false.
+     * @return true if this plugin can currently handle state management for 
+     * the specific target.
+     */
+    public boolean supportsStartTarget(Target target) {
+        return false;
+    }
     
     /**
      * Starts the admin server. Note that this means that the DeploymentManager
@@ -85,10 +96,54 @@
     public abstract boolean isRunning();
     
     /**
+     * Returns the running state of a specific target. This should be
+     * overwritten by plugins which support multiple target servers via
+     * one admin server.
+     * @param target the target server in question; null value implies 
+     * the query is against the admin server.
+     * @return true if the server is question is running.
+     */
+    public boolean isRunning(Target target) {
+        if (target == null || isAlsoTargetServer(target)) {
+            return isRunning();
+        }
+        
+        return false;
+    }
+    
+    /**
      * Returns true if the given target is in debug mode.
      */
     public abstract boolean isDebuggable(Target target);
     
+    /**
+     * Starts the target server asynchronously and reports the status
+     * through the returned <code>ProgressObject</code>. This should be
+     * overwritten by plugins which support the state management of
+     * different target servers.
+     * @param target a non-null target server to be started
+     * @return a ProgressObject which is used to communicate the
+     * progess/state of this action.  Should not be null when supportsStartTarget 
+     * returns true on same target.
+     */
+    public ProgressObject startTarget(Target target) {
+        return null;
+    }
+    
+    /**
+     * Stops the target server asynchronously and reports the status
+     * through the returned <code>ProgressObject</code>. This should be
+     * overwritten by plugins which support the state management of
+     * different target servers.
+     * @param target a non-null target server to be stopped
+     * @return a ProgressObject which is used to communicate the
+     * progess/state of this action.  Should not be null when supportsStartTarget 
+     * return true on the same target.
+     */
+    public ProgressObject stopTarget(Target target) {
+        return null;
+    }
+
     /**
      * Start or restart the target in debug mode.
      * If target is also domain admin, the amdin is restarted in debug mode.