Author: rob.stryker(a)jboss.com Date: 2010-10-20 02:50:01 -0400 (Wed, 20 Oct 2010) New Revision: 25928 Removed: trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/bean/ Modified: trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeLocator.java trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeStartup.java trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/ServerDefinition.java Log: JBIDE-7370 why dont you commit?? Modified: trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeLocator.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeLocator.java 2010-10-20 06:24:30 UTC (rev 25927) +++ trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeLocator.java 2010-10-20 06:50:01 UTC (rev 25928) @@ -21,10 +21,9 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.wst.server.core.model.RuntimeLocatorDelegate; -import org.jboss.tools.runtime.bean.ServerBean; -import org.jboss.tools.runtime.bean.ServerBeanLoader; -import org.jboss.tools.runtime.bean.ServerType; +import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType; +import org.jboss.ide.eclipse.as.core.server.bean.ServerBean; +import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader; public class JBossRuntimeLocator { @@ -59,7 +58,7 @@ File root = path.toFile(); ServerBean serverBean = loader.loadFromLocation(root); - if (!ServerType.UNKNOWN.equals(serverBean.getType())) { + if (!JBossServerType.UNKNOWN.equals(serverBean.getType())) { serverDefinitions.add(new ServerDefinition(serverBean)); } else { String seamVersion = getSeamVersionFromManifest(root.getAbsolutePath()); Modified: trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeStartup.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeStartup.java 2010-10-20 06:24:30 UTC (rev 25927) +++ trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeStartup.java 2010-10-20 06:50:01 UTC (rev 25928) @@ -31,7 +31,6 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.preferences.ConfigurationScope; import org.eclipse.core.runtime.preferences.IEclipsePreferences; -import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.datatools.connectivity.ConnectionProfileConstants; import org.eclipse.datatools.connectivity.ConnectionProfileException; import org.eclipse.datatools.connectivity.ProfileManager; @@ -59,11 +58,10 @@ import org.eclipse.wst.server.core.ServerUtil; import org.eclipse.wst.server.core.internal.RuntimeWorkingCopy; import org.eclipse.wst.server.core.internal.ServerWorkingCopy; -import org.jboss.ide.eclipse.as.core.util.JBossServerType; -import org.jboss.ide.eclipse.as.core.util.ServerBeanLoader; +import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType; +import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader; import org.jboss.tools.jbpm.preferences.JbpmInstallation; import org.jboss.tools.jbpm.preferences.PreferencesManager; -import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.SeamUtil; import org.jboss.tools.seam.core.project.facet.SeamRuntime; import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; Modified: trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/ServerDefinition.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/ServerDefinition.java 2010-10-20 06:24:30 UTC (rev 25927) +++ trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/ServerDefinition.java 2010-10-20 06:50:01 UTC (rev 25928) @@ -12,7 +12,7 @@ import java.io.File; -import org.jboss.tools.runtime.bean.ServerBean; +import org.jboss.ide.eclipse.as.core.server.bean.ServerBean; /** * @author Snjeza