JBoss Tools SVN: r12610 - workspace/grid/esb-example.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-12-16 05:45:05 -0500 (Tue, 16 Dec 2008)
New Revision: 12610
Modified:
workspace/grid/esb-example/transform_CSV2XML.zip
workspace/grid/esb-example/transform_XML2XML_simple.zip
Log:
JBIDE-3406:Can't deploy transform_CSV2XML and transform_XML2XML_simple Example projects to the server.
Modified: workspace/grid/esb-example/transform_CSV2XML.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/esb-example/transform_XML2XML_simple.zip
===================================================================
(Binary files differ)
17 years
JBoss Tools SVN: r12609 - in trunk/jmx/tests/org.jboss.tools.jmx.core.test: src/org/jboss/tools/jmx/core/tests and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-15 18:24:53 -0500 (Mon, 15 Dec 2008)
New Revision: 12609
Added:
trunk/jmx/tests/org.jboss.tools.jmx.core.test/projects/JMX_EXAMPLE/src/com/example/QueueSamplerMBean.java
Removed:
trunk/jmx/tests/org.jboss.tools.jmx.core.test/projects/JMX_EXAMPLE/src/com/example/QueueSamplerMXBean.java
Modified:
trunk/jmx/tests/org.jboss.tools.jmx.core.test/projects/JMX_EXAMPLE/src/com/example/QueueSampler.java
trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/DefaultProviderTest.java
Log:
unit test fixes
Modified: trunk/jmx/tests/org.jboss.tools.jmx.core.test/projects/JMX_EXAMPLE/src/com/example/QueueSampler.java
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.core.test/projects/JMX_EXAMPLE/src/com/example/QueueSampler.java 2008-12-15 23:02:18 UTC (rev 12608)
+++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/projects/JMX_EXAMPLE/src/com/example/QueueSampler.java 2008-12-15 23:24:53 UTC (rev 12609)
@@ -9,7 +9,7 @@
import java.util.Date;
import java.util.Queue;
-public class QueueSampler implements QueueSamplerMXBean {
+public class QueueSampler implements QueueSamplerMBean {
private Queue<String> queue;
Copied: trunk/jmx/tests/org.jboss.tools.jmx.core.test/projects/JMX_EXAMPLE/src/com/example/QueueSamplerMBean.java (from rev 12599, trunk/jmx/tests/org.jboss.tools.jmx.core.test/projects/JMX_EXAMPLE/src/com/example/QueueSamplerMXBean.java)
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.core.test/projects/JMX_EXAMPLE/src/com/example/QueueSamplerMBean.java (rev 0)
+++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/projects/JMX_EXAMPLE/src/com/example/QueueSamplerMBean.java 2008-12-15 23:24:53 UTC (rev 12609)
@@ -0,0 +1,12 @@
+/*
+ * QueueSamplerMXBean.java - MXBean interface describing the management
+ * operations and attributes for the QueueSampler MXBean. In this case
+ * there is a read-only attribute "QueueSample" and an operation "clearQueue".
+ */
+
+package com.example;
+
+public interface QueueSamplerMBean {
+ public QueueSample getQueueSample();
+ public void clearQueue();
+}
Property changes on: trunk/jmx/tests/org.jboss.tools.jmx.core.test/projects/JMX_EXAMPLE/src/com/example/QueueSamplerMBean.java
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: trunk/jmx/tests/org.jboss.tools.jmx.core.test/projects/JMX_EXAMPLE/src/com/example/QueueSamplerMXBean.java
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.core.test/projects/JMX_EXAMPLE/src/com/example/QueueSamplerMXBean.java 2008-12-15 23:02:18 UTC (rev 12608)
+++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/projects/JMX_EXAMPLE/src/com/example/QueueSamplerMXBean.java 2008-12-15 23:24:53 UTC (rev 12609)
@@ -1,12 +0,0 @@
-/*
- * QueueSamplerMXBean.java - MXBean interface describing the management
- * operations and attributes for the QueueSampler MXBean. In this case
- * there is a read-only attribute "QueueSample" and an operation "clearQueue".
- */
-
-package com.example;
-
-public interface QueueSamplerMXBean {
- public QueueSample getQueueSample();
- public void clearQueue();
-}
Modified: trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/DefaultProviderTest.java
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/DefaultProviderTest.java 2008-12-15 23:02:18 UTC (rev 12608)
+++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/DefaultProviderTest.java 2008-12-15 23:24:53 UTC (rev 12609)
@@ -20,12 +20,16 @@
import org.eclipse.debug.core.ILaunchConfigurationType;
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.jboss.tools.jmx.core.ExtensionManager;
import org.jboss.tools.jmx.core.IConnectionProvider;
import org.jboss.tools.jmx.core.IConnectionWrapper;
import org.jboss.tools.jmx.core.providers.DefaultConnectionProvider;
import org.jboss.tools.jmx.core.tests.util.TestProjectProvider;
+import org.jboss.tools.jmx.core.tree.DomainNode;
import org.jboss.tools.jmx.core.tree.Node;
import org.jboss.tools.jmx.core.tree.Root;
@@ -81,6 +85,20 @@
ILaunchConfigurationWorkingCopy wc = createLaunch();
ILaunch launch = wc.launch("run", new NullProgressMonitor());
+ /* */
+ IProcess p = launch.getProcesses()[0];
+ p.getStreamsProxy().getErrorStreamMonitor().addListener(new IStreamListener() {
+ public void streamAppended(String text, IStreamMonitor monitor) {
+ System.out.println("[error] " + text);
+ }
+ });
+ p.getStreamsProxy().getOutputStreamMonitor().addListener(new IStreamListener() {
+ public void streamAppended(String text, IStreamMonitor monitor) {
+ System.out.println("[out] " + text);
+ }
+ });
+
+ /* */
Thread.sleep(10000);
try {
@@ -105,7 +123,14 @@
Node[] children = root.getChildren();
assertTrue("children were null", children != null);
- assertEquals("Example had the wrong number of domains", 5, children.length);
+ assertTrue("children length was less than 1", children.length >= 0);
+
+ boolean found = false;
+ for( int i = 0; i < children.length; i++ )
+ if( children[i] instanceof DomainNode && ((DomainNode)children[i]).getDomain().equals("com.example"))
+ found = true;
+
+ assertTrue("Domain \"com.example\" not found", found);
} finally {
projectProvider.dispose();
launch.terminate();
17 years
JBoss Tools SVN: r12608 - in trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core: tests and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-15 18:02:18 -0500 (Mon, 15 Dec 2008)
New Revision: 12608
Removed:
trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/DefaultMBeanServerConnectionFactoryTest.java
Modified:
trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/JMXCoreAllTests.java
Log:
Modified: trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/JMXCoreAllTests.java
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/JMXCoreAllTests.java 2008-12-15 22:18:18 UTC (rev 12607)
+++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/JMXCoreAllTests.java 2008-12-15 23:02:18 UTC (rev 12608)
@@ -2,7 +2,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.jboss.tools.jmx.core.tests.DefaultMBeanServerConnectionFactoryTest;
import org.jboss.tools.jmx.core.tests.DefaultProviderTest;
import org.jboss.tools.jmx.core.tests.NodeBuilderTestCase;
@@ -10,7 +9,6 @@
public class JMXCoreAllTests {
public static Test suite() {
TestSuite suite = new TestSuite();
- suite.addTestSuite(DefaultMBeanServerConnectionFactoryTest.class);
suite.addTestSuite(DefaultProviderTest.class);
suite.addTestSuite(NodeBuilderTestCase.class);
return suite;
Deleted: trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/DefaultMBeanServerConnectionFactoryTest.java
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/DefaultMBeanServerConnectionFactoryTest.java 2008-12-15 22:18:18 UTC (rev 12607)
+++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/DefaultMBeanServerConnectionFactoryTest.java 2008-12-15 23:02:18 UTC (rev 12608)
@@ -1,60 +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.tools.jmx.core.tests;
-
-import junit.framework.TestCase;
-
-public class DefaultMBeanServerConnectionFactoryTest extends TestCase {
-//
-// private String correctURL;
-//
-// private JMXConnectorServer cs;
-//
-// protected void setUp() throws Exception {
-// super.setUp();
-// MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
-// JMXServiceURL url = new JMXServiceURL("service:jmx:rmi://"); //$NON-NLS-1$
-// cs = JMXConnectorServerFactory.newJMXConnectorServer(url, null, mbs);
-// cs.start();
-// correctURL = cs.getAddress().toString();
-// System.out.println(correctURL);
-// }
-//
-// protected void tearDown() throws Exception {
-// cs.stop();
-// correctURL = null;
-// super.tearDown();
-// }
-//
-// public void testConnectToNullURL() throws Exception {
-// DefaultMBeanServerConnectionFactory factory = new DefaultMBeanServerConnectionFactory();
-// try {
-// factory.createMBeanServerConnection(null);
-// fail("should not connect to null descriptor"); //$NON-NLS-1$
-// } catch (Exception e) {
-// }
-// }
-//
-// public void testConnectToBadURL() throws Exception {
-// DefaultMBeanServerConnectionFactory factory = new DefaultMBeanServerConnectionFactory();
-// MBeanServerConnectionDescriptor descriptor = new MBeanServerConnectionDescriptor(UUID.randomUUID().toString(), "service:whatever", null, null);
-// try {
-// factory.createMBeanServerConnection(descriptor);
-// fail("should not connect to bad URL"); //$NON-NLS-1$
-// } catch (Exception e) {
-// }
-// }
-//
-// public void testConnectToURL() throws Exception {
-// DefaultMBeanServerConnectionFactory factory = new DefaultMBeanServerConnectionFactory();
-// MBeanServerConnectionDescriptor descriptor = new MBeanServerConnectionDescriptor(correctURL, correctURL, null, null);
-// MBeanServerConnection mbsc = factory.createMBeanServerConnection(descriptor);
-// assertNotNull(mbsc);
-// }
-}
17 years
JBoss Tools SVN: r12607 - in trunk/jmx/tests: org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-15 17:18:18 -0500 (Mon, 15 Dec 2008)
New Revision: 12607
Added:
trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/JMXCoreAllTests.java
trunk/jmx/tests/org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui/JMXUIAllTests.java
Removed:
trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/AllTests.java
trunk/jmx/tests/org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui/AllTests.java
Log:
Test rename.
Deleted: trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/AllTests.java
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/AllTests.java 2008-12-15 21:46:46 UTC (rev 12606)
+++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/AllTests.java 2008-12-15 22:18:18 UTC (rev 12607)
@@ -1,18 +0,0 @@
-package org.jboss.tools.jmx.core;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.jboss.tools.jmx.core.tests.DefaultMBeanServerConnectionFactoryTest;
-import org.jboss.tools.jmx.core.tests.DefaultProviderTest;
-import org.jboss.tools.jmx.core.tests.NodeBuilderTestCase;
-
-
-public class AllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite();
- suite.addTestSuite(DefaultMBeanServerConnectionFactoryTest.class);
- suite.addTestSuite(DefaultProviderTest.class);
- suite.addTestSuite(NodeBuilderTestCase.class);
- return suite;
- }
-}
Copied: trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/JMXCoreAllTests.java (from rev 12600, trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/AllTests.java)
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/JMXCoreAllTests.java (rev 0)
+++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/JMXCoreAllTests.java 2008-12-15 22:18:18 UTC (rev 12607)
@@ -0,0 +1,18 @@
+package org.jboss.tools.jmx.core;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jboss.tools.jmx.core.tests.DefaultMBeanServerConnectionFactoryTest;
+import org.jboss.tools.jmx.core.tests.DefaultProviderTest;
+import org.jboss.tools.jmx.core.tests.NodeBuilderTestCase;
+
+
+public class JMXCoreAllTests {
+ public static Test suite() {
+ TestSuite suite = new TestSuite();
+ suite.addTestSuite(DefaultMBeanServerConnectionFactoryTest.class);
+ suite.addTestSuite(DefaultProviderTest.class);
+ suite.addTestSuite(NodeBuilderTestCase.class);
+ return suite;
+ }
+}
Property changes on: trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/JMXCoreAllTests.java
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: trunk/jmx/tests/org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui/AllTests.java
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui/AllTests.java 2008-12-15 21:46:46 UTC (rev 12606)
+++ trunk/jmx/tests/org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui/AllTests.java 2008-12-15 22:18:18 UTC (rev 12607)
@@ -1,14 +0,0 @@
-package org.jboss.tools.jmx.ui;
-import org.jboss.tools.jmx.ui.internal.MBeanUtilsTestCase;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-public class AllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite();
- suite.addTestSuite(MBeanUtilsTestCase.class);
- return suite;
- }
-}
Copied: trunk/jmx/tests/org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui/JMXUIAllTests.java (from rev 12600, trunk/jmx/tests/org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui/AllTests.java)
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui/JMXUIAllTests.java (rev 0)
+++ trunk/jmx/tests/org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui/JMXUIAllTests.java 2008-12-15 22:18:18 UTC (rev 12607)
@@ -0,0 +1,14 @@
+package org.jboss.tools.jmx.ui;
+import org.jboss.tools.jmx.ui.internal.MBeanUtilsTestCase;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+
+public class JMXUIAllTests {
+ public static Test suite() {
+ TestSuite suite = new TestSuite();
+ suite.addTestSuite(MBeanUtilsTestCase.class);
+ return suite;
+ }
+}
Property changes on: trunk/jmx/tests/org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui/JMXUIAllTests.java
___________________________________________________________________
Name: svn:mergeinfo
+
17 years
JBoss Tools SVN: r12606 - branches/jbosstools-3.0.0.CR1/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-15 16:46:46 -0500 (Mon, 15 Dec 2008)
New Revision: 12606
Modified:
branches/jbosstools-3.0.0.CR1/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java
Log:
JBIDE-3369 branch
Modified: branches/jbosstools-3.0.0.CR1/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java
===================================================================
--- branches/jbosstools-3.0.0.CR1/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2008-12-15 21:46:01 UTC (rev 12605)
+++ branches/jbosstools-3.0.0.CR1/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2008-12-15 21:46:46 UTC (rev 12606)
@@ -118,6 +118,7 @@
IPath deployPath = configPath.append("deploy");
addEntries(location.append("client"), list);
addEntries(location.append("lib"), list);
+ addEntries(location.append("common").append("lib"), list);
addEntries(configPath.append("lib"), list);
addEntries(deployPath.append("jbossweb.sar").append("jsf-libs"),list);
addEntries(deployerPath.append("jboss-aop-jboss5.deployer"), list);
17 years
JBoss Tools SVN: r12605 - trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-15 16:46:01 -0500 (Mon, 15 Dec 2008)
New Revision: 12605
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java
Log:
JBIDE-3369 - trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2008-12-15 21:19:00 UTC (rev 12604)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2008-12-15 21:46:01 UTC (rev 12605)
@@ -118,6 +118,7 @@
IPath deployPath = configPath.append("deploy");
addEntries(location.append("client"), list);
addEntries(location.append("lib"), list);
+ addEntries(location.append("common").append("lib"), list);
addEntries(configPath.append("lib"), list);
addEntries(deployPath.append("jbossweb.sar").append("jsf-libs"),list);
addEntries(deployerPath.append("jboss-aop-jboss5.deployer"), list);
17 years
JBoss Tools SVN: r12604 - in branches/jbosstools-3.0.0.CR1/as/plugins: org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-15 16:19:00 -0500 (Mon, 15 Dec 2008)
New Revision: 12604
Modified:
branches/jbosstools-3.0.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java
branches/jbosstools-3.0.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java
branches/jbosstools-3.0.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
Log:
JBIDE-3408 - new 5.0 server should deploy standard
Modified: branches/jbosstools-3.0.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java
===================================================================
--- branches/jbosstools-3.0.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2008-12-15 21:11:42 UTC (rev 12603)
+++ branches/jbosstools-3.0.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2008-12-15 21:19:00 UTC (rev 12604)
@@ -116,14 +116,13 @@
if( type.equals(DEPLOY_METADATA)) {
return IJBossServerConstants.PLUGIN_LOCATION.append(getServer().getId().replace(' ', '_')).
append(IJBossServerConstants.DEPLOY).makeAbsolute().toString();
- } else if( type.equals(DEPLOY_SERVER)){
+ } else /* if( type.equals(DEPLOY_SERVER)) */ {
IJBossServerRuntime jbsrt = getRuntime();
String config = jbsrt.getJBossConfiguration();
- return new Path(IJBossServerConstants.SERVER)
- .append(config)
- .append(IJBossServerConstants.DEPLOY).makeRelative().toString();
+ IPath p = new Path(IJBossServerConstants.SERVER).append(config)
+ .append(IJBossServerConstants.DEPLOY).makeRelative();
+ return makeGlobal(getRuntime(), p).toString();
}
- return makeGlobal(getRuntime(), new Path(getAttribute(DEPLOY_DIRECTORY, ""))).toString();
}
public void setDeployFolder(String folder) {
@@ -137,15 +136,14 @@
if( type.equals(DEPLOY_METADATA)) {
return IJBossServerConstants.PLUGIN_LOCATION.append(getServer().getId().replace(' ', '_')).
append(IJBossServerConstants.TEMP_DEPLOY).makeAbsolute().toString();
- } else if( type.equals(DEPLOY_SERVER)){
+ } else /* if( type.equals(DEPLOY_SERVER)) */{
IJBossServerRuntime jbsrt = getRuntime();
String config = jbsrt.getJBossConfiguration();
- return new Path(IJBossServerConstants.SERVER)
- .append(config)
- .append(IJBossServerConstants.TMP)
- .append(IJBossServerConstants.JBOSSTOOLS_TMP).makeRelative().toString();
+ IPath p = new Path(IJBossServerConstants.SERVER)
+ .append(config).append(IJBossServerConstants.TMP)
+ .append(IJBossServerConstants.JBOSSTOOLS_TMP).makeRelative();
+ return makeGlobal(getRuntime(), p).toString();
}
- return makeGlobal(getRuntime(), new Path(getAttribute(TEMP_DEPLOY_DIRECTORY, ""))).toString();
}
public void setTempDeployFolder(String folder) {
setAttribute(TEMP_DEPLOY_DIRECTORY, makeRelative(getRuntime(), new Path(folder)).toString());
Modified: branches/jbosstools-3.0.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java
===================================================================
--- branches/jbosstools-3.0.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java 2008-12-15 21:11:42 UTC (rev 12603)
+++ branches/jbosstools-3.0.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java 2008-12-15 21:19:00 UTC (rev 12604)
@@ -61,6 +61,7 @@
import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
import org.jboss.ide.eclipse.as.ui.Messages;
@@ -111,6 +112,9 @@
metadataRadio.setSelection(getDeployType().equals(IDeployableServer.DEPLOY_METADATA));
serverRadio.setSelection(getDeployType().equals(IDeployableServer.DEPLOY_SERVER));
customRadio.setSelection(getDeployType().equals(IDeployableServer.DEPLOY_CUSTOM));
+ currentSelection = metadataRadio.getSelection() ? metadataRadio :
+ serverRadio.getSelection() ? serverRadio :
+ customRadio;
radioListener = new SelectionListener() {
public void widgetDefaultSelected(SelectionEvent e) {
@@ -232,17 +236,20 @@
}
private String getDeployType() {
- return helper.getAttribute(IDeployableServer.DEPLOY_DIRECTORY_TYPE, IDeployableServer.DEPLOY_CUSTOM);
+ return getServer().getDeployLocationType();
}
private String getDeployDir() {
- return helper.getAttribute(IDeployableServer.DEPLOY_DIRECTORY, "");
+ return makeRelative(getServer().getDeployFolder());
}
private String getTempDeployDir() {
- String defaultt = ServerPlugin.getInstance().getStateLocation().toFile().getAbsolutePath();
- return helper.getAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, defaultt);
+ return makeRelative(getServer().getTempDeployFolder());
}
+ private IDeployableServer getServer() {
+ return (IDeployableServer)server.loadAdapter(IDeployableServer.class, new NullProgressMonitor());
+ }
+
public IStatus[] getSaveStatus() {
String error = "";
List<Status> status = new ArrayList<Status>();
Modified: branches/jbosstools-3.0.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
===================================================================
--- branches/jbosstools-3.0.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2008-12-15 21:11:42 UTC (rev 12603)
+++ branches/jbosstools-3.0.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2008-12-15 21:19:00 UTC (rev 12604)
@@ -26,6 +26,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
@@ -261,13 +262,15 @@
String deployTmpFolderVal = IJBossServerConstants.PLUGIN_LOCATION.append(name).
append(IJBossServerConstants.TEMP_DEPLOY).makeAbsolute().toString();
-
JBossServer jbs = (JBossServer)wc.loadAdapter(JBossServer.class, new NullProgressMonitor());
jbs.setUsername("admin");
jbs.setPassword("admin");
- jbs.setDeployLocationType(IDeployableServer.DEPLOY_METADATA);
+
+ boolean as5 = isAS5();
+ String as5TmpDeployFolderVal = new Path(IJBossServerConstants.SERVER).append(getRuntime().getJBossConfiguration()).append(IJBossServerConstants.JBOSSTOOLS_TMP).makeRelative().toString();
+ jbs.setDeployLocationType(as5 ? IDeployableServer.DEPLOY_SERVER : IDeployableServer.DEPLOY_METADATA);
jbs.setDeployFolder(deployVal);
- jbs.setTempDeployFolder(deployTmpFolderVal);
+ jbs.setTempDeployFolder(as5 ? as5TmpDeployFolderVal : deployTmpFolderVal);
new File(deployVal).mkdirs();
new File(deployTmpFolderVal).mkdirs();
}
@@ -284,6 +287,11 @@
return ajbsrt;
}
+ protected boolean isAS5() {
+ return getRuntime().getRuntime().getRuntimeType().
+ getVersion().equals("5.0");
+ }
+
public boolean isComplete() {
return getErrorString() == null ? true : false;
}
17 years
JBoss Tools SVN: r12603 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-15 16:11:42 -0500 (Mon, 15 Dec 2008)
New Revision: 12603
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
Log:
JBIDE-3408
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2008-12-15 19:13:10 UTC (rev 12602)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2008-12-15 21:11:42 UTC (rev 12603)
@@ -116,14 +116,13 @@
if( type.equals(DEPLOY_METADATA)) {
return IJBossServerConstants.PLUGIN_LOCATION.append(getServer().getId().replace(' ', '_')).
append(IJBossServerConstants.DEPLOY).makeAbsolute().toString();
- } else if( type.equals(DEPLOY_SERVER)){
+ } else /* if( type.equals(DEPLOY_SERVER)) */ {
IJBossServerRuntime jbsrt = getRuntime();
String config = jbsrt.getJBossConfiguration();
- return new Path(IJBossServerConstants.SERVER)
- .append(config)
- .append(IJBossServerConstants.DEPLOY).makeRelative().toString();
+ IPath p = new Path(IJBossServerConstants.SERVER).append(config)
+ .append(IJBossServerConstants.DEPLOY).makeRelative();
+ return makeGlobal(getRuntime(), p).toString();
}
- return makeGlobal(getRuntime(), new Path(getAttribute(DEPLOY_DIRECTORY, ""))).toString();
}
public void setDeployFolder(String folder) {
@@ -137,15 +136,14 @@
if( type.equals(DEPLOY_METADATA)) {
return IJBossServerConstants.PLUGIN_LOCATION.append(getServer().getId().replace(' ', '_')).
append(IJBossServerConstants.TEMP_DEPLOY).makeAbsolute().toString();
- } else if( type.equals(DEPLOY_SERVER)){
+ } else /* if( type.equals(DEPLOY_SERVER)) */{
IJBossServerRuntime jbsrt = getRuntime();
String config = jbsrt.getJBossConfiguration();
- return new Path(IJBossServerConstants.SERVER)
- .append(config)
- .append(IJBossServerConstants.TMP)
- .append(IJBossServerConstants.JBOSSTOOLS_TMP).makeRelative().toString();
+ IPath p = new Path(IJBossServerConstants.SERVER)
+ .append(config).append(IJBossServerConstants.TMP)
+ .append(IJBossServerConstants.JBOSSTOOLS_TMP).makeRelative();
+ return makeGlobal(getRuntime(), p).toString();
}
- return makeGlobal(getRuntime(), new Path(getAttribute(TEMP_DEPLOY_DIRECTORY, ""))).toString();
}
public void setTempDeployFolder(String folder) {
setAttribute(TEMP_DEPLOY_DIRECTORY, makeRelative(getRuntime(), new Path(folder)).toString());
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java 2008-12-15 19:13:10 UTC (rev 12602)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java 2008-12-15 21:11:42 UTC (rev 12603)
@@ -61,6 +61,7 @@
import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
import org.jboss.ide.eclipse.as.ui.Messages;
@@ -111,6 +112,9 @@
metadataRadio.setSelection(getDeployType().equals(IDeployableServer.DEPLOY_METADATA));
serverRadio.setSelection(getDeployType().equals(IDeployableServer.DEPLOY_SERVER));
customRadio.setSelection(getDeployType().equals(IDeployableServer.DEPLOY_CUSTOM));
+ currentSelection = metadataRadio.getSelection() ? metadataRadio :
+ serverRadio.getSelection() ? serverRadio :
+ customRadio;
radioListener = new SelectionListener() {
public void widgetDefaultSelected(SelectionEvent e) {
@@ -232,17 +236,20 @@
}
private String getDeployType() {
- return helper.getAttribute(IDeployableServer.DEPLOY_DIRECTORY_TYPE, IDeployableServer.DEPLOY_CUSTOM);
+ return getServer().getDeployLocationType();
}
private String getDeployDir() {
- return helper.getAttribute(IDeployableServer.DEPLOY_DIRECTORY, "");
+ return makeRelative(getServer().getDeployFolder());
}
private String getTempDeployDir() {
- String defaultt = ServerPlugin.getInstance().getStateLocation().toFile().getAbsolutePath();
- return helper.getAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, defaultt);
+ return makeRelative(getServer().getTempDeployFolder());
}
+ private IDeployableServer getServer() {
+ return (IDeployableServer)server.loadAdapter(IDeployableServer.class, new NullProgressMonitor());
+ }
+
public IStatus[] getSaveStatus() {
String error = "";
List<Status> status = new ArrayList<Status>();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2008-12-15 19:13:10 UTC (rev 12602)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2008-12-15 21:11:42 UTC (rev 12603)
@@ -26,6 +26,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
@@ -261,13 +262,15 @@
String deployTmpFolderVal = IJBossServerConstants.PLUGIN_LOCATION.append(name).
append(IJBossServerConstants.TEMP_DEPLOY).makeAbsolute().toString();
-
JBossServer jbs = (JBossServer)wc.loadAdapter(JBossServer.class, new NullProgressMonitor());
jbs.setUsername("admin");
jbs.setPassword("admin");
- jbs.setDeployLocationType(IDeployableServer.DEPLOY_METADATA);
+
+ boolean as5 = isAS5();
+ String as5TmpDeployFolderVal = new Path(IJBossServerConstants.SERVER).append(getRuntime().getJBossConfiguration()).append(IJBossServerConstants.JBOSSTOOLS_TMP).makeRelative().toString();
+ jbs.setDeployLocationType(as5 ? IDeployableServer.DEPLOY_SERVER : IDeployableServer.DEPLOY_METADATA);
jbs.setDeployFolder(deployVal);
- jbs.setTempDeployFolder(deployTmpFolderVal);
+ jbs.setTempDeployFolder(as5 ? as5TmpDeployFolderVal : deployTmpFolderVal);
new File(deployVal).mkdirs();
new File(deployTmpFolderVal).mkdirs();
}
@@ -284,6 +287,11 @@
return ajbsrt;
}
+ protected boolean isAS5() {
+ return getRuntime().getRuntime().getRuntimeType().
+ getVersion().equals("5.0");
+ }
+
public boolean isComplete() {
return getErrorString() == null ? true : false;
}
17 years
JBoss Tools SVN: r12602 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: editor/mozilla and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2008-12-15 14:13:10 -0500 (Mon, 15 Dec 2008)
New Revision: 12602
Added:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/ScrollingSupport.java
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java
Log:
CODING IN PROGRESS - issue JBIDE-3029: DND doesn't work correctly for components.
Description: If I can't see all page, I can't drag and drop an element from, for example, bottom to top or vice versa.
https://jira.jboss.org/jira/browse/JBIDE-3029
Scrolling during DND -- initial implementation.
Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/ScrollingSupport.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/ScrollingSupport.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/ScrollingSupport.java 2008-12-15 19:13:10 UTC (rev 12602)
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2008 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
+ ******************************************************************************/
+package org.jboss.tools.vpe.dnd;
+
+import org.eclipse.swt.graphics.Rectangle;
+import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor;
+import org.mozilla.interfaces.nsIDOMMouseEvent;
+import org.mozilla.interfaces.nsIEmbeddingSiteWindow;
+import org.mozilla.interfaces.nsIWebBrowser;
+
+/**
+ * @author yradtsevich
+ *
+ */
+public class ScrollingSupport {
+ private static final int SCROLLING_STEP = 10;
+ private static final int SCROLLING_BORDERS = 20;
+
+ // XXX: the value of SCROLLBAR_HEIGHT and SCROLLBAR_WIDTH
+ // should be set according to environment settings
+ private static final int SCROLLBAR_HEIGHT = 16;
+ private static final int SCROLLBAR_WIDTH = 16;
+
+ private final XulRunnerEditor xulRunnerEditor;
+ public ScrollingSupport(XulRunnerEditor xulRunnerEditor) {
+ this.xulRunnerEditor = xulRunnerEditor;
+ }
+
+ public void scroll(nsIDOMMouseEvent mouseEvent) {
+ final nsIWebBrowser webBrowser = xulRunnerEditor.getWebBrowser();
+
+ Rectangle rect = getWindowBounds();
+
+ final int mouseX = mouseEvent.getClientX();
+ final int mouseY = mouseEvent.getClientY();
+ int scrollX = 0;
+ int scrollY = 0;
+ if (rect.x + SCROLLING_BORDERS > mouseX) {
+ scrollX-= SCROLLING_STEP;
+ }
+ if (rect.y + SCROLLING_BORDERS > mouseY) {
+ scrollY-= SCROLLING_STEP;
+ }
+ if (rect.x + rect.width - SCROLLING_BORDERS - SCROLLBAR_WIDTH < mouseX) {
+ scrollX+= SCROLLING_STEP;
+ }
+ if (rect.y + rect.height - SCROLLING_BORDERS - SCROLLBAR_HEIGHT < mouseY) {
+ scrollY+= SCROLLING_STEP;
+ }
+
+ if (scrollX != 0 || scrollY != 0) {
+ webBrowser.getContentDOMWindow().scrollBy(scrollX, scrollY);
+ }
+ }
+
+ public Rectangle getWindowBounds() {
+ nsIEmbeddingSiteWindow window = (nsIEmbeddingSiteWindow)
+ xulRunnerEditor
+ .getWebBrowser()
+ .getContainerWindow()
+ .queryInterface(nsIEmbeddingSiteWindow.NS_IEMBEDDINGSITEWINDOW_IID);
+
+ int[] xArray = new int[1]; // Left hand corner of the outer area
+ int[] yArray = new int[1]; // Top corner of the outer area
+ int[] widthArray = new int[1]; // Width of the inner or outer area
+ int[] heightArray = new int[1]; // Height of the inner or outer area
+
+ window.getDimensions(nsIEmbeddingSiteWindow.DIM_FLAGS_SIZE_INNER,
+ xArray, yArray, widthArray, heightArray);
+
+ return new Rectangle(xArray[0], yArray[0], widthArray[0], heightArray[0]);
+ }
+}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java 2008-12-15 18:36:08 UTC (rev 12601)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java 2008-12-15 19:13:10 UTC (rev 12602)
@@ -13,11 +13,11 @@
import org.jboss.tools.vpe.editor.VpeController;
import org.jboss.tools.vpe.editor.VpeVisualCaretInfo;
-import org.jboss.tools.vpe.editor.VpeVisualInnerDropInfo;
import org.jboss.tools.vpe.editor.mozilla.EditorDomEventListener;
import org.jboss.tools.vpe.editor.mozilla.MozillaDropInfo;
import org.jboss.tools.vpe.editor.selection.VpeSelectionController;
import org.jboss.tools.vpe.xulrunner.XPCOM;
+import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor;
import org.mozilla.interfaces.nsIComponentManager;
import org.mozilla.interfaces.nsIDOMEvent;
import org.mozilla.interfaces.nsIDOMEventTarget;
@@ -146,15 +146,24 @@
* @param event
*/
public void dragOver(nsIDOMEvent event, EditorDomEventListener editorDomEventListener) {
+ final nsIDOMMouseEvent mouseEvent =
+ (nsIDOMMouseEvent) event.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID);
+ final XulRunnerEditor editor = ((VpeController) editorDomEventListener).getXulRunnerEditor();
+ new ScrollingSupport(editor).scroll(mouseEvent);
+ refreshCanDrop(event, editorDomEventListener);
+ }
+
+ private void refreshCanDrop(nsIDOMEvent event,
+ EditorDomEventListener editorDomEventListener) {
boolean canDrop = true;
-
+
nsIDOMMouseEvent mouseEvent = (nsIDOMMouseEvent) event.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID);
//in this condition early was check for xulelement
if (editorDomEventListener != null) {
if (getDragService().getCurrentSession().isDataFlavorSupported(VpeController.MODEL_FLAVOR)) {
-
+
MozillaDropInfo info;
-
+
if(getDragService().getCurrentSession().getSourceNode()==null){
//external drag
info = editorDomEventListener.canExternalDrop(mouseEvent, VpeController.MODEL_FLAVOR, ""); //$NON-NLS-1$
@@ -192,13 +201,10 @@
event.preventDefault();
}
-
-
//sets possability to drop current element here
getDragService().getCurrentSession().setCanDrop(canDrop);
mouseEvent.preventDefault();
mouseEvent.stopPropagation();
-
}
/**
* Drop Event handler
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java 2008-12-15 18:36:08 UTC (rev 12601)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java 2008-12-15 19:13:10 UTC (rev 12602)
@@ -122,69 +122,54 @@
*/
public void handleEvent(nsIDOMEvent domEvent) {
- if(getEditorDomEventListener()==null){
-
- return;
- } else if(MOUSEMOVEEVENTTYPE.equals(domEvent.getType())) {
-
+ if(getEditorDomEventListener() != null) {
+ final String eventType = domEvent.getType();
+ if(MOUSEMOVEEVENTTYPE.equals(eventType)) {
nsIDOMMouseEvent mouseEvent;
mouseEvent = (nsIDOMMouseEvent) domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID);
getEditorDomEventListener().mouseMove(mouseEvent);
- } else if(MOUSEDOWNEVENTTYPE.equals(domEvent.getType())) {
-
+ } else if(MOUSEDOWNEVENTTYPE.equals(eventType)) {
nsIDOMMouseEvent mouseEvent;
mouseEvent = (nsIDOMMouseEvent) domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID);
getEditorDomEventListener().mouseDown(mouseEvent);
-
- } else if(MOUSEUPEVENTTYPE.equals(domEvent.getType())) {
-
+ } else if(MOUSEUPEVENTTYPE.equals(eventType)) {
nsIDOMMouseEvent mouseEvent;
mouseEvent = (nsIDOMMouseEvent) domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID);
getEditorDomEventListener().mouseUp(mouseEvent);
- } else if(CLICKEVENTTYPE.equals(domEvent.getType())) {
-
+ } else if(CLICKEVENTTYPE.equals(eventType)) {
nsIDOMMouseEvent mouseEvent;
mouseEvent = (nsIDOMMouseEvent) domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID);
getEditorDomEventListener().mouseClick(mouseEvent);
- } else if(DBLCLICK.equals(domEvent.getType())) {
-
+ } else if(DBLCLICK.equals(eventType)) {
nsIDOMMouseEvent mouseEvent;
mouseEvent = (nsIDOMMouseEvent) domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID);
getEditorDomEventListener().mouseDblClick(mouseEvent);
- } else if(KEYPRESS.equals(domEvent.getType())) {
-
+ } else if(KEYPRESS.equals(eventType)) {
nsIDOMKeyEvent keyEvent = (nsIDOMKeyEvent) domEvent.queryInterface(nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID);
getEditorDomEventListener().keyPress(keyEvent);
- } else if(CONTEXTMENUEVENTTYPE.equals(domEvent.getType())) {
-
+ } else if(CONTEXTMENUEVENTTYPE.equals(eventType)) {
//first param are null 0, because this not used in event handler
getEditorDomEventListener().onShowContextMenu(0, domEvent, (nsIDOMNode) domEvent.getTarget().queryInterface(nsIDOMNode.NS_IDOMNODE_IID));
- } else if(DRAGGESTUREEVENT.equals(domEvent.getType())) {
-
+ } else if(DRAGGESTUREEVENT.equals(eventType)) {
if(getEditorDomEventListener()!=null) {
-
getEditorDomEventListener().dragGesture(domEvent);
}
- } else if(DRAGDROPEVENT.equals(domEvent.getType())) {
- // calls when drop event occure
-
+ } else if(DRAGDROPEVENT.equals(eventType)) {
+ // calls when drop event occure
getEditorDomEventListener().dragDrop(domEvent);
domEvent.stopPropagation();
domEvent.preventDefault();
- } else if(DRAGENTEREVENT.equals(domEvent.getType())) {
+ } else if(DRAGENTEREVENT.equals(eventType)) {
//just ignore this event
- } else if(DRAGEXITEVENT.equals(domEvent.getType())) {
+ } else if(DRAGEXITEVENT.equals(eventType)) {
//just ignore this event
- } else if(DRAGOVEREVENT.equals(domEvent.getType())) {
-
- getEditorDomEventListener().dragOver(domEvent);
- }
- if(getEditorDomEventListener()!=null) {
- getEditorDomEventListener().onRefresh();
+ } else if(DRAGOVEREVENT.equals(eventType)) {
+ getEditorDomEventListener().dragOver(domEvent);
}
-
+ getEditorDomEventListener().onRefresh();
+ }
}
-
+
/* (non-Javadoc)
* @see org.mozilla.interfaces.nsISelectionListener#notifySelectionChanged(org.mozilla.interfaces.nsIDOMDocument, org.mozilla.interfaces.nsISelection, short)
*/
@@ -193,5 +178,4 @@
editorDomEventListener.notifySelectionChanged(domDocument, selection, reason);
}
}
-
}
17 years
JBoss Tools SVN: r12601 - trunk/esb/docs/esb_ref_guide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2008-12-15 13:36:08 -0500 (Mon, 15 Dec 2008)
New Revision: 12601
Modified:
trunk/esb/docs/esb_ref_guide/en/modules/esb_support.xml
trunk/esb/docs/esb_ref_guide/en/modules/introduction.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-468
Modified: trunk/esb/docs/esb_ref_guide/en/modules/esb_support.xml
===================================================================
--- trunk/esb/docs/esb_ref_guide/en/modules/esb_support.xml 2008-12-15 17:52:07 UTC (rev 12600)
+++ trunk/esb/docs/esb_ref_guide/en/modules/esb_support.xml 2008-12-15 18:36:08 UTC (rev 12601)
@@ -14,7 +14,7 @@
<title>ESB Support</title>
<para>In this section we will focus on all concepts that <property>JBoss Tools</property>
- integrates for working with JBoss ESB.</para>
+ integrate for working with JBoss ESB.</para>
<section>
<title>ESB Tools Installation</title>
@@ -25,8 +25,7 @@
<para>ESB Tools come as one module of JBoss Tools project. Since ESB Tools have a
dependence on other JBoss Tools modules we recommend you to install a bundle
of all <ulink url="http://labs.jboss.com/tools/download/index.html">JBoss
- Tools plug-ins</ulink> installation instruction on which you can find on
- JBoss Wiki in <ulink url="http://labs.jboss.com/wiki/InstallingJBossTools"
+ Tools plug-ins</ulink>. You can find all necessary installation instructions on JBoss Wiki in the <ulink url="http://labs.jboss.com/wiki/InstallingJBossTools"
>InstallingJBossTools</ulink> section.</para>
</section>
@@ -42,10 +41,10 @@
</emphasis> in the main menu bar or context menu for selected project and
then <emphasis>
<property>ESB > ESB Project</property>
- </emphasis> in the New dialog:</para>
+ </emphasis> in the dialog opened:</para>
<figure>
- <title>New Dialog</title>
+ <title>Select a Wizard dialog</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/esb_project/01_create_esb_project.png"/>
@@ -55,12 +54,11 @@
<para> Clicking <emphasis>
<property>Next</property>
- </emphasis> brings us to the first wizard page where it's necessary to
- specify the project name, ESB version and target JBoss Runtime. We set, for example, <emphasis>
+ </emphasis> brings you to the JBoss ESB Project wizard page where a project name, ESB version and target JBoss Runtime are to be specified. Specify, for example, <emphasis>
<property>helloworld</property>
</emphasis> as the name and accept default ESB version.</para>
<figure>
- <title>Project Name, Target JBoss Runtime and ESB Version</title>
+ <title>JBoss ESB Project wizard</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/esb_project/02_create_esb_project.png"/>
@@ -70,30 +68,30 @@
<para> Clicking <emphasis>
<property>Next</property>
- </emphasis> brings us to the ESB facet installation page where we can
- specify source folder name, ESB content folder name, ESB content folder is the folder that contains the most of
- artifacts that an ESB archive needs, we also can configure ESB libraries to the project by selecting a ESB runtime,
- there are two ways to set ESB runtime: </para>
+ </emphasis> brings you to the ESB facet installation page where you can
+ specify Java Source Directory and ESB Content Directory. ESB Content Directory is a folder that contains the most of
+ artifacts that an ESB archive needs. You also can configure ESB libraries to the project by selecting a ESB runtime using one of the options:,
+ </para>
<para>1. Use <emphasis>
<property>Server Supplied ESB Runtime</property>
</emphasis>
</para>
- <para> 2. Select an ESB runtime from JBoss ESB runtime list predefined in preference
+ <para> 2. Select a ESB runtime from the JBoss ESB runtime list predefined in the preferences
</para>
- <para>If choose the first option, we have to make sure that the project has Target JBoss Runtime set and the runtime has a ESB runtime installed.
+ <para>If you choose the first option, make sure that the project has the Target JBoss Runtime set and this runtime has a ESB runtime installed.
</para>
<figure>
- <title>JBoss ESB facet installation</title>
+ <title>Install ESB facet step</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/esb_project/03_create_esb_project.png"/>
</imageobject>
</mediaobject>
</figure>
- <para>Clicking <emphasis>
+ <para>Click <emphasis>
<property>Finish</property>
- </emphasis>, an ESB project with default <emphasis><property>jboss-esb.xml</property></emphasis>
+ </emphasis> and a ESB project with the default <emphasis><property>jboss-esb.xml</property></emphasis>
will be created. </para>
<figure>
@@ -109,12 +107,11 @@
<section>
<title>Creating ESB Project using JBoss Tools Project Examples Wizard</title>
- <para>JBoss Tools provides a Project Example wizard, it provides a easy way for users to create some kinds of project, so far,
- you can find some ESB samples and Seam, Portlet samples as well, now let's start to
- create a ESB project using the Project Examples wizard.</para>
+ <para>JBoss Tools provides a Project Example wizard that is an easy way for users to create some kinds of projects to be used as examples with some predefined structure. Let's start
+ creating a ESB project using this wizard.</para>
- <para>Before create a ESB project example, you should create JBoss Runtime with the name is <emphasis><property>
- JBoss 4.2 Runtime</property></emphasis>, it will be used by the ESB examples. </para>
+ <para>Before creating a ESB project example create JBoss Runtime with name <emphasis><property>
+ JBoss 4.2 Runtime</property></emphasis>, it will be used by your ESB project example. </para>
<para>Select <emphasis>
<property>File >New > Others </property>
@@ -124,7 +121,7 @@
</emphasis> in the New dialog:</para>
<figure>
- <title>New Dialog</title>
+ <title>Select a wizard - Project Examples</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/esb_project/05_esb_project_example.png"/>
@@ -134,10 +131,10 @@
<para> Clicking <emphasis>
<property>Next</property>
- </emphasis>, it brings us to the wizard page where we can select a ESB project example from the example list.
+ </emphasis> brings you to the wizard page where you can select a ESB project example from the example list.
Every ESB example has two projects, one is a ESB project and another is a Java project used to test the ESB project.</para>
<figure>
- <title>JBoss Tools Project Examples</title>
+ <title>JBoss Tools ESB Project Examples</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/esb_project/06_esb_project_example.png"/>
@@ -146,9 +143,9 @@
</figure>
<para>Select <emphasis><property>JBoss ESB HelloWorld Example</property> </emphasis> ESB and Client project, and then click
- <emphasis><property>Finish</property></emphasis>, then you can get two projects created. </para>
+ <emphasis><property>Finish</property></emphasis>, then you will get two projects created. </para>
<figure>
- <title>JBoss ESB Project Examples</title>
+ <title>JBoss ESB Project Examples: helloworld and helloworld_testclient</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/esb_project/07_esb_project_example.png"/>
@@ -156,18 +153,18 @@
</mediaobject>
</figure>
- <para> Deploying the HelloWorld ESB project and run a test class in the client Java project, see the the test result in Console view.</para>
+ <para> Deploy the HelloWorld ESB project and run a test class in the client Java project to see the test result in the Console view.</para>
</section>
<section>
<title>Deploying a ESB Project</title>
- <para>In this chapter we will show you how to deploy a ESB project using WTP deployment framework.</para>
+ <para>In this chapter youwill see how to deploy a ESB project using the WTP deployment framework.</para>
- <para>Before deploy the project, open the JBoss Server View by selecting <emphasis><property>Window > Show View > Other >
+ <para>Before deploying the project, open the JBoss Server View by selecting <emphasis><property>Window > Show View > Other >
Server > JBoss Server View</property></emphasis>,
- and then create a JBoss Server in the server view and start it, and then right click the created JBoss server,
+ create a JBoss Server in the Server view and start it, and then right click the created JBoss server,
select <emphasis><property> </property> Add and Remove Projects</emphasis>,
- add ESB projects which you want to deploy from left side to right side on the popped up dialog. </para>
+ and add the ESB projects you want to deploy from the left side to the right side in the opened dialog. </para>
<figure>
<title>Add and Remove Projects</title>
@@ -178,11 +175,11 @@
</mediaobject>
</figure>
- <para>Clicking <emphasis><property>Finish</property> </emphasis> button, thus, the project is added into the JBoss Server.
- You also can drag the ESB project from Project View to the JBoss server.</para>
+ <para>Click <emphasis><property>Finish</property> </emphasis> to add the project to the server.
+ You also can drag the ESB project from the Project View to the server.</para>
<figure>
- <title>Configure new JBoss ESB Runtime</title>
+ <title>JBoss Server View</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/esb_project/09_esb_runtime_new.png"/>
@@ -190,9 +187,8 @@
</mediaobject>
</figure>
- <para>So far, we add the ESB project to the JBoss server module list, then we should publish the project the server,
- right click the JBoss Server and select <emphasis><property>Publish</property></emphasis>,
- you can check the deploying result in Console view.</para>
+ <para>Thus, you have just added the ESB project to the JBoss server module list. Right click the JBoss Server and select <emphasis><property>Publish</property></emphasis> to publish the project on the server.
+ You can check the deploying result in the Console view.</para>
</section>
@@ -211,7 +207,7 @@
</emphasis> in the New dialog:</para>
<figure>
- <title>New Dialog</title>
+ <title>Select a wizard - ESB File</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/esb_support/01_create_esb.png"/>
@@ -221,13 +217,12 @@
<para> Clicking <emphasis>
<property>Next</property>
- </emphasis> brings us to the wizard page where it's necessary to
- specify the folder, name and version for the file. We choose, for example, <emphasis>
+ </emphasis> brings you to the wizard page where a folder, a name and a version for the file should be specified. Choose, for example, <emphasis>
<property>jboss-esb.xml</property>
- </emphasis> as the name and accept the selected projects folder and default
+ </emphasis> as the name and accept the selected projects folder and the default
version.</para>
<figure>
- <title>Folder, Name and Version</title>
+ <title>Folder, Name and Version for ESB file</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/esb_support/02_create_esb.png"/>
@@ -235,7 +230,7 @@
</mediaobject>
</figure>
- <para>Thus, our file will be created in the selected projects folder by default. If
+ <para>Thus, your file will be created in the selected projects folder by default. If
you want to change the folder for your future file click <emphasis>
<property>Browse...</property>
</emphasis> button to set needed folder or simply type it.</para>
@@ -249,18 +244,18 @@
<section>
<title>Configuring ESB Runtime in Preference</title>
- <para>In this chapter we will show you how to predefine a JBoss ESB runtime on preference page.</para>
+ <para>In this chapter you will know how to predefine a JBoss ESB runtime on the Preferences page.</para>
<para>You may already know, there are two ways to set JBoss ESB runtime when creating a ESB project,
- one way is to use the project target JBoss runtime, another way is to select a JBoss ESB runtime which predefined in JBoss Tools preference.
+ one is to use the project target JBoss runtime, and another is to select a JBoss ESB runtime predefined in JBoss Tools preferences.
Let's configure it.</para>
<para>Select <emphasis>
<property>Window >Preferences > JBoss Tools > JBoss ESB Runtime</property>
- </emphasis> , it bring us to the JBoss ESB Runtime preference page where you can add, remove and Edit a JBoss ESB runtime.</para>
+ </emphasis>, to open the JBoss ESB Runtime Preferences page where you can add, remove and Edit a JBoss ESB runtime.</para>
<figure>
- <title>New JBoss ESB Runtime</title>
+ <title>JBoss ESB Runtimes</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/esb_project/10_esb_runtime.png"/>
@@ -268,10 +263,8 @@
</mediaobject>
</figure>
- <para> Select <emphasis>
- <property>Add</property>
- </emphasis>, it pop up a dialog where we can specify the JBoss ESB runtime location, name and version number,
- you also can customize the libraries of the runtime by checking the <emphasis><property>Customize JBoss ESB Runtime jars</property> </emphasis> checkbox. </para>
+ <para> Select <emphasis><property>Add</property></emphasis> to open a dialog where you can specify the JBoss ESB runtime location, name and version number.
+ You also can customize the libraries of the runtime by checking the <emphasis><property>Customize JBoss ESB Runtime jars</property> </emphasis> checkbox. </para>
<figure>
<title>Configure new JBoss ESB Runtime</title>
@@ -282,8 +275,8 @@
</mediaobject>
</figure>
- <para>The new JBoss ESB Runtime will be configured, click <emphasis> <property>OK</property> </emphasis> to finish the dialog and save the preference,
- then you can use the configuration when creating JBoss ESB project. </para>
+ <para>The new JBoss ESB Runtime will be configured. Click <emphasis> <property>OK</property> </emphasis> to finish and save the preferences.
+ You can use the configuration when creating a JBoss ESB project. </para>
</section>
Modified: trunk/esb/docs/esb_ref_guide/en/modules/introduction.xml
===================================================================
--- trunk/esb/docs/esb_ref_guide/en/modules/introduction.xml 2008-12-15 17:52:07 UTC (rev 12600)
+++ trunk/esb/docs/esb_ref_guide/en/modules/introduction.xml 2008-12-15 18:36:08 UTC (rev 12601)
@@ -20,11 +20,11 @@
<title>What is ESB?</title>
- <para>ESB (Enterprise Service Bus) - an abstraction layer on top of an implementation of an
- enterprise messaging system that provides the features with which Service Oriented
- Architectures may be implemented.</para>
- <para>If you want to develop applications using ESB technology JBoss ESB also meet your
- needs. The JBoss Tools provide ESB editor and all necessary wizards for creating ESB
+ <para>ESB (Enterprise Service Bus) - an abstraction layer on top of implementation of an
+ enterprise messaging system that provides the features Service Oriented
+ Architectures may be implemented with.</para>
+ <para>If you want to develop applications using ESB technology JBoss ESB also meets your
+ needs. The JBoss Tools provide ESB editor and all necessary wizards for creating an ESB
file.</para>
<para>In this guide we provide you with the information on ESB Editor which allows you to
develop ESB file much faster and with far fewer errors so sparing your time.</para>
17 years