JBoss Tools SVN: r32900 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test: src/org/jboss/tools/cdi/seam/solder/core/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-13 13:11:26 -0400 (Wed, 13 Jul 2011)
New Revision: 32900
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java
Log:
JBIDE-9313
https://issues.jboss.org/browse/JBIDE-9313
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/META-INF/MANIFEST.MF 2011-07-13 17:10:44 UTC (rev 32899)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/META-INF/MANIFEST.MF 2011-07-13 17:11:26 UTC (rev 32900)
@@ -10,6 +10,7 @@
org.eclipse.core.resources,
org.junit,
org.jboss.tools.cdi.core,
+ org.jboss.tools.cdi.core.test,
org.jboss.tools.cdi.seam.solder.core,
org.jboss.tools.common,
org.eclipse.ui,
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java 2011-07-13 17:10:44 UTC (rev 32899)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java 2011-07-13 17:11:26 UTC (rev 32900)
@@ -18,12 +18,14 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.osgi.internal.loader.buddy.DependentPolicy;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
import org.jboss.tools.cdi.core.IProducer;
+import org.jboss.tools.cdi.core.test.DependentProjectTest;
import org.jboss.tools.test.util.ResourcesUtils;
/**
@@ -64,25 +66,7 @@
}
protected IInjectionPointField getInjectionPointField(ICDIProject cdi, String beanClassFilePath, String fieldName) {
- IFile file = cdi.getNature().getProject().getFile(beanClassFilePath);
- Set<IBean> beans = cdi.getBeans(file.getFullPath());
- Iterator<IBean> it = beans.iterator();
- while(it.hasNext()) {
- IBean b = it.next();
- if(b instanceof IProducer) it.remove();
- }
- assertEquals("Wrong number of the beans", 1, beans.size());
- Set<IInjectionPoint> injections = beans.iterator().next().getInjectionPoints();
- for (IInjectionPoint injectionPoint : injections) {
- if(injectionPoint instanceof IInjectionPointField) {
- IInjectionPointField field = (IInjectionPointField)injectionPoint;
- if(fieldName.equals(field.getField().getElementName())) {
- return field;
- }
- }
- }
- fail("Can't find \"" + fieldName + "\" injection point filed in " + beanClassFilePath);
- return null;
+ return DependentProjectTest.getInjectionPointField(cdi, beanClassFilePath, fieldName);
}
}
14 years, 9 months
JBoss Tools SVN: r32899 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test: src/org/jboss/tools/cdi/seam/config/core/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-13 13:10:44 -0400 (Wed, 13 Jul 2011)
New Revision: 32899
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigTest.java
Log:
JBIDE-9313
https://issues.jboss.org/browse/JBIDE-9313
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/META-INF/MANIFEST.MF 2011-07-13 16:19:33 UTC (rev 32898)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/META-INF/MANIFEST.MF 2011-07-13 17:10:44 UTC (rev 32899)
@@ -10,6 +10,7 @@
org.eclipse.core.resources,
org.junit,
org.jboss.tools.cdi.core,
+ org.jboss.tools.cdi.core.test,
org.jboss.tools.cdi.seam.config.core,
org.jboss.tools.common,
org.eclipse.ui,
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigTest.java 2011-07-13 16:19:33 UTC (rev 32898)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigTest.java 2011-07-13 17:10:44 UTC (rev 32899)
@@ -26,6 +26,7 @@
import org.jboss.tools.cdi.core.IInjectionPointField;
import org.jboss.tools.cdi.core.IProducer;
import org.jboss.tools.cdi.core.extension.feature.IBuildParticipantFeature;
+import org.jboss.tools.cdi.core.test.DependentProjectTest;
import org.jboss.tools.cdi.seam.config.core.CDISeamConfigExtension;
import org.jboss.tools.cdi.seam.config.core.ConfigDefinitionContext;
import org.jboss.tools.cdi.seam.config.core.definition.SeamBeanDefinition;
@@ -82,25 +83,7 @@
}
protected IInjectionPointField getInjectionPointField(ICDIProject cdi, String beanClassFilePath, String fieldName) {
- IFile file = cdi.getNature().getProject().getFile(beanClassFilePath);
- Set<IBean> beans = cdi.getBeans(file.getFullPath());
- Iterator<IBean> it = beans.iterator();
- while(it.hasNext()) {
- IBean b = it.next();
- if(b instanceof IProducer) it.remove();
- }
- assertEquals("Wrong number of the beans", 1, beans.size());
- Set<IInjectionPoint> injections = beans.iterator().next().getInjectionPoints();
- for (IInjectionPoint injectionPoint : injections) {
- if(injectionPoint instanceof IInjectionPointField) {
- IInjectionPointField field = (IInjectionPointField)injectionPoint;
- if(fieldName.equals(field.getField().getElementName())) {
- return field;
- }
- }
- }
- fail("Can't find \"" + fieldName + "\" injection point filed in " + beanClassFilePath);
- return null;
+ return DependentProjectTest.getInjectionPointField(cdi, beanClassFilePath, fieldName);
}
protected SeamBeansDefinition getBeansDefinition(ConfigDefinitionContext context, String path) {
14 years, 9 months
JBoss Tools SVN: r32898 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-13 12:19:33 -0400 (Wed, 13 Jul 2011)
New Revision: 32898
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java
Log:
JBIDE-9313
https://issues.jboss.org/browse/JBIDE-9313
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2011-07-13 16:09:45 UTC (rev 32897)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2011-07-13 16:19:33 UTC (rev 32898)
@@ -155,122 +155,146 @@
return producer;
}
+ /*
+ * Case 1.
+ * Bean A is defined in CDITest1 project.
+ * Alternative bean B is defined in CDITest1 project. It is not selected.
+ * Alternative bean C is defined in CDITest2 project. It is not selected.
+ *
+ * ASSERT: Injection resolved to bean A.
+ */
public void testAlternativesInDependentProjects() throws CoreException {
- ICDIProject cdi1 = CDICorePlugin.getCDIProject(project1, true);
ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true);
-
- /*
- * Case 1.
- * Bean A is defined in CDITest1 project.
- * Alternative bean B is defined in CDITest1 project. It is not selected.
- * Alternative bean C is defined in CDITest2 project. It is not selected.
- *
- * ASSERT: Injection resolved to bean A.
- */
IInjectionPointField f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case1/X.java", "a");
Set<IBean> bs = cdi2.getBeans(true, f);
assertEquals(1, bs.size());
assertEquals("A", bs.iterator().next().getBeanClass().getElementName());
+ }
- /*
- * Case 2.
- * Bean A is defined in CDITest1 project.
- * Alternative bean B is defined in CDITest1 project. It is not selected.
- * Alternative bean C is defined in CDITest2 project. It is selected in CDITest2.
- *
- * ASSERT: Injection resolved to bean C.
- */
- f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case2/X.java", "a");
- bs = cdi2.getBeans(true, f);
+ /*
+ * Case 2.
+ * Bean A is defined in CDITest1 project.
+ * Alternative bean B is defined in CDITest1 project. It is not selected.
+ * Alternative bean C is defined in CDITest2 project. It is selected in CDITest2.
+ *
+ * ASSERT: Injection resolved to bean C.
+ */
+ public void testAlternativesInDependentProjects2() throws CoreException {
+ ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true);
+ IInjectionPoint f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case2/X.java", "a");
+ Set<IBean> bs = cdi2.getBeans(true, f);
assertEquals(1, bs.size());
assertEquals("C", bs.iterator().next().getBeanClass().getElementName());
+ }
- /*
- * Case 3.
- * Bean A is defined in CDITest1 project.
- * Alternative bean B is defined in CDITest1 project. It is selected in CDITest2.
- * Alternative bean C is defined in CDITest2 project. It is not selected.
- *
- * ASSERT: Injection resolved to bean B.
- */
- f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case3/X.java", "a");
- bs = cdi2.getBeans(true, f);
+ /*
+ * Case 3.
+ * Bean A is defined in CDITest1 project.
+ * Alternative bean B is defined in CDITest1 project. It is selected in CDITest2.
+ * Alternative bean C is defined in CDITest2 project. It is not selected.
+ *
+ * ASSERT: Injection resolved to bean B.
+ */
+ public void testAlternativesInDependentProjects3() throws CoreException {
+ ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true);
+ IInjectionPoint f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case3/X.java", "a");
+ Set<IBean> bs = cdi2.getBeans(true, f);
assertEquals(1, bs.size());
assertEquals("B", bs.iterator().next().getBeanClass().getElementName());
+ }
- /*
- * Case 4-1.
- * Bean A is defined in CDITest1 project.
- * Alternative bean B is defined in CDITest1 project. It is selected in CDITest1.
- * Alternative bean C is defined in CDITest2 project. It is not selected.
- *
- * ASSERT: Injection resolved to bean A.
- */
- f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case4/X.java", "a");
- bs = cdi2.getBeans(true, f);
+ /*
+ * Case 4-1.
+ * Bean A is defined in CDITest1 project.
+ * Alternative bean B is defined in CDITest1 project. It is selected in CDITest1.
+ * Alternative bean C is defined in CDITest2 project. It is not selected.
+ *
+ * ASSERT: Injection resolved to bean A.
+ */
+ public void testAlternativesInDependentProjects4_1() throws CoreException {
+ ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true);
+ IInjectionPoint f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case4/X.java", "a");
+ Set<IBean> bs = cdi2.getBeans(true, f);
assertEquals(1, bs.size());
assertEquals("A", bs.iterator().next().getBeanClass().getElementName());
+ }
- /*
- * Case 4-2.
- * Bean A is defined in CDITest1 project.
- * Alternative bean B is defined in CDITest1 project. It is selected in CDITest1.
- * Alternative bean C is defined in CDITest2 project. It is not selected.
- * Bean Y is defined in CDITest1 but it is accessed through project CDITest2
- * ASSERT: Injection resolved to bean B.
- */
- f = getInjectionPointField(cdi1, "/src/cdi/test/alternative/case4/Y.java", "b");
- bs = cdi2.getBeans(true, f);
+ /*
+ * Case 4-2.
+ * Bean A is defined in CDITest1 project.
+ * Alternative bean B is defined in CDITest1 project. It is selected in CDITest1.
+ * Alternative bean C is defined in CDITest2 project. It is not selected.
+ * Bean Y is defined in CDITest1 but it is accessed through project CDITest2
+ *
+ * ASSERT: Injection resolved to bean B.
+ */
+ public void testAlternativesInDependentProjects4_2() throws CoreException {
+ ICDIProject cdi1 = CDICorePlugin.getCDIProject(project1, true);
+ ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true);
+ IInjectionPoint f = getInjectionPointField(cdi1, "/src/cdi/test/alternative/case4/Y.java", "b");
+ Set<IBean> bs = cdi2.getBeans(true, f);
assertEquals(1, bs.size());
assertEquals("B", bs.iterator().next().getBeanClass().getElementName());
+ }
- /*
- * Case 5.
- * Bean A is defined in CDITest1 project.
- * Alternative bean B is defined in CDITest1 project. It is selected in CDITest1.
- * Alternative bean C is defined in CDITest2 project. It is selected in CDITest2.
- *
- * ASSERT: Injection resolved to bean C.
- */
- f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case5/X.java", "a");
- bs = cdi2.getBeans(true, f);
+ /*
+ * Case 5.
+ * Bean A is defined in CDITest1 project.
+ * Alternative bean B is defined in CDITest1 project. It is selected in CDITest1.
+ * Alternative bean C is defined in CDITest2 project. It is selected in CDITest2.
+ *
+ * ASSERT: Injection resolved to bean C.
+ */
+ public void testAlternativesInDependentProjects5() throws CoreException {
+ ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true);
+ IInjectionPoint f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case5/X.java", "a");
+ Set<IBean> bs = cdi2.getBeans(true, f);
assertEquals(1, bs.size());
assertEquals("C", bs.iterator().next().getBeanClass().getElementName());
+ }
- /*
- * Case 6.
- * Bean A is defined in CDITest1 project.
- * Alternative bean B is defined in CDITest1 project. It is selected in CDITest2.
- * Alternative bean C is defined in CDITest2 project. It is selected in CDITest2.
- *
- * ASSERT: Multiple beans: injection resolved to beans B and C.
- */
- f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case6/X.java", "a");
- bs = cdi2.getBeans(true, f);
+ /*
+ * Case 6.
+ * Bean A is defined in CDITest1 project.
+ * Alternative bean B is defined in CDITest1 project. It is selected in CDITest2.
+ * Alternative bean C is defined in CDITest2 project. It is selected in CDITest2.
+ *
+ * ASSERT: Multiple beans: injection resolved to beans B and C.
+ */
+ public void testAlternativesInDependentProjects6() throws CoreException {
+ ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true);
+ IInjectionPoint f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case6/X.java", "a");
+ Set<IBean> bs = cdi2.getBeans(true, f);
assertEquals(2, bs.size());
+ }
- /*
- * Case 7.
- * Bean A is defined in CDITest1 project.
- * Alternative bean B is defined in CDITest1 project. It is not selected.
- * Producer bean P is declared in B.p().
- *
- * ASSERT: No eligible bean.
- */
- f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case7/X.java", "p");
- bs = cdi2.getBeans(true, f);
+ /*
+ * Case 7.
+ * Bean A is defined in CDITest1 project.
+ * Alternative bean B is defined in CDITest1 project. It is not selected.
+ * Producer bean P is declared in B.p().
+ *
+ * ASSERT: No eligible bean.
+ */
+ public void testAlternativesInDependentProjects7() throws CoreException {
+ ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true);
+ IInjectionPoint f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case7/X.java", "p");
+ Set<IBean> bs = cdi2.getBeans(true, f);
assertTrue(bs.isEmpty());
+ }
- /*
- * Case 8.
- * Bean A is defined in CDITest1 project.
- * Alternative bean B is defined in CDITest1 project. It is selected in CDITest1.
- * Producer bean P is declared in B.p().
- *
- * ASSERT: Injection resolved to bean B.p().
- */
- f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case8/X.java", "p");
- bs = cdi2.getBeans(true, f);
+ /*
+ * Case 8.
+ * Bean A is defined in CDITest1 project.
+ * Alternative bean B is defined in CDITest1 project. It is selected in CDITest1.
+ * Producer bean P is declared in B.p().
+ *
+ * ASSERT: Injection resolved to bean B.p().
+ */
+ public void testAlternativesInDependentProjects8() throws CoreException {
+ ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true);
+ IInjectionPoint f = getInjectionPointField(cdi2, "/src/cdi/test/alternative/case8/X.java", "p");
+ Set<IBean> bs = cdi2.getBeans(true, f);
assertEquals(1, bs.size());
IBean b = bs.iterator().next();
assertTrue(b instanceof IProducerMethod);
14 years, 9 months
JBoss Tools SVN: r32897 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-13 12:09:45 -0400 (Wed, 13 Jul 2011)
New Revision: 32897
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java
Log:
[JBIDE-9054] removed unneeded reference to DelegatingServerBehavior
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java 2011-07-13 15:56:00 UTC (rev 32896)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java 2011-07-13 16:09:45 UTC (rev 32897)
@@ -13,11 +13,8 @@
import java.util.List;
import java.util.Properties;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.debug.core.model.IProcess;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
-import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
@@ -35,14 +32,14 @@
public static final String POLLER_ID = "org.jboss.ide.eclipse.as.core.runtime.server.processTerminatedPoller"; //$NON-NLS-1$
private ServerStatePollerType type;
- private DelegatingServerBehavior server;
+ private IServer server;
public void beginPolling(IServer server, boolean expectedState,
PollThread pt) {
- this.server = (DelegatingServerBehavior)server.loadAdapter(DelegatingServerBehavior.class, new NullProgressMonitor());
+ this.server = server;
}
public IServer getServer() {
- return server.getServer();
+ return server;
}
public void cancel(int type) {
14 years, 9 months
JBoss Tools SVN: r32896 - in trunk/as: plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-13 11:56:00 -0400 (Wed, 13 Jul 2011)
New Revision: 32896
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IProcessProvider.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/MockTests.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java
Log:
[JBIDE-9054] extracted IProcessProvider interface to its own file (since we need to separate interfaces from implementations so that we will be able to export interfaces and hide implementations)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java 2011-07-13 15:49:01 UTC (rev 32895)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java 2011-07-13 15:56:00 UTC (rev 32896)
@@ -33,11 +33,7 @@
public class ProcessTerminatedPoller implements IServerStatePoller {
public static final String POLLER_ID = "org.jboss.ide.eclipse.as.core.runtime.server.processTerminatedPoller"; //$NON-NLS-1$
- public static interface IProcessProvider {
- public IProcess getProcess();
- }
-
private ServerStatePollerType type;
private DelegatingServerBehavior server;
public void beginPolling(IServer server, boolean expectedState,
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IProcessProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IProcessProvider.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IProcessProvider.java 2011-07-13 15:56:00 UTC (rev 32896)
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.ide.eclipse.as.core.server.internal;
+
+import org.eclipse.debug.core.model.IProcess;
+
+public interface IProcessProvider {
+ public IProcess getProcess();
+}
\ No newline at end of file
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IProcessProvider.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-07-13 15:49:01 UTC (rev 32895)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-07-13 15:56:00 UTC (rev 32896)
@@ -35,7 +35,6 @@
import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
-import org.jboss.ide.eclipse.as.core.extensions.polling.ProcessTerminatedPoller.IProcessProvider;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.LocalStopLaunchConfigurator;
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/MockTests.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/MockTests.java 2011-07-13 15:49:01 UTC (rev 32895)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/MockTests.java 2011-07-13 15:56:00 UTC (rev 32896)
@@ -20,8 +20,8 @@
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.jboss.ide.eclipse.as.core.extensions.polling.ProcessTerminatedPoller.IProcessProvider;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.internal.IProcessProvider;
import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java 2011-07-13 15:49:01 UTC (rev 32895)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java 2011-07-13 15:56:00 UTC (rev 32896)
@@ -41,10 +41,10 @@
import org.eclipse.wst.server.core.IServer.IOperationListener;
import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.core.ServerCore;
-import org.jboss.ide.eclipse.as.core.extensions.polling.ProcessTerminatedPoller.IProcessProvider;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer;
-import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.internal.IProcessProvider;
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
import org.jboss.ide.eclipse.as.core.util.FileUtil;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
14 years, 9 months
JBoss Tools SVN: r32895 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-13 11:49:01 -0400 (Wed, 13 Jul 2011)
New Revision: 32895
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java
Log:
[JBIDE-9337] remove JBoss7ManagerService from DelegatingJBoss7ServerBehaviour (delegating server behavior should only delegate and do nothing more)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java 2011-07-13 14:50:58 UTC (rev 32894)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java 2011-07-13 15:49:01 UTC (rev 32895)
@@ -47,7 +47,6 @@
public static final String MARK_DO_DEPLOY = "org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7JSTPublisher.markUndeploy"; //$NON-NLS-1$
private IProcess serverProcess;
- private IJBoss7ManagerService service;
private IDebugEventSetListener serverProcessListener;
private PollThread pollThread;
@@ -139,10 +138,7 @@
@Override
public void dispose() {
- super.dispose();
- if (service != null) {
- service.dispose();
- }
+ getDelegate().dispose();
}
@Override
14 years, 9 months
JBoss Tools SVN: r32894 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-13 10:50:58 -0400 (Wed, 13 Jul 2011)
New Revision: 32894
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
Log:
[JBIDE-9054] cleaned imports
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-07-13 14:48:48 UTC (rev 32893)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-07-13 14:50:58 UTC (rev 32894)
@@ -11,7 +11,6 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.v7;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Properties;
14 years, 9 months
JBoss Tools SVN: r32893 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-13 10:48:48 -0400 (Wed, 13 Jul 2011)
New Revision: 32893
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
Log:
[JBIDE-9054] replaced empty list by Collections#emtpyList() (was: new ArrayList())
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-07-13 14:42:10 UTC (rev 32892)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-07-13 14:48:48 UTC (rev 32893)
@@ -12,6 +12,7 @@
package org.jboss.ide.eclipse.as.core.server.internal.v7;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Properties;
@@ -113,7 +114,7 @@
}
public List<String> getRequiredProperties() {
- return new ArrayList<String>();
+ return Collections.emptyList();
}
public void failureHandled(Properties properties) {
14 years, 9 months
JBoss Tools SVN: r32892 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-13 10:42:10 -0400 (Wed, 13 Jul 2011)
New Revision: 32892
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java
Log:
[JBIDE-9337] corrected service creation to be lazy since actual behaviour is only set after instantiation
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-07-13 13:50:31 UTC (rev 32891)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-07-13 14:42:10 UTC (rev 32892)
@@ -61,7 +61,6 @@
}
public boolean isComplete() throws PollingException, RequiresInfoException {
- IJBoss7ManagerService service = null;
try {
if (expectedState == SERVER_DOWN) {
return awaitShutdown(service);
@@ -70,8 +69,6 @@
}
} catch (Exception e) {
throw new PollingException(e.getMessage());
- } finally {
- disposeService(service);
}
}
@@ -101,28 +98,18 @@
}
}
- private void disposeService(IJBoss7ManagerService service) {
- if (service != null) {
- service.dispose();
- }
- }
-
public boolean getState() throws PollingException, RequiresInfoException {
- IJBoss7ManagerService service = null;
try {
- service = JBoss7ManagerUtil.getService(getServer());
JBoss7ServerState serverState = service.getServerState(getServer().getHost(), getManagementPort());
return serverState == JBoss7ServerState.RUNNING
|| serverState == JBoss7ServerState.RESTART_REQUIRED;
} catch (Exception e) {
throw new PollingException(e.getMessage());
- } finally {
- disposeService(service);
}
}
public void cleanup() {
- service.dispose();
+ JBoss7ManagerUtil.dispose(service);
}
public List<String> getRequiredProperties() {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-07-13 13:50:31 UTC (rev 32891)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-07-13 14:42:10 UTC (rev 32892)
@@ -46,18 +46,14 @@
@Override
protected IStatus gracefullStop() {
IServer server = getServer();
- IJBoss7ManagerService service = null;
try {
- service = getService();
JBoss7Server jbossServer = ServerConverter.checkedGetJBossServer(server, JBoss7Server.class);
- service.stop(jbossServer.getHost(), jbossServer.getManagementPort());
+ getService().stop(jbossServer.getHost(), jbossServer.getManagementPort());
return Status.OK_STATUS;
} catch (Exception e) {
return new Status(
IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
MessageFormat.format(Messages.JBoss7ServerBehavior_could_not_stop, server.getName()), e);
- } finally {
- JBoss7ManagerUtil.dispose(service);
}
}
14 years, 9 months
JBoss Tools SVN: r32891 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-13 09:50:31 -0400 (Wed, 13 Jul 2011)
New Revision: 32891
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java
Log:
[JBIDE-9337] corrected service creation to be lazy since actual behaviour is only set after instantiation
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java 2011-07-13 13:24:03 UTC (rev 32890)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java 2011-07-13 13:50:31 UTC (rev 32891)
@@ -16,7 +16,7 @@
import org.osgi.framework.BundleContext;
public class JBoss7ManagerUtil {
-
+
private static final String JBOSS7_RUNTIME = "org.jboss.ide.eclipse.as.runtime.70"; //$NON-NLS-1$
public static IJBoss7ManagerService getService(IServer server) throws Exception {
@@ -28,7 +28,7 @@
private static String getRequiredVersion(IServer server) {
String id = server.getRuntime().getRuntimeType().getId();
- if (JBOSS7_RUNTIME.equals(id)) {
+ if (JBOSS7_RUNTIME.equals(id)) {
return IJBoss7ManagerService.AS_VERSION_700;
}
return null;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-07-13 13:24:03 UTC (rev 32890)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-07-13 13:50:31 UTC (rev 32891)
@@ -27,10 +27,6 @@
private IJBoss7ManagerService service;
- public LocalJBoss7BehaviorDelegate() throws Exception {
- this.service = JBoss7ManagerUtil.getService(getServer());
- }
-
public IStatus canChangeState(String launchMode) {
return Status.OK_STATUS;
}
@@ -52,7 +48,7 @@
IServer server = getServer();
IJBoss7ManagerService service = null;
try {
- service = JBoss7ManagerUtil.getService(server);
+ service = getService();
JBoss7Server jbossServer = ServerConverter.checkedGetJBossServer(server, JBoss7Server.class);
service.stop(jbossServer.getHost(), jbossServer.getManagementPort());
return Status.OK_STATUS;
@@ -81,6 +77,17 @@
@Override
public void dispose() {
- JBoss7ManagerUtil.dispose(service);
+ try {
+ JBoss7ManagerUtil.dispose(getService());
+ } catch(Exception e) {
+ // ignore
+ }
}
+
+ protected IJBoss7ManagerService getService() throws Exception {
+ if (service == null) {
+ this.service = JBoss7ManagerUtil.getService(getServer());
+ }
+ return service;
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-07-13 13:24:03 UTC (rev 32890)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-07-13 13:50:31 UTC (rev 32891)
@@ -33,10 +33,6 @@
private IJBoss7ManagerService service;
- public RSEJBoss7BehaviourDelegate() throws Exception {
- this.service = JBoss7ManagerUtil.getService(getServer());
- }
-
@Override
protected String getShutdownCommand(IServer server) throws CoreException {
String defaultCommand = ServerUtil.checkedGetBehaviorDelegate(server).getDefaultStopArguments();
@@ -57,8 +53,10 @@
@Override
protected IStatus gracefullStop() {
IServer server = getServer();
+ IJBoss7ManagerService service = null;
try {
JBoss7Server jbossServer = ServerConverter.checkedGetJBossServer(server, JBoss7Server.class);
+ service = getService();
service.stop(jbossServer.getHost(), jbossServer.getManagementPort());
return Status.OK_STATUS;
} catch (Exception e) {
@@ -69,6 +67,17 @@
}
public void dispose() {
- JBoss7ManagerUtil.dispose(service);
+ try {
+ JBoss7ManagerUtil.dispose(getService());
+ } catch(Exception e) {
+ // ignore
+ }
}
+
+ protected IJBoss7ManagerService getService() throws Exception {
+ if (service == null) {
+ this.service = JBoss7ManagerUtil.getService(getServer());
+ }
+ return service;
+ }
}
14 years, 9 months