JBoss Tools SVN: r33845 - trunk/forge/plugins/org.jboss.tools.forge.runtime.ext.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-08-12 11:18:21 -0400 (Fri, 12 Aug 2011)
New Revision: 33845
Added:
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/pom.xml
Log:
cleanup
Copied: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/pom.xml (from rev 33844, trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/org.jboss.tools.forge.runtime.ext/pom.xml)
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/pom.xml (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/pom.xml 2011-08-12 15:18:21 UTC (rev 33845)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools.forge</groupId>
+ <artifactId>plugins</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.forge.plugins</groupId>
+ <artifactId>org.jboss.tools.forge.runtime.ext</artifactId>
+
+ <packaging>eclipse-plugin</packaging>
+</project>
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33844 - trunk/forge/plugins/org.jboss.tools.forge.runtime.ext.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-08-12 11:15:25 -0400 (Fri, 12 Aug 2011)
New Revision: 33844
Added:
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/build.properties
Log:
cleanup
Copied: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/build.properties (from rev 33843, trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/org.jboss.tools.forge.runtime.ext/build.properties)
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/build.properties (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/build.properties 2011-08-12 15:15:25 UTC (rev 33844)
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ modules/
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33843 - trunk/forge/plugins/org.jboss.tools.forge.runtime.ext.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-08-12 11:13:59 -0400 (Fri, 12 Aug 2011)
New Revision: 33843
Added:
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.project
Log:
cleanup
Copied: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.project (from rev 33842, trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/org.jboss.tools.forge.runtime.ext/.project)
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.project (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.project 2011-08-12 15:13:59 UTC (rev 33843)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.forge.runtime.ext</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33842 - trunk/forge/plugins/org.jboss.tools.forge.runtime.ext.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-08-12 11:12:37 -0400 (Fri, 12 Aug 2011)
New Revision: 33842
Added:
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.classpath
Log:
cleanup
Copied: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.classpath (from rev 33841, trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/org.jboss.tools.forge.runtime.ext/.classpath)
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.classpath (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.classpath 2011-08-12 15:12:37 UTC (rev 33842)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33841 - trunk/forge/plugins/org.jboss.tools.forge.runtime.ext.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-08-12 11:11:08 -0400 (Fri, 12 Aug 2011)
New Revision: 33841
Removed:
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.classpath
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.project
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/build.properties
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/pom.xml
Log:
cleanup
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.classpath
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.classpath 2011-08-12 15:09:49 UTC (rev 33840)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.classpath 2011-08-12 15:11:08 UTC (rev 33841)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.project
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.project 2011-08-12 15:09:49 UTC (rev 33840)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.project 2011-08-12 15:11:08 UTC (rev 33841)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.jboss.tools.forge.runtime.ext</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/build.properties
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/build.properties 2011-08-12 15:09:49 UTC (rev 33840)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/build.properties 2011-08-12 15:11:08 UTC (rev 33841)
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/pom.xml
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/pom.xml 2011-08-12 15:09:49 UTC (rev 33840)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/pom.xml 2011-08-12 15:11:08 UTC (rev 33841)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.jboss.tools.forge</groupId>
- <artifactId>plugins</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
- <groupId>org.jboss.tools.forge.plugins</groupId>
- <artifactId>org.jboss.tools.forge.plugin</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33840 - trunk/forge/plugins/org.jboss.tools.forge.runtime.ext.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-08-12 11:09:49 -0400 (Fri, 12 Aug 2011)
New Revision: 33840
Added:
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/modules/
Log:
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33839 - trunk/forge/plugins/org.jboss.tools.forge.runtime.ext.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-08-12 11:08:07 -0400 (Fri, 12 Aug 2011)
New Revision: 33839
Added:
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/
Log:
cleanup
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33838 - trunk/forge/plugins/org.jboss.tools.forge.runtime.ext.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-08-12 11:06:00 -0400 (Fri, 12 Aug 2011)
New Revision: 33838
Removed:
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/src/
Log:
cleanup
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33837 - trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/org.jboss.tools.forge.runtime.ext/modules.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-08-12 11:04:54 -0400 (Fri, 12 Aug 2011)
New Revision: 33837
Removed:
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/org.jboss.tools.forge.runtime.ext/modules/...index
Log:
cleanup
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/org.jboss.tools.forge.runtime.ext/modules/...index
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/org.jboss.tools.forge.runtime.ext/modules/...index 2011-08-12 13:34:43 UTC (rev 33836)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/org.jboss.tools.forge.runtime.ext/modules/...index 2011-08-12 15:04:54 UTC (rev 33837)
@@ -1,115 +0,0 @@
-
-.settings
-.settings/.svn
-.settings/.svn/prop-base
-.settings/.svn/props
-.settings/.svn/text-base
-.settings/.svn/tmp
-.settings/.svn/tmp/prop-base
-.settings/.svn/tmp/props
-.settings/.svn/tmp/text-base
-.svn
-.svn/prop-base
-.svn/props
-.svn/text-base
-.svn/tmp
-.svn/tmp/prop-base
-.svn/tmp/props
-.svn/tmp/text-base
-bin
-bin/META-INF
-bin/org
-bin/org/jboss
-bin/org/jboss/tools
-bin/org/jboss/tools/forge
-bin/org/jboss/tools/forge/runtime
-bin/org/jboss/tools/forge/runtime/ext
-META-INF
-META-INF/.svn
-META-INF/.svn/prop-base
-META-INF/.svn/props
-META-INF/.svn/text-base
-META-INF/.svn/tmp
-META-INF/.svn/tmp/prop-base
-META-INF/.svn/tmp/props
-META-INF/.svn/tmp/text-base
-modules
-modules/org
-modules/org/jboss
-modules/org/jboss/tools
-modules/org/jboss/tools/forge
-modules/org/jboss/tools/forge/runtime
-modules/org/jboss/tools/forge/runtime/ext
-modules/org/jboss/tools/forge/runtime/ext/main
-src
-src/.svn
-src/.svn/prop-base
-src/.svn/props
-src/.svn/text-base
-src/.svn/tmp
-src/.svn/tmp/prop-base
-src/.svn/tmp/props
-src/.svn/tmp/text-base
-src/META-INF
-src/META-INF/.svn
-src/META-INF/.svn/prop-base
-src/META-INF/.svn/props
-src/META-INF/.svn/text-base
-src/META-INF/.svn/tmp
-src/META-INF/.svn/tmp/prop-base
-src/META-INF/.svn/tmp/props
-src/META-INF/.svn/tmp/text-base
-src/org
-src/org/.svn
-src/org/.svn/prop-base
-src/org/.svn/props
-src/org/.svn/text-base
-src/org/.svn/tmp
-src/org/.svn/tmp/prop-base
-src/org/.svn/tmp/props
-src/org/.svn/tmp/text-base
-src/org/jboss
-src/org/jboss/.svn
-src/org/jboss/.svn/prop-base
-src/org/jboss/.svn/props
-src/org/jboss/.svn/text-base
-src/org/jboss/.svn/tmp
-src/org/jboss/.svn/tmp/prop-base
-src/org/jboss/.svn/tmp/props
-src/org/jboss/.svn/tmp/text-base
-src/org/jboss/tools
-src/org/jboss/tools/.svn
-src/org/jboss/tools/.svn/prop-base
-src/org/jboss/tools/.svn/props
-src/org/jboss/tools/.svn/text-base
-src/org/jboss/tools/.svn/tmp
-src/org/jboss/tools/.svn/tmp/prop-base
-src/org/jboss/tools/.svn/tmp/props
-src/org/jboss/tools/.svn/tmp/text-base
-src/org/jboss/tools/forge
-src/org/jboss/tools/forge/.svn
-src/org/jboss/tools/forge/.svn/prop-base
-src/org/jboss/tools/forge/.svn/props
-src/org/jboss/tools/forge/.svn/text-base
-src/org/jboss/tools/forge/.svn/tmp
-src/org/jboss/tools/forge/.svn/tmp/prop-base
-src/org/jboss/tools/forge/.svn/tmp/props
-src/org/jboss/tools/forge/.svn/tmp/text-base
-src/org/jboss/tools/forge/runtime
-src/org/jboss/tools/forge/runtime/.svn
-src/org/jboss/tools/forge/runtime/.svn/prop-base
-src/org/jboss/tools/forge/runtime/.svn/props
-src/org/jboss/tools/forge/runtime/.svn/text-base
-src/org/jboss/tools/forge/runtime/.svn/tmp
-src/org/jboss/tools/forge/runtime/.svn/tmp/prop-base
-src/org/jboss/tools/forge/runtime/.svn/tmp/props
-src/org/jboss/tools/forge/runtime/.svn/tmp/text-base
-src/org/jboss/tools/forge/runtime/ext
-src/org/jboss/tools/forge/runtime/ext/.svn
-src/org/jboss/tools/forge/runtime/ext/.svn/prop-base
-src/org/jboss/tools/forge/runtime/ext/.svn/props
-src/org/jboss/tools/forge/runtime/ext/.svn/text-base
-src/org/jboss/tools/forge/runtime/ext/.svn/tmp
-src/org/jboss/tools/forge/runtime/ext/.svn/tmp/prop-base
-src/org/jboss/tools/forge/runtime/ext/.svn/tmp/props
-src/org/jboss/tools/forge/runtime/ext/.svn/tmp/text-base
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33836 - in trunk/as: plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core and 14 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-12 09:34:43 -0400 (Fri, 12 Aug 2011)
New Revision: 33836
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7DeploymentResult.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7ManagerService.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7DeploymentState.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerServiceProxy.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManangerConnectException.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManangerException.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ServerState.java
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/IJBoss7DeploymentResult.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/IJBoss7ManagerService.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7DeploymentState.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManagerServiceProxy.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManagerUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManangerConnectException.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManangerException.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ServerState.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties
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
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/jboss-management-service.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/DeploymentOperationResult.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/JBoss7ManagerService.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/util/AS7ManagerUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/JBossManagementServiceTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/utils/AS7ManagerTestUtils.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java
Log:
[JBIDE-9500] moved management interfaces back to as.core
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2011-08-12 13:34:43 UTC (rev 33836)
@@ -36,6 +36,7 @@
org.jboss.ide.eclipse.as.core.server.internal.launch,
org.jboss.ide.eclipse.as.core.server.internal.launch.configuration,
org.jboss.ide.eclipse.as.core.server.internal.v7,
+ org.jboss.ide.eclipse.as.core.server.v7.management,
org.jboss.ide.eclipse.as.core.server.xpl,
org.jboss.ide.eclipse.as.core.util
Bundle-ClassPath: dom4j-1.6.1.jar,
@@ -44,4 +45,3 @@
.
Bundle-Vendor: %Bundle-Vendor.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.jboss.ide.eclipse.as.management.as7
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -94,6 +94,8 @@
public static String PublishRenameFailure;
public static String ErrorDisposingLocalJBoss7BehaviorDelegate;
+ public static String JBoss7ServerState_noEnumForString;
+
static {
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-08-12 13:34:43 UTC (rev 33836)
@@ -71,4 +71,5 @@
JMXScannerCanceled=JBossTools was unable to contact the JBoss deployment scanner in a reasonable amount of time. This step has been skipped.
ConnectingToServerViaJMX=Connecting to {0} via JMX
ExtensionManager_could_not_load_publishers=Could not load publishers
-ErrorDisposingLocalJBoss7BehaviorDelegate=Could not dispose LocalJBoss7BehaviorDelegate
\ No newline at end of file
+ErrorDisposingLocalJBoss7BehaviorDelegate=Could not dispose LocalJBoss7BehaviorDelegate
+JBoss7ServerState_noEnumForString="No JBoss7ServerState enum for string {0}"
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-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -26,11 +26,11 @@
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
-import org.jboss.ide.eclipse.as.management.as7.IJBoss7ManagerService;
-import org.jboss.ide.eclipse.as.management.as7.JBoss7ManagerUtil;
-import org.jboss.ide.eclipse.as.management.as7.JBoss7ManagerUtil.IServiceAware;
-import org.jboss.ide.eclipse.as.management.as7.JBoss7ManangerConnectException;
-import org.jboss.ide.eclipse.as.management.as7.JBoss7ServerState;
+import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService;
+import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManagerUtil;
+import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManangerConnectException;
+import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ServerState;
+import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManagerUtil.IServiceAware;
import org.osgi.framework.InvalidSyntaxException;
/**
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-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -20,10 +20,10 @@
import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate;
+import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService;
+import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManagerUtil;
import org.jboss.ide.eclipse.as.core.util.PollThreadUtils;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
-import org.jboss.ide.eclipse.as.management.as7.IJBoss7ManagerService;
-import org.jboss.ide.eclipse.as.management.as7.JBoss7ManagerUtil;
import org.osgi.framework.InvalidSyntaxException;
public class LocalJBoss7BehaviorDelegate extends LocalJBossBehaviorDelegate {
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7DeploymentResult.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7DeploymentResult.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7DeploymentResult.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * 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.v7.management;
+
+import org.eclipse.core.runtime.IStatus;
+
+public interface IJBoss7DeploymentResult {
+
+ public abstract IStatus getStatus() throws JBoss7ManangerException;
+
+}
\ No newline at end of file
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7ManagerService.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7ManagerService.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7ManagerService.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -0,0 +1,157 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.v7.management;
+
+import java.io.File;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+
+public interface IJBoss7ManagerService {
+
+ public static final String AS_VERSION_PROPERTY = "as.version"; //$NON-NLS-1$
+
+ public static final String AS_VERSION_700 = "700"; //$NON-NLS-1$
+
+ public static final int MGMT_PORT = 9999;
+
+ /**
+ * Asynchronously deploy a file to a server
+ * @param host
+ *
+ * The host
+ * @param port
+ * The port
+ * @param name
+ * The deployment's name
+ * @param file
+ * The file to be deployed
+ * @param monitor
+ * The progress monitor
+ *
+ * @return Not sure what to return yet
+ * @throws Exception
+ */
+ public IJBoss7DeploymentResult deployAsync(String host, int port,
+ String deploymentName, File file, IProgressMonitor monitor) throws Exception;
+
+ /**
+ * Synchronously deploy a file to a server
+ *
+ * @param host
+ * The host
+ * @param port
+ * The port
+ * @param name
+ * The deployment's name
+ * @param file
+ * The file to be deployed
+ * @param monitor
+ * The progress monitor
+ *
+ * @return Not sure what to return yet
+ * @throws Exception
+ */
+ public IJBoss7DeploymentResult deploySync(String host, int port,
+ String deploymentName, File file, IProgressMonitor monitor) throws Exception;
+
+ /**
+ * Asynchronously undeploy a file to a server
+ *
+ * @param host
+ * The host
+ * @param port
+ * The port
+ * @param name
+ * The deployment's name
+ * @param file
+ * The file to be deployed
+ * @param monitor
+ * The progress monitor
+ *
+ * @return Not sure what to return yet
+ * @throws Exception
+ */
+ public IJBoss7DeploymentResult undeployAsync(String host, int port,
+ String deploymentName, boolean removeFile, IProgressMonitor monitor) throws Exception;
+
+ /**
+ * Synchronously undeploy a file to a server
+ *
+ * @param host
+ * The host
+ * @param port
+ * The port
+ * @param name
+ * The deployment's name
+ * @param file
+ * The file to be deployed
+ * @param monitor
+ * The progress monitor
+ *
+ * @return Not sure what to return yet
+ * @throws Exception
+ */
+ public IJBoss7DeploymentResult syncUndeploy(String host, int port,
+ String deploymentName, boolean removeFile, IProgressMonitor monitor) throws Exception;
+
+ /**
+ * Returns the state for a given deployment name on a given host and port.
+ *
+ * @param host
+ * the host to query
+ * @param port
+ * the port to contact it on
+ * @param deploymentName
+ * the name of the deployment that shall be queried
+ *
+ * @return the state of the deployment
+ * @throws Exception
+ */
+ public JBoss7DeploymentState getDeploymentState(String host, int port, String deploymentName) throws Exception;
+
+ /**
+ * Returns the state of the server
+ *
+ * @param host the server to query
+ * @param port the port to communicate on
+ * @return the state of the server
+ *
+ * @throws Exception
+ */
+ public JBoss7ServerState getServerState(String host, int port) throws Exception;
+
+ /**
+ * Returns <code>true</code> if the server is running, <code>false</code>
+ * otherwise.
+ *
+ * @param host the server to to query
+ * @param port the port to communicate on
+ * @return true if it's running, false otherwise
+ * @throws Exception
+ */
+ public boolean isRunning(String host, int port) throws Exception;
+
+ @Deprecated
+ public JBoss7ServerState getServerState(String host) throws Exception;
+
+ /**
+ * Stops the given server
+ *
+ * @throws JBoss7ManangerException
+ * @throws Exception
+ */
+ public void stop(String host, int port) throws Exception;
+
+ @Deprecated
+ public void stop(String host) throws Exception;
+
+ public void dispose();
+}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7DeploymentState.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7DeploymentState.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7DeploymentState.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.v7.management;
+
+
+/**
+ * An enum that reflects the state of a deployment.
+ *
+ * @author André Dietisheim
+ */
+public enum JBoss7DeploymentState {
+ STARTED ,
+ STOPPED;
+}
\ No newline at end of file
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerServiceProxy.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerServiceProxy.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerServiceProxy.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -0,0 +1,96 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.v7.management;
+
+import java.io.File;
+import java.text.MessageFormat;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.util.tracker.ServiceTracker;
+
+/**
+ * @author André Dietisheim
+ */
+public class JBoss7ManagerServiceProxy extends ServiceTracker<IJBoss7ManagerService, IJBoss7ManagerService>
+ implements IJBoss7ManagerService {
+
+ public JBoss7ManagerServiceProxy(BundleContext context, String asVersion) throws InvalidSyntaxException {
+ super(
+ context,
+ context.createFilter(MessageFormat
+ .format("(&(objectClass={0})(as.version={1}))", IJBoss7ManagerService.class.getCanonicalName(), asVersion)), null); //$NON-NLS-1$
+ }
+
+ public IJBoss7DeploymentResult deployAsync(String host, int port, String deploymentName, File file,
+ IProgressMonitor monitor) throws Exception {
+ return checkedGetService().deployAsync(host, port, deploymentName, file, monitor);
+ }
+
+ public IJBoss7DeploymentResult deploySync(String host, int port, String deploymentName, File file,
+ IProgressMonitor monitor) throws Exception {
+ return checkedGetService().deployAsync(host, port, deploymentName, file, monitor);
+ }
+
+ public IJBoss7DeploymentResult undeployAsync(String host, int port, String deploymentName, boolean removeFile,
+ IProgressMonitor monitor) throws Exception {
+ return checkedGetService().undeployAsync(host, port, deploymentName, removeFile, monitor);
+ }
+
+ public IJBoss7DeploymentResult syncUndeploy(String host, int port, String deploymentName, boolean removeFile,
+ IProgressMonitor monitor) throws Exception {
+ return checkedGetService().syncUndeploy(host, port, deploymentName, removeFile, monitor);
+ }
+
+ public JBoss7DeploymentState getDeploymentState(String host, int port, String deploymentName) throws Exception {
+ return checkedGetService().getDeploymentState(host, port, deploymentName);
+ }
+
+ public JBoss7ServerState getServerState(String host, int port) throws Exception {
+ return checkedGetService().getServerState(host, port);
+ }
+
+ public boolean isRunning(String host, int port) throws Exception {
+ try {
+ return checkedGetService().isRunning(host, port);
+ } catch (Exception e) {
+ return false;
+ }
+ }
+
+ @Deprecated
+ public JBoss7ServerState getServerState(String host) throws Exception {
+ return checkedGetService().getServerState(host);
+ }
+
+ public void stop(String host, int port) throws Exception {
+ checkedGetService().stop(host, port);
+ }
+
+ @Deprecated
+ public void stop(String host) throws Exception {
+ checkedGetService().stop(host);
+ }
+
+ private IJBoss7ManagerService checkedGetService() throws JBoss7ManangerException {
+ IJBoss7ManagerService service = getService();
+ if (service == null) {
+ throw new JBoss7ManangerException("Could not acquire JBoss Management service"); //$NON-NLS-1$
+ }
+ return service;
+ }
+
+ public void dispose() {
+ close();
+ }
+
+}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.v7.management;
+
+import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+
+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 InvalidSyntaxException {
+ BundleContext context = JBossServerCorePlugin.getContext();
+ JBoss7ManagerServiceProxy proxy = new JBoss7ManagerServiceProxy(context, getRequiredVersion(server));
+ proxy.open();
+ return proxy;
+ }
+
+ private static String getRequiredVersion(IServer server) {
+ String id = server.getRuntime().getRuntimeType().getId();
+ if (JBOSS7_RUNTIME.equals(id)) {
+ return IJBoss7ManagerService.AS_VERSION_700;
+ }
+ return null;
+ }
+
+ public static void dispose(IJBoss7ManagerService service) {
+ if (service != null) {
+ service.dispose();
+ }
+ }
+
+ public static <RESULT> RESULT executeWithService(IServiceAware<RESULT> serviceAware, IServer server) throws Exception {
+ IJBoss7ManagerService service = null;
+ try {
+ service = JBoss7ManagerUtil.getService(server);
+ return serviceAware.execute(service);
+ } finally {
+ if (service != null) {
+ service.dispose();
+ }
+ }
+ }
+
+ public static interface IServiceAware<RESULT> {
+
+ public RESULT execute(IJBoss7ManagerService service) throws Exception;
+
+ }
+
+}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManangerConnectException.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManangerConnectException.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManangerConnectException.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat Inc..
+ * 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
+ *
+ * Contributors:
+ * Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.jboss.ide.eclipse.as.core.server.v7.management;
+
+/**
+ * @author André Dietisheim
+ */
+public class JBoss7ManangerConnectException extends JBoss7ManangerException {
+
+ private static final long serialVersionUID = 1L;
+
+ public JBoss7ManangerConnectException(Throwable cause) {
+ super(cause);
+ }
+
+}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManangerException.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManangerException.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManangerException.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat Inc..
+ * 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
+ *
+ * Contributors:
+ * Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.jboss.ide.eclipse.as.core.server.v7.management;
+
+/**
+ * @author André Dietisheim
+ */
+public class JBoss7ManangerException extends Exception {
+
+ private static final long serialVersionUID = 1L;
+
+ public JBoss7ManangerException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public JBoss7ManangerException(Throwable cause) {
+ super(cause);
+ }
+
+ public JBoss7ManangerException(String message) {
+ super(message);
+ }
+
+}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ServerState.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ServerState.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ServerState.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * 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.v7.management;
+
+import java.text.MessageFormat;
+
+import org.jboss.ide.eclipse.as.core.Messages;
+
+/**
+ * @author André Dietisheim
+ */
+public enum JBoss7ServerState {
+ STARTING, RUNNING, RESTART_REQUIRED;
+
+ public static JBoss7ServerState valueOfIgnoreCase(String stateString) {
+ JBoss7ServerState matchingState = null;
+ if (stateString != null && stateString.length() > 0) {
+ for (JBoss7ServerState availableState : values()) {
+ if (stateString.equalsIgnoreCase(availableState.name())) {
+ matchingState = availableState;
+ break;
+ }
+ }
+ }
+ if (matchingState == null) {
+ throw new IllegalArgumentException(MessageFormat.format(
+ Messages.JBoss7ServerState_noEnumForString,
+ stateString));
+ }
+
+ return matchingState;
+ }
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2011-08-12 13:34:43 UTC (rev 33836)
@@ -4,7 +4,8 @@
Bundle-SymbolicName: org.jboss.ide.eclipse.as.management.as7
Bundle-Version: 2.3.0.qualifier
Bundle-Activator: org.jboss.ide.eclipse.as.internal.management.as7.Activator
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
+Require-Bundle: org.jboss.ide.eclipse.as.core;bundle-version="2.3.0",
+ org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.wst.server.core;bundle-version="1.1.302"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
@@ -20,6 +21,5 @@
xnio-api-3.0.0.Beta3.jar,
xnio-nio-3.0.0.Beta3.jar
Service-Component: META-INF/jboss-management-service.xml
-Export-Package: org.jboss.ide.eclipse.as.internal.management.as7;x-friends:="org.jboss.ide.eclipse.as.management.as7.tests",
- org.jboss.ide.eclipse.as.management.as7
+Export-Package: org.jboss.ide.eclipse.as.internal.management.as7;x-friends:="org.jboss.ide.eclipse.as.management.as7.tests"
Bundle-Vendor: JBoss by Red Hat
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-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/jboss-management-service.xml 2011-08-12 13:34:43 UTC (rev 33836)
@@ -2,7 +2,7 @@
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.jboss.ide.eclipse.as.management.as7.service">
<implementation class="org.jboss.ide.eclipse.as.internal.management.as7.JBoss7ManagerService"/>
<service>
- <provide interface="org.jboss.ide.eclipse.as.management.as7.IJBoss7ManagerService"/>
+ <provide interface="org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService"/>
</service>
<property name="as.version" type="String" value="700"/>
</scr:component>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -36,11 +36,11 @@
import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentPlanResult;
import org.jboss.as.protocol.old.StreamUtils;
import org.jboss.dmr.ModelNode;
+import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7DeploymentResult;
+import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7DeploymentState;
+import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManangerException;
+import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ServerState;
import org.jboss.ide.eclipse.as.internal.management.as7.util.AS7ManagerUtil;
-import org.jboss.ide.eclipse.as.management.as7.IJBoss7DeploymentResult;
-import org.jboss.ide.eclipse.as.management.as7.JBoss7DeploymentState;
-import org.jboss.ide.eclipse.as.management.as7.JBoss7ManangerException;
-import org.jboss.ide.eclipse.as.management.as7.JBoss7ServerState;
/**
* @author André Dietisheim
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Messages.java 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Messages.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -13,8 +13,6 @@
import org.eclipse.osgi.util.NLS;
public class AS7Messages extends NLS {
- public static String JBoss7ServerState_noEnumForString;
-
public static String ModuleStateEvaluationFailed;
public static String OperationOnAddressFailed;
public static String FailedToBuildOperation;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Messages.properties 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Messages.properties 2011-08-12 13:34:43 UTC (rev 33836)
@@ -1,5 +1,3 @@
-JBoss7ServerState_noEnumForString="No JBoss7ServerState enum for string {0}"
-
ModuleStateEvaluationFailed=Could not evaluate state for deployment {0}
OperationOnAddressFailed=Could not execute {0} for {1}. Failure was {2}.
FailedToBuildOperation=Failed to build operation.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/DeploymentOperationResult.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/DeploymentOperationResult.java 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/DeploymentOperationResult.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -20,8 +20,8 @@
import org.jboss.as.controller.client.helpers.standalone.DeploymentAction;
import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentActionResult;
import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentPlanResult;
-import org.jboss.ide.eclipse.as.management.as7.IJBoss7DeploymentResult;
-import org.jboss.ide.eclipse.as.management.as7.JBoss7ManangerException;
+import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7DeploymentResult;
+import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManangerException;
/**
* A class that holds the status of a deployment operation.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/JBoss7ManagerService.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/JBoss7ManagerService.java 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/JBoss7ManagerService.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -13,10 +13,10 @@
import java.io.File;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.jboss.ide.eclipse.as.management.as7.IJBoss7DeploymentResult;
-import org.jboss.ide.eclipse.as.management.as7.IJBoss7ManagerService;
-import org.jboss.ide.eclipse.as.management.as7.JBoss7DeploymentState;
-import org.jboss.ide.eclipse.as.management.as7.JBoss7ServerState;
+import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7DeploymentResult;
+import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService;
+import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7DeploymentState;
+import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ServerState;
/**
* @author Rob Stryker
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/util/AS7ManagerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/util/AS7ManagerUtil.java 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/util/AS7ManagerUtil.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -30,10 +30,10 @@
import org.jboss.dmr.ModelNode;
import org.jboss.dmr.ModelType;
import org.jboss.dmr.Property;
+import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManangerException;
import org.jboss.ide.eclipse.as.internal.management.as7.AS7Messages;
import org.jboss.ide.eclipse.as.internal.management.as7.DefaultOperationRequestBuilder;
import org.jboss.ide.eclipse.as.internal.management.as7.OperationFormatException;
-import org.jboss.ide.eclipse.as.management.as7.JBoss7ManangerException;
/**
* Various utility methods to deal with the as7 management api.
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/IJBoss7DeploymentResult.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/IJBoss7DeploymentResult.java 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/IJBoss7DeploymentResult.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * 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.management.as7;
-
-import org.eclipse.core.runtime.IStatus;
-
-public interface IJBoss7DeploymentResult {
-
- public abstract IStatus getStatus() throws JBoss7ManangerException;
-
-}
\ No newline at end of file
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/IJBoss7ManagerService.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/IJBoss7ManagerService.java 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/IJBoss7ManagerService.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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.management.as7;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-public interface IJBoss7ManagerService {
-
- public static final String AS_VERSION_PROPERTY = "as.version"; //$NON-NLS-1$
-
- public static final String AS_VERSION_700 = "700"; //$NON-NLS-1$
-
- public static final int MGMT_PORT = 9999;
-
- /**
- * Asynchronously deploy a file to a server
- * @param host
- *
- * The host
- * @param port
- * The port
- * @param name
- * The deployment's name
- * @param file
- * The file to be deployed
- * @param monitor
- * The progress monitor
- *
- * @return Not sure what to return yet
- * @throws Exception
- */
- public IJBoss7DeploymentResult deployAsync(String host, int port,
- String deploymentName, File file, IProgressMonitor monitor) throws Exception;
-
- /**
- * Synchronously deploy a file to a server
- *
- * @param host
- * The host
- * @param port
- * The port
- * @param name
- * The deployment's name
- * @param file
- * The file to be deployed
- * @param monitor
- * The progress monitor
- *
- * @return Not sure what to return yet
- * @throws Exception
- */
- public IJBoss7DeploymentResult deploySync(String host, int port,
- String deploymentName, File file, IProgressMonitor monitor) throws Exception;
-
- /**
- * Asynchronously undeploy a file to a server
- *
- * @param host
- * The host
- * @param port
- * The port
- * @param name
- * The deployment's name
- * @param file
- * The file to be deployed
- * @param monitor
- * The progress monitor
- *
- * @return Not sure what to return yet
- * @throws Exception
- */
- public IJBoss7DeploymentResult undeployAsync(String host, int port,
- String deploymentName, boolean removeFile, IProgressMonitor monitor) throws Exception;
-
- /**
- * Synchronously undeploy a file to a server
- *
- * @param host
- * The host
- * @param port
- * The port
- * @param name
- * The deployment's name
- * @param file
- * The file to be deployed
- * @param monitor
- * The progress monitor
- *
- * @return Not sure what to return yet
- * @throws Exception
- */
- public IJBoss7DeploymentResult syncUndeploy(String host, int port,
- String deploymentName, boolean removeFile, IProgressMonitor monitor) throws Exception;
-
- /**
- * Returns the state for a given deployment name on a given host and port.
- *
- * @param host
- * the host to query
- * @param port
- * the port to contact it on
- * @param deploymentName
- * the name of the deployment that shall be queried
- *
- * @return the state of the deployment
- * @throws Exception
- */
- public JBoss7DeploymentState getDeploymentState(String host, int port, String deploymentName) throws Exception;
-
- /**
- * Returns the state of the server
- *
- * @param host the server to query
- * @param port the port to communicate on
- * @return the state of the server
- *
- * @throws Exception
- */
- public JBoss7ServerState getServerState(String host, int port) throws Exception;
-
- /**
- * Returns <code>true</code> if the server is running, <code>false</code>
- * otherwise.
- *
- * @param host the server to to query
- * @param port the port to communicate on
- * @return true if it's running, false otherwise
- * @throws Exception
- */
- public boolean isRunning(String host, int port) throws Exception;
-
- @Deprecated
- public JBoss7ServerState getServerState(String host) throws Exception;
-
- /**
- * Stops the given server
- *
- * @throws JBoss7ManangerException
- * @throws Exception
- */
- public void stop(String host, int port) throws Exception;
-
- @Deprecated
- public void stop(String host) throws Exception;
-
- public void dispose();
-}
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7DeploymentState.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7DeploymentState.java 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7DeploymentState.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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.management.as7;
-
-
-/**
- * An enum that reflects the state of a deployment.
- *
- * @author André Dietisheim
- */
-public enum JBoss7DeploymentState {
- STARTED ,
- STOPPED;
-}
\ No newline at end of file
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManagerServiceProxy.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManagerServiceProxy.java 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManagerServiceProxy.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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.management.as7;
-
-import java.io.File;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * @author André Dietisheim
- */
-public class JBoss7ManagerServiceProxy extends ServiceTracker<IJBoss7ManagerService, IJBoss7ManagerService>
- implements IJBoss7ManagerService {
-
- public JBoss7ManagerServiceProxy(BundleContext context, String asVersion) throws InvalidSyntaxException {
- super(
- context,
- context.createFilter(MessageFormat
- .format("(&(objectClass={0})(as.version={1}))", IJBoss7ManagerService.class.getCanonicalName(), asVersion)), null); //$NON-NLS-1$
- }
-
- public IJBoss7DeploymentResult deployAsync(String host, int port, String deploymentName, File file,
- IProgressMonitor monitor) throws Exception {
- return checkedGetService().deployAsync(host, port, deploymentName, file, monitor);
- }
-
- public IJBoss7DeploymentResult deploySync(String host, int port, String deploymentName, File file,
- IProgressMonitor monitor) throws Exception {
- return checkedGetService().deployAsync(host, port, deploymentName, file, monitor);
- }
-
- public IJBoss7DeploymentResult undeployAsync(String host, int port, String deploymentName, boolean removeFile,
- IProgressMonitor monitor) throws Exception {
- return checkedGetService().undeployAsync(host, port, deploymentName, removeFile, monitor);
- }
-
- public IJBoss7DeploymentResult syncUndeploy(String host, int port, String deploymentName, boolean removeFile,
- IProgressMonitor monitor) throws Exception {
- return checkedGetService().syncUndeploy(host, port, deploymentName, removeFile, monitor);
- }
-
- public JBoss7DeploymentState getDeploymentState(String host, int port, String deploymentName) throws Exception {
- return checkedGetService().getDeploymentState(host, port, deploymentName);
- }
-
- public JBoss7ServerState getServerState(String host, int port) throws Exception {
- return checkedGetService().getServerState(host, port);
- }
-
- public boolean isRunning(String host, int port) throws Exception {
- try {
- return checkedGetService().isRunning(host, port);
- } catch (Exception e) {
- return false;
- }
- }
-
- @Deprecated
- public JBoss7ServerState getServerState(String host) throws Exception {
- return checkedGetService().getServerState(host);
- }
-
- public void stop(String host, int port) throws Exception {
- checkedGetService().stop(host, port);
- }
-
- @Deprecated
- public void stop(String host) throws Exception {
- checkedGetService().stop(host);
- }
-
- private IJBoss7ManagerService checkedGetService() throws JBoss7ManangerException {
- IJBoss7ManagerService service = getService();
- if (service == null) {
- throw new JBoss7ManangerException("Could not acquire JBoss Management service"); //$NON-NLS-1$
- }
- return service;
- }
-
- public void dispose() {
- close();
- }
-
-}
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManagerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManagerUtil.java 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManagerUtil.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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.management.as7;
-
-import org.eclipse.wst.server.core.IServer;
-import org.jboss.ide.eclipse.as.internal.management.as7.Activator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-
-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 InvalidSyntaxException {
- BundleContext context = Activator.getContext();
- JBoss7ManagerServiceProxy proxy = new JBoss7ManagerServiceProxy(context, getRequiredVersion(server));
- proxy.open();
- return proxy;
- }
-
- private static String getRequiredVersion(IServer server) {
- String id = server.getRuntime().getRuntimeType().getId();
- if (JBOSS7_RUNTIME.equals(id)) {
- return IJBoss7ManagerService.AS_VERSION_700;
- }
- return null;
- }
-
- public static void dispose(IJBoss7ManagerService service) {
- if (service != null) {
- service.dispose();
- }
- }
-
- public static <RESULT> RESULT executeWithService(IServiceAware<RESULT> serviceAware, IServer server) throws Exception {
- IJBoss7ManagerService service = null;
- try {
- service = JBoss7ManagerUtil.getService(server);
- return serviceAware.execute(service);
- } finally {
- if (service != null) {
- service.dispose();
- }
- }
- }
-
- public static interface IServiceAware<RESULT> {
-
- public RESULT execute(IJBoss7ManagerService service) throws Exception;
-
- }
-
-}
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManangerConnectException.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManangerConnectException.java 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManangerConnectException.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat Inc..
- * 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
- *
- * Contributors:
- * Red Hat Incorporated - initial API and implementation
- *******************************************************************************/
-package org.jboss.ide.eclipse.as.management.as7;
-
-/**
- * @author André Dietisheim
- */
-public class JBoss7ManangerConnectException extends JBoss7ManangerException {
-
- private static final long serialVersionUID = 1L;
-
- public JBoss7ManangerConnectException(Throwable cause) {
- super(cause);
- }
-
-}
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManangerException.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManangerException.java 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManangerException.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat Inc..
- * 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
- *
- * Contributors:
- * Red Hat Incorporated - initial API and implementation
- *******************************************************************************/
-package org.jboss.ide.eclipse.as.management.as7;
-
-/**
- * @author André Dietisheim
- */
-public class JBoss7ManangerException extends Exception {
-
- private static final long serialVersionUID = 1L;
-
- public JBoss7ManangerException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public JBoss7ManangerException(Throwable cause) {
- super(cause);
- }
-
- public JBoss7ManangerException(String message) {
- super(message);
- }
-
-}
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ServerState.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ServerState.java 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ServerState.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * 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.management.as7;
-
-import java.text.MessageFormat;
-
-import org.jboss.ide.eclipse.as.internal.management.as7.AS7Messages;
-
-/**
- * @author André Dietisheim
- */
-public enum JBoss7ServerState {
- STARTING, RUNNING, RESTART_REQUIRED;
-
- public static JBoss7ServerState valueOfIgnoreCase(String stateString) {
- JBoss7ServerState matchingState = null;
- if (stateString != null && stateString.length() > 0) {
- for (JBoss7ServerState availableState : values()) {
- if (stateString.equalsIgnoreCase(availableState.name())) {
- matchingState = availableState;
- break;
- }
- }
- }
- if (matchingState == null) {
- throw new IllegalArgumentException(MessageFormat.format(
- AS7Messages.JBoss7ServerState_noEnumForString,
- stateString));
- }
-
- return matchingState;
- }
-}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF 2011-08-12 13:34:43 UTC (rev 33836)
@@ -28,4 +28,3 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.jboss.ide.eclipse.as.rse.core
Bundle-Localization: plugin
-Import-Package: org.jboss.ide.eclipse.as.management.as7
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-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -20,9 +20,9 @@
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server;
+import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService;
+import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManagerUtil;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
-import org.jboss.ide.eclipse.as.management.as7.IJBoss7ManagerService;
-import org.jboss.ide.eclipse.as.management.as7.JBoss7ManagerUtil;
public class RSEJBoss7BehaviourDelegate extends RSEBehaviourDelegate {
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -23,11 +23,11 @@
import java.net.UnknownHostException;
import java.util.concurrent.ExecutionException;
+import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7DeploymentState;
+import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManangerException;
+import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ServerState;
import org.jboss.ide.eclipse.as.internal.management.as7.AS7Manager;
import org.jboss.ide.eclipse.as.internal.management.as7.tests.utils.AS7ManagerTestUtils;
-import org.jboss.ide.eclipse.as.management.as7.JBoss7DeploymentState;
-import org.jboss.ide.eclipse.as.management.as7.JBoss7ManangerException;
-import org.jboss.ide.eclipse.as.management.as7.JBoss7ServerState;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/JBossManagementServiceTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/JBossManagementServiceTest.java 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/JBossManagementServiceTest.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -14,7 +14,7 @@
import java.net.UnknownHostException;
-import org.jboss.ide.eclipse.as.management.as7.IJBoss7ManagerService;
+import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/utils/AS7ManagerTestUtils.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/utils/AS7ManagerTestUtils.java 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/utils/AS7ManagerTestUtils.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -25,9 +25,9 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
+import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7DeploymentResult;
+import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManangerException;
import org.jboss.ide.eclipse.as.internal.management.as7.AS7Manager;
-import org.jboss.ide.eclipse.as.management.as7.IJBoss7DeploymentResult;
-import org.jboss.ide.eclipse.as.management.as7.JBoss7ManangerException;
import org.osgi.framework.Bundle;
/**
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF 2011-08-12 13:34:43 UTC (rev 33836)
@@ -56,4 +56,3 @@
org.jboss.ide.eclipse.as.test.util,
org.jboss.ide.eclipse.as.test.util.jdt,
org.jboss.ide.eclipse.as.test.util.wtp
-Import-Package: org.jboss.ide.eclipse.as.management.as7
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java 2011-08-12 13:02:40 UTC (rev 33835)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java 2011-08-12 13:34:43 UTC (rev 33836)
@@ -17,12 +17,12 @@
import java.util.Hashtable;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.jboss.ide.eclipse.as.management.as7.IJBoss7DeploymentResult;
-import org.jboss.ide.eclipse.as.management.as7.IJBoss7ManagerService;
-import org.jboss.ide.eclipse.as.management.as7.JBoss7DeploymentState;
-import org.jboss.ide.eclipse.as.management.as7.JBoss7ManagerServiceProxy;
-import org.jboss.ide.eclipse.as.management.as7.JBoss7ManangerException;
-import org.jboss.ide.eclipse.as.management.as7.JBoss7ServerState;
+import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7DeploymentResult;
+import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService;
+import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7DeploymentState;
+import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManagerServiceProxy;
+import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ManangerException;
+import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ServerState;
import org.jboss.ide.eclipse.as.test.ASTest;
import org.junit.Test;
import org.osgi.framework.BundleContext;
14 years, 8 months
- 1
- 0