Author: rob.stryker(a)jboss.com Date: 2012-02-01 01:51:11 -0500 (Wed, 01 Feb 2012) New Revision: 38356 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossBehaviourDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IPollResultListener.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IProcessProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerLogListener.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IMemento.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/XMLMemento.java Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.core/.settings/.api_filters trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IServerLogListener.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IPollResultListener.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IProcessProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLauncher.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/internal/FileUtils.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/internal/IMemento.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/internal/XMLMemento.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathCategory.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/ServerLogger.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractBehaviourDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/BehaviourModel.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalStopLaunchConfigurator.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/LocalCopyCallback.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/FileUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/ServerLogView.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/MockArgsTests.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java Log: JBIDE-10769 - moving files around, will continue Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/.settings/.api_filters =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/.settings/.api_filters 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/.settings/.api_filters 2012-02-01 06:51:11 UTC (rev 38356) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<component id="org.jboss.ide.eclipse.as.core" version="2"> - <resource path="jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java" type="org.jboss.ide.eclipse.as.core.server.internal.IJBossBehaviourDelegate"> - <filter id="403804204"> - <message_arguments> - <message_argument value="org.jboss.ide.eclipse.as.core.server.internal.IJBossBehaviourDelegate"/> - <message_argument value="getPathFilter(IModule[])"/> - </message_arguments> - </filter> - </resource> -</component> Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathCategory.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathCategory.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathCategory.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -13,7 +13,7 @@ import java.util.HashMap; import org.eclipse.wst.server.core.IServer; -import org.jboss.ide.eclipse.as.core.util.internal.IMemento; +import org.jboss.ide.eclipse.as.core.util.IMemento; /** * A class representing an XPath Category, which Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -36,9 +36,9 @@ import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; import org.jboss.ide.eclipse.as.core.util.IConstants; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; +import org.jboss.ide.eclipse.as.core.util.IMemento; import org.jboss.ide.eclipse.as.core.util.ServerUtil; -import org.jboss.ide.eclipse.as.core.util.internal.IMemento; -import org.jboss.ide.eclipse.as.core.util.internal.XMLMemento; +import org.jboss.ide.eclipse.as.core.util.XMLMemento; /** * The class representing the model for all xpath storage and searching Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -28,7 +28,7 @@ import org.jaxen.XPath; import org.jaxen.dom4j.Dom4jXPath; import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode; -import org.jboss.ide.eclipse.as.core.util.internal.IMemento; +import org.jboss.ide.eclipse.as.core.util.IMemento; /** * A simple value object to hold the XPath query data Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IServerLogListener.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IServerLogListener.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IServerLogListener.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -1,18 +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.extensions.events; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.wst.server.core.IServer; - -public interface IServerLogListener { - public void logging(IStatus status, IServer server); -} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/ServerLogger.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/ServerLogger.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/ServerLogger.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -20,6 +20,7 @@ import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerCore; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.server.IServerLogListener; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; import org.osgi.service.prefs.BackingStoreException; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -15,9 +15,9 @@ import org.eclipse.debug.core.model.IProcess; import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.server.IProcessProvider; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; -import org.jboss.ide.eclipse.as.core.server.internal.IProcessProvider; import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType; /** Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -125,6 +125,29 @@ return newResources; } + public static int countMembers(IModule module) { + try { + ModuleDelegate delegate = (ModuleDelegate)module.loadAdapter(ModuleDelegate.class, new NullProgressMonitor()); + return delegate == null ? 0 : countMembers(delegate.members()); + } catch( CoreException ce ) {} + return 0; + } + + public static int countMembers(IModuleResource[] resources) { + int count = 0; + if( resources == null ) return 0; + for( int i = 0; i < resources.length; i++ ) { + if( resources[i] instanceof IModuleFile ) { + count++; + } else if( resources[i] instanceof IModuleFolder ) { + count += countMembers(((IModuleFolder)resources[i]).members()); + } + } + return count; + } + + + /** * Utility method for just quickly discovering the filtered member list * @since 2.3 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -61,26 +61,6 @@ } - public static int countMembers(IModule module) { - try { - ModuleDelegate delegate = (ModuleDelegate)module.loadAdapter(ModuleDelegate.class, new NullProgressMonitor()); - return delegate == null ? 0 : countMembers(delegate.members()); - } catch( CoreException ce ) {} - return 0; - } - public static int countMembers(IModuleResource[] resources) { - int count = 0; - if( resources == null ) return 0; - for( int i = 0; i < resources.length; i++ ) { - if( resources[i] instanceof IModuleFile ) { - count++; - } else if( resources[i] instanceof IModuleFolder ) { - count += countMembers(((IModuleFolder)resources[i]).members()); - } - } - return count; - } - /** * All preferences are stored in the "local" setting as it was decided * having to replicate deploy paths for each publish method was not good Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossBehaviourDelegate.java (from rev 38327, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossBehaviourDelegate.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossBehaviourDelegate.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -0,0 +1,51 @@ +/******************************************************************************* + * Copyright (c) 2011 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; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.wst.server.core.IModule; +import org.jboss.ide.eclipse.as.core.publishers.patterns.IModulePathFilter; +import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; + +public interface IJBossBehaviourDelegate { + + public String getBehaviourTypeId(); + + public void setActualBehaviour(DelegatingServerBehavior actualBehaviour); + + public void stop(boolean force); + + public void publishStart(final IProgressMonitor monitor) throws CoreException; + + public void publishFinish(final IProgressMonitor monitor) throws CoreException; + + public void onServerStarting(); + + public void onServerStopping(); + + public void onServerStarted(); + + public void onServerStopped(); + + public IStatus canChangeState(String launchMode); + + public String getDefaultStopArguments() throws CoreException; + + /** + * @since 2.3 + */ + public IModulePathFilter getPathFilter(IModule[] moduleTree); + + public void dispose(); +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IPollResultListener.java (from rev 38327, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IPollResultListener.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IPollResultListener.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IPollResultListener.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -0,0 +1,23 @@ +/******************************************************************************* + * Copyright (c) 2011 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; + +public interface IPollResultListener { + + /** + * Called if the poller did + * @param expectedState + * @param currentState + */ + public void stateAsserted(boolean expectedState, boolean currentState); + + public void stateNotAsserted(boolean expectedState, boolean currentState); +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IProcessProvider.java (from rev 38327, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IProcessProvider.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IProcessProvider.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IProcessProvider.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -0,0 +1,18 @@ +/******************************************************************************* + * Copyright (c) 2011 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; + +import org.eclipse.debug.core.model.IProcess; + +public interface IProcessProvider { + public IProcess getProcess(); +} \ No newline at end of file Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerLogListener.java (from rev 38327, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IServerLogListener.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerLogListener.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerLogListener.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -0,0 +1,18 @@ +/******************************************************************************* + * 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; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.wst.server.core.IServer; + +public interface IServerLogListener { + public void logging(IStatus status, IServer server); +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractBehaviourDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractBehaviourDelegate.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractBehaviourDelegate.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -17,6 +17,7 @@ import org.eclipse.wst.server.core.IModule; import org.jboss.ide.eclipse.as.core.modules.ResourceModuleResourceUtil; import org.jboss.ide.eclipse.as.core.publishers.patterns.IModulePathFilter; +import org.jboss.ide.eclipse.as.core.server.IJBossBehaviourDelegate; /** * A complete stub implementation of the interface Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -15,6 +15,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.server.IJBoss6Server; +import org.jboss.ide.eclipse.as.core.server.IPollResultListener; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/BehaviourModel.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/BehaviourModel.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/BehaviourModel.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -11,6 +11,7 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.server.IJBossBehaviourDelegate; import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod; import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType; import org.jboss.ide.eclipse.as.core.server.internal.launch.IJBossLaunchDelegate; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -26,6 +26,7 @@ import org.jboss.ide.eclipse.as.core.publishers.PublishUtil; import org.jboss.ide.eclipse.as.core.publishers.patterns.IModulePathFilter; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; +import org.jboss.ide.eclipse.as.core.server.IJBossBehaviourDelegate; import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod; import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType; import org.jboss.ide.eclipse.as.core.server.internal.BehaviourModel.Behaviour; Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 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; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.wst.server.core.IModule; -import org.jboss.ide.eclipse.as.core.publishers.patterns.IModulePathFilter; - -public interface IJBossBehaviourDelegate { - - public String getBehaviourTypeId(); - - public void setActualBehaviour(DelegatingServerBehavior actualBehaviour); - - public void stop(boolean force); - - public void publishStart(final IProgressMonitor monitor) throws CoreException; - - public void publishFinish(final IProgressMonitor monitor) throws CoreException; - - public void onServerStarting(); - - public void onServerStopping(); - - public void onServerStarted(); - - public void onServerStopped(); - - public IStatus canChangeState(String launchMode); - - public String getDefaultStopArguments() throws CoreException; - - /** - * @since 2.3 - */ - public IModulePathFilter getPathFilter(IModule[] moduleTree); - - public void dispose(); -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IPollResultListener.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IPollResultListener.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IPollResultListener.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -1,23 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 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; - -public interface IPollResultListener { - - /** - * Called if the poller did - * @param expectedState - * @param currentState - */ - public void stateAsserted(boolean expectedState, boolean currentState); - - public void stateNotAsserted(boolean expectedState, boolean currentState); -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IProcessProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IProcessProvider.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IProcessProvider.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -1,18 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 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; - -import org.eclipse.debug.core.model.IProcess; - -public interface IProcessProvider { - public IProcess getProcess(); -} \ No newline at end of file Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -38,6 +38,7 @@ import org.jboss.ide.eclipse.as.core.publishers.AbstractServerToolsPublisher; import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; +import org.jboss.ide.eclipse.as.core.server.IProcessProvider; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.LocalStopLaunchConfigurator; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -19,6 +19,7 @@ import org.jboss.ide.eclipse.as.core.Messages; import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes; import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; +import org.jboss.ide.eclipse.as.core.server.IPollResultListener; import org.jboss.ide.eclipse.as.core.server.IProvideCredentials; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller.PollingException; Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLauncher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLauncher.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLauncher.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -1,209 +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.launch; - -import java.util.ArrayList; -import java.util.Arrays; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Status; -import org.eclipse.debug.core.DebugException; -import org.eclipse.debug.core.ILaunch; -import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; -import org.eclipse.debug.core.ILaunchManager; -import org.eclipse.debug.core.IStreamListener; -import org.eclipse.debug.core.model.IProcess; -import org.eclipse.debug.core.model.IStreamMonitor; -import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; -import org.eclipse.wst.server.core.IServer; -import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; -import org.jboss.ide.eclipse.as.core.Messages; - -public class TwiddleLauncher { - - /** - * Create one launch for each String of arguments. - * Each element in the array is a COMPLETE LIST of arguments. - * For example: - * twiddleArgs[0] = "-s localhost:1099 -a jmx/rmi/RMIAdaptor get \"whatever\"" - * twiddleArgs[1] = "-s localhost:1099 -a jmx/rmi/RMIAdaptor get \"whatever2\"" - * - * @param twiddleArgs - * @param jbServer - * @param seed - * @return - */ - public static ProcessData[] launchTwiddles(String[] twiddleArgs, IServer server, boolean addPrefix) throws CoreException { - ILaunchConfigurationWorkingCopy wc; - ArrayList<ProcessData> list = new ArrayList<ProcessData>(); - for( int i = 0; i < twiddleArgs.length; i++ ) { - String args2 = addPrefix ? TwiddleLaunchConfiguration.getDefaultArgs(server) + twiddleArgs[i] : twiddleArgs[i]; - wc = TwiddleLaunchConfiguration.createLaunchConfiguration(server, args2); - ILaunch launch = wc.launch(ILaunchManager.RUN_MODE, new NullProgressMonitor(), false, false); - list.addAll(Arrays.asList(toProcessDatas(launch.getProcesses()))); - } - - ProcessData[] ret = new ProcessData[list.size()]; - list.toArray(ret); - - return ret; - } - - protected static ProcessData[] toProcessDatas(IProcess[] processes) { - ProcessData[] datas = new ProcessData[processes.length]; - for( int i = 0; i < processes.length; i++ ) { - datas[i] = new ProcessData(processes[i], ""); //$NON-NLS-1$ - datas[i].startListening(); - } - return datas; - } - - private boolean canceled = false; - private int delay = 500; - - public void setCanceled() { - canceled = true; - } - - public ProcessData[] getTwiddleResults(IServer server, String args, boolean addPrefix ) { - ProcessData[] processes; - try { - processes = TwiddleLauncher.launchTwiddles(new String[] { args }, server, addPrefix); - } catch( CoreException ce ) { - return new ProcessData[0]; - } - waitForThreadsToTerminate(processes); - - // stop listening - for( int i = 0; i < processes.length; i++ ) { - processes[i].stopListening(); - } - - return processes; - } - - protected void waitForThreadsToTerminate(ProcessData[] processes) { - boolean allTerminated = false; - while( !allTerminated && !canceled) { - allTerminated = true; - for( int i = 0; i < processes.length; i++ ) { - if( processes[i].getProcess().isTerminated() == false ) { - allTerminated = false; - } - } - if( !allTerminated ) { - if( canceled ) { - try { - // if canceled, terminate all twiddle processes - for( int i = 0; i < processes.length; i++ ) - processes[i].getProcess().terminate(); - } catch( DebugException e ) { - IStatus s = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, - Messages.TerminateTwiddleFailed, e); - JBossServerCorePlugin.getDefault().getLog().log(s); - } - } - // sleep - try { - Thread.sleep(delay); - } catch( InterruptedException ie ) { - } - } - } - } - - public static class ProcessData implements IStreamListener { - private String args; - private String processType; - - private IProcess process; - private IStreamMonitor outMonitor; - private IStreamMonitor errMonitor; - - private String out, err; - - public ProcessData(IProcess process, String processType) { - this(null, process, processType); - try { - this.args = process.getLaunch().getLaunchConfiguration(). - getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String)null); - } catch( CoreException ce ) { - } - - } - - public ProcessData(String args, IProcess process, String processType) { - this.args = args; - this.process = process; - this.processType = processType; - - //ASDebug.p("process is " + process, this); - //ASDebug.p("Stream Proxy is " + process.getStreamsProxy(), this); - this.outMonitor = process.getStreamsProxy().getOutputStreamMonitor(); - this.errMonitor = process.getStreamsProxy().getErrorStreamMonitor(); - - out = ""; //$NON-NLS-1$ - err = ""; //$NON-NLS-1$ - } - - public void startListening() { - outMonitor.addListener(this); - errMonitor.addListener(this); - } - - public void stopListening() { - outMonitor.removeListener(this); - errMonitor.removeListener(this); - } - - public void resetStrings() { - out = ""; //$NON-NLS-1$ - err = ""; //$NON-NLS-1$ - } - - public void destroy() { - stopListening(); - resetStrings(); - } - - public void streamAppended(String text, IStreamMonitor monitor) { - if( monitor == outMonitor ) { - out += text; - } else if( monitor == errMonitor ) { - err += text; - } - } - - public String getArgs() { - return args; - } - - public String getErr() { - return err; - } - - public String getOut() { - return out; - } - - public String getProcesType() { - return processType; - } - - public IProcess getProcess() { - return process; - } - - } - -} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalStopLaunchConfigurator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalStopLaunchConfigurator.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalStopLaunchConfigurator.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -17,8 +17,8 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.jdt.launching.IRuntimeClasspathEntry; import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.server.IJBossBehaviourDelegate; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; -import org.jboss.ide.eclipse.as.core.server.internal.IJBossBehaviourDelegate; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/LocalCopyCallback.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/LocalCopyCallback.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/LocalCopyCallback.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -27,9 +27,9 @@ import org.jboss.ide.eclipse.as.core.publishers.PublishUtil; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler; +import org.jboss.ide.eclipse.as.core.util.FileUtil; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.core.util.StreamUtils; -import org.jboss.ide.eclipse.as.core.util.internal.FileUtils; public class LocalCopyCallback implements IPublishCopyCallbackHandler { @@ -82,7 +82,7 @@ */ private IStatus copyFile(InputStream in, String to) { try { - FileUtils.writeTo(in, to); + FileUtil.writeTo(in, to); return Status.OK_STATUS; } catch (IOException e) { //Trace.trace(Trace.SEVERE, "Error copying file", e); @@ -130,7 +130,7 @@ private File writeToTempFile(InputStream in, IPath filePath) throws IOException { // Change from original PublishUtil, will require File tempFile = File.createTempFile(TEMPFILE_PREFIX, "." + filePath.getFileExtension(), getTempFolder()); //$NON-NLS-1$ - FileUtils.writeTo(in, tempFile); + FileUtil.writeTo(in, tempFile); return tempFile; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -30,8 +30,8 @@ import org.eclipse.wst.server.core.model.IModuleResourceDelta; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes; +import org.jboss.ide.eclipse.as.core.modules.ResourceModuleResourceUtil; import org.jboss.ide.eclipse.as.core.publishers.AbstractServerToolsPublisher; -import org.jboss.ide.eclipse.as.core.publishers.PublishUtil; import org.jboss.ide.eclipse.as.core.publishers.patterns.IModulePathFilter; /** * Utility class with an assortment of useful file methods. @@ -253,7 +253,7 @@ * @since 2.3 */ public IStatus[] initFullPublish(IModuleResource[] resources, IModulePathFilter filter, IProgressMonitor monitor) throws CoreException { - int count = PublishUtil.countMembers(resources); + int count = ResourceModuleResourceUtil.countMembers(resources); monitor = ProgressUtil.getMonitorFor(monitor); monitor.beginTask("Publishing " + count + " resources", //$NON-NLS-1$ //$NON-NLS-2$ (100 * (count)) + 200); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -29,8 +29,6 @@ import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType; import org.jboss.ide.eclipse.as.core.server.internal.BehaviourModel; import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; -import org.jboss.ide.eclipse.as.core.util.internal.IMemento; -import org.jboss.ide.eclipse.as.core.util.internal.XMLMemento; public class DeploymentPreferenceLoader { public static final String DEPLOYMENT_PREFERENCES_KEY = "org.jboss.ide.eclipse.as.core.util.deploymentPreferenceKey"; //$NON-NLS-1$ Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/FileUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/FileUtil.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/FileUtil.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -12,6 +12,7 @@ import java.io.BufferedInputStream; import java.io.BufferedOutputStream; +import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileFilter; import java.io.FileInputStream; @@ -22,7 +23,10 @@ import java.util.ArrayList; import java.util.Date; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; import org.eclipse.osgi.util.NLS; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; @@ -277,4 +281,106 @@ } } + + // Copied from internal class FileUtils.java + private static final int BUFFER = 65536; + + public static void writeTo(InputStream in, String fileName) throws IOException { + writeTo(in, new File(fileName)); + } + + public static void writeTo(InputStream in, File file) throws IOException { + OutputStream out = null; + try { + out = new BufferedOutputStream(new FileOutputStream(file)); + writeTo(in, out); + } finally { + if (out != null) { + out.close(); + } + } + } + + public static void writeTo(InputStream in, OutputStream out) throws IOException { + byte[] buffer = new byte[BUFFER]; + int avail = in.read(buffer); + while (avail > 0) { + out.write(buffer, 0, avail); + avail = in.read(buffer); + } + } + + public static void setContents(File file, String contents) throws IOException, CoreException { + byte[] buffer = new byte[BUFFER]; + InputStream in = new ByteArrayInputStream(contents.getBytes()); + OutputStream out = null; + try { + out = new BufferedOutputStream(new FileOutputStream(file)); + int avail = in.read(buffer); + while (avail > 0) { + out.write(buffer, 0, avail); + avail = in.read(buffer); + } + } finally { + if (out != null) { + out.close(); + } + } + } + + public static String getContents(IFile file) throws IOException, CoreException { + return getContents(file.getLocation().toFile()); + } + + public static String getContents(File aFile) throws IOException { + return new String(getBytesFromFile(aFile)); + } + + public static byte[] getBytesFromFile(File file) throws IOException { + InputStream is = new FileInputStream(file); + byte[] bytes = new byte[(int)file.length()]; + int offset = 0; + int numRead = 0; + while (offset < bytes.length + && (numRead=is.read(bytes, offset, bytes.length-offset)) >= 0) { + offset += numRead; + } + is.close(); + return bytes; + } + + public static void setContents(IFile file, int val) throws IOException , CoreException{ + setContents(file, "" + val); //$NON-NLS-1$ + } + + public static void setContents(IFile file, String val) throws IOException , CoreException{ + if( !file.exists()) + file.create(new ByteArrayInputStream((val).getBytes()), false, null); + else + file.setContents(new ByteArrayInputStream((val).getBytes()), false, false, new NullProgressMonitor()); + try { + Thread.sleep(2000); + } catch( InterruptedException ie) {} + //JobUtils.waitForIdle(); + } + + public static int countFiles(File root) { + int count = 0; + if( !root.isDirectory() ) + return 1; + File[] children = root.listFiles(); + for( int i = 0; i < children.length; i++ ) + count += countFiles(children[i]); + return count; + } + + public static int countAllResources(File root) { + int count = 0; + if( !root.isDirectory() ) + return 1; + File[] children = root.listFiles(); + for( int i = 0; i < children.length; i++ ) + count += countAllResources(children[i]); + return 1 + count; + } } Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IMemento.java (from rev 38327, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/internal/IMemento.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IMemento.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IMemento.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -0,0 +1,115 @@ +/******************************************************************************* + * Copyright (c) 2006 Jeff Mesnil + * All rights reserved. This program and the accompanying materials + * are 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 + *******************************************************************************/ +package org.jboss.ide.eclipse.as.core.util; + +import java.util.List; + +/** + * Stolen from webtools wst.server.core, + * represents a savable memento to be + * translated into xml + * + * Moved from org.jboss.ide.eclipse.as.core.util.internal + * to org.jboss.ide.eclipse.as.core.util + * + * May later move to COMMON + * + */ +public interface IMemento { + /** + * Creates a new child of this memento with the given type. + * <p> + * The <code>getChild</code> and <code>getChildren</code> methods + * are used to retrieve children of a given type. + * </p> + * + * @param type the type + * @return a new child memento + * @see #getChild + * @see #getChildren + */ + public IMemento createChild(String type); + + /** + * Returns the first child with the given type id. + * + * @param type the type id + * @return the first child with the given type + */ + public IMemento getChild(String type); + + /** + * Returns all children with the given type id. + * + * @param type the type id + * @return the list of children with the given type + */ + public IMemento[] getChildren(String type); + + /** + * Returns the floating point value of the given key. + * + * @param key the key + * @return the value, or <code>null</code> if the key was not found or was found + * but was not a floating point number + */ + public Float getFloat(String key); + + /** + * Returns the integer value of the given key. + * + * @param key the key + * @return the value, or <code>null</code> if the key was not found or was found + * but was not an integer + */ + public Integer getInteger(String key); + + /** + * Returns the string value of the given key. + * + * @param key the key + * @return the value, or <code>null</code> if the key was not found or was found + * but was not an integer + */ + public String getString(String key); + + /** + * Returns the boolean value of the given key. + * + * @param key the key + * @return the value, or <code>null</code> if the key was not found or was found + * but was not a boolean + */ + public Boolean getBoolean(String key); + + public List<String> getNames(); + + /** + * Sets the value of the given key to the given integer. + * + * @param key the key + * @param value the value + */ + public void putInteger(String key, int value); + + /** + * Sets the value of the given key to the given boolean value. + * + * @param key the key + * @param value the value + */ + public void putBoolean(String key, boolean value); + + /** + * Sets the value of the given key to the given string. + * + * @param key the key + * @param value the value + */ + public void putString(String key, String value); +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -16,10 +16,10 @@ import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.ExtensionManager; import org.jboss.ide.eclipse.as.core.server.INeedCredentials; +import org.jboss.ide.eclipse.as.core.server.IPollResultListener; import org.jboss.ide.eclipse.as.core.server.IProvideCredentials; import org.jboss.ide.eclipse.as.core.server.IServerProvider; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; -import org.jboss.ide.eclipse.as.core.server.internal.IPollResultListener; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; import org.jboss.ide.eclipse.as.core.server.internal.PollThread; import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -32,6 +32,7 @@ runtimeServerTypeMap.put(IJBossToolingConstants.AS_51, IJBossToolingConstants.SERVER_AS_51); runtimeServerTypeMap.put(IJBossToolingConstants.AS_60, IJBossToolingConstants.SERVER_AS_60); runtimeServerTypeMap.put(IJBossToolingConstants.AS_70, IJBossToolingConstants.SERVER_AS_70); + runtimeServerTypeMap.put(IJBossToolingConstants.AS_71, IJBossToolingConstants.SERVER_AS_71); runtimeServerTypeMap.put(IJBossToolingConstants.EAP_43, IJBossToolingConstants.SERVER_EAP_43); runtimeServerTypeMap.put(IJBossToolingConstants.EAP_50, IJBossToolingConstants.SERVER_EAP_50); runtimeServerTypeMap.put(IJBossToolingConstants.EAP_60, IJBossToolingConstants.SERVER_EAP_60); @@ -41,10 +42,10 @@ public static IServer createDeployOnlyServer(String deployLocation, String tempDeployLocation, String rtName, String serverName) throws CoreException { - IRuntimeType rt = ServerCore.findRuntimeType("org.jboss.ide.eclipse.as.runtime.stripped"); //$NON-NLS-1$ + IRuntimeType rt = ServerCore.findRuntimeType(IJBossToolingConstants.DEPLOY_ONLY_RUNTIME); IRuntimeWorkingCopy wc = rt.createRuntime(rtName, null); IRuntime runtime = wc.save(true, null); - IServerType st = ServerCore.findServerType("org.jboss.ide.eclipse.as.systemCopyServer"); //$NON-NLS-1$ + IServerType st = ServerCore.findServerType(IJBossToolingConstants.DEPLOY_ONLY_SERVER); ServerWorkingCopy swc = (ServerWorkingCopy) st.createServer(serverName, null, null); swc.setServerConfiguration(null); swc.setName(serverName); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -33,9 +33,9 @@ import org.eclipse.wst.server.core.ServerCore; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.Messages; +import org.jboss.ide.eclipse.as.core.server.IJBossBehaviourDelegate; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; -import org.jboss.ide.eclipse.as.core.server.internal.IJBossBehaviourDelegate; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; public class ServerUtil { Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/XMLMemento.java (from rev 38327, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/internal/XMLMemento.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/XMLMemento.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/XMLMemento.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -0,0 +1,434 @@ +/******************************************************************************* + * Copyright (c) 2006 Jeff Mesnil + * All rights reserved. This program and the accompanying materials + * are 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 + *******************************************************************************/ +package org.jboss.ide.eclipse.as.core.util; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.OutputKeys; +import javax.xml.transform.Result; +import javax.xml.transform.Source; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.w3c.dom.Text; +import org.xml.sax.InputSource; + +/** + * Stolen from webtools wst.server.core + * Moved from org.jboss.ide.eclipse.as.core.util.internal + * to org.jboss.ide.eclipse.as.core.util + * + * May later move to COMMON + * + */ +public class XMLMemento implements IMemento { + private Document factory; + private Element element; + + /** + * Answer a memento for the document and element. For simplicity + * you should use createReadRoot and createWriteRoot to create the initial + * mementos on a document. + */ + public XMLMemento(Document doc, Element el) { + factory = doc; + element = el; + } + + /* + * @see IMemento + */ + public IMemento createChild(String type) { + Element child = factory.createElement(type); + element.appendChild(child); + return new XMLMemento(factory, child); + } + + public void removeChild(XMLMemento child) { + element.removeChild(child.element); + } + + /** + * Create a Document from a Reader and answer a root memento for reading + * a document. + */ + public static XMLMemento createReadRoot(InputStream in) { + Document document = null; + try { + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + DocumentBuilder parser = factory.newDocumentBuilder(); + document = parser.parse(new InputSource(in)); + Node node = document.getFirstChild(); + if (node instanceof Element) + return new XMLMemento(document, (Element) node); + } catch (Exception e) { + // ignore + } finally { + try { + in.close(); + } catch (Exception e) { + // ignore + } + } + return null; + } + + /** + * Answer a root memento for writing a document. + * + * @param type a type + * @return a memento + */ + public static XMLMemento createWriteRoot(String type) { + Document document; + try { + document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); + Element element = document.createElement(type); + document.appendChild(element); + return new XMLMemento(document, element); + } catch (ParserConfigurationException e) { + throw new Error(e); + } + } + + /* + * @see IMemento + */ + public IMemento getChild(String type) { + // Get the nodes. + NodeList nodes = element.getChildNodes(); + int size = nodes.getLength(); + if (size == 0) + return null; + + // Find the first node which is a child of this node. + for (int nX = 0; nX < size; nX ++) { + Node node = nodes.item(nX); + if (node instanceof Element) { + Element element2 = (Element)node; + if (element2.getNodeName().equals(type)) + return new XMLMemento(factory, element2); + } + } + + // A child was not found. + return null; + } + + /* + * @see IMemento + */ + public IMemento [] getChildren(String type) { + // Get the nodes. + NodeList nodes = element.getChildNodes(); + int size = nodes.getLength(); + if (size == 0) + return new IMemento[0]; + + // Extract each node with given type. + List<Element> list = new ArrayList<Element>(size); + for (int nX = 0; nX < size; nX ++) { + Node node = nodes.item(nX); + if (node instanceof Element) { + Element element2 = (Element)node; + if (element2.getNodeName().equals(type)) + list.add(element2); + } + } + + // Create a memento for each node. + size = list.size(); + IMemento [] results = new IMemento[size]; + for (int x = 0; x < size; x ++) { + results[x] = new XMLMemento(factory, list.get(x)); + } + return results; + } + + public String[] getChildNames() { + // Get the nodes. + NodeList nodes = element.getChildNodes(); + int size = nodes.getLength(); + if (size == 0) + return new String[0]; + + // Extract each node with given type. + List<String> list = new ArrayList<String>(); + for (int nX = 0; nX < size; nX ++) { + Node node = nodes.item(nX); + if (node instanceof Element) { + Element element2 = (Element)node; + if (!list.contains(element2.getNodeName())) + list.add(element2.getNodeName()); + } + } + return (String[]) list.toArray(new String[list.size()]); + } + + /** + * Return the contents of this memento as a byte array. + * + * @return byte[] + * @throws IOException if anything goes wrong + */ + public byte[] getContents() throws IOException { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + save(out); + return out.toByteArray(); + } + + /** + * Returns an input stream for writing to the disk with a local locale. + * + * @return java.io.InputStream + * @throws IOException if anything goes wrong + */ + public InputStream getInputStream() throws IOException { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + save(out); + return new ByteArrayInputStream(out.toByteArray()); + } + + /* + * @see IMemento + */ + public Float getFloat(String key) { + Attr attr = element.getAttributeNode(key); + if (attr == null) + return null; + String strValue = attr.getValue(); + try { + return new Float(strValue); + } catch (NumberFormatException e) { + return null; + } + } + + /* + * @see IMemento + */ + public Integer getInteger(String key) { + Attr attr = element.getAttributeNode(key); + if (attr == null) + return null; + String strValue = attr.getValue(); + try { + return new Integer(strValue); + } catch (NumberFormatException e) { + return null; + } + } + + /* + * @see IMemento + */ + public String getString(String key) { + Attr attr = element.getAttributeNode(key); + if (attr == null) + return null; + return attr.getValue(); + } + + public List<String> getNames() { + NamedNodeMap map = element.getAttributes(); + int size = map.getLength(); + List<String> list = new ArrayList<String>(); + for (int i = 0; i < size; i++) { + Node node = map.item(i); + String name = node.getNodeName(); + list.add(name); + } + return list; + } + + /** + * Loads a memento from the given filename. + * + * @param in java.io.InputStream + * @return org.eclipse.ui.IMemento + */ + public static IMemento loadMemento(InputStream in) { + return createReadRoot(in); + } + + /** + * Loads a memento from the given filename. + * + * @param filename java.lang.String + * @return org.eclipse.ui.IMemento + * @exception java.io.IOException + */ + public static IMemento loadMemento(String filename) throws IOException { + InputStream in = null; + try { + in = new BufferedInputStream(new FileInputStream(filename)); + return XMLMemento.createReadRoot(in); + } finally { + try { + if (in != null) + in.close(); + } catch (Exception e) { + // ignore + } + } + } + + /* + * @see IMemento + */ + public void putInteger(String key, int n) { + element.setAttribute(key, String.valueOf(n)); + } + + /* + * @see IMemento + */ + public void putString(String key, String value) { + if (value == null) + return; + element.setAttribute(key, value); + } + + /** + * Save this Memento to a Writer. + * + * @throws IOException if there is a problem saving + */ + public void save(OutputStream os) throws IOException { + Result result = new StreamResult(os); + Source source = new DOMSource(factory); + try { + Transformer transformer = TransformerFactory.newInstance().newTransformer(); + transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$ + transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$ + transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8"); //$NON-NLS-1$ + transformer.setOutputProperty("{http://xml.apache.org/xalan}indent-a...;, "2"); //$NON-NLS-1$ //$NON-NLS-2$ + transformer.transform(source, result); + } catch (Exception e) { + throw (IOException) (new IOException().initCause(e)); + } + } + + /** + * Saves the memento to the given file. + * + * @param filename java.lang.String + * @exception java.io.IOException + */ + public void saveToFile(String filename) throws IOException { + BufferedOutputStream w = null; + try { + w = new BufferedOutputStream(new FileOutputStream(filename)); + save(w); + } catch (IOException e) { + throw e; + } catch (Exception e) { + throw new IOException(e.getLocalizedMessage()); + } finally { + if (w != null) { + try { + w.close(); + } catch (Exception e) { + // ignore + } + } + } + } + + public String saveToString() throws IOException { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + save(out); + return out.toString("UTF-8"); //$NON-NLS-1$ + } + + /* + * @see IMemento#getBoolean(String) + */ + public Boolean getBoolean(String key) { + Attr attr = element.getAttributeNode(key); + if (attr == null) + return null; + String strValue = attr.getValue(); + if ("true".equalsIgnoreCase(strValue)) //$NON-NLS-1$ + return new Boolean(true); + return new Boolean(false); + } + + /* + * @see IMemento#putBoolean(String, boolean) + */ + public void putBoolean(String key, boolean value) { + element.setAttribute(key, new Boolean(value).toString()); + } + + /** + * Returns the Text node of the memento. Each memento is allowed only + * one Text node. + * + * @return the Text node of the memento, or <code>null</code> if + * the memento has no Text node. + */ + public Text getTextNode() { + // Get the nodes. + NodeList nodes = element.getChildNodes(); + int size = nodes.getLength(); + if (size == 0) { + return null; + } + for (int nX = 0; nX < size; nX++) { + Node node = nodes.item(nX); + if (node instanceof Text) { + return (Text) node; + } + } + // a Text node was not found + return null; + } + + /* (non-Javadoc) + */ + public void putTextData(String data) { + Text textNode = getTextNode(); + if (textNode == null) { + textNode = factory.createTextNode(data); + // Always add the text node as the first child (fixes bug 93718) + element.insertBefore(textNode, element.getFirstChild()); + } else { + textNode.setData(data); + } + } + + public String getTextData() { + Text textNode = getTextNode(); + if (textNode != null) { + return textNode.getData(); + } + return ""; //$NON-NLS-1$ + } +} \ No newline at end of file Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/internal/FileUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/internal/FileUtils.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/internal/FileUtils.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -1,135 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 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.util.internal; - -import java.io.BufferedOutputStream; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.NullProgressMonitor; - -/** - * Various util methods that allow to read and write to files. - * - * @author André Dietisheim - * - */ -public class FileUtils { - - private static final int BUFFER = 65536; - - public static void writeTo(InputStream in, String fileName) throws IOException { - writeTo(in, new File(fileName)); - } - - public static void writeTo(InputStream in, File file) throws IOException { - OutputStream out = null; - try { - out = new BufferedOutputStream(new FileOutputStream(file)); - writeTo(in, out); - } finally { - if (out != null) { - out.close(); - } - } - } - - public static void writeTo(InputStream in, OutputStream out) throws IOException { - byte[] buffer = new byte[BUFFER]; - int avail = in.read(buffer); - while (avail > 0) { - out.write(buffer, 0, avail); - avail = in.read(buffer); - } - } - - public static void setContents(File file, String contents) throws IOException, CoreException { - byte[] buffer = new byte[BUFFER]; - InputStream in = new ByteArrayInputStream(contents.getBytes()); - OutputStream out = null; - try { - out = new BufferedOutputStream(new FileOutputStream(file)); - int avail = in.read(buffer); - while (avail > 0) { - out.write(buffer, 0, avail); - avail = in.read(buffer); - } - } finally { - if (out != null) { - out.close(); - } - } - } - - public static String getContents(IFile file) throws IOException, CoreException { - return getContents(file.getLocation().toFile()); - } - - public static String getContents(File aFile) throws IOException { - return new String(getBytesFromFile(aFile)); - } - - public static byte[] getBytesFromFile(File file) throws IOException { - InputStream is = new FileInputStream(file); - byte[] bytes = new byte[(int)file.length()]; - int offset = 0; - int numRead = 0; - while (offset < bytes.length - && (numRead=is.read(bytes, offset, bytes.length-offset)) >= 0) { - offset += numRead; - } - is.close(); - return bytes; - } - - public static void setContents(IFile file, int val) throws IOException , CoreException{ - setContents(file, "" + val); //$NON-NLS-1$ - } - - public static void setContents(IFile file, String val) throws IOException , CoreException{ - if( !file.exists()) - file.create(new ByteArrayInputStream((val).getBytes()), false, null); - else - file.setContents(new ByteArrayInputStream((val).getBytes()), false, false, new NullProgressMonitor()); - try { - Thread.sleep(2000); - } catch( InterruptedException ie) {} - //JobUtils.waitForIdle(); - } - - public static int countFiles(File root) { - int count = 0; - if( !root.isDirectory() ) - return 1; - File[] children = root.listFiles(); - for( int i = 0; i < children.length; i++ ) - count += countFiles(children[i]); - return count; - } - - public static int countAllResources(File root) { - int count = 0; - if( !root.isDirectory() ) - return 1; - File[] children = root.listFiles(); - for( int i = 0; i < children.length; i++ ) - count += countAllResources(children[i]); - return 1 + count; - } - -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/internal/IMemento.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/internal/IMemento.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/internal/IMemento.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -1,110 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Jeff Mesnil - * All rights reserved. This program and the accompanying materials - * are 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 - *******************************************************************************/ -package org.jboss.ide.eclipse.as.core.util.internal; - -import java.util.List; - -/** - * Stolen from webtools wst.server.core, - * represents a savable memento to be - * translated into xml - * - */ -public interface IMemento { - /** - * Creates a new child of this memento with the given type. - * <p> - * The <code>getChild</code> and <code>getChildren</code> methods - * are used to retrieve children of a given type. - * </p> - * - * @param type the type - * @return a new child memento - * @see #getChild - * @see #getChildren - */ - public IMemento createChild(String type); - - /** - * Returns the first child with the given type id. - * - * @param type the type id - * @return the first child with the given type - */ - public IMemento getChild(String type); - - /** - * Returns all children with the given type id. - * - * @param type the type id - * @return the list of children with the given type - */ - public IMemento[] getChildren(String type); - - /** - * Returns the floating point value of the given key. - * - * @param key the key - * @return the value, or <code>null</code> if the key was not found or was found - * but was not a floating point number - */ - public Float getFloat(String key); - - /** - * Returns the integer value of the given key. - * - * @param key the key - * @return the value, or <code>null</code> if the key was not found or was found - * but was not an integer - */ - public Integer getInteger(String key); - - /** - * Returns the string value of the given key. - * - * @param key the key - * @return the value, or <code>null</code> if the key was not found or was found - * but was not an integer - */ - public String getString(String key); - - /** - * Returns the boolean value of the given key. - * - * @param key the key - * @return the value, or <code>null</code> if the key was not found or was found - * but was not a boolean - */ - public Boolean getBoolean(String key); - - public List<String> getNames(); - - /** - * Sets the value of the given key to the given integer. - * - * @param key the key - * @param value the value - */ - public void putInteger(String key, int value); - - /** - * Sets the value of the given key to the given boolean value. - * - * @param key the key - * @param value the value - */ - public void putBoolean(String key, boolean value); - - /** - * Sets the value of the given key to the given string. - * - * @param key the key - * @param value the value - */ - public void putString(String key, String value); -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/internal/XMLMemento.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/internal/XMLMemento.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/internal/XMLMemento.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -1,430 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Jeff Mesnil - * All rights reserved. This program and the accompanying materials - * are 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 - *******************************************************************************/ -package org.jboss.ide.eclipse.as.core.util.internal; - -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.OutputKeys; -import javax.xml.transform.Result; -import javax.xml.transform.Source; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; - -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.w3c.dom.Text; -import org.xml.sax.InputSource; - -/** - * Stolen from webtools wst.server.core - * - */ -public final class XMLMemento implements IMemento { - private Document factory; - private Element element; - - /** - * Answer a memento for the document and element. For simplicity - * you should use createReadRoot and createWriteRoot to create the initial - * mementos on a document. - */ - public XMLMemento(Document doc, Element el) { - factory = doc; - element = el; - } - - /* - * @see IMemento - */ - public IMemento createChild(String type) { - Element child = factory.createElement(type); - element.appendChild(child); - return new XMLMemento(factory, child); - } - - public void removeChild(XMLMemento child) { - element.removeChild(child.element); - } - - /** - * Create a Document from a Reader and answer a root memento for reading - * a document. - */ - public static XMLMemento createReadRoot(InputStream in) { - Document document = null; - try { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - DocumentBuilder parser = factory.newDocumentBuilder(); - document = parser.parse(new InputSource(in)); - Node node = document.getFirstChild(); - if (node instanceof Element) - return new XMLMemento(document, (Element) node); - } catch (Exception e) { - // ignore - } finally { - try { - in.close(); - } catch (Exception e) { - // ignore - } - } - return null; - } - - /** - * Answer a root memento for writing a document. - * - * @param type a type - * @return a memento - */ - public static XMLMemento createWriteRoot(String type) { - Document document; - try { - document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); - Element element = document.createElement(type); - document.appendChild(element); - return new XMLMemento(document, element); - } catch (ParserConfigurationException e) { - throw new Error(e); - } - } - - /* - * @see IMemento - */ - public IMemento getChild(String type) { - // Get the nodes. - NodeList nodes = element.getChildNodes(); - int size = nodes.getLength(); - if (size == 0) - return null; - - // Find the first node which is a child of this node. - for (int nX = 0; nX < size; nX ++) { - Node node = nodes.item(nX); - if (node instanceof Element) { - Element element2 = (Element)node; - if (element2.getNodeName().equals(type)) - return new XMLMemento(factory, element2); - } - } - - // A child was not found. - return null; - } - - /* - * @see IMemento - */ - public IMemento [] getChildren(String type) { - // Get the nodes. - NodeList nodes = element.getChildNodes(); - int size = nodes.getLength(); - if (size == 0) - return new IMemento[0]; - - // Extract each node with given type. - List<Element> list = new ArrayList<Element>(size); - for (int nX = 0; nX < size; nX ++) { - Node node = nodes.item(nX); - if (node instanceof Element) { - Element element2 = (Element)node; - if (element2.getNodeName().equals(type)) - list.add(element2); - } - } - - // Create a memento for each node. - size = list.size(); - IMemento [] results = new IMemento[size]; - for (int x = 0; x < size; x ++) { - results[x] = new XMLMemento(factory, list.get(x)); - } - return results; - } - - public String[] getChildNames() { - // Get the nodes. - NodeList nodes = element.getChildNodes(); - int size = nodes.getLength(); - if (size == 0) - return new String[0]; - - // Extract each node with given type. - List<String> list = new ArrayList<String>(); - for (int nX = 0; nX < size; nX ++) { - Node node = nodes.item(nX); - if (node instanceof Element) { - Element element2 = (Element)node; - if (!list.contains(element2.getNodeName())) - list.add(element2.getNodeName()); - } - } - return (String[]) list.toArray(new String[list.size()]); - } - - /** - * Return the contents of this memento as a byte array. - * - * @return byte[] - * @throws IOException if anything goes wrong - */ - public byte[] getContents() throws IOException { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - save(out); - return out.toByteArray(); - } - - /** - * Returns an input stream for writing to the disk with a local locale. - * - * @return java.io.InputStream - * @throws IOException if anything goes wrong - */ - public InputStream getInputStream() throws IOException { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - save(out); - return new ByteArrayInputStream(out.toByteArray()); - } - - /* - * @see IMemento - */ - public Float getFloat(String key) { - Attr attr = element.getAttributeNode(key); - if (attr == null) - return null; - String strValue = attr.getValue(); - try { - return new Float(strValue); - } catch (NumberFormatException e) { - return null; - } - } - - /* - * @see IMemento - */ - public Integer getInteger(String key) { - Attr attr = element.getAttributeNode(key); - if (attr == null) - return null; - String strValue = attr.getValue(); - try { - return new Integer(strValue); - } catch (NumberFormatException e) { - return null; - } - } - - /* - * @see IMemento - */ - public String getString(String key) { - Attr attr = element.getAttributeNode(key); - if (attr == null) - return null; - return attr.getValue(); - } - - public List<String> getNames() { - NamedNodeMap map = element.getAttributes(); - int size = map.getLength(); - List<String> list = new ArrayList<String>(); - for (int i = 0; i < size; i++) { - Node node = map.item(i); - String name = node.getNodeName(); - list.add(name); - } - return list; - } - - /** - * Loads a memento from the given filename. - * - * @param in java.io.InputStream - * @return org.eclipse.ui.IMemento - */ - public static IMemento loadMemento(InputStream in) { - return createReadRoot(in); - } - - /** - * Loads a memento from the given filename. - * - * @param filename java.lang.String - * @return org.eclipse.ui.IMemento - * @exception java.io.IOException - */ - public static IMemento loadMemento(String filename) throws IOException { - InputStream in = null; - try { - in = new BufferedInputStream(new FileInputStream(filename)); - return XMLMemento.createReadRoot(in); - } finally { - try { - if (in != null) - in.close(); - } catch (Exception e) { - // ignore - } - } - } - - /* - * @see IMemento - */ - public void putInteger(String key, int n) { - element.setAttribute(key, String.valueOf(n)); - } - - /* - * @see IMemento - */ - public void putString(String key, String value) { - if (value == null) - return; - element.setAttribute(key, value); - } - - /** - * Save this Memento to a Writer. - * - * @throws IOException if there is a problem saving - */ - public void save(OutputStream os) throws IOException { - Result result = new StreamResult(os); - Source source = new DOMSource(factory); - try { - Transformer transformer = TransformerFactory.newInstance().newTransformer(); - transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$ - transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$ - transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8"); //$NON-NLS-1$ - transformer.setOutputProperty("{http://xml.apache.org/xalan}indent-a...;, "2"); //$NON-NLS-1$ //$NON-NLS-2$ - transformer.transform(source, result); - } catch (Exception e) { - throw (IOException) (new IOException().initCause(e)); - } - } - - /** - * Saves the memento to the given file. - * - * @param filename java.lang.String - * @exception java.io.IOException - */ - public void saveToFile(String filename) throws IOException { - BufferedOutputStream w = null; - try { - w = new BufferedOutputStream(new FileOutputStream(filename)); - save(w); - } catch (IOException e) { - throw e; - } catch (Exception e) { - throw new IOException(e.getLocalizedMessage()); - } finally { - if (w != null) { - try { - w.close(); - } catch (Exception e) { - // ignore - } - } - } - } - - public String saveToString() throws IOException { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - save(out); - return out.toString("UTF-8"); //$NON-NLS-1$ - } - - /* - * @see IMemento#getBoolean(String) - */ - public Boolean getBoolean(String key) { - Attr attr = element.getAttributeNode(key); - if (attr == null) - return null; - String strValue = attr.getValue(); - if ("true".equalsIgnoreCase(strValue)) //$NON-NLS-1$ - return new Boolean(true); - return new Boolean(false); - } - - /* - * @see IMemento#putBoolean(String, boolean) - */ - public void putBoolean(String key, boolean value) { - element.setAttribute(key, new Boolean(value).toString()); - } - - /** - * Returns the Text node of the memento. Each memento is allowed only - * one Text node. - * - * @return the Text node of the memento, or <code>null</code> if - * the memento has no Text node. - */ - public Text getTextNode() { - // Get the nodes. - NodeList nodes = element.getChildNodes(); - int size = nodes.getLength(); - if (size == 0) { - return null; - } - for (int nX = 0; nX < size; nX++) { - Node node = nodes.item(nX); - if (node instanceof Text) { - return (Text) node; - } - } - // a Text node was not found - return null; - } - - /* (non-Javadoc) - */ - public void putTextData(String data) { - Text textNode = getTextNode(); - if (textNode == null) { - textNode = factory.createTextNode(data); - // Always add the text node as the first child (fixes bug 93718) - element.insertBefore(textNode, element.getFirstChild()); - } else { - textNode.setData(data); - } - } - - public String getTextData() { - Text textNode = getTextNode(); - if (textNode != null) { - return textNode.getData(); - } - return ""; //$NON-NLS-1$ - } -} \ No newline at end of file Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -21,8 +21,8 @@ import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller; +import org.jboss.ide.eclipse.as.core.server.IJBossBehaviourDelegate; import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; -import org.jboss.ide.eclipse.as.core.server.internal.IJBossBehaviourDelegate; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration; import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties; Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -1,176 +0,0 @@ -/******************************************************************************* -* Copyright (c) 2009 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.ui.dialogs; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.TrayDialog; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Font; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.layout.FormAttachment; -import org.eclipse.swt.layout.FormData; -import org.eclipse.swt.layout.FormLayout; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.server.core.IServer; -import org.jboss.ide.eclipse.as.core.server.internal.launch.TwiddleLaunchConfiguration; -import org.jboss.ide.eclipse.as.core.server.internal.launch.TwiddleLauncher; -import org.jboss.ide.eclipse.as.core.server.internal.launch.TwiddleLauncher.ProcessData; -import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; -import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; -import org.jboss.ide.eclipse.as.ui.Messages; - -/** - * - * @author Rob Stryker <rob.stryker(a)redhat.com&gt; - * - */ -public class TwiddleDialog extends TrayDialog { - - private static final int EXECUTE_ID = 2042; - private Text query, results; - private Label queryLabel; - private IServer server = null; - private Composite parentComposite; - - - public TwiddleDialog(Shell parentShell, Object selection) { - super(parentShell); - setShellStyle(getShellStyle() | SWT.RESIZE); - if( selection instanceof IServer ) { - server = (IServer)selection; - } - - } - - protected void configureShell(Shell newShell) { - super.configureShell(newShell); - newShell.setText(Messages.TwiddleDialog); - newShell.setImage(JBossServerUISharedImages.getImage(JBossServerUISharedImages.TWIDDLE_IMAGE)); - } - - protected Point getInitialSize() { - return new Point(600, 300); - } - - protected void createButtonsForButtonBar(Composite parent) { - // create OK and Cancel buttons by default - createButton(parent, EXECUTE_ID, Messages.TwiddleDialogExecute, true); - createButton(parent, IDialogConstants.OK_ID, Messages.TwiddleDialogDone, - false); - } - - protected void buttonPressed(int buttonId) { - if (IDialogConstants.OK_ID == buttonId) { - okPressed(); - } else if (EXECUTE_ID == buttonId) { - executePressed(); - } - } - - protected void executePressed() { - final String args = query.getText(); - final Display dis = getShell().getDisplay(); - final IServer jbs = server; - getButton(EXECUTE_ID).setEnabled(false); - Thread t = new Thread() { - public void run() { - try { - TwiddleLauncher launcher = new TwiddleLauncher(); - final ProcessData[] datas = launcher.getTwiddleResults(jbs, args, false); - if( datas.length == 1 ) { - final String s2 = datas[0].getOut(); - dis.asyncExec(new Runnable() { - public void run() { - // reset the default button, focus on the query, and - // the entire string selected for easy new queries. - results.setText(s2); - getButton(EXECUTE_ID).setEnabled(true); - Shell shell = parentComposite.getShell(); - query.setFocus(); - query.setSelection(0, query.getText().length()); - if (shell != null) { - shell.setDefaultButton(getButton(EXECUTE_ID)); - } - } - } ); - } - } catch( Exception e ) { - IStatus status = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, Messages.TwiddleDialog_UnexpectedError, e); - JBossServerUIPlugin.getDefault().getLog().log(status); - } - - } - }; - t.start(); - - } - - protected Control createDialogArea(Composite parent) { - this.parentComposite = parent; - Composite c = (Composite)super.createDialogArea(parent); - Composite main = new Composite(c, SWT.NONE); - main.setLayoutData(new GridData(GridData.FILL_BOTH)); - - main.setLayout(new FormLayout()); - - queryLabel = new Label(main, SWT.NONE); - queryLabel.setText(Messages.TwiddleDialogArguments); - FormData queryLabelData = new FormData(); - queryLabelData.left = new FormAttachment(0,5); - queryLabelData.top = new FormAttachment(0,5); - queryLabel.setLayoutData(queryLabelData); - - PlatformUI.getWorkbench().getHelpSystem().setHelp(getShell(), - "org.jboss.ide.eclipse.as.ui.twiddle_usage_tutorial_help"); //$NON-NLS-1$ - - query = new Text(main, SWT.BORDER); - FormData queryData = new FormData(); - queryData.top = new FormAttachment(queryLabel, 5); - queryData.right = new FormAttachment(100, -5); - queryData.left = new FormAttachment(0, 5); - query.setLayoutData(queryData); - - - - // Now add stuff to main - results = new Text(main, SWT.BORDER | SWT.READ_ONLY | SWT.MULTI | SWT.V_SCROLL); - FormData resultsData = new FormData(); - resultsData.left = new FormAttachment(0,5); - resultsData.right = new FormAttachment(100,-5); - resultsData.bottom = new FormAttachment(100,-5); - resultsData.top = new FormAttachment(query, 5); - results.setLayoutData(resultsData); - results.setFont(new Font(null, "Courier New", 8, SWT.NONE)); //$NON-NLS-1$ - - // set the default text - try { - String args = TwiddleLaunchConfiguration.getDefaultArgs(server); - query.setText(args); - query.setFocus(); - query.setSelection(args.length()); - } catch( CoreException ce ) { - // server probably not found. - - } - return c; - } - -} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/ServerLogView.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/ServerLogView.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/ServerLogView.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -70,8 +70,8 @@ import org.eclipse.ui.part.ViewPart; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes; -import org.jboss.ide.eclipse.as.core.extensions.events.IServerLogListener; import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; +import org.jboss.ide.eclipse.as.core.server.IServerLogListener; import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; public class ServerLogView extends ViewPart implements IServerLogListener, ISelectionListener { Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/MockArgsTests.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/MockArgsTests.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/MockArgsTests.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -20,8 +20,8 @@ import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.IServerWorkingCopy; +import org.jboss.ide.eclipse.as.core.server.IProcessProvider; import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; -import org.jboss.ide.eclipse.as.core.server.internal.IProcessProvider; import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java 2012-02-01 05:23:23 UTC (rev 38355) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java 2012-02-01 06:51:11 UTC (rev 38356) @@ -42,9 +42,9 @@ import org.eclipse.wst.server.core.IServerWorkingCopy; import org.eclipse.wst.server.core.ServerCore; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; +import org.jboss.ide.eclipse.as.core.server.IProcessProvider; import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer; -import org.jboss.ide.eclipse.as.core.server.internal.IProcessProvider; import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; import org.jboss.ide.eclipse.as.core.util.FileUtil; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;