Index: src/org/netbeans/modules/j2ee/sun/ide/j2ee/StartSunServer.java
===================================================================
RCS file: /cvs/serverplugins/sun/appsrv81/src/org/netbeans/modules/j2ee/sun/ide/j2ee/StartSunServer.java,v
retrieving revision 1.28
diff -c -r1.28 StartSunServer.java
*** src/org/netbeans/modules/j2ee/sun/ide/j2ee/StartSunServer.java	23 Apr 2007 20:10:44 -0000	1.28
--- src/org/netbeans/modules/j2ee/sun/ide/j2ee/StartSunServer.java	25 Apr 2007 14:09:21 -0000
***************
*** 58,63 ****
--- 58,64 ----
  import org.openide.DialogDisplayer;
  import org.openide.ErrorManager;
  import org.openide.NotifyDescriptor;
+ import org.openide.filesystems.FileUtil;
  import org.openide.util.RequestProcessor;
  import org.openide.util.NbBundle;
  import org.netbeans.modules.j2ee.deployment.plugins.spi.StartServer;
***************
*** 67,72 ****
--- 68,74 ----
  import org.netbeans.modules.j2ee.sun.api.SunServerStateInterface;
  import org.netbeans.modules.j2ee.sun.ide.j2ee.ui.Util;
  import org.openide.filesystems.FileObject;
+ import org.openide.util.Utilities;
  import org.openide.windows.InputOutput;
  
  /**
***************
*** 828,847 ****
      private boolean applySettingsToDomain(ProfilerServerSettings settings) {
          boolean retVal;
          SunDeploymentManagerInterface sunDm = (SunDeploymentManagerInterface)this.dm;
!         String ext = (File.separatorChar == '/' ? "conf" : "bat");          // NOI18N
          File asenv = new File(sunDm.getPlatformRoot(),"config/asenv."+ext);            // NOI18N
          Asenv asenvContent = new Asenv(asenv);
!         String currentJdkRoot = "\""+asenvContent.get(Asenv.AS_JAVA)+"\"";
          String newJdkRoot = currentJdkRoot;
          Iterator<FileObject>  iter = settings.getJavaPlatform().getInstallFolders().iterator();
-         FileObject fo;
          if (iter.hasNext()) {
!             fo = iter.next();
!             //newJdkRoot = fo.getPath();
!             if (File.pathSeparatorChar == ':') {
!                 newJdkRoot = "\"/"+fo.getPath()+"\"";
              } else {
!                 newJdkRoot = "\""+fo.getPath()+"\"";
              }
          }
          retVal = ConfigureProfiler.modifyAsEnvScriptFile(dm, newJdkRoot);
--- 830,851 ----
      private boolean applySettingsToDomain(ProfilerServerSettings settings) {
          boolean retVal;
          SunDeploymentManagerInterface sunDm = (SunDeploymentManagerInterface)this.dm;
!         String ext = (Utilities.isWindows() ? "bat" : "conf");          // NOI18N
          File asenv = new File(sunDm.getPlatformRoot(),"config/asenv."+ext);            // NOI18N
          Asenv asenvContent = new Asenv(asenv);
!         String currentJdkRoot = asenvContent.get(Asenv.AS_JAVA);
!         if (!Utilities.isWindows()) {
!             currentJdkRoot = "\""+currentJdkRoot+"\"";
!         }
          String newJdkRoot = currentJdkRoot;
          Iterator<FileObject>  iter = settings.getJavaPlatform().getInstallFolders().iterator();
          if (iter.hasNext()) {
!             FileObject fo = iter.next();
!             String jdkPath = FileUtil.toFile(fo).getAbsolutePath();
!             if (Utilities.isWindows()) {
!                 newJdkRoot = jdkPath;
              } else {
!                 newJdkRoot = "\""+jdkPath+"\"";
              }
          }
          retVal = ConfigureProfiler.modifyAsEnvScriptFile(dm, newJdkRoot);
***************
*** 856,862 ****
      private void resetProfiler() {
          ConfigureProfiler.removeProfilerFromDomain(dm);
          if (oldJdkRoot != null) {
!             if (ConfigureProfiler.modifyAsEnvScriptFile(dm, oldJdkRoot)) {
                  Logger.getLogger(StartSunServer.class.getName()).warning("Environment rewrite failed");  // NOI18N
              } else {
                  oldJdkRoot = null;
--- 860,866 ----
      private void resetProfiler() {
          ConfigureProfiler.removeProfilerFromDomain(dm);
          if (oldJdkRoot != null) {
!             if (!ConfigureProfiler.modifyAsEnvScriptFile(dm, oldJdkRoot)) {
                  Logger.getLogger(StartSunServer.class.getName()).warning("Environment rewrite failed");  // NOI18N
              } else {
                  oldJdkRoot = null;