? issue97469.patch
Index: src/org/netbeans/modules/j2ee/jboss4/ide/ui/JBPluginUtils.java
===================================================================
RCS file: /cvs/serverplugins/jboss4/src/org/netbeans/modules/j2ee/jboss4/ide/ui/JBPluginUtils.java,v
retrieving revision 1.2.18.3.2.3.24.1
diff -u -r1.2.18.3.2.3.24.1 JBPluginUtils.java
--- src/org/netbeans/modules/j2ee/jboss4/ide/ui/JBPluginUtils.java	22 Feb 2007 12:56:41 -0000	1.2.18.3.2.3.24.1
+++ src/org/netbeans/modules/j2ee/jboss4/ide/ui/JBPluginUtils.java	21 Mar 2007 13:55:57 -0000
@@ -138,6 +138,7 @@
     
     //--------------- checking for possible server directory -------------
     private static List<String> serverRequirements4x = new LinkedList<String>();
+    private static List<String> serverAlterRequirements4x = new LinkedList<String>();
     
     static {
         serverRequirements4x.add("bin");                        // NOI18N
@@ -146,6 +147,16 @@
         serverRequirements4x.add("server");                     // NOI18N
         serverRequirements4x.add("lib/jboss-common.jar");       // NOI18N
         serverRequirements4x.add("lib/endorsed/resolver.jar");  // NOI18N
+
+        // Alter requirements are for support of jboss 4.2.X
+        serverAlterRequirements4x.add("bin");                   // NOI18N
+        serverAlterRequirements4x.add("client");                // NOI18N
+        serverAlterRequirements4x.add("lib");                   // NOI18N
+        serverAlterRequirements4x.add("server");                // NOI18N
+        serverAlterRequirements4x.add("lib/jboss-common.jar");  // NOI18N
+        serverAlterRequirements4x.add("client/jaxb-xjc.jar");   // NOI18N
+        serverAlterRequirements4x.add("client/jaxb-impl.jar");  // NOI18N
+        serverAlterRequirements4x.add("client/jaxb-api.jar");   // NOI18N    
     }  
     
     private static List<String> serverRequirements5x = new LinkedList<String>();
@@ -171,7 +182,8 @@
     }
     
     public static boolean isGoodJBServerLocation4x(File candidate){
-        return isGoodJBServerLocation(candidate, serverRequirements4x);
+        return isGoodJBServerLocation(candidate, serverRequirements4x) ||
+                isGoodJBServerLocation(candidate, serverAlterRequirements4x);
     }
     
     public static boolean isGoodJBServerLocation4x(JBDeploymentManager dm){
Index: src/org/netbeans/modules/j2ee/jboss4/nodes/JBEarApplicationsChildren.java
===================================================================
RCS file: /cvs/serverplugins/jboss4/src/org/netbeans/modules/j2ee/jboss4/nodes/JBEarApplicationsChildren.java,v
retrieving revision 1.1.4.5.24.1
diff -u -r1.1.4.5.24.1 JBEarApplicationsChildren.java
--- src/org/netbeans/modules/j2ee/jboss4/nodes/JBEarApplicationsChildren.java	22 Feb 2007 12:56:42 -0000	1.1.4.5.24.1
+++ src/org/netbeans/modules/j2ee/jboss4/nodes/JBEarApplicationsChildren.java	21 Mar 2007 13:55:57 -0000
@@ -81,7 +81,7 @@
                             String name = elem.getKeyProperty(propertyName);
 
                             if (isRemoteManagementSupported() && isJB4x) {
-                                if (name.endsWith(".sar")) { // NOI18N
+                                if (name.endsWith(".sar") || name.endsWith(".deployer")) { // NOI18N
                                     continue;
                                 }
                             }