*** /space/cvs/nb_all/serverplugins/jboss4/nbproject/project.xml
--- /space/cvs/nb_all/serverplugins/jboss4/nbproject/project.xml
***************
*** 14,84 ****
  <project xmlns="http://www.netbeans.org/ns/project/1">
      <type>org.netbeans.modules.apisupport.project</type>
      <configuration>
!         <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
              <code-name-base>org.netbeans.modules.j2ee.jboss4</code-name-base>
              <module-dependencies>
                  <dependency>
!                     <code-name-base>org.openide.filesystems</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <specification-version>6.2</specification-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.openide.util</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
!                     <run-dependency>
!                         <specification-version>6.2</specification-version>
!                     </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.openide.nodes</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <specification-version>6.2</specification-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.openide.dialogs</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <specification-version>6.2</specification-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.openide.awt</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <specification-version>6.2</specification-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.openide.modules</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <specification-version>6.2</specification-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.openide.text</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <specification-version>6.2</specification-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.openide.windows</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <specification-version>6.2</specification-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
--- 14,94 ----
  <project xmlns="http://www.netbeans.org/ns/project/1">
      <type>org.netbeans.modules.apisupport.project</type>
      <configuration>
!         
!     <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
              <code-name-base>org.netbeans.modules.j2ee.jboss4</code-name-base>
+             
+ 
+             <!-- This section exposes packages that can be used
+                  by other modules which depend on this one.
+                  If you don't do this, and attempt to access a class
+                  in this module from another module, you'll
+                  get a NoClassDefFoundException at runtime.
+             -->
              <module-dependencies>
                  <dependency>
!                     <code-name-base>org.netbeans.api.xml</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <release-version>1</release-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.netbeans.modules.j2ee.api.ejbmodule</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
!                     <run-dependency/>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.netbeans.modules.j2ee.dd</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <release-version>1</release-version>
!                         <specification-version>1.3</specification-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.netbeans.modules.j2eeapis</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <release-version>1</release-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.netbeans.modules.j2eeserver</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <release-version>3</release-version>
!                         <specification-version>1.5</specification-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.netbeans.modules.project.libraries</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <release-version>1</release-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.netbeans.modules.schema2beans</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <release-version>1</release-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.netbeans.modules.websvc.jaxrpc16</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <release-version>1</release-version>
!                         <specification-version>1.0</specification-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
***************
*** 90,178 ****
                      </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.netbeans.modules.j2ee.api.ejbmodule</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
!                     <run-dependency/>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.openide.loaders</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
!                     <run-dependency/>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.openide.io</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
!                     <run-dependency/>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.netbeans.modules.j2eeserver</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <release-version>3</release-version>
!                         <specification-version>1.5</specification-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.netbeans.modules.j2eeapis</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
!                     <run-dependency>
!                         <release-version>1</release-version>
!                     </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.netbeans.modules.project.libraries</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
!                     <run-dependency>
!                         <release-version>1</release-version>
!                     </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.openide.execution</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <specification-version>1.3</specification-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.netbeans.modules.schema2beans</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <release-version>1</release-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.netbeans.modules.j2ee.dd</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <release-version>1</release-version>
!                         <specification-version>1.3</specification-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.netbeans.api.xml</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <release-version>1</release-version>
                      </run-dependency>
                  </dependency>
              </module-dependencies>
- 
-             <!-- This section exposes packages that can be used
-                  by other modules which depend on this one.
-                  If you don't do this, and attempt to access a class
-                  in this module from another module, you'll
-                  get a NoClassDefFoundException at runtime.
-             -->
              <public-packages/>
          </data>
      </configuration>
--- 100,188 ----
                      </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.openide.awt</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
!                     <run-dependency>
!                         <specification-version>6.2</specification-version>
!                     </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.openide.dialogs</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
!                     <run-dependency>
!                         <specification-version>6.2</specification-version>
!                     </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.openide.execution</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
!                     <run-dependency>
!                         <specification-version>1.3</specification-version>
!                     </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.openide.filesystems</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <specification-version>6.2</specification-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.openide.io</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
!                     <run-dependency/>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.openide.loaders</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
!                     <run-dependency/>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.openide.modules</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <specification-version>6.2</specification-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.openide.nodes</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <specification-version>6.2</specification-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.openide.text</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <specification-version>6.2</specification-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
!                     <code-name-base>org.openide.util</code-name-base>
                      <build-prerequisite/>
                      <compile-dependency/>
                      <run-dependency>
!                         <specification-version>6.2</specification-version>
                      </run-dependency>
                  </dependency>
+                 <dependency>
+                     <code-name-base>org.openide.windows</code-name-base>
+                     <build-prerequisite/>
+                     <compile-dependency/>
+                     <run-dependency>
+                         <specification-version>6.2</specification-version>
+                     </run-dependency>
+                 </dependency>
              </module-dependencies>
              <public-packages/>
          </data>
*** /space/cvs/nb_all/serverplugins/jboss4/src/org/netbeans/modules/j2ee/jboss4/ide/JBJ2eePlatformFactory.java
--- /space/cvs/nb_all/serverplugins/jboss4/src/org/netbeans/modules/j2ee/jboss4/ide/JBJ2eePlatformFactory.java
***************
*** 35,42 ****
  //****
  import org.netbeans.modules.j2ee.jboss4.JBDeploymentManager;
  import java.io.FilenameFilter;
- import javax.swing.filechooser.FileFilter;
  import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
  import org.openide.modules.InstalledFileLocator;
   
  /**
--- 35,43 ----
  //****
  import org.netbeans.modules.j2ee.jboss4.JBDeploymentManager;
  import java.io.FilenameFilter;
  import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
  import org.openide.modules.InstalledFileLocator;
+ 
   
  /**
   *
***************
*** 184,204 ****
          }
  
          public boolean isToolSupported(String toolName) {
              return false;
          }
  
          public File[] getToolClasspathEntries(String toolName) {
!             return new File[0];
!         }
! 
! 
!         // copied from appserv plugin
!         private URL fileToUrl(File file) throws MalformedURLException {
!             URL url = file.toURI().toURL();
!             if (FileUtil.isArchiveFile(url)) {
!                 url = FileUtil.getArchiveRoot(url);
              }
!             return url;
          }
      }
  }
--- 184,217 ----
          }
  
          public boolean isToolSupported(String toolName) {
+             if ("wscompile".equals(toolName)) { // TODO this will be removed - just for testing
+                 return true;
+             }
              return false;
          }
  
          public File[] getToolClasspathEntries(String toolName) {
!             if ("wscompile".equals(toolName)) { // TODO this will be removed - just for testing
!                 File root = InstalledFileLocator.getDefault().locate("modules/ext/jaxrpc16", null, false);
!                 return new File[] {
!                     new File(root, "jaxrpc-api.jar"),
!                     new File(root, "saaj-api.jar"),
!                     new File(root, "saaj-impl.jar"),
!                     new File(root, "jaxrpc-api.jar"),
!                     new File(root, "jaxrpc-impl.jar"),
!                 };
              }
!             return null;
          }
+ 
+ 
+         // copied from appserv plugin
+         private URL fileToUrl(File file) throws MalformedURLException {
+             URL url = file.toURI().toURL();
+             if (FileUtil.isArchiveFile(url)) {
+                 url = FileUtil.getArchiveRoot(url);
+             }
+             return url;
+         }
      }
  }