From: Robert S. <ra...@gm...> - 2006-07-10 15:44:43
|
User: rawb Date: 06/07/10 11:44:42 Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model ModuleModel.java DescriptorModel.java Log: Misc. changes. Revision Changes Path 1.4 +4 -1 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/ModuleModel.java (In the diff below, changes in quantity of whitespace are not shown.) Index: ModuleModel.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/ModuleModel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- ModuleModel.java 9 Jun 2006 20:17:04 -0000 1.3 +++ ModuleModel.java 10 Jul 2006 15:44:42 -0000 1.4 @@ -124,10 +124,13 @@ } public static boolean isPackagedModule(IModule module) { + if( "jboss.archive".equals(module.getModuleType().getId())) return true; + /* if( "jboss.web".equals(module.getModuleType().getId())) return true; if( "jboss.ear".equals(module.getModuleType().getId())) return true; if( "jboss.ejb".equals(module.getModuleType().getId())) return true; if( "jboss.aop".equals(module.getModuleType().getId())) return true; + */ return false; } @@ -449,7 +452,7 @@ /** * Date is the last time this module was changed. - * Servers can use this to figure out if it needs to be + * Servers can use this to figure OUT if it needs to be * published again or not. */ private long date; 1.3 +29 -3 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/DescriptorModel.java (In the diff below, changes in quantity of whitespace are not shown.) Index: DescriptorModel.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/DescriptorModel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- DescriptorModel.java 2 Jun 2006 16:47:56 -0000 1.2 +++ DescriptorModel.java 10 Jul 2006 15:44:42 -0000 1.3 @@ -23,6 +23,7 @@ import java.io.File; import java.net.URL; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -33,7 +34,8 @@ import org.eclipse.wst.server.core.ServerCore; import org.jboss.ide.eclipse.as.core.JBossServerCore; import org.jboss.ide.eclipse.as.core.server.JBossServer; -import org.jboss.ide.eclipse.as.core.server.runtime.JBossRuntimeConfiguration; +import org.jboss.ide.eclipse.as.core.server.ServerAttributeHelper; +import org.jboss.ide.eclipse.as.core.util.ASDebug; /** * This class is intended to represent the actual mbeans, @@ -91,15 +93,18 @@ */ public class ServerDescriptorModel { private String serverId; + private long lastChecked; + private String configPath; public ServerDescriptorModel(String id) { this.serverId = id; + ServerAttributeHelper helper = getJBossServer().getAttributeHelper(); + configPath = helper.getConfigurationPath(); + } public int getJNDIPort() { try { - JBossRuntimeConfiguration rc = getJBossServer().getRuntimeConfiguration(); - String configPath = rc.getConfigurationPath(); String jbossServicePath = configPath + File.separator + "conf" + File.separator + "jboss-service.xml"; URL jbossServiceURL = new File(jbossServicePath).toURL(); @@ -121,6 +126,27 @@ return JBossServerCore.getServer(ServerCore.findServer(serverId)); } + private File[] getAllDescriptors() { + ArrayList list = new ArrayList(); + File config = new File(configPath); + getAllDescriptorsRecurse(config, list); + File[] ret = new File[list.size()]; + list.toArray(ret); + return ret; + } + + private void getAllDescriptorsRecurse(File parent, ArrayList collector) { + if( parent.isDirectory() ) { + File[] children = parent.listFiles(); + for( int i = 0; i < children.length; i++ ) { + if( children[i].isDirectory()) { + getAllDescriptorsRecurse(children[i], collector); + } else if( children[i].getAbsolutePath().endsWith(".xml")) { + collector.add(children[i]); + } + } + } + } } |