July 2011 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r32620 - in trunk/common: features and 45 other directories.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2011-07-05 12:36:21 -0400 (Tue, 05 Jul 2011) New Revision: 32620 Modified: trunk/common/features/org.jboss.tools.common.all.feature/pom.xml trunk/common/features/org.jboss.tools.common.all.tests.feature/pom.xml trunk/common/features/org.jboss.tools.common.core.feature/pom.xml trunk/common/features/org.jboss.tools.common.feature/pom.xml trunk/common/features/org.jboss.tools.common.text.ext.feature/pom.xml trunk/common/features/org.jboss.tools.common.ui.feature/pom.xml trunk/common/features/org.jboss.tools.common.verification.feature/feature.xml trunk/common/features/org.jboss.tools.common.verification.feature/pom.xml trunk/common/features/pom.xml trunk/common/plugins/org.jboss.tools.common.base.test/pom.xml trunk/common/plugins/org.jboss.tools.common.el.core/pom.xml trunk/common/plugins/org.jboss.tools.common.el.ui/pom.xml trunk/common/plugins/org.jboss.tools.common.gef/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.gef/pom.xml trunk/common/plugins/org.jboss.tools.common.meta.ui/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.meta.ui/pom.xml trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/pom.xml trunk/common/plugins/org.jboss.tools.common.model.ui/pom.xml trunk/common/plugins/org.jboss.tools.common.model/pom.xml trunk/common/plugins/org.jboss.tools.common.projecttemplates/pom.xml trunk/common/plugins/org.jboss.tools.common.resref.core/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.resref.core/pom.xml trunk/common/plugins/org.jboss.tools.common.resref.ui/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.resref.ui/pom.xml trunk/common/plugins/org.jboss.tools.common.text.ext/pom.xml trunk/common/plugins/org.jboss.tools.common.text.xml/pom.xml trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.ui/pom.xml trunk/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.verification.ui/pom.xml trunk/common/plugins/org.jboss.tools.common.verification/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.verification/pom.xml trunk/common/plugins/org.jboss.tools.common/pom.xml trunk/common/plugins/pom.xml trunk/common/pom.xml trunk/common/site/pom.xml trunk/common/tests/org.jboss.tools.common.el.core.test/pom.xml trunk/common/tests/org.jboss.tools.common.model.test/pom.xml trunk/common/tests/org.jboss.tools.common.model.ui.test/META-INF/MANIFEST.MF trunk/common/tests/org.jboss.tools.common.model.ui.test/pom.xml trunk/common/tests/org.jboss.tools.common.test/META-INF/MANIFEST.MF trunk/common/tests/org.jboss.tools.common.test/pom.xml trunk/common/tests/org.jboss.tools.common.verification.test/META-INF/MANIFEST.MF trunk/common/tests/org.jboss.tools.common.verification.test/pom.xml trunk/common/tests/org.jboss.tools.common.verification.ui.test/META-INF/MANIFEST.MF trunk/common/tests/org.jboss.tools.common.verification.ui.test/pom.xml trunk/common/tests/pom.xml Log: JBIDE-9260 common bumped to 3.3.0.qualifier/snapshot consistently Modified: trunk/common/features/org.jboss.tools.common.all.feature/pom.xml =================================================================== --- trunk/common/features/org.jboss.tools.common.all.feature/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/features/org.jboss.tools.common.all.feature/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>features</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.features</groupId> <artifactId>org.jboss.tools.common.all.feature</artifactId> - <version>3.3.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> </project> Modified: trunk/common/features/org.jboss.tools.common.all.tests.feature/pom.xml =================================================================== --- trunk/common/features/org.jboss.tools.common.all.tests.feature/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/features/org.jboss.tools.common.all.tests.feature/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>features</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.features</groupId> <artifactId>org.jboss.tools.common.all.tests.feature</artifactId> - <version>3.3.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> </project> Modified: trunk/common/features/org.jboss.tools.common.core.feature/pom.xml =================================================================== --- trunk/common/features/org.jboss.tools.common.core.feature/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/features/org.jboss.tools.common.core.feature/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>features</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.features</groupId> <artifactId>org.jboss.tools.common.core.feature</artifactId> - <version>3.3.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> </project> Modified: trunk/common/features/org.jboss.tools.common.feature/pom.xml =================================================================== --- trunk/common/features/org.jboss.tools.common.feature/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/features/org.jboss.tools.common.feature/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>features</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.features</groupId> <artifactId>org.jboss.tools.common.feature</artifactId> - <version>3.3.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> </project> Modified: trunk/common/features/org.jboss.tools.common.text.ext.feature/pom.xml =================================================================== --- trunk/common/features/org.jboss.tools.common.text.ext.feature/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/features/org.jboss.tools.common.text.ext.feature/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>features</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.features</groupId> <artifactId>org.jboss.tools.common.text.ext.feature</artifactId> - <version>3.3.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> </project> Modified: trunk/common/features/org.jboss.tools.common.ui.feature/pom.xml =================================================================== --- trunk/common/features/org.jboss.tools.common.ui.feature/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/features/org.jboss.tools.common.ui.feature/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>features</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.features</groupId> <artifactId>org.jboss.tools.common.ui.feature</artifactId> - <version>3.3.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> </project> Modified: trunk/common/features/org.jboss.tools.common.verification.feature/feature.xml =================================================================== --- trunk/common/features/org.jboss.tools.common.verification.feature/feature.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/features/org.jboss.tools.common.verification.feature/feature.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -2,7 +2,7 @@ <feature id="org.jboss.tools.common.verification.feature" label="%featureName" - version="3.1.0.qualifier" + version="3.3.0.qualifier" provider-name="%providerName"> <description url="http://www.jboss.org/tools"> Modified: trunk/common/features/org.jboss.tools.common.verification.feature/pom.xml =================================================================== --- trunk/common/features/org.jboss.tools.common.verification.feature/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/features/org.jboss.tools.common.verification.feature/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>features</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.features</groupId> <artifactId>org.jboss.tools.common.verification.feature</artifactId> - <version>3.1.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> </project> Modified: trunk/common/features/pom.xml =================================================================== --- trunk/common/features/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/features/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,11 +4,11 @@ <groupId>org.jboss.tools.common</groupId> <artifactId>features</artifactId> <name>common.features</name> - <version>0.0.1-SNAPSHOT</version> + <parent> <groupId>org.jboss.tools</groupId> <artifactId>common</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <packaging>pom</packaging> <modules> Modified: trunk/common/plugins/org.jboss.tools.common/pom.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>plugins</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.plugins</groupId> <artifactId>org.jboss.tools.common</artifactId> - <version>3.3.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> </project> Modified: trunk/common/plugins/org.jboss.tools.common.base.test/pom.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.base.test/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.base.test/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>plugins</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.plugins</groupId> <artifactId>org.jboss.tools.common.base.test</artifactId> - <version>3.3.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> </project> Modified: trunk/common/plugins/org.jboss.tools.common.el.core/pom.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.el.core/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>plugins</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.plugins</groupId> <artifactId>org.jboss.tools.common.el.core</artifactId> - <version>3.3.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> </project> Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/pom.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.ui/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.el.ui/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>plugins</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.plugins</groupId> <artifactId>org.jboss.tools.common.el.ui</artifactId> - <version>3.3.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> </project> Modified: trunk/common/plugins/org.jboss.tools.common.gef/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.gef/META-INF/MANIFEST.MF 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.gef/META-INF/MANIFEST.MF 2011-07-05 16:36:21 UTC (rev 32620) @@ -27,5 +27,5 @@ org.eclipse.gef;bundle-version="3.7.0", org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.core.resources;bundle-version="3.7.100" -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.3.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/common/plugins/org.jboss.tools.common.gef/pom.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.gef/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.gef/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>plugins</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.plugins</groupId> <artifactId>org.jboss.tools.common.gef</artifactId> - <version>3.1.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> </project> Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/META-INF/MANIFEST.MF 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/META-INF/MANIFEST.MF 2011-07-05 16:36:21 UTC (rev 32620) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.common.meta.ui;singleton:=true -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.3.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.jboss.tools.common.model, Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/pom.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>plugins</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.plugins</groupId> <artifactId>org.jboss.tools.common.meta.ui</artifactId> - <version>3.1.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> </project> Modified: trunk/common/plugins/org.jboss.tools.common.model/pom.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.model/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>plugins</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.plugins</groupId> <artifactId>org.jboss.tools.common.model</artifactId> - <version>3.3.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> </project> Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/pom.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>plugins</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.plugins</groupId> <artifactId>org.jboss.tools.common.model.ui</artifactId> - <version>3.3.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> </project> Modified: trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF 2011-07-05 16:36:21 UTC (rev 32620) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.jboss.tools.common.model.ui.capabilities;singleton:=true -Bundle-Version: 3.2.0.qualifier +Bundle-Version: 3.3.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Localization: plugin Require-Bundle: org.eclipse.ui;bundle-version="3.7.0" Modified: trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/pom.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>plugins</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.plugins</groupId> <artifactId>org.jboss.tools.common.model.ui.capabilities</artifactId> - <version>3.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> </project> Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/pom.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.projecttemplates/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>plugins</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.plugins</groupId> <artifactId>org.jboss.tools.common.projecttemplates</artifactId> - <version>3.3.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> </project> Modified: trunk/common/plugins/org.jboss.tools.common.resref.core/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.resref.core/META-INF/MANIFEST.MF 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.resref.core/META-INF/MANIFEST.MF 2011-07-05 16:36:21 UTC (rev 32620) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.common.resref.core -Bundle-Version: 3.2.0.qualifier +Bundle-Version: 3.3.0.qualifier Bundle-Activator: org.jboss.tools.common.resref.core.ResourceReferencePlugin Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", org.eclipse.core.runtime;bundle-version="3.7.0", Modified: trunk/common/plugins/org.jboss.tools.common.resref.core/pom.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.resref.core/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.resref.core/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>plugins</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.plugins</groupId> <artifactId>org.jboss.tools.common.resref.core</artifactId> - <version>3.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> </project> Modified: trunk/common/plugins/org.jboss.tools.common.resref.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.resref.ui/META-INF/MANIFEST.MF 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.resref.ui/META-INF/MANIFEST.MF 2011-07-05 16:36:21 UTC (rev 32620) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.common.resref.ui -Bundle-Version: 3.2.0.qualifier +Bundle-Version: 3.3.0.qualifier Bundle-Activator: org.jboss.tools.common.resref.ui.Activator Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", org.eclipse.core.runtime;bundle-version="3.7.0", Modified: trunk/common/plugins/org.jboss.tools.common.resref.ui/pom.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.resref.ui/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.resref.ui/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>plugins</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.plugins</groupId> <artifactId>org.jboss.tools.common.resref.ui</artifactId> - <version>3.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> </project> Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/pom.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>plugins</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.plugins</groupId> <artifactId>org.jboss.tools.common.text.ext</artifactId> - <version>3.3.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> </project> Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/pom.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.xml/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.text.xml/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>plugins</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.plugins</groupId> <artifactId>org.jboss.tools.common.text.xml</artifactId> - <version>3.3.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> </project> Modified: trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2011-07-05 16:36:21 UTC (rev 32620) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.common.ui;singleton:=true -Bundle-Version: 3.2.0.qualifier +Bundle-Version: 3.3.0.qualifier Require-Bundle: org.eclipse.osgi;bundle-version="3.7.0", org.jboss.tools.common, org.eclipse.ui;bundle-version="3.7.0", Modified: trunk/common/plugins/org.jboss.tools.common.ui/pom.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.ui/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.ui/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>plugins</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.plugins</groupId> <artifactId>org.jboss.tools.common.ui</artifactId> - <version>3.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> </project> Modified: trunk/common/plugins/org.jboss.tools.common.verification/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification/META-INF/MANIFEST.MF 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.verification/META-INF/MANIFEST.MF 2011-07-05 16:36:21 UTC (rev 32620) @@ -22,5 +22,5 @@ org.eclipse.core.resources;bundle-version="3.7.100", org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.wst.validation;bundle-version="1.2.300" -Bundle-Version: 3.2.0.qualifier +Bundle-Version: 3.3.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/common/plugins/org.jboss.tools.common.verification/pom.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.verification/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>plugins</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.plugins</groupId> <artifactId>org.jboss.tools.common.verification</artifactId> - <version>3.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> </project> Modified: trunk/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF 2011-07-05 16:36:21 UTC (rev 32620) @@ -30,5 +30,5 @@ org.eclipse.jface;bundle-version="3.7.0", org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200", org.eclipse.wst.validation;bundle-version="1.2.300" -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.3.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/common/plugins/org.jboss.tools.common.verification.ui/pom.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification.ui/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/org.jboss.tools.common.verification.ui/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>plugins</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.plugins</groupId> <artifactId>org.jboss.tools.common.verification.ui</artifactId> - <version>3.1.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> </project> Modified: trunk/common/plugins/pom.xml =================================================================== --- trunk/common/plugins/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/plugins/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,11 +4,11 @@ <groupId>org.jboss.tools.common</groupId> <artifactId>plugins</artifactId> <name>common.plugins</name> - <version>0.0.1-SNAPSHOT</version> + <parent> <groupId>org.jboss.tools</groupId> <artifactId>common</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <packaging>pom</packaging> <modules> Modified: trunk/common/pom.xml =================================================================== --- trunk/common/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -11,7 +11,7 @@ <groupId>org.jboss.tools</groupId> <artifactId>common</artifactId> <name>common.all</name> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>plugins</module> Modified: trunk/common/site/pom.xml =================================================================== --- trunk/common/site/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/site/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,10 +4,10 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>common</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common</groupId> <artifactId>common.site</artifactId> - <version>0.0.1-SNAPSHOT</version> + <packaging>eclipse-update-site</packaging> </project> Modified: trunk/common/tests/org.jboss.tools.common.el.core.test/pom.xml =================================================================== --- trunk/common/tests/org.jboss.tools.common.el.core.test/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/tests/org.jboss.tools.common.el.core.test/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,11 +4,11 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>tests</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.tests</groupId> <artifactId>org.jboss.tools.common.el.core.test</artifactId> - <version>3.3.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> <properties> <emma.filter>org.jboss.tools.common.el.core*,org.jboss.tools.common.el.internal.core*</emma.filter> Modified: trunk/common/tests/org.jboss.tools.common.model.test/pom.xml =================================================================== --- trunk/common/tests/org.jboss.tools.common.model.test/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/tests/org.jboss.tools.common.model.test/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,11 +4,11 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>tests</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.tests</groupId> <artifactId>org.jboss.tools.common.model.test</artifactId> - <version>3.3.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> <properties> Modified: trunk/common/tests/org.jboss.tools.common.model.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/common/tests/org.jboss.tools.common.model.ui.test/META-INF/MANIFEST.MF 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/tests/org.jboss.tools.common.model.ui.test/META-INF/MANIFEST.MF 2011-07-05 16:36:21 UTC (rev 32620) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.common.model.ui.test;singleton:=true -Bundle-Version: 3.2.0.qualifier +Bundle-Version: 3.3.0.qualifier Require-Bundle: org.junit;bundle-version="3.8.2";visibility:=reexport, org.eclipse.jface, org.jboss.tools.tests, Modified: trunk/common/tests/org.jboss.tools.common.model.ui.test/pom.xml =================================================================== --- trunk/common/tests/org.jboss.tools.common.model.ui.test/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/tests/org.jboss.tools.common.model.ui.test/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,11 +4,11 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>tests</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.tests</groupId> <artifactId>org.jboss.tools.common.model.ui.test</artifactId> - <version>3.2.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> <properties> Modified: trunk/common/tests/org.jboss.tools.common.test/META-INF/MANIFEST.MF =================================================================== --- trunk/common/tests/org.jboss.tools.common.test/META-INF/MANIFEST.MF 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/tests/org.jboss.tools.common.test/META-INF/MANIFEST.MF 2011-07-05 16:36:21 UTC (rev 32620) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.common.test -Bundle-Version: 3.2.0.qualifier +Bundle-Version: 3.3.0.qualifier Bundle-Vendor: %Bundle-Vendor.0 Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, Modified: trunk/common/tests/org.jboss.tools.common.test/pom.xml =================================================================== --- trunk/common/tests/org.jboss.tools.common.test/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/tests/org.jboss.tools.common.test/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,11 +4,11 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>tests</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.tests</groupId> <artifactId>org.jboss.tools.common.test</artifactId> - <version>3.2.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> <properties> <emma.filter>org.jboss.tools.common*</emma.filter> Modified: trunk/common/tests/org.jboss.tools.common.verification.test/META-INF/MANIFEST.MF =================================================================== --- trunk/common/tests/org.jboss.tools.common.verification.test/META-INF/MANIFEST.MF 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/tests/org.jboss.tools.common.verification.test/META-INF/MANIFEST.MF 2011-07-05 16:36:21 UTC (rev 32620) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.common.verification.test;singleton:=true -Bundle-Version: 3.2.0.qualifier +Bundle-Version: 3.3.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.common.verification.test Modified: trunk/common/tests/org.jboss.tools.common.verification.test/pom.xml =================================================================== --- trunk/common/tests/org.jboss.tools.common.verification.test/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/tests/org.jboss.tools.common.verification.test/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,11 +4,11 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>tests</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.tests</groupId> <artifactId>org.jboss.tools.common.verification.test</artifactId> - <version>3.2.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> <properties> <emma.filter>org.jboss.tools.common.verification*</emma.filter> Modified: trunk/common/tests/org.jboss.tools.common.verification.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/common/tests/org.jboss.tools.common.verification.ui.test/META-INF/MANIFEST.MF 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/tests/org.jboss.tools.common.verification.ui.test/META-INF/MANIFEST.MF 2011-07-05 16:36:21 UTC (rev 32620) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Verification UI Test Plug-in Bundle-SymbolicName: org.jboss.tools.common.verification.ui.test -Bundle-Version: 3.2.0.qualifier +Bundle-Version: 3.3.0.qualifier Require-Bundle: org.junit, org.jboss.tools.tests, org.eclipse.jface, Modified: trunk/common/tests/org.jboss.tools.common.verification.ui.test/pom.xml =================================================================== --- trunk/common/tests/org.jboss.tools.common.verification.ui.test/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/tests/org.jboss.tools.common.verification.ui.test/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,11 +4,11 @@ <parent> <groupId>org.jboss.tools.common</groupId> <artifactId>tests</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.common.tests</groupId> <artifactId>org.jboss.tools.common.verification.ui.test</artifactId> - <version>3.2.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> <properties> <emma.filter>org.jboss.tools.common.verification.ui*</emma.filter> Modified: trunk/common/tests/pom.xml =================================================================== --- trunk/common/tests/pom.xml 2011-07-05 16:33:31 UTC (rev 32619) +++ trunk/common/tests/pom.xml 2011-07-05 16:36:21 UTC (rev 32620) @@ -4,11 +4,10 @@ <groupId>org.jboss.tools.common</groupId> <artifactId>tests</artifactId> <name>common.tests</name> - <version>0.0.1-SNAPSHOT</version> <parent> <groupId>org.jboss.tools</groupId> <artifactId>common</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <packaging>pom</packaging> <modules>

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r32619 - 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-05 12:33:31 -0400 (Tue, 05 Jul 2011) New Revision: 32619 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchConfiguration.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java Log: [JBIDE-9215] added infrastructure for remote launching (added delegate capability). Switching is not implemented yet, it's the next step Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-07-05 16:26:51 UTC (rev 32618) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-07-05 16:33:31 UTC (rev 32619) @@ -68,6 +68,7 @@ public void setupLaunchConfiguration(ILaunchConfigurationWorkingCopy launchConfig, IProgressMonitor monitor) throws CoreException { + // TODO: implement setup for RSE launch delegate too new LocalJBoss7StartupConfigurator(getServer()).configure(launchConfig); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java 2011-07-05 16:26:51 UTC (rev 32618) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java 2011-07-05 16:33:31 UTC (rev 32619) @@ -10,70 +10,92 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.core.server.internal.v7; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; + import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunchConfiguration; -import org.eclipse.debug.core.model.ILaunchConfigurationDelegate; -import org.eclipse.debug.core.model.IProcess; -import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller; -import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; -import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate; +import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; +import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod; import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration; -import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils; -import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences; +import org.jboss.ide.eclipse.as.core.server.internal.launch.LocalJBossStartLaunchDelegate; /** * @author Rob Stryker */ -public class JBoss7ServerStartupLaunchConfiguration extends JBossServerStartupLaunchConfiguration implements - ILaunchConfigurationDelegate { +public class JBoss7ServerStartupLaunchConfiguration extends JBossServerStartupLaunchConfiguration { - public String[] getJavaLibraryPath(ILaunchConfiguration configuration) throws CoreException { - return new String[] {}; + private static HashMap<String, StartLaunchDelegate> launchDelegates; + private static ArrayList<IStartLaunchSetupParticipant> setupParticipants; + + static { + setupParticipants = new ArrayList<IStartLaunchSetupParticipant>(); + setupParticipants.add(new LocalJBossStartLaunchDelegate()); + launchDelegates = new HashMap<String, StartLaunchDelegate>(); + launchDelegates.put(LocalPublishMethod.LOCAL_PUBLISH_METHOD, new LocalJBoss7StartLaunchConfiguration()); } + + public static void addLaunchDelegateMapping(String mode, StartLaunchDelegate del) { + launchDelegates.put(mode, del); + } - public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) - throws CoreException { - JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); - if( LaunchCommandPreferences.ignoreLaunchCommand(jbsBehavior.getServer())) { - jbsBehavior.setServerStarting(); - jbsBehavior.setServerStarted(); - return false; - } - // TODO: use the configured poller - boolean started = WebPortPoller.onePing(jbsBehavior.getServer()); - if( started ) { - jbsBehavior.setServerStarting(); - jbsBehavior.setServerStarted(); - return false; - } - return true; + public static void addSetupLaunchParticipant(IStartLaunchSetupParticipant participant) { + setupParticipants.add(participant); } - public void preLaunch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) - throws CoreException { - try { - JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); - jbsBehavior.setRunMode(mode); - jbsBehavior.serverStarting(); - } catch (CoreException ce) { - // report it + // Allow all participants to set some defaults for their own details + // Participants should be careful not to change shared launch keys / values + // unless their operation mode (local / rse / etc) is in use + public static void setupLaunchConfiguration(ILaunchConfigurationWorkingCopy workingCopy, IServer server) throws CoreException { + for( Iterator<IStartLaunchSetupParticipant> i = setupParticipants.iterator(); i.hasNext(); ) { + i.next().setupLaunchConfiguration(workingCopy, server); } + } + + protected StartLaunchDelegate getDelegate(ILaunchConfiguration configuration) throws CoreException { +// TODO: choose delegate upon setting (server editor) +// IServer server = ServerUtil.getServer(configuration); +// DeployableServerBehavior beh = ServerConverter.getDeployableServerBehavior(server); +// IJBossServerPublishMethodType type = beh.createPublishMethod().getPublishMethodType(); +// return launchDelegates.get(type.getId()); + +// always return local launch delegate until all parts were implemented + return new LocalJBoss7StartLaunchConfiguration(); + } + + public void actualLaunch(ILaunchConfiguration configuration, + String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { + getDelegate(configuration).actualLaunch(this, configuration, mode, launch, monitor); + } + + @Deprecated + public void superActualLaunch(ILaunchConfiguration configuration, + String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { + super.actualLaunch(configuration, mode, launch, monitor); + } + /* + * Ensures that the working directory and classpath are 100% accurate. + * Merges proper required params into args and vm args + */ + @Override + public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { + return getDelegate(configuration).preLaunchCheck(configuration, mode, monitor); + } - public void postLaunch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) - throws CoreException { - try { - JBoss7ServerBehavior behavior = JBossServerBehaviorUtils.getJBoss7ServerBehavior(configuration); - IProcess[] processes = launch.getProcesses(); - if (processes != null && processes.length >= 1) { - behavior.setProcess(processes[0]); - ((LocalJBossBehaviorDelegate) (behavior.getDelegate())).setProcess(processes[0]); - } - behavior.setRunMode(mode); - } catch (CoreException ce) { - // report it - } + @Override + public void preLaunch(ILaunchConfiguration configuration, + String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { + getDelegate(configuration).preLaunch(configuration, mode, launch, monitor); } + + @Override + public void postLaunch(ILaunchConfiguration configuration, String mode, + ILaunch launch, IProgressMonitor monitor) throws CoreException { + getDelegate(configuration).postLaunch(configuration, mode, launch, monitor); + } } Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchConfiguration.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchConfiguration.java 2011-07-05 16:33:31 UTC (rev 32619) @@ -0,0 +1,80 @@ +/******************************************************************************* + * 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.v7; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.debug.core.ILaunch; +import org.eclipse.debug.core.ILaunchConfiguration; +import org.eclipse.debug.core.model.IProcess; +import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller; +import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; +import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate; +import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.IStartLaunchSetupParticipant; +import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.StartLaunchDelegate; +import org.jboss.ide.eclipse.as.core.server.internal.launch.LocalJBossStartLaunchDelegate; +import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils; +import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences; + +/** + * @author Rob Stryker + */ +public class LocalJBoss7StartLaunchConfiguration extends LocalJBossStartLaunchDelegate + implements StartLaunchDelegate, IStartLaunchSetupParticipant { + + public String[] getJavaLibraryPath(ILaunchConfiguration configuration) throws CoreException { + return new String[] {}; + } + + public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) + throws CoreException { + JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); + if( LaunchCommandPreferences.ignoreLaunchCommand(jbsBehavior.getServer())) { + jbsBehavior.setServerStarting(); + jbsBehavior.setServerStarted(); + return false; + } + // TODO: use the configured poller + boolean started = WebPortPoller.onePing(jbsBehavior.getServer()); + if( started ) { + jbsBehavior.setServerStarting(); + jbsBehavior.setServerStarted(); + return false; + } + return true; + } + + public void preLaunch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) + throws CoreException { + try { + JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); + jbsBehavior.setRunMode(mode); + jbsBehavior.serverStarting(); + } catch (CoreException ce) { + // report it + } + } + + public void postLaunch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) + throws CoreException { + try { + JBoss7ServerBehavior behavior = JBossServerBehaviorUtils.getJBoss7ServerBehavior(configuration); + IProcess[] processes = launch.getProcesses(); + if (processes != null && processes.length >= 1) { + behavior.setProcess(processes[0]); + ((LocalJBossBehaviorDelegate) (behavior.getDelegate())).setProcess(processes[0]); + } + behavior.setRunMode(mode); + } catch (CoreException ce) { + // report it + } + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchConfiguration.java ___________________________________________________________________ Added: svn:mime-type + text/plain

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r32618 - in trunk/forge: tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2011-07-05 12:26:51 -0400 (Tue, 05 Jul 2011) New Revision: 32618 Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntimeTest.java Log: starting notification should happen when process is already initialized Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java 2011-07-05 16:19:02 UTC (rev 32617) +++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java 2011-07-05 16:26:51 UTC (rev 32618) @@ -35,10 +35,10 @@ } try { progressMonitor.beginTask("Starting Forge", IProgressMonitor.UNKNOWN); + streamListener = new StartupListener(); + process = ForgeLaunchHelper.launch(getName(), getLocation()); state = STATE_STARTING; propertyChangeSupport.firePropertyChange(PROPERTY_STATE, STATE_NOT_RUNNING, STATE_STARTING); - streamListener = new StartupListener(); - process = ForgeLaunchHelper.launch(getName(), getLocation()); process.getStreamsProxy().getOutputStreamMonitor().addListener(streamListener); progressMonitor.worked(1); while (STATE_STARTING.equals(state)) { Modified: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntimeTest.java =================================================================== --- trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntimeTest.java 2011-07-05 16:19:02 UTC (rev 32617) +++ trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntimeTest.java 2011-07-05 16:26:51 UTC (rev 32618) @@ -132,6 +132,9 @@ private class TestPropertyChangeListener implements PropertyChangeListener { public void propertyChange(PropertyChangeEvent evt) { propertyChangeEvents.add(evt); + if (ForgeRuntime.STATE_STARTING.equals(evt.getNewValue())) { + assertNotNull(runtime.getProcess()); + } } }

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r32617 - in trunk/forge: tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2011-07-05 12:19:02 -0400 (Tue, 05 Jul 2011) New Revision: 32617 Added: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntimeTest.java Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntime.java trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeExternalRuntime.java trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeRuntime.java trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeExternalRuntimeTest.java Log: start and stop functionality of ForgeRuntime is implemented and tested Added: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java 2011-07-05 16:19:02 UTC (rev 32617) @@ -0,0 +1,101 @@ +package org.jboss.tools.forge.core.process; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.debug.core.DebugException; +import org.eclipse.debug.core.IStreamListener; +import org.eclipse.debug.core.model.IProcess; +import org.eclipse.debug.core.model.IStreamMonitor; +import org.jboss.tools.forge.core.ForgeCorePlugin; + +public abstract class ForgeAbstractRuntime implements ForgeRuntime { + + private static final String PROPERTY_STATE = "state"; + + private IProcess process = null; + private String state = STATE_NOT_RUNNING; + + private PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this); + + public IProcess getProcess() { + return process; + } + + public String getState() { + return state; + } + + public void start(IProgressMonitor progressMonitor) { + IStreamListener streamListener = null; + if (progressMonitor == null) { + progressMonitor = new NullProgressMonitor(); + } + try { + progressMonitor.beginTask("Starting Forge", IProgressMonitor.UNKNOWN); + state = STATE_STARTING; + propertyChangeSupport.firePropertyChange(PROPERTY_STATE, STATE_NOT_RUNNING, STATE_STARTING); + streamListener = new StartupListener(); + process = ForgeLaunchHelper.launch(getName(), getLocation()); + process.getStreamsProxy().getOutputStreamMonitor().addListener(streamListener); + progressMonitor.worked(1); + while (STATE_STARTING.equals(state)) { + if (progressMonitor.isCanceled()) { + terminate(); + state = STATE_NOT_RUNNING; + propertyChangeSupport.firePropertyChange(PROPERTY_STATE, STATE_STARTING, STATE_NOT_RUNNING); + } else { + progressMonitor.worked(1); + } + } + } finally { + process.getStreamsProxy().getOutputStreamMonitor().removeListener(streamListener); + if (STATE_NOT_RUNNING.equals(state)) { + process = null; + } + progressMonitor.done(); + } + } + + public void stop(IProgressMonitor progressMonitor) { + if (progressMonitor == null) { + progressMonitor = new NullProgressMonitor(); + } + try { + progressMonitor.beginTask("Stopping Forge", 1); + terminate(); + process = null; + state = STATE_NOT_RUNNING; + propertyChangeSupport.firePropertyChange(PROPERTY_STATE, STATE_RUNNING, STATE_NOT_RUNNING); + } finally { + progressMonitor.done(); + } + } + + private void terminate() { + try { + process.terminate(); + } catch (DebugException e) { + ForgeCorePlugin.log(e); + } + } + + public void addPropertyChangeListener(PropertyChangeListener propertyChangeListener) { + propertyChangeSupport.addPropertyChangeListener(propertyChangeListener); + } + + public void removePropertyChangeListener(PropertyChangeListener propertyChangeListener) { + propertyChangeSupport.removePropertyChangeListener(propertyChangeListener); + } + + private class StartupListener implements IStreamListener { + @Override + public void streamAppended(String text, IStreamMonitor monitor) { + state = STATE_RUNNING; + propertyChangeSupport.firePropertyChange(PROPERTY_STATE, STATE_STARTING, STATE_RUNNING); + } + } + +} Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntime.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntime.java 2011-07-05 16:18:38 UTC (rev 32616) +++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntime.java 2011-07-05 16:19:02 UTC (rev 32617) @@ -6,7 +6,7 @@ import org.eclipse.core.runtime.Platform; import org.jboss.tools.forge.core.ForgeCorePlugin; -public class ForgeEmbeddedRuntime implements ForgeRuntime { +public class ForgeEmbeddedRuntime extends ForgeAbstractRuntime { public static final ForgeRuntime INSTANCE = new ForgeEmbeddedRuntime(); Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeExternalRuntime.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeExternalRuntime.java 2011-07-05 16:18:38 UTC (rev 32616) +++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeExternalRuntime.java 2011-07-05 16:19:02 UTC (rev 32617) @@ -1,6 +1,6 @@ package org.jboss.tools.forge.core.process; -public class ForgeExternalRuntime implements ForgeRuntime { +public class ForgeExternalRuntime extends ForgeAbstractRuntime { private String name, location; Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeRuntime.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeRuntime.java 2011-07-05 16:18:38 UTC (rev 32616) +++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeRuntime.java 2011-07-05 16:19:02 UTC (rev 32617) @@ -1,9 +1,24 @@ package org.jboss.tools.forge.core.process; +import java.beans.PropertyChangeListener; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.debug.core.model.IProcess; + public interface ForgeRuntime { + String STATE_NOT_RUNNING = "org.jboss.tools.forge.notRunning"; + String STATE_RUNNING = "org.jboss.tools.forge.running"; + String STATE_STARTING = "org.jboss.tools.forge.starting"; + String getName(); String getLocation(); String getType(); + String getState(); + IProcess getProcess(); + void start(IProgressMonitor progressMonitor); + void stop(IProgressMonitor progressMonitor); + void addPropertyChangeListener(PropertyChangeListener propertyChangeListener); + void removePropertyChangeListener(PropertyChangeListener propertyChangeListener); } Added: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntimeTest.java =================================================================== --- trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntimeTest.java (rev 0) +++ trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntimeTest.java 2011-07-05 16:19:02 UTC (rev 32617) @@ -0,0 +1,175 @@ +package org.jboss.tools.forge.core.process; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Platform; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class ForgeAbstractRuntimeTest { + + private ForgeRuntime runtime; + private Set<String> calledMethods; + private List<PropertyChangeEvent> propertyChangeEvents; + private PropertyChangeListener propertyChangeListener; + private int amountWorked; + private int totalWork; + private String taskName; + + @Before + public void setUp() { + propertyChangeEvents = new ArrayList<PropertyChangeEvent>(); + calledMethods = new HashSet<String>(); + runtime = new ForgeTestRuntime(); + propertyChangeListener = new TestPropertyChangeListener(); + runtime.addPropertyChangeListener(propertyChangeListener); + amountWorked = 0; + totalWork = 0; + taskName = null; + } + + @After + public void tearDown() throws Exception { + if (runtime.getProcess() != null) { + runtime.getProcess().terminate(); + } + runtime.removePropertyChangeListener(propertyChangeListener); + propertyChangeListener = null; + runtime = null; + calledMethods = null; + propertyChangeEvents = null; + } + + @Test + public void testStartComplete() { + runtime.start(null); + assertEquals(ForgeRuntime.STATE_RUNNING, runtime.getState()); + assertNotNull(runtime.getProcess()); + assertEquals(2, propertyChangeEvents.size()); + for (PropertyChangeEvent evt : propertyChangeEvents) { + if (ForgeRuntime.STATE_NOT_RUNNING.equals(evt.getOldValue())) { + assertEquals(ForgeRuntime.STATE_STARTING, evt.getNewValue()); + } else if (ForgeRuntime.STATE_STARTING.equals(evt.getOldValue())) { + assertEquals(ForgeRuntime.STATE_RUNNING, evt.getNewValue()); + } + } + } + + @Test + public void testStartWithProgressMonitor() { + runtime.start(new TestProgressMonitor()); + assertEquals(ForgeRuntime.STATE_NOT_RUNNING, runtime.getState()); + assertNull(runtime.getProcess()); + assertEquals("Starting Forge", taskName); + assertEquals(IProgressMonitor.UNKNOWN, totalWork); + assertEquals(4, calledMethods.size()); + assertTrue(calledMethods.contains("beginTask")); + assertTrue(calledMethods.contains("isCanceled")); + assertTrue(calledMethods.contains("worked")); + assertTrue(calledMethods.contains("done")); + assertEquals(1, amountWorked); + assertEquals(2, propertyChangeEvents.size()); + for (PropertyChangeEvent evt : propertyChangeEvents) { + if (ForgeRuntime.STATE_NOT_RUNNING.equals(evt.getOldValue())) { + assertEquals(ForgeRuntime.STATE_STARTING, evt.getNewValue()); + } else if (ForgeRuntime.STATE_STARTING.equals(evt.getOldValue())) { + assertEquals(ForgeRuntime.STATE_NOT_RUNNING, evt.getNewValue()); + } + } + } + + @Test + public void testStopComplete() { + runtime.start(null); + assertEquals(ForgeRuntime.STATE_RUNNING, runtime.getState()); + propertyChangeEvents.clear(); + runtime.stop(null); + assertEquals(ForgeRuntime.STATE_NOT_RUNNING, runtime.getState()); + assertNull(runtime.getProcess()); + assertEquals(1, propertyChangeEvents.size()); + for (PropertyChangeEvent evt : propertyChangeEvents) { + assertEquals(ForgeRuntime.STATE_RUNNING, evt.getOldValue()); + assertEquals(ForgeRuntime.STATE_NOT_RUNNING, evt.getNewValue()); + } + } + + @Test + public void testStopWithProgressMonitor() { + runtime.start(null); + assertEquals(ForgeRuntime.STATE_RUNNING, runtime.getState()); + propertyChangeEvents.clear(); + runtime.stop(new TestProgressMonitor()); + assertEquals(ForgeRuntime.STATE_NOT_RUNNING, runtime.getState()); + assertNull(runtime.getProcess()); + assertEquals("Stopping Forge", taskName); + assertEquals(1, totalWork); + assertEquals(2, calledMethods.size()); + assertTrue(calledMethods.contains("beginTask")); + assertTrue(calledMethods.contains("done")); + assertEquals(0, amountWorked); + assertEquals(1, propertyChangeEvents.size()); + for (PropertyChangeEvent evt : propertyChangeEvents) { + assertEquals(ForgeRuntime.STATE_RUNNING, evt.getOldValue()); + assertEquals(ForgeRuntime.STATE_NOT_RUNNING, evt.getNewValue()); + } + } + + private class TestPropertyChangeListener implements PropertyChangeListener { + public void propertyChange(PropertyChangeEvent evt) { + propertyChangeEvents.add(evt); + } + } + + private class TestProgressMonitor extends NullProgressMonitor { + public void beginTask(String name, int total) { + taskName = name; + totalWork = total; + calledMethods.add("beginTask"); + } + public void done() { + calledMethods.add("done"); + } + public boolean isCanceled() { + calledMethods.add("isCanceled"); + return super.isCanceled(); + } + public void worked(int work) { + amountWorked++; + calledMethods.add("worked"); + setCanceled(true); + super.worked(work); + } + } + + private class ForgeTestRuntime extends ForgeAbstractRuntime { + public String getName() { + return "test"; + } + public String getLocation() { + String result = null; + try { + result = FileLocator.getBundleFile(Platform.getBundle("org.jboss.tools.forge.runtime")).getAbsolutePath(); + } catch (IOException e) {} + return result; + } + public String getType() { + return "test"; + } + } + +} Modified: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeExternalRuntimeTest.java =================================================================== --- trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeExternalRuntimeTest.java 2011-07-05 16:18:38 UTC (rev 32616) +++ trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeExternalRuntimeTest.java 2011-07-05 16:19:02 UTC (rev 32617) @@ -1,6 +1,6 @@ package org.jboss.tools.forge.core.process; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test;

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r32616 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-07-05 12:18:38 -0400 (Tue, 05 Jul 2011) New Revision: 32616 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java Log: [JBIDE-9215] hiding mapping maps from the outside Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2011-07-05 15:56:46 UTC (rev 32615) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2011-07-05 16:18:38 UTC (rev 32616) @@ -53,8 +53,8 @@ public void setupLaunchConfiguration(ILaunchConfigurationWorkingCopy workingCopy, IServer server) throws CoreException; } - public static HashMap<String, StartLaunchDelegate> launchDelegates; - public static ArrayList<IStartLaunchSetupParticipant> setupParticipants; + private static HashMap<String, StartLaunchDelegate> launchDelegates; + private static ArrayList<IStartLaunchSetupParticipant> setupParticipants; static { setupParticipants = new ArrayList<IStartLaunchSetupParticipant>();

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r32615 - 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-05 11:56:46 -0400 (Tue, 05 Jul 2011) New Revision: 32615 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java Log: [JBIDE-9215] added TODO to not forget to change the code to use the poller that is configured (current: always uses web port poller) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java 2011-07-05 15:54:53 UTC (rev 32614) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java 2011-07-05 15:56:46 UTC (rev 32615) @@ -41,6 +41,7 @@ jbsBehavior.setServerStarted(); return false; } + // TODO: use the configured poller boolean started = WebPortPoller.onePing(jbsBehavior.getServer()); if( started ) { jbsBehavior.setServerStarting();

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r32614 - trunk/as/plugins/org.jboss.ide.eclipse.as.core.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-07-05 11:54:53 -0400 (Tue, 05 Jul 2011) New Revision: 32614 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml Log: [JBIDE-9298] corrected erroneous launch config class in as7 launch config Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-07-05 14:49:35 UTC (rev 32613) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-07-05 15:54:53 UTC (rev 32614) @@ -631,7 +631,7 @@ sourcePathComputerId="org.eclipse.jst.server.generic.core.sourcePathComputer"/> <launchConfigurationType category="JBoss" - delegate="org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7StartupLaunchConfiguration" + delegate="org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ServerStartupLaunchConfiguration" id="org.jboss.ide.eclipse.as.core.server.JBoss7StartupConfiguration" modes="run,debug,profile" name="JBoss Application Server Startup Configuration"

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r32613 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-07-05 10:49:35 -0400 (Tue, 05 Jul 2011) New Revision: 32613 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigProperties.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigurator.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java Log: [JBIDE-9215] replaced static #getDefaultStopCommand by read/write to launch config - like it is done in all other launch config cases. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigProperties.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigProperties.java 2011-07-05 13:33:51 UTC (rev 32612) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigProperties.java 2011-07-05 14:49:35 UTC (rev 32613) @@ -19,7 +19,9 @@ */ public class RSELaunchConfigProperties { + public static final String RSE_DEFAULT_STARTUP_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate.DEFAULT_STARTUP_COMMAND"; public static final String RSE_STARTUP_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate.STARTUP_COMMAND"; + public static final String RSE_DEFAULT_SHUTDOWN_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate.DEFAULT_SHUTDOWN_COMMAND"; public static final String RSE_SHUTDOWN_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate.SHUTDOWN_COMMAND"; public static final String DETECT_STARTUP_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate.DETECT_STARTUP_COMMAND"; public static final String DETECT_SHUTDOWN_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate.DETECT_SHUTDOWN_COMMAND"; @@ -50,6 +52,15 @@ launchConfig.setAttribute(DETECT_SHUTDOWN_COMMAND, detectShutdown); } + public static void setDefaultStartupCommand(String startupCommand, ILaunchConfigurationWorkingCopy launchConfig) { + launchConfig.setAttribute(RSE_DEFAULT_STARTUP_COMMAND, startupCommand); + } + + public static String getDefaultStartupCommand(ILaunchConfiguration launchConfig, String defaultCommand) + throws CoreException { + return launchConfig.getAttribute(RSE_DEFAULT_STARTUP_COMMAND, defaultCommand); + } + public static void setStartupCommand(String startupCommand, ILaunchConfigurationWorkingCopy launchConfig) { launchConfig.setAttribute(RSE_STARTUP_COMMAND, startupCommand); } @@ -75,4 +86,14 @@ throws CoreException { return launchConfig.getAttribute(RSE_SHUTDOWN_COMMAND, defaultCommand); } + + public static void setDefaultShutdownCommand(String shutdownCommand, ILaunchConfigurationWorkingCopy launchConfig) { + launchConfig.setAttribute(RSE_DEFAULT_SHUTDOWN_COMMAND, shutdownCommand); + } + + public static String getDefaultShutdownCommand(ILaunchConfiguration launchConfig, String defaultCommand) + throws CoreException { + return launchConfig.getAttribute(RSE_DEFAULT_SHUTDOWN_COMMAND, defaultCommand); + } + } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigurator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigurator.java 2011-07-05 13:33:51 UTC (rev 32612) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigurator.java 2011-07-05 14:49:35 UTC (rev 32613) @@ -29,12 +29,16 @@ @Override public void configure(ILaunchConfigurationWorkingCopy launchConfig) throws CoreException { + RSELaunchConfigProperties.setDefaultStartupCommand(defaultLaunchCommand, launchConfig); + boolean detectStartupCommand = RSELaunchConfigProperties.isDetectStartupCommand(launchConfig, true); String currentStartupCmd = RSELaunchConfigProperties.getStartupCommand(launchConfig); if( detectStartupCommand || !isSet(currentStartupCmd)) { RSELaunchConfigProperties.setStartupCommand(defaultLaunchCommand, launchConfig); } + RSELaunchConfigProperties.setDefaultShutdownCommand(defaultStopCommand, launchConfig); + boolean detectShutdownCommand = RSELaunchConfigProperties.isDetectShutdownCommand(launchConfig, true); String currentStopCmd = RSELaunchConfigProperties.getShutdownCommand(launchConfig); if( detectShutdownCommand || isSet(currentStopCmd)) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-07-05 13:33:51 UTC (rev 32612) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-07-05 14:49:35 UTC (rev 32613) @@ -12,7 +12,6 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.rse.core; -import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -121,7 +120,17 @@ String command2 = ""; try { config = behaviour.getServer().getLaunchConfiguration(false, new NullProgressMonitor()); - String defaultCmd = getDefaultStopCommand(behaviour.getServer(), true); + /* + * ATTENTION: this was commented since #getDefaultStopCommand is not static any more + * String defaultCmd = getDefaultStopCommand(behaviour.getServer(), true); + */ + + /* + * This was added to make it compile + */ + String defaultCmd = ""; + + command2 = config == null ? defaultCmd : RSELaunchConfigProperties.getShutdownCommand(config, defaultCmd); behaviour.setServerStopping(); @@ -182,8 +191,7 @@ */ } - @Deprecated - public static String getDefaultStopCommand(IServer server) { + private String getDefaultStopCommand(IServer server) { try { return getDefaultStopCommand(server, false); } catch (CoreException ce) {/* ignore, INTENTIONAL */ @@ -191,8 +199,7 @@ return null; } - @Deprecated - public static String getDefaultStopCommand(IServer server, boolean errorOnFail) throws CoreException { + private String getDefaultStopCommand(IServer server, boolean errorOnFail) throws CoreException { String rseHome = null; rseHome = RSEUtils.getRSEHomeDir(server, errorOnFail); JBossServer jbs = ServerConverter.getJBossServer(server); @@ -220,7 +227,7 @@ return jbs.getServer(); } - public static String getDefaultLaunchCommand(ILaunchConfiguration config) throws CoreException { + private String getDefaultLaunchCommand(ILaunchConfiguration config) throws CoreException { String serverId = JBossLaunchConfigProperties.getServerId(config); JBossServer jbossServer = ServerConverter.checkedFindJBossServer(serverId); String rseHome = jbossServer.getServer().getAttribute(RSEUtils.RSE_SERVER_HOME_DIR, ""); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java 2011-07-05 13:33:51 UTC (rev 32612) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java 2011-07-05 14:49:35 UTC (rev 32613) @@ -27,11 +27,19 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Text; +import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.StartLaunchDelegate; +import org.jboss.ide.eclipse.as.core.util.LaunchConfigUtils; import org.jboss.ide.eclipse.as.rse.core.RSELaunchConfigProperties; import org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate; +import org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod; import org.jboss.ide.eclipse.as.ui.UIUtil; import org.jboss.ide.eclipse.as.ui.launch.JBossLaunchConfigurationTabGroup.IJBossLaunchTabProvider; +/** + * @author Rob Stryker + * @author André Dietisheim + * + */ public class RSELaunchTabProvider implements IJBossLaunchTabProvider { public ILaunchConfigurationTab[] createTabs() { @@ -97,7 +105,8 @@ if( autoStartArgs.getSelection()) { String command = null; try { - command = RSELaunchDelegate.getDefaultLaunchCommand(initialConfig); +// command = RSELaunchDelegate.getDefaultLaunchCommand(initialConfig); + command = RSELaunchConfigProperties.getDefaultStartupCommand(initialConfig, ""); startText.setText(command); } catch(CoreException ce) { // TODO

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r32612 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-07-05 09:33:51 -0400 (Tue, 05 Jul 2011) New Revision: 32612 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java Log: [JBIDE-9215] corrected launch in local launch config (was calling wrong method) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java 2011-07-05 13:24:39 UTC (rev 32611) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java 2011-07-05 13:33:51 UTC (rev 32612) @@ -54,7 +54,7 @@ JBossServerStartupLaunchConfiguration launchConfig, ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { - launch(configuration, mode, launch, monitor); + actualLaunch(configuration, mode, launch, monitor); } public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor)

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r32611 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-07-05 09:24:39 -0400 (Tue, 05 Jul 2011) New Revision: 32611 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java Log: [JBIDE-9215] removed duplicate behavior#setServerStarted Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-07-05 13:17:27 UTC (rev 32610) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-07-05 13:24:39 UTC (rev 32611) @@ -58,13 +58,12 @@ ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { JBossServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration); + beh.setServerStarting(); if (LaunchCommandPreferences.ignoreLaunchCommand(beh.getServer())) { - beh.setServerStarting(); beh.setServerStarted(); return; } - beh.setServerStarting(); String command = RSELaunchConfigProperties.getStartupCommand(configuration); try { ServerShellModel model = RSEHostShellModel.getInstance().getModel(beh.getServer());

14 years, 9 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits July 2011