Author: snjeza
Date: 2010-01-13 05:01:09 -0500 (Wed, 13 Jan 2010)
New Revision: 19728
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5582 Support for server runtime JBossAS 6.0
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2010-01-13
08:57:24 UTC (rev 19727)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2010-01-13
10:01:09 UTC (rev 19728)
@@ -99,10 +99,14 @@
String insideServer = JBossServer.getDeployFolder(ds, JBossServer.DEPLOY_SERVER);
String metadata = JBossServer.getDeployFolder(ds, JBossServer.DEPLOY_METADATA);
String custom = JBossServer.getDeployFolder(ds, JBossServer.DEPLOY_CUSTOM);
+ String serverHome = null;
+ if (server != null && server.getRuntime()!= null &&
server.getRuntime().getLocation() != null) {
+ serverHome = server.getRuntime().getLocation().toString();
+ }
folders.add(insideServer);
if( !folders.contains(metadata))
folders.add(metadata);
- if( !folders.contains(custom))
+ if( !folders.contains(custom) && !custom.equals(serverHome))
folders.add(custom);
IModule[] modules2 =
org.eclipse.wst.server.core.ServerUtil.getModules(server.getServerType().getRuntimeType().getModuleTypes());