Author: jjankovi Date: 2012-04-18 05:09:41 -0400 (Wed, 18 Apr 2012) New Revision: 40273 Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/properties/swtbot.properties trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/requirements.properties trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/Activator.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java Log: small modification Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/properties/swtbot.properties =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/properties/swtbot.properties 2012-04-18 08:56:04 UTC (rev 40272) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/properties/swtbot.properties 2012-04-18 09:09:41 UTC (rev 40273) @@ -1 +1,3 @@ -SERVER=AS,6.0,default,../../../requirements/target/jboss-6.0.0.Final +#SERVER=AS,6.0,default,../../../requirements/target/jboss-6.0.0.Final +SERVER=AS,7.0,default,../../../requirements/target/jboss-as-web-7.0.2.Final +#SERVER=AS,6.0,default,/home/jjankovi/jboss-6.0.0.Final-WS Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/requirements.properties =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/requirements.properties 2012-04-18 08:56:04 UTC (rev 40272) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/requirements.properties 2012-04-18 09:09:41 UTC (rev 40273) @@ -1,2 +1,2 @@ -requirements=jbossas-6.0.0.Final +requirements=jbossas-7.0.2.Final #best runtime would AS 7 + WS / EAP 5.1 <= Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/Activator.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/Activator.java 2012-04-18 08:56:04 UTC (rev 40272) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/Activator.java 2012-04-18 09:09:41 UTC (rev 40273) @@ -1,66 +1,43 @@ - /******************************************************************************* - * Copyright (c) 2007-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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ +/******************************************************************************* + * Copyright (c) 2010 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.tools.ws.ui.bot.test; -import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends AbstractUIPlugin { +public class Activator implements BundleActivator { + private static BundleContext context; + // The plug-in ID public static final String PLUGIN_ID = "org.jboss.tools.ws.ui.bot.test"; - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { + + static BundleContext getContext() { + return context; } /* * (non-Javadoc) - * - * @see - * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext - * ) + * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext) */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; + public void start(BundleContext bundleContext) throws Exception { + Activator.context = bundleContext; } /* * (non-Javadoc) - * - * @see - * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext - * ) + * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext) */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); + public void stop(BundleContext bundleContext) throws Exception { + Activator.context = null; } - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - } Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-04-18 08:56:04 UTC (rev 40272) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-04-18 09:09:41 UTC (rev 40273) @@ -59,7 +59,7 @@ if (!projectExists(getWsProjectName())) { //importing project without targeted runtime set - importWSTestProject("/resources/projects/" + + importWSTestProject("resources/projects/" + getWsProjectName(), getWsProjectName()); //set target runtime - TO DO projectHelper.addDefaultRuntimeIntoProject(getWsProjectName());