Author: adietish Date: 2011-07-11 07:58:39 -0400 (Mon, 11 Jul 2011) New Revision: 32809 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBoss7RuntimeClasspathUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchConfigUtils.java Log: [JBIDE-9215] renamed IJBossRuntimeResourceConstants.JBOSS_MODULES_JAR to IJBossRuntimeResourceConstants.JBOSS7_MODULES_JAR Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java 2011-07-11 10:21:13 UTC (rev 32808) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java 2011-07-11 11:58:39 UTC (rev 32809) @@ -46,7 +46,7 @@ public static final String START_JAR = "run.jar"; //$NON-NLS-1$ public static final String START_JAR_LOC = BIN + Path.SEPARATOR + START_JAR; public static final String TOOLS_JAR = "tools.jar"; //$NON-NLS-1$ - public static final String JBOSS_MODULES_JAR = "jboss-modules.jar"; //$NON-NLS-1$ + public static final String JBOSS7_MODULES_JAR = "jboss-modules.jar"; //$NON-NLS-1$ public static final String LOGGING_PROPERTIES = "logging.properties"; //$NON-NLS-1$ public static final String JSF_LIB = "jsf-libs"; //$NON-NLS-1$ public static final String JBOSSWEB_TOMCAT55_SAR = "jbossweb-tomcat55.sar"; //$NON-NLS-1$ Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBoss7RuntimeClasspathUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBoss7RuntimeClasspathUtil.java 2011-07-11 10:21:13 UTC (rev 32808) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBoss7RuntimeClasspathUtil.java 2011-07-11 11:58:39 UTC (rev 32809) @@ -36,7 +36,7 @@ @Deprecated public static IRuntimeClasspathEntry getModulesClasspathEntry(IServer server) throws CoreException { IPath runtimeLocation = server.getRuntime().getLocation(); - IPath modulesLocation = runtimeLocation.append(IJBossRuntimeResourceConstants.JBOSS_MODULES_JAR); + IPath modulesLocation = runtimeLocation.append(IJBossRuntimeResourceConstants.JBOSS7_MODULES_JAR); return JavaRuntime.newArchiveRuntimeClasspathEntry(modulesLocation); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchConfigUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchConfigUtils.java 2011-07-11 10:21:13 UTC (rev 32808) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchConfigUtils.java 2011-07-11 11:58:39 UTC (rev 32809) @@ -74,7 +74,29 @@ addCPEntry(serverHome.append(relative), list); } - public static List<String> toStrings(List<IRuntimeClasspathEntry> cp) { + public static List<String> toStrings(List<?> cp) { + Iterator<?> cpi = cp.iterator(); + ArrayList<String> list = new ArrayList<String>(); + while (cpi.hasNext()) { + Object entry = cpi.next(); + if (entry instanceof IRuntimeClasspathEntry) { + try { + list.add(((IRuntimeClasspathEntry) entry).getMemento()); + } catch (Exception e) { + // Trace.trace(Trace.SEVERE, "Could not resolve classpath entry: + // " + entry, e); + } + } else if (entry instanceof String) { + list.add((String) entry); + } else if (entry != null){ + list.add(entry.toString()); + } + } + + return list; + } + + public static List<String> toString(List<IRuntimeClasspathEntry> cp) { Iterator<IRuntimeClasspathEntry> cpi = cp.iterator(); ArrayList<String> list = new ArrayList<String>(); while (cpi.hasNext()) { @@ -106,7 +128,7 @@ public static IRuntimeClasspathEntry getModulesClasspathEntry(IServer server) throws CoreException { IPath runtimeLocation = server.getRuntime().getLocation(); - IPath modulesLocation = runtimeLocation.append(IJBossRuntimeResourceConstants.JBOSS_MODULES_JAR); + IPath modulesLocation = runtimeLocation.append(IJBossRuntimeResourceConstants.JBOSS7_MODULES_JAR); return JavaRuntime.newArchiveRuntimeClasspathEntry(modulesLocation); }