Index: serverplugins/weblogic9/src/org/netbeans/modules/j2ee/weblogic9/WLDeploymentFactory.java =================================================================== RCS file: /cvs/serverplugins/weblogic9/src/org/netbeans/modules/j2ee/weblogic9/WLDeploymentFactory.java,v retrieving revision 1.5.8.1.2.5 diff -u -r1.5.8.1.2.5 WLDeploymentFactory.java --- serverplugins/weblogic9/src/org/netbeans/modules/j2ee/weblogic9/WLDeploymentFactory.java 11 Sep 2006 15:57:43 -0000 1.5.8.1.2.5 +++ serverplugins/weblogic9/src/org/netbeans/modules/j2ee/weblogic9/WLDeploymentFactory.java 29 Sep 2006 10:12:12 -0000 @@ -122,7 +122,7 @@ } } - private DeploymentManager getDM(String uri, String username, String password, String host, String port) throws DeploymentManagerCreationException { + static DeploymentManager getDM(String uri, String username, String password, String host, String port) throws DeploymentManagerCreationException { if (WLDebug.isEnabled()) { WLDebug.notify(WLDeploymentFactory.class, "getDM, uri:" + uri+" username:" + username+" password:"+password+" host:"+host+" port:"+port); } Index: serverplugins/weblogic9/src/org/netbeans/modules/j2ee/weblogic9/WLDeploymentManager.java =================================================================== RCS file: /cvs/serverplugins/weblogic9/src/org/netbeans/modules/j2ee/weblogic9/WLDeploymentManager.java,v retrieving revision 1.9.8.3.2.3 diff -u -r1.9.8.3.2.3 WLDeploymentManager.java --- serverplugins/weblogic9/src/org/netbeans/modules/j2ee/weblogic9/WLDeploymentManager.java 11 Sep 2006 15:57:43 -0000 1.9.8.3.2.3 +++ serverplugins/weblogic9/src/org/netbeans/modules/j2ee/weblogic9/WLDeploymentManager.java 29 Sep 2006 10:12:12 -0000 @@ -148,6 +148,14 @@ return process; } + private DeploymentManager getDM() throws IllegalStateException { + try { + return WLDeploymentFactory.getDM(uri, username, password, host, port); + } catch (DeploymentManagerCreationException e) { + throw new IllegalStateException(e); + } + } + public ProgressObject distribute(Target[] target, File file, File file2) throws IllegalStateException { if (WLDebug.isEnabled()) // debug output @@ -159,19 +167,19 @@ return new WLDeployer(uri).deploy(target, file, file2, getHost(), getPort()); } else { //weblogic jsr88 version - modifiedLoader(); + ClassLoader currentLoader = modifiedLoader(); try { - return new DelegatingProgressObject(dm.distribute(target, file, file2)); + return new DelegatingProgressObject( getDM().distribute(target, file, file2)); } finally { - originalLoader(); + originalLoader(currentLoader); } } } - private ClassLoader swapLoader; +// private ClassLoader swapLoader; - private void modifiedLoader() { - swapLoader = Thread.currentThread().getContextClassLoader(); + private ClassLoader modifiedLoader() { + ClassLoader currentLoader = Thread.currentThread().getContextClassLoader(); String serverRoot = getInstanceProperties().getProperty(WLPluginProperties.SERVER_ROOT_ATTR); // if serverRoot is null, then we are in a server instance registration process, thus this call // is made from InstanceProperties creation -> WLPluginProperties singleton contains @@ -180,9 +188,13 @@ serverRoot = WLPluginProperties.getInstance().getInstallLocation(); Thread.currentThread().setContextClassLoader(WLDeploymentFactory.getWLClassLoader(serverRoot)); + return currentLoader; } - private void originalLoader() { - Thread.currentThread().setContextClassLoader(swapLoader); + + private void originalLoader(ClassLoader currentLoader) { + if (currentLoader != null) { + Thread.currentThread().setContextClassLoader(currentLoader); + } } /** @@ -217,11 +229,11 @@ if (WLDebug.isEnabled()) // debug output WLDebug.notify("redeploy(" + targetModuleID + ", " + // NOI18N inputStream + ", " + inputStream2 + ")"); // NOI18N - modifiedLoader(); + ClassLoader currentLoader = modifiedLoader(); try { - return new DelegatingProgressObject(dm.redeploy(targetModuleID, inputStream, inputStream2)); + return new DelegatingProgressObject(getDM().redeploy(targetModuleID, inputStream, inputStream2)); } finally { - originalLoader(); + originalLoader(currentLoader); } } @@ -235,11 +247,11 @@ if (WLDebug.isEnabled()) // debug output WLDebug.notify("distribute(" + target + ", " + // NOI18N inputStream + ", " + inputStream2 + ")"); // NOI18N - modifiedLoader(); + ClassLoader currentLoader = modifiedLoader(); try { - return new DelegatingProgressObject(dm.distribute(target, inputStream, inputStream2)); + return new DelegatingProgressObject(getDM().distribute(target, inputStream, inputStream2)); } finally { - originalLoader(); + originalLoader(currentLoader); } } @@ -252,11 +264,11 @@ throws IllegalStateException { if (WLDebug.isEnabled()) // debug output WLDebug.notify("undeploy(" + targetModuleID + ")"); // NOI18N - modifiedLoader(); + ClassLoader currentLoader = modifiedLoader(); try { - return new DelegatingProgressObject(dm.undeploy(targetModuleID)); + return new DelegatingProgressObject(getDM().undeploy(targetModuleID)); } finally { - originalLoader(); + originalLoader(currentLoader); } } @@ -270,11 +282,11 @@ if (WLDebug.isEnabled()) // debug output WLDebug.notify("stop(" + targetModuleID + ")"); // NOI18N - modifiedLoader(); + ClassLoader currentLoader = modifiedLoader(); try { - return new DelegatingProgressObject(dm.stop(targetModuleID)); + return new DelegatingProgressObject(getDM().stop(targetModuleID)); } finally { - originalLoader(); + originalLoader(currentLoader); } } @@ -288,11 +300,11 @@ if (WLDebug.isEnabled()) // debug output WLDebug.notify("start(" + targetModuleID + ")"); // NOI18N - modifiedLoader(); + ClassLoader currentLoader = modifiedLoader(); try { - return new DelegatingProgressObject(dm.start(targetModuleID)); + return new DelegatingProgressObject(getDM().start(targetModuleID)); } finally { - originalLoader(); + originalLoader(currentLoader); } } @@ -307,12 +319,12 @@ WLDebug.notify("getAvailableModules(" + moduleType + // NOI18N ", " + target + ")"); // NOI18N - modifiedLoader(); + ClassLoader currentLoader = modifiedLoader(); try { - TargetModuleID t[] = dm.getAvailableModules(moduleType, target); + TargetModuleID t[] = getDM().getAvailableModules(moduleType, target); return t; } finally { - originalLoader(); + originalLoader(currentLoader); } } @@ -327,15 +339,15 @@ WLDebug.notify("getNonRunningModules(" + moduleType + // NOI18N ", " + target + ")"); // NOI18N - modifiedLoader(); + ClassLoader currentLoader = modifiedLoader(); try { - TargetModuleID t[] = dm.getNonRunningModules(moduleType, target); + TargetModuleID t[] = getDM().getNonRunningModules(moduleType, target); for (int i=0; i < t.length; i++) { System.out.println("non running module:" + t[i]); } return t; } finally { - originalLoader(); + originalLoader(currentLoader); } } @@ -350,15 +362,15 @@ WLDebug.notify("getRunningModules(" + moduleType + // NOI18N ", " + target + ")"); // NOI18N - modifiedLoader(); + ClassLoader currentLoader = modifiedLoader(); try { - TargetModuleID t[] = dm.getRunningModules(moduleType, target); + TargetModuleID t[] = getDM().getRunningModules(moduleType, target); for (int i=0; i < t.length; i++) { System.out.println("running module:" + t[i]); } return t; } finally { - originalLoader(); + originalLoader(currentLoader); } } @@ -374,11 +386,11 @@ WLDebug.notify("redeploy(" + targetModuleID + ", " + // NOI18N file + ", " + file2 + ")"); // NOI18N - modifiedLoader(); + ClassLoader currentLoader = modifiedLoader(); try { - return new DelegatingProgressObject(dm.redeploy(targetModuleID, file, file2)); + return new DelegatingProgressObject(getDM().redeploy(targetModuleID, file, file2)); } finally { - originalLoader(); + originalLoader(currentLoader); } } @@ -391,11 +403,11 @@ if (WLDebug.isEnabled()) // debug output WLDebug.notify("setLocale(" + locale + ")"); // NOI18N - modifiedLoader(); + ClassLoader currentLoader = modifiedLoader(); try { - dm.setLocale(locale); + getDM().setLocale(locale); } finally { - originalLoader(); + originalLoader(currentLoader); } } @@ -408,11 +420,11 @@ if (WLDebug.isEnabled()) // debug output WLDebug.notify("isLocaleSupported(" + locale + ")"); // NOI18N - modifiedLoader(); + ClassLoader currentLoader = modifiedLoader(); try { - return dm.isLocaleSupported(locale); + return getDM().isLocaleSupported(locale); } finally { - originalLoader(); + originalLoader(currentLoader); } } @@ -428,11 +440,11 @@ WLDebug.notify("setDConfigBeanVersion(" + // NOI18N dConfigBeanVersionType + ")"); // NOI18N - modifiedLoader(); + ClassLoader currentLoader = modifiedLoader(); try { - dm.setDConfigBeanVersion(dConfigBeanVersionType); + getDM().setDConfigBeanVersion(dConfigBeanVersionType); } finally { - originalLoader(); + originalLoader(currentLoader); } } @@ -447,11 +459,11 @@ WLDebug.notify("isDConfigBeanVersionSupported(" + // NOI18N dConfigBeanVersionType + ")"); // NOI18N - modifiedLoader(); + ClassLoader currentLoader = modifiedLoader(); try { - return dm.isDConfigBeanVersionSupported(dConfigBeanVersionType); + return getDM().isDConfigBeanVersionSupported(dConfigBeanVersionType); } finally { - originalLoader(); + originalLoader(currentLoader); } } @@ -464,7 +476,7 @@ if (WLDebug.isEnabled()) // debug output WLDebug.notify("release()"); // NOI18N - modifiedLoader(); + ClassLoader currentLoader = modifiedLoader(); try { if (dm != null) { // delegate the call and clear the stored deployment manager @@ -479,7 +491,7 @@ } } } finally { - originalLoader(); + originalLoader(currentLoader); } } @@ -492,11 +504,11 @@ if (WLDebug.isEnabled()) // debug output WLDebug.notify("isRedeploySupported()"); // NOI18N - modifiedLoader(); + ClassLoader currentLoader = modifiedLoader(); try { - return dm.isRedeploySupported(); + return getDM().isRedeploySupported(); } finally { - originalLoader(); + originalLoader(currentLoader); } } @@ -509,11 +521,11 @@ if (WLDebug.isEnabled()) // debug output WLDebug.notify("getCurrentLocale()"); // NOI18N - modifiedLoader(); + ClassLoader currentLoader = modifiedLoader(); try { - return dm.getCurrentLocale(); + return getDM().getCurrentLocale(); } finally { - originalLoader(); + originalLoader(currentLoader); } } @@ -526,11 +538,11 @@ if (WLDebug.isEnabled()) // debug output WLDebug.notify("getDConfigBeanVersion()"); // NOI18N - modifiedLoader(); + ClassLoader currentLoader = modifiedLoader(); try { return dm.getDConfigBeanVersion(); } finally { - originalLoader(); + originalLoader(currentLoader); } } @@ -543,11 +555,11 @@ if (WLDebug.isEnabled()) // debug output WLDebug.notify("getDefaultLocale()"); // NOI18N - modifiedLoader(); + ClassLoader currentLoader = modifiedLoader(); try { return dm.getDefaultLocale(); } finally { - originalLoader(); + originalLoader(currentLoader); } } @@ -560,11 +572,11 @@ if (WLDebug.isEnabled()) // debug output WLDebug.notify("getSupportedLocales()"); // NOI18N - modifiedLoader(); + ClassLoader currentLoader = modifiedLoader(); try { return dm.getSupportedLocales(); } finally { - originalLoader(); + originalLoader(currentLoader); } } @@ -577,11 +589,11 @@ if (WLDebug.isEnabled()) // debug output WLDebug.notify("getTargets()"); // NOI18N - modifiedLoader(); + ClassLoader currentLoader = modifiedLoader(); try { - return dm.getTargets(); + return getDM().getTargets(); } finally { - originalLoader(); + originalLoader(currentLoader); } }