Author: adietish
Date: 2011-04-23 17:21:00 -0400 (Sat, 23 Apr 2011)
New Revision: 30808
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagentServiceProxy.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagentSeriveTest.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7ManagementService.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagementUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/jboss-management-service.xml
Log:
[JBIDE-8784] added service availability test, added server version property &
constant
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7ManagementService.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7ManagementService.java 2011-04-23
16:56:45 UTC (rev 30807)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/IJBoss7ManagementService.java 2011-04-23
21:21:00 UTC (rev 30808)
@@ -15,12 +15,17 @@
* in case several different plugins need to implement it
*/
public interface IJBoss7ManagementService {
+
+ public static final String AS_VERSION_PROPERTY = "as.version"; //$NON-NLS-1$
+
+ public static final String AS_VERSION_700 = "700"; //$NON-NLS-1$
+
/**
* Get a manager which can be responsible *only* for
* deployments, both synchronously and asynchronously.
* @return
*/
- public IJBoss7DeploymentManager getDeploymentManager();
+ public IJBoss7DeploymentManager getDeploymentManager() throws
JBoss7ManangementException;
/**
* Get an interface which can handle executing any and all remote
@@ -28,5 +33,5 @@
*
* @return
*/
- public IJBoss7ManagementInterface getManagementInterface();
+ public IJBoss7ManagementInterface getManagementInterface() throws
JBoss7ManangementException;
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagementUtil.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagementUtil.java 2011-04-23
16:56:45 UTC (rev 30807)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagementUtil.java 2011-04-23
21:21:00 UTC (rev 30808)
@@ -20,7 +20,6 @@
import org.osgi.framework.ServiceReference;
public class JBoss7ManagementUtil {
- public static final String SERVER_VERSION_PROPERTY = "as.version";
//$NON-NLS-1$
public static final String SERVICE_VERSION_70 =
"org.jboss.ide.eclipse.as.management.as7.service"; //$NON-NLS-1$
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagentServiceProxy.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagentServiceProxy.java
(rev 0)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagentServiceProxy.java 2011-04-23
21:21:00 UTC (rev 30808)
@@ -0,0 +1,34 @@
+package org.jboss.ide.eclipse.as.core.server.internal.v7;
+
+import java.text.MessageFormat;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.util.tracker.ServiceTracker;
+
+public class JBoss7ManagentServiceProxy extends
ServiceTracker<IJBoss7ManagementService, IJBoss7ManagementService>
+ implements IJBoss7ManagementService {
+
+ private static final String FILTER_EXPRESSION =
+ "(&(objectClass=" + IJBoss7ManagementService.class.getCanonicalName() +
")(as.version={0}))"; //$NON-NLS-1$ //$NON-NLS-2$
+
+ public JBoss7ManagentServiceProxy(BundleContext context, String asVersion) {
+ super(context, MessageFormat.format(FILTER_EXPRESSION, asVersion), null);
+ }
+
+ public IJBoss7DeploymentManager getDeploymentManager() throws JBoss7ManangementException
{
+
+ return checkedGetService().getDeploymentManager();
+ }
+
+ public IJBoss7ManagementInterface getManagementInterface() throws
JBoss7ManangementException {
+ return checkedGetService().getManagementInterface();
+ }
+
+ private IJBoss7ManagementService checkedGetService() throws JBoss7ManangementException
{
+ IJBoss7ManagementService service = getService();
+ if (service == null) {
+ throw new JBoss7ManangementException("Could not acquire JBoss Management
service"); //$NON-NLS-1$
+ }
+ return service;
+ }
+}
Property changes on:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagentServiceProxy.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/jboss-management-service.xml
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/jboss-management-service.xml 2011-04-23
16:56:45 UTC (rev 30807)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/jboss-management-service.xml 2011-04-23
21:21:00 UTC (rev 30808)
@@ -4,5 +4,5 @@
<service>
<provide
interface="org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7ManagementService"/>
</service>
- <property name="as.version" type="String"
value="7"/>
+ <property name="as.version" type="String"
value="700"/>
</scr:component>
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagentSeriveTest.java
===================================================================
---
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagentSeriveTest.java
(rev 0)
+++
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagentSeriveTest.java 2011-04-23
21:21:00 UTC (rev 30808)
@@ -0,0 +1,24 @@
+package org.jboss.ide.eclipse.as.test.server;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentManager;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7ManagementService;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManagentServiceProxy;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangementException;
+import org.jboss.ide.eclipse.as.test.ASTest;
+import org.junit.Test;
+import org.osgi.framework.BundleContext;
+
+public class JBossManagentSeriveTest {
+
+ @Test
+ public void canUseService() throws JBoss7ManangementException {
+ BundleContext context = ASTest.getDefault().getBundle().getBundleContext();
+ JBoss7ManagentServiceProxy serviceProxy = new JBoss7ManagentServiceProxy(context,
IJBoss7ManagementService.AS_VERSION_700);
+ serviceProxy.open();
+ IJBoss7DeploymentManager manager = serviceProxy.getDeploymentManager();
+ assertNotNull(manager);
+ }
+
+}
Property changes on:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagentSeriveTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Show replies by date