Attachment #39758 for bug #97469

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 97469
Collapse All | Expand All

Lines 138-143 Link Here

(-)src/org/netbeans/modules/j2ee/jboss4/ide/ui/JBPluginUtils.java (-1 / +13 lines)
138		138
139	//--------------- checking for possible server directory -------------	139	//--------------- checking for possible server directory -------------
140	private static List<String> serverRequirements4x = new LinkedList<String>();	140	private static List<String> serverRequirements4x = new LinkedList<String>();
		141	private static List<String> serverAlterRequirements4x = new LinkedList<String>();
141		142
142	static {	143	static {
143	serverRequirements4x.add("bin"); // NOI18N	144	serverRequirements4x.add("bin"); // NOI18N
Lines 146-151 Link Here
146	serverRequirements4x.add("server"); // NOI18N	147	serverRequirements4x.add("server"); // NOI18N
147	serverRequirements4x.add("lib/jboss-common.jar"); // NOI18N	148	serverRequirements4x.add("lib/jboss-common.jar"); // NOI18N
148	serverRequirements4x.add("lib/endorsed/resolver.jar"); // NOI18N	149	serverRequirements4x.add("lib/endorsed/resolver.jar"); // NOI18N
		150
		151	// Alter requirements are for support of jboss 4.2.X
		152	serverAlterRequirements4x.add("bin"); // NOI18N
		153	serverAlterRequirements4x.add("client"); // NOI18N
		154	serverAlterRequirements4x.add("lib"); // NOI18N
		155	serverAlterRequirements4x.add("server"); // NOI18N
		156	serverAlterRequirements4x.add("lib/jboss-common.jar"); // NOI18N
		157	serverAlterRequirements4x.add("client/jaxb-xjc.jar"); // NOI18N
		158	serverAlterRequirements4x.add("client/jaxb-impl.jar"); // NOI18N
		159	serverAlterRequirements4x.add("client/jaxb-api.jar"); // NOI18N
149	}	160	}
150		161
151	private static List<String> serverRequirements5x = new LinkedList<String>();	162	private static List<String> serverRequirements5x = new LinkedList<String>();
Lines 171-177 Link Here
171	}	182	}
172		183
173	public static boolean isGoodJBServerLocation4x(File candidate){	184	public static boolean isGoodJBServerLocation4x(File candidate){
174	return isGoodJBServerLocation(candidate, serverRequirements4x);	185	return isGoodJBServerLocation(candidate, serverRequirements4x) \|\|
		186	isGoodJBServerLocation(candidate, serverAlterRequirements4x);
175	}	187	}
176		188
177	public static boolean isGoodJBServerLocation4x(JBDeploymentManager dm){	189	public static boolean isGoodJBServerLocation4x(JBDeploymentManager dm){

Lines 81-87 Link Here

(-)src/org/netbeans/modules/j2ee/jboss4/nodes/JBEarApplicationsChildren.java (-1 / +1 lines)
81	String name = elem.getKeyProperty(propertyName);	81	String name = elem.getKeyProperty(propertyName);
82		82
83	if (isRemoteManagementSupported() && isJB4x) {	83	if (isRemoteManagementSupported() && isJB4x) {
84	if (name.endsWith(".sar")) { // NOI18N	84	if (name.endsWith(".sar") \|\| name.endsWith(".deployer")) { // NOI18N
85	continue;	85	continue;
86	}	86	}
87	}	87	}

Return to bug 97469