[jbosstools-commits] JBoss Tools SVN: r31024 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: server/internal/v7 and 1 other directories.

Author: adietish Date: 2011-05-03 05:28:57 -0400 (Tue, 03 May 2011) New Revision: 31024 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeClasspathUtil.java Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeClasspathUtil.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeLaunchConfigBuilder.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java Log: [JBIDE-8793] corrected warning due to usage of internal jdt classes Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-05-03 03:18:21 UTC (rev 31023) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-05-03 09:28:57 UTC (rev 31024) @@ -46,7 +46,7 @@ import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate; import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.IStartLaunchSetupParticipant; import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.StartLaunchDelegate; -import org.jboss.ide.eclipse.as.core.server.internal.v7.JBossRuntimeClasspathUtil; +import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7RuntimeClasspathUtil; import org.jboss.ide.eclipse.as.core.util.ArgsUtil; import org.jboss.ide.eclipse.as.core.util.IConstants; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; @@ -226,12 +226,11 @@ ArrayList<String> runtimeClassPaths = AbstractJBossLaunchConfigType.convertClasspath(classpath); return runtimeClassPaths; - } protected static IRuntimeClasspathEntry getRunJarRuntimeCPEntry(IServer server) throws CoreException { if (server.getServerType().getId().endsWith("70")) { //$NON-NLS-1$ - return JBossRuntimeClasspathUtil.getModulesClasspathEntry(server); + return JBoss7RuntimeClasspathUtil.getModulesClasspathEntry(server); } else { IPath containerPath = new Path(RunJarContainerWrapper.ID).append(server.getName()); return JavaRuntime.newRuntimeContainerClasspathEntry(containerPath, IRuntimeClasspathEntry.USER_CLASSES); Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeClasspathUtil.java (from rev 31023, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeClasspathUtil.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeClasspathUtil.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeClasspathUtil.java 2011-05-03 09:28:57 UTC (rev 31024) @@ -0,0 +1,40 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.core.server.internal.v7; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.jdt.launching.IRuntimeClasspathEntry; +import org.eclipse.jdt.launching.IVMInstall; +import org.eclipse.jdt.launching.JavaRuntime; +import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.server.internal.launch.AbstractJBossLaunchConfigType; +import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants; + +public class JBoss7RuntimeClasspathUtil { + + public static List<String> getClasspath(IServer server, IVMInstall vmInstall) throws CoreException { + List<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>(); + classpath.add(getModulesClasspathEntry(server)); + AbstractJBossLaunchConfigType.addJREEntry(classpath, vmInstall); + List<String> runtimeClassPaths = AbstractJBossLaunchConfigType.convertClasspath(classpath); + return runtimeClassPaths; + } + + public static IRuntimeClasspathEntry getModulesClasspathEntry(IServer server) throws CoreException { + IPath runtimeLocation = server.getRuntime().getLocation(); + IPath modulesLocation = runtimeLocation.append(IJBossRuntimeResourceConstants.JBOSS_MODULES_JAR); + return JavaRuntime.newArchiveRuntimeClasspathEntry(modulesLocation); + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeClasspathUtil.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeClasspathUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeClasspathUtil.java 2011-05-03 03:18:21 UTC (rev 31023) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeClasspathUtil.java 2011-05-03 09:28:57 UTC (rev 31024) @@ -1,46 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.ide.eclipse.as.core.server.internal.v7; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.jdt.core.IClasspathEntry; -import org.eclipse.jdt.internal.launching.RuntimeClasspathEntry; -import org.eclipse.jdt.launching.IRuntimeClasspathEntry; -import org.eclipse.jdt.launching.IVMInstall; -import org.eclipse.jdt.launching.JavaRuntime; -import org.eclipse.wst.server.core.IServer; -import org.jboss.ide.eclipse.as.core.server.internal.launch.AbstractJBossLaunchConfigType; - -public class JBossRuntimeClasspathUtil { - - private static final String JBOSS_MODULES_JAR = "jboss-modules.jar"; //$NON-NLS-1$ - - public static List<String> getClasspath(IServer server, IVMInstall vmInstall) throws CoreException { - List<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>(); - classpath.add(getModulesClasspathEntry(server)); - AbstractJBossLaunchConfigType.addJREEntry(classpath, vmInstall); - List<String> runtimeClassPaths = AbstractJBossLaunchConfigType.convertClasspath(classpath); - return runtimeClassPaths; - } - - public static IRuntimeClasspathEntry getModulesClasspathEntry(IServer server) throws CoreException { - IPath runtimeLocation = server.getRuntime().getLocation(); - IPath modulesLocation = runtimeLocation.append(JBOSS_MODULES_JAR); - IClasspathEntry entry = - JavaRuntime.newArchiveRuntimeClasspathEntry(modulesLocation).getClasspathEntry(); - return new RuntimeClasspathEntry(entry); - } - -} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeLaunchConfigBuilder.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeLaunchConfigBuilder.java 2011-05-03 03:18:21 UTC (rev 31023) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBossRuntimeLaunchConfigBuilder.java 2011-05-03 09:28:57 UTC (rev 31024) @@ -52,7 +52,7 @@ } public JBossRuntimeLaunchConfigBuilder setClassPath(IServer server) throws CoreException { - return setClassPath(JBossRuntimeClasspathUtil.getClasspath(server, jbossRuntime.getVM())); + return setClassPath(JBoss7RuntimeClasspathUtil.getClasspath(server, jbossRuntime.getVM())); } public JBossRuntimeLaunchConfigBuilder setClassPath(List<String> entries) throws CoreException { 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-05-03 03:18:21 UTC (rev 31023) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java 2011-05-03 09:28:57 UTC (rev 31024) @@ -11,6 +11,7 @@ package org.jboss.ide.eclipse.as.core.util; public interface IJBossRuntimeResourceConstants { + /* Files and folders that are in various JBoss installations */ public static final String SERVER = "server"; //$NON-NLS-1$ public static final String BIN = "bin"; //$NON-NLS-1$ @@ -38,8 +39,8 @@ public static final String SHUTDOWN_SH = "shutdown.sh"; //$NON-NLS-1$ public static final String START_JAR = "run.jar"; //$NON-NLS-1$ 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 JSF_LIB = "jsf-libs"; //$NON-NLS-1$ public static final String JBOSSWEB_TOMCAT55_SAR = "jbossweb-tomcat55.sar"; //$NON-NLS-1$ public static final String JBOSSWEB_SAR = "jbossweb.sar"; //$NON-NLS-1$