JBoss Tools SVN: r30641 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-04-18 15:01:12 -0400 (Mon, 18 Apr 2011)
New Revision: 30641
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF
Log:
JBIDE-8742 org.hibernate.eclipse.console requires org.eclipse.jpt.core but it could not be found (as it was removed from Indigo M6)
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF 2011-04-18 18:38:28 UTC (rev 30640)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF 2011-04-18 19:01:12 UTC (rev 30641)
@@ -82,6 +82,7 @@
org.eclipse.ant.core;bundle-version="3.2.200",
org.eclipse.ant.launching;bundle-version="1.0.0",
org.eclipse.ant.ui;bundle-version="3.5.0",
- org.eclipse.core.externaltools;bundle-version="1.0.0"
+ org.eclipse.core.externaltools;bundle-version="1.0.0",
+ org.eclipse.jst.j2ee.web;bundle-version="1.1.500"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
14 years, 12 months
JBoss Tools SVN: r30638 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: server/internal/v7 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-04-18 14:02:26 -0400 (Mon, 18 Apr 2011)
New Revision: 30638
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7DeploymentManager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7ManagementInterface.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7ManagementService.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagementUtil.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java
Log:
introducing as7 management plugin interfaces in as.core
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java 2011-04-18 17:57:32 UTC (rev 30637)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java 2011-04-18 18:02:26 UTC (rev 30638)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.core;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.IExtensionRegistry;
@@ -57,7 +56,6 @@
*/
public void start(BundleContext context) throws Exception {
super.start(context);
-
// Start the array of models that need to be started
UnitedServerListenerManager.getDefault();
UnitedServerListenerManager.getDefault().addListener(XPathModel.getDefault());
@@ -81,6 +79,10 @@
public static JBossServerCorePlugin getDefault() {
return plugin;
}
+
+ public static BundleContext getContext() {
+ return plugin.getBundle().getBundleContext();
+ }
public static IPath getServerStateLocation(IServer server) {
return ServerUtil.getServerStateLocation(server);
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7DeploymentManager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7DeploymentManager.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7DeploymentManager.java 2011-04-18 18:02:26 UTC (rev 30638)
@@ -0,0 +1,79 @@
+package org.jboss.ide.eclipse.as.core.server.internal.v7;
+
+import java.io.File;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+
+/**
+ *
+ * This class is interim API and may change drastically
+ * as development on the application server continues.
+ * I expect credentials to be required eventually,
+ * and the API will need to adjust to handle them.
+ *
+ */
+public interface IJBoss7DeploymentManager {
+ /**
+ * Asynchronously deploy a file to a server
+ *
+ * @param host The host
+ * @param port The port
+ * @param name The deployment's name
+ * @param file The file to be deployed
+ * @param monitor The progress monitor
+ *
+ * @return Not sure what to return yet
+ * @throws Exception
+ */
+ public Object deployAsync(String host, int port,
+ String deploymentName, File file, IProgressMonitor monitor) throws Exception;
+
+ /**
+ * Synchronously deploy a file to a server
+ *
+ * @param host The host
+ * @param port The port
+ * @param name The deployment's name
+ * @param file The file to be deployed
+ * @param monitor The progress monitor
+ *
+ * @return Not sure what to return yet
+ * @throws Exception
+ */
+ public Object deploySync(String host, int port,
+ String deploymentName, File file, IProgressMonitor monitor) throws Exception;
+
+
+ /**
+ * Asynchronously undeploy a file to a server
+ *
+ * @param host The host
+ * @param port The port
+ * @param name The deployment's name
+ * @param file The file to be deployed
+ * @param monitor The progress monitor
+ *
+ * @return Not sure what to return yet
+ * @throws Exception
+ */
+ public Object undeployAsync(String host, int port,
+ String deploymentName, boolean removeFile, IProgressMonitor monitor) throws Exception;
+
+
+ /**
+ * Synchronously undeploy a file to a server
+ *
+ * @param host The host
+ * @param port The port
+ * @param name The deployment's name
+ * @param file The file to be deployed
+ * @param monitor The progress monitor
+ *
+ * @return Not sure what to return yet
+ * @throws Exception
+ */
+ public Object syncUndeploy(String host, int port,
+ String deploymentName, boolean removeFile, IProgressMonitor monitor) throws Exception;
+
+
+}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7ManagementInterface.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7ManagementInterface.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7ManagementInterface.java 2011-04-18 18:02:26 UTC (rev 30638)
@@ -0,0 +1,9 @@
+package org.jboss.ide.eclipse.as.core.server.internal.v7;
+
+public interface IJBoss7ManagementInterface {
+ /**
+ * Need a method to build a request...
+ * we can't just expose the entire ModelNode api, but,
+ * we need a good way for them to be able to build such nodes
+ */
+}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7ManagementService.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7ManagementService.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7ManagementService.java 2011-04-18 18:02:26 UTC (rev 30638)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.core.server.internal.v7;
+
+/**
+ * This class may belong in the main JBoss AS core plugin,
+ * in case several different plugins need to implement it
+ */
+public interface IJBoss7ManagementService {
+ /**
+ * Get a manager which can be responsible *only* for
+ * deployments, both synchronously and asynchronously.
+ * @return
+ */
+ public IJBoss7DeploymentManager getDeploymentManager();
+
+ /**
+ * Get an interface which can handle executing any and all remote
+ * management tasks via wrappers of more raw APIs.
+ *
+ * @return
+ */
+ public IJBoss7ManagementInterface getManagementInterface();
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java 2011-04-18 17:57:32 UTC (rev 30637)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java 2011-04-18 18:02:26 UTC (rev 30638)
@@ -56,6 +56,7 @@
IServer server, IModule[] module,
int publishType, IModuleResourceDelta[] delta,
IProgressMonitor monitor) throws CoreException {
+ IJBoss7ManagementService service = JBoss7ManagementUtil.findManagementService(server);
if( !JBoss7Server.supportsJBoss7Deployment(server))
return super.publishModule(method, server, module, publishType, delta, monitor);
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagementUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagementUtil.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagementUtil.java 2011-04-18 18:02:26 UTC (rev 30638)
@@ -0,0 +1,45 @@
+package org.jboss.ide.eclipse.as.core.server.internal.v7;
+
+import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+
+public class JBoss7ManagementUtil {
+ public static final String SERVICE_VERSION_70 = "org.jboss.ide.eclipse.as.management.as7.service"; //$NON-NLS-1$
+
+ public static IJBoss7ManagementService findManagementService(IServer server) {
+ BundleContext context = JBossServerCorePlugin.getDefault().getContext();
+
+// String tmp = "org.jboss.ide.eclipse.as.management.as7.service"; //$NON-NLS-1$
+// String clazz = "org.jboss.ide.eclipse.as.management.as7.deployment.JBossManagementService"; //$NON-NLS-1$
+ String iface = "IJBoss7ManagementService"; //$NON-NLS-1$
+ String clazz3 = "org.jboss.ide.eclipse.as.core.server.internal.v7." + iface; //$NON-NLS-1$
+ String requiredService = getRequiredServiceName(server);
+ if( requiredService == null )
+ return null;
+
+ try {
+ ServiceReference[] refs = context.getServiceReferences(clazz3, null);
+ for( int i = 0; i < refs.length; i++ ) {
+ Object compName = refs[i].getProperty("component.name"); //$NON-NLS-1$
+ if( requiredService.equals(compName)) {
+ Bundle b = refs[i].getBundle();
+ Object service2 = context.getService(refs[i]);
+ if( service2 instanceof IJBoss7ManagementService ) {
+ return ((IJBoss7ManagementService)service2);
+ }
+ }
+ }
+ } catch(InvalidSyntaxException ise ) {
+ }
+ return null;
+ }
+
+ private static String getRequiredServiceName(IServer s) {
+ // TODO if required, make sure to add new versions here
+ return SERVICE_VERSION_70;
+ }
+}
14 years, 12 months
JBoss Tools SVN: r30637 - in trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-04-18 13:57:32 -0400 (Mon, 18 Apr 2011)
New Revision: 30637
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/jboss-management-service.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-as-protocol-7.0.0.Beta3-SNAPSHOT.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-dmr-1.0.0.Beta5.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-logging-3.0.0.Beta3.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-marshalling-1.3.0.CR8.jar
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-threads-2.0.0.CR8.jar
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/.project
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF
Log:
introducing as7 management plugin
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/.project
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/.project 2011-04-18 17:56:13 UTC (rev 30636)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/.project 2011-04-18 17:57:32 UTC (rev 30637)
@@ -20,6 +20,11 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ds.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2011-04-18 17:56:13 UTC (rev 30636)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2011-04-18 17:57:32 UTC (rev 30637)
@@ -16,3 +16,4 @@
jboss-marshalling-1.3.0.CR8.jar,
jboss-threads-2.0.0.CR8.jar,
.
+Service-Component: META-INF/jboss-management-service.xml
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/jboss-management-service.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/jboss-management-service.xml (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/jboss-management-service.xml 2011-04-18 17:57:32 UTC (rev 30637)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.jboss.ide.eclipse.as.management.as7.service">
+ <implementation class="org.jboss.ide.eclipse.as.management.as7.deployment.JBossManagementService"/>
+ <service>
+ <provide interface="org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7ManagementService"/>
+ </service>
+</scr:component>
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-as-protocol-7.0.0.Beta3-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-as-protocol-7.0.0.Beta3-SNAPSHOT.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-dmr-1.0.0.Beta5.jar
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-dmr-1.0.0.Beta5.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-logging-3.0.0.Beta3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-logging-3.0.0.Beta3.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-marshalling-1.3.0.CR8.jar
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-marshalling-1.3.0.CR8.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-threads-2.0.0.CR8.jar
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-threads-2.0.0.CR8.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
14 years, 12 months
JBoss Tools SVN: r30636 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-04-18 13:56:13 -0400 (Mon, 18 Apr 2011)
New Revision: 30636
Removed:
trunk/xulrunner2/
Log:
remove redundant xulrunner 2
14 years, 12 months
JBoss Tools SVN: r30635 - trunk/jst/tests/org.jboss.tools.jst.web.kb.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-04-18 12:51:53 -0400 (Mon, 18 Apr 2011)
New Revision: 30635
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml
Log:
fix version in org.jboss.tools.jst.web.kb.test pom.xml to match manifest.mf
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml 2011-04-18 16:01:24 UTC (rev 30634)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml 2011-04-18 16:51:53 UTC (rev 30635)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.jboss.tools.jst.tests</groupId>
<artifactId>org.jboss.tools.jst.web.kb.test</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
14 years, 12 months
JBoss Tools SVN: r30633 - in trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test: suite and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: psrna
Date: 2011-04-18 11:20:52 -0400 (Mon, 18 Apr 2011)
New Revision: 30633
Modified:
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELTest.java
Log:
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java 2011-04-18 08:40:56 UTC (rev 30632)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java 2011-04-18 15:20:52 UTC (rev 30633)
@@ -44,6 +44,8 @@
" </soapenv:Body>" +
"</soapenv:Envelope>";
+
+
IProject project;
ServersView sView = new ServersView();
PackageExplorer pExplorer = new PackageExplorer() {
@@ -140,7 +142,7 @@
bpel.addAssignFixedToExpression("assignFixedToExpression", "Fixed Expression", "$simpleOut.payload");
bpel.addReply("replySimple", "simpleOut", "", new String[] {"client", "AssignTestProcess", "simple"});
-
+ /*
// Publish the process
pExplorer.runOnServer("AssignerProject");
Thread.sleep(TIME_5S);
@@ -152,6 +154,14 @@
Thread.sleep(TIME_5S);
Assert.assertFalse(console.getConsoleText().contains("[ASSIGN] Assignment Fault:"));
Assert.assertEquals("Fixed Expression", response);
+ */
+ log.info("############## START SLEEPING ################");
+ bot.sleep(TIME_20S);
+ bot.sleep(TIME_20S);
+ bot.sleep(TIME_20S);
+ bot.sleep(TIME_20S);
+ bot.sleep(TIME_20S);
+ bot.sleep(TIME_20S);
}
void openFile(String projectName, String... path) throws Exception {
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java 2011-04-18 08:40:56 UTC (rev 30632)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java 2011-04-18 15:20:52 UTC (rev 30633)
@@ -9,6 +9,7 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.bpel.ui.bot.test.suite.BPELTest;
import org.jboss.tools.bpel.ui.bot.test.util.ResourceHelper;
+import org.jboss.tools.bpel.util.SendSoapMessage;
import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires;
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
@@ -18,7 +19,6 @@
import org.jboss.tools.ui.bot.ext.view.ProjectExplorer;
import org.jboss.tools.ui.bot.ext.view.ServersView;
import org.junit.Assert;
-import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -29,7 +29,24 @@
@SWTBotTestRequires(server = @Server(type = ServerType.SOA, state = ServerState.Running), perspective="BPEL Perspective")
public class OdeDeployTest extends BPELTest {
- static String BUNDLE = "org.jboss.tools.bpel.ui.bot.test";
+ final static String BUNDLE = "org.jboss.tools.bpel.ui.bot.test";
+ final static String ENDPOINT = "http://localhost:8080/SayHelloProcess";
+ final static String MESSAGE =
+ "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" " +
+ "xmlns:q0=\"http://www.jboss.org/bpel/examples\" " +
+ "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" " +
+ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" +
+ " <soapenv:Header/>" +
+ " <soapenv:Body>" +
+ " <q0:SayHelloRequest>" +
+ " <q0:input>JBDS</q0:input>" +
+ " </q0:SayHelloRequest>" +
+ " </soapenv:Body>" +
+ "</soapenv:Envelope>";
+
+
+
+
ServersView sView = new ServersView();
ProjectExplorer projExplorer = new ProjectExplorer(){
@@ -114,7 +131,24 @@
server.expand();
bot.sleep(TIME_5S);
assertTrue(server.getNode("say_hello [Synchronized]").isVisible());
+ }
+
+ @Test
+ public void requestResponseTest() throws Exception {
+ // Test the process
+ String response = SendSoapMessage.sendMessage(ENDPOINT, MESSAGE, "simple");
+
+ Assert.assertTrue(response != null);
+ Assert.assertTrue(response.contains("<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\">"));
+ Assert.assertTrue(response.contains("<SOAP-ENV:Header />"));
+ Assert.assertTrue(response.contains("<SOAP-ENV:Body>"));
+ Assert.assertTrue(response.contains("<SayHelloResponse xmlns=\"http://www.jboss.org/bpel/examples\">"));
+ Assert.assertTrue(response.contains("<tns:result xmlns:tns=\"http://www.jboss.org/bpel/examples\">Hello JBDS</tns:result>"));
+ Assert.assertTrue(response.contains("</SayHelloResponse>"));
+ Assert.assertTrue(response.contains("</SOAP-ENV:Body>"));
+ Assert.assertTrue(response.contains("</SOAP-ENV:Envelope>"));
+
}
@@ -122,7 +156,6 @@
-
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java 2011-04-18 08:40:56 UTC (rev 30632)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java 2011-04-18 15:20:52 UTC (rev 30633)
@@ -16,7 +16,7 @@
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
-(a)SuiteClasses({OdeDeployTest.class /*WizardTest.class, ActivityModelingTest.class,*/ /* AssignActivityTest.class,*/ /*SimpleModelingTest.class, FaultModelingTest.class*/})
+(a)SuiteClasses({OdeDeployTest.class, WizardTest.class, ActivityModelingTest.class, AssignActivityTest.class, SimpleModelingTest.class, FaultModelingTest.class})
@RunWith(RequirementAwareSuite.class)
public class BPELAllTest extends TestSuite {
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELTest.java 2011-04-18 08:40:56 UTC (rev 30632)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELTest.java 2011-04-18 15:20:52 UTC (rev 30633)
@@ -75,12 +75,12 @@
}
bot.button("Finish").click();
- bot.sleep(5000);
+ bot.sleep(TIME_5S);
IProject iproject = ResourcesPlugin.getWorkspace().getRoot().getProject(project);
IFile bpelFile = iproject.getFile(new Path("bpelContent/" + name + ".bpel"));
assertTrue(bpelFile.exists());
- assertTrue(iproject.getFile(new Path("bpelContent/" + name + ".bpelex")).exists());
+ //assertTrue(iproject.getFile(new Path("bpelContent/" + name + ".bpelex")).exists());
assertTrue(iproject.getFile(new Path("bpelContent/" + name + "Artifacts.wsdl")).exists());
return bpelFile;
14 years, 12 months
JBoss Tools SVN: r30632 - branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2011-04-18 04:40:56 -0400 (Mon, 18 Apr 2011)
New Revision: 30632
Modified:
branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java
Log:
JBIDE-6134
Disable the animation
Modified: branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java
===================================================================
--- branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2011-04-18 04:15:56 UTC (rev 30631)
+++ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2011-04-18 08:40:56 UTC (rev 30632)
@@ -1122,6 +1122,8 @@
}
public boolean autoLayout(boolean animation) {
+ // disable the animation now
+ animation = false;
final GraphAnimation graphAnimation = new GraphAnimation();
HashMap<Object, Node> nodeMap = new HashMap<Object, Node>();
DirectedGraph directedGraph = collectionGraphInformation(nodeMap);
14 years, 12 months