JBoss Tools SVN: r39977 - trunk/maven/plugins/org.jboss.tools.maven.gwt/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-04-02 17:59:13 -0400 (Mon, 02 Apr 2012)
New Revision: 39977
Modified:
trunk/maven/plugins/org.jboss.tools.maven.gwt/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-11244 Auto-discover all the modules and add them to the configuration on GWT project import
removed dependency to com.google.gdt.eclipse.maven.e37
Modified: trunk/maven/plugins/org.jboss.tools.maven.gwt/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.gwt/META-INF/MANIFEST.MF 2012-04-02 21:34:20 UTC (rev 39976)
+++ trunk/maven/plugins/org.jboss.tools.maven.gwt/META-INF/MANIFEST.MF 2012-04-02 21:59:13 UTC (rev 39977)
@@ -9,7 +9,6 @@
org.eclipse.core.resources;bundle-version="3.7.100",
com.google.gwt.eclipse.core;bundle-version="2.5.0",
org.eclipse.jdt.core;bundle-version="3.7.0",
- com.google.gdt.eclipse.maven.e37;bundle-version="2.5.2",
org.slf4j.api;bundle-version="1.6.0",
org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.1.0)",
org.eclipse.jface;bundle-version="3.7.0",
12 years, 9 months
JBoss Tools SVN: r39976 - trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-04-02 17:34:20 -0400 (Mon, 02 Apr 2012)
New Revision: 39976
Modified:
trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/GWTProjectConfigurator.java
trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/MavenGWTPlugin.java
Log:
https://issues.jboss.org/browse/JBIDE-11244 Auto-discover all the modules and add them to the configuration on GWT project import
copyright comments are added to new source files
Modified: trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/GWTProjectConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/GWTProjectConfigurator.java 2012-04-02 21:30:25 UTC (rev 39975)
+++ trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/GWTProjectConfigurator.java 2012-04-02 21:34:20 UTC (rev 39976)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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.tools.maven.gwt;
import java.util.ArrayList;
Modified: trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/MavenGWTPlugin.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/MavenGWTPlugin.java 2012-04-02 21:30:25 UTC (rev 39975)
+++ trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/MavenGWTPlugin.java 2012-04-02 21:34:20 UTC (rev 39976)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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.tools.maven.gwt;
import org.osgi.framework.BundleActivator;
12 years, 9 months
JBoss Tools SVN: r39975 - in trunk/maven: plugins and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-04-02 17:30:25 -0400 (Mon, 02 Apr 2012)
New Revision: 39975
Modified:
trunk/maven/features/pom.xml
trunk/maven/plugins/pom.xml
trunk/maven/site/category.xml
Log:
https://issues.jboss.org/browse/JBIDE-11244 Auto-discover all the modules and add them to the configuration on GWT project import
included org.jboss.tools.maven.gwt plugin and org.eclipse.maven.gwt.feature into build
Modified: trunk/maven/features/pom.xml
===================================================================
--- trunk/maven/features/pom.xml 2012-04-02 21:01:19 UTC (rev 39974)
+++ trunk/maven/features/pom.xml 2012-04-02 21:30:25 UTC (rev 39975)
@@ -24,7 +24,8 @@
<module>org.jboss.tools.maven.jaxrs.feature</module>
<module>org.jboss.tools.maven.jbosspackaging.feature</module>
<module>org.jboss.tools.maven.jpa.feature</module>
- <module>org.jboss.tools.maven.profiles.feature</module>
+ <module>org.jboss.tools.maven.profiles.feature</module>
+ <module>org.jboss.tools.maven.gwt.feature</module>
</modules>
<repositories>
Modified: trunk/maven/plugins/pom.xml
===================================================================
--- trunk/maven/plugins/pom.xml 2012-04-02 21:01:19 UTC (rev 39974)
+++ trunk/maven/plugins/pom.xml 2012-04-02 21:30:25 UTC (rev 39975)
@@ -25,7 +25,8 @@
<module>org.jboss.tools.maven.jbosspackaging</module>
<module>org.jboss.tools.maven.jpa</module>
<module>org.jboss.tools.maven.profiles.core</module>
- <module>org.jboss.tools.maven.profiles.ui</module>
+ <module>org.jboss.tools.maven.profiles.ui</module>
+ <module>org.jboss.tools.maven.gwt</module>
</modules>
</project>
Modified: trunk/maven/site/category.xml
===================================================================
--- trunk/maven/site/category.xml 2012-04-02 21:01:19 UTC (rev 39974)
+++ trunk/maven/site/category.xml 2012-04-02 21:30:25 UTC (rev 39975)
@@ -78,4 +78,7 @@
<feature url="features/org.jboss.tools.maven.profiles.feature.source_0.0.0.jar" id="org.jboss.tools.maven.profiles.feature.source" version="0.0.0">
<category name="JBoss Tools maven Nightly Build Update Site"/>
</feature>
+ <feature url="features/org.jboss.tools.maven.gwt.feature_0.0.0.qualifier.jar" id="org.jboss.tools.maven.gwt.feature" version="0.0.0">
+ <category name="JBoss Tools maven Nightly Build Update Site"/>
+ </feature>
</site>
12 years, 9 months
JBoss Tools SVN: r39974 - in trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui: preferences and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-04-02 17:01:19 -0400 (Mon, 02 Apr 2012)
New Revision: 39974
Modified:
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencePage.java
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencesInitializer.java
Log:
https://issues.jboss.org/browse/JBIDE-11244 Auto-discover all the modules and add them to the configuration on GWT project import
patch to maven.ui to let enable/disable GWT Configurator plugin
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java 2012-04-02 20:55:30 UTC (rev 39973)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java 2012-04-02 21:01:19 UTC (rev 39974)
@@ -87,6 +87,10 @@
public static final boolean CONFIGURE_JPA_VALUE = true;
+ public static final String CONFIGURE_GWT = "configureGWT"; //$NON-NLS-1$
+
+ public static final boolean CONFIGURE_GWT_VALUE = true;
+
// The shared instance
private static Activator plugin;
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java 2012-04-02 20:55:30 UTC (rev 39973)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java 2012-04-02 21:01:19 UTC (rev 39974)
@@ -56,6 +56,7 @@
public static String ConfiguratorPreferencePage_Configure_Seam_Runtime;
public static String ConfiguratorPreferencePage_Configure_Seam_when_importing_Maven_projects;
public static String ConfiguratorPreferencePage_When_importing_Maven_projects_configure_the_following;
+ public static String ConfiguratorPreferencePage_Configure_GWT;
public static String ProfileManager_Updating_maven_profiles;
public static String ProfileSelectionHandler_Loading_maven_profiles;
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties 2012-04-02 20:55:30 UTC (rev 39973)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties 2012-04-02 21:01:19 UTC (rev 39974)
@@ -34,7 +34,9 @@
ConfiguratorPreferencePage_Configure_Seam_Artifacts=Seam Artifacts (view folder, model source folder, package ...)
ConfiguratorPreferencePage_Configure_Seam_Runtime=Seam Runtime
ConfiguratorPreferencePage_Configure_Seam_when_importing_Maven_projects=Seam
+ConfiguratorPreferencePage_Configure_GWT=GWT Entry Point Modules
+
ConfiguratorPreferencePage_When_importing_Maven_projects_configure_the_following=When importing Maven projects configure the following:
ProfileManager_Updating_maven_profiles=Updating maven profiles
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencePage.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencePage.java 2012-04-02 20:55:30 UTC (rev 39973)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencePage.java 2012-04-02 21:01:19 UTC (rev 39974)
@@ -43,6 +43,7 @@
private static final String ORG_JBOSS_TOOLS_MAVEN_SEAM = "org.jboss.tools.maven.seam"; //$NON-NLS-1$
private static final String ORG_JBOSS_TOOLS_MAVEN_JAXRS = "org.jboss.tools.maven.jaxrs"; //$NON-NLS-1$
private static final String ORG_JBOSS_TOOLS_MAVEN_JPA = "org.jboss.tools.maven.jpa"; //$NON-NLS-1$
+ private static final String ORG_JBOSS_TOOLS_MAVEN_GWT = "org.jboss.tools.maven.gwt"; //$NON-NLS-1$
private Button configureSeamButton;
private Button configureSeamRuntimeButton;
@@ -56,6 +57,7 @@
private Button configureHibernateButton;
private Button configureJaxRsButton;
private Button configureJpaButton;
+ private Button configureGwtButton;
@Override
protected Control createContents(Composite parent) {
@@ -156,6 +158,14 @@
configureJpaButton.setSelection(configureJpa);
}
+ if (bundleExists(ORG_JBOSS_TOOLS_MAVEN_GWT)) {
+ configureGwtButton = new Button(composite,SWT.CHECK);
+ configureGwtButton.setText(Messages.ConfiguratorPreferencePage_Configure_GWT);
+ boolean configureJpa = store.getBoolean(Activator.CONFIGURE_GWT);
+ configureGwtButton.setSelection(configureJpa);
+ }
+
+
return composite;
}
@@ -233,6 +243,10 @@
store.setValue(Activator.CONFIGURE_JPA, Activator.CONFIGURE_JPA_VALUE);
}
+ if (bundleExists(ORG_JBOSS_TOOLS_MAVEN_GWT)) {
+ store.setValue(Activator.CONFIGURE_GWT, Activator.CONFIGURE_GWT_VALUE);
+ }
+
super.performDefaults();
}
@@ -272,6 +286,10 @@
store.setValue(Activator.CONFIGURE_JPA, configureJpaButton.getSelection());
}
+ if (bundleExists(ORG_JBOSS_TOOLS_MAVEN_GWT)) {
+ store.setValue(Activator.CONFIGURE_GWT, configureGwtButton.getSelection());
+ }
+
return super.performOk();
}
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencesInitializer.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencesInitializer.java 2012-04-02 20:55:30 UTC (rev 39973)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencesInitializer.java 2012-04-02 21:01:19 UTC (rev 39974)
@@ -62,7 +62,10 @@
Activator.CONFIGURE_JAXRS_VALUE);
node.putBoolean(
Activator.CONFIGURE_JPA,
- Activator.CONFIGURE_JPA_VALUE);
+ Activator.CONFIGURE_JPA_VALUE);
+ node.putBoolean(
+ Activator.CONFIGURE_GWT,
+ Activator.CONFIGURE_GWT_VALUE);
}
}
12 years, 9 months
JBoss Tools SVN: r39973 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.client: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-04-02 16:55:30 -0400 (Mon, 02 Apr 2012)
New Revision: 39973
Added:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.2.1-SNAPSHOT.jar
Removed:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.2.0-SNAPSHOT.jar
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties
Log:
[JBIDE-11445] committed new client jar
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath 2012-04-02 18:20:39 UTC (rev 39972)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath 2012-04-02 20:55:30 UTC (rev 39973)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="openshift-java-client-1.2.0-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="openshift-java-client-1.2.1-SNAPSHOT.jar"/>
<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"/>
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF 2012-04-02 18:20:39 UTC (rev 39972)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF 2012-04-02 20:55:30 UTC (rev 39973)
@@ -6,7 +6,7 @@
Bundle-Vendor: JBoss by Red Hat
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .,
- openshift-java-client-1.2.0-SNAPSHOT.jar
+ openshift-java-client-1.2.1-SNAPSHOT.jar
Export-Package: com.openshift.express.client,
com.openshift.express.client.configuration,
com.openshift.express.client.utils
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties 2012-04-02 18:20:39 UTC (rev 39972)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties 2012-04-02 20:55:30 UTC (rev 39973)
@@ -2,4 +2,4 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- openshift-java-client-1.2.0-SNAPSHOT.jar
+ openshift-java-client-1.2.1-SNAPSHOT.jar
Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.2.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.2.1-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.2.1-SNAPSHOT.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
12 years, 9 months
JBoss Tools SVN: r39972 - trunk/jsf/tests/org.jboss.tools.jsf.base.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-04-02 14:20:39 -0400 (Mon, 02 Apr 2012)
New Revision: 39972
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.base.test/
Log:
bin folder added to svn:ignore
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
12 years, 9 months
JBoss Tools SVN: r39971 - trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-04-02 14:08:05 -0400 (Mon, 02 Apr 2012)
New Revision: 39971
Modified:
trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/GWTProjectConfigurator.java
Log:
https://issues.jboss.org/browse/JBIDE-11244 Auto-discover all the modules and add them to the configuration on GWT project import
switched to MavenProject.getPlugin("org.apache.maven.plugins:maven-war-plugin") instead of iteration over plugins as fred suggested
Modified: trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/GWTProjectConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/GWTProjectConfigurator.java 2012-04-02 17:04:07 UTC (rev 39970)
+++ trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/GWTProjectConfigurator.java 2012-04-02 18:08:05 UTC (rev 39971)
@@ -25,34 +25,27 @@
private static final Logger log = LoggerFactory.getLogger(AbstractProjectConfigurator.class);
- public static final String CODEHAUS_GROUP_ID = "org.codehaus.mojo";
- public static final String GWT_MAVEN_PLUGIN_ARTIFACT_ID = "gwt-maven-plugin";
+ public static final String GWT_WAR_MAVEN_PLUGIN_KEY = "org.apache.maven.plugins:maven-war-plugin";
@Override
- public void configure(ProjectConfigurationRequest arg0, IProgressMonitor arg1) throws CoreException {
+ public void configure(ProjectConfigurationRequest projectConfig, IProgressMonitor monitor) throws CoreException {
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
boolean configureGWT = store.getBoolean(Activator.CONFIGURE_GWT);
log.debug("GWT Entry Point Modules configuration is {}",configureGWT ? "enabled" : "disabled");
- if(configureGWT) {
- List<Plugin> plugins = arg0.getMavenProjectFacade().getMavenProject().getBuildPlugins();
- for (Plugin plugin : plugins) {
- if(CODEHAUS_GROUP_ID.equals(plugin.getGroupId()) && GWT_MAVEN_PLUGIN_ARTIFACT_ID.equals(plugin.getArtifactId())) {
- log.debug("Configure Entry Point Modules for GWT Project {}", arg0.getProject().getName());
- IModule[] modules = ModuleUtils.findAllModules(JavaCore.create(arg0.getProject()),false);
- List<String> modNames = new ArrayList<String>();
- for (IModule iModule : modules) {
- modNames.add(iModule.getQualifiedName());
- log.debug("\t {}",iModule.getQualifiedName());
- }
- try {
- GWTProjectProperties.setEntryPointModules(arg0.getProject(), modNames);
- } catch (BackingStoreException e) {
- log.error("Ecseption in Maven GWT Configurator", e);
- }
- break;
- }
+ if(configureGWT && projectConfig.getMavenProject().getPlugin(GWT_WAR_MAVEN_PLUGIN_KEY)!=null) {
+ log.debug("Configure Entry Point Modules for GWT Project {}", projectConfig.getProject().getName());
+ IModule[] modules = ModuleUtils.findAllModules(JavaCore.create(projectConfig.getProject()),false);
+ List<String> modNames = new ArrayList<String>();
+ for (IModule iModule : modules) {
+ modNames.add(iModule.getQualifiedName());
+ log.debug("\t {}",iModule.getQualifiedName());
}
+ try {
+ GWTProjectProperties.setEntryPointModules(projectConfig.getProject(), modNames);
+ } catch (BackingStoreException e) {
+ log.error("Ecseption in Maven GWT Configurator", e);
+ }
}
}
}
12 years, 9 months
JBoss Tools SVN: r39970 - in trunk/runtime: tests/org.jboss.tools.runtime.test/META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-04-02 13:04:07 -0400 (Mon, 02 Apr 2012)
New Revision: 39970
Modified:
trunk/runtime/pom.xml
trunk/runtime/tests/org.jboss.tools.runtime.test/META-INF/MANIFEST.MF
Log:
add Export-Package: org.jboss.tools.runtime.test to org.jboss.tools.runtime.test/META-INF/MANIFEST.MF so it can be used downstream by runtime-soa build; update instructions for building runtime component to match that of runtime-soa component
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2012-04-02 17:03:53 UTC (rev 39969)
+++ trunk/runtime/pom.xml 2012-04-02 17:04:07 UTC (rev 39970)
@@ -15,10 +15,15 @@
<packaging>pom</packaging>
<modules>
<module>plugins</module>
+ <module>tests</module>
<module>features</module>
- <module>tests</module>
<module>site</module>
</modules>
+ <!-- to build, need to resolve TP and upstream components
+ mvn clean install -f ../build/pom-core.xml -Pruntime-bootstrap,local.site,jbosstools-nightly-staging-composite
+ or
+ mvn clean install -Pdefault,jbosstools-nightly-staging-composite
+ -->
<repositories>
<!-- To resolve parent artifact -->
Modified: trunk/runtime/tests/org.jboss.tools.runtime.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.test/META-INF/MANIFEST.MF 2012-04-02 17:03:53 UTC (rev 39969)
+++ trunk/runtime/tests/org.jboss.tools.runtime.test/META-INF/MANIFEST.MF 2012-04-02 17:04:07 UTC (rev 39970)
@@ -38,3 +38,4 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %BundleVendor
Bundle-Localization: plugin
+Export-Package: org.jboss.tools.runtime.test
12 years, 9 months
JBoss Tools SVN: r39969 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui: src/org/jboss/tools/openshift/express/internal/ui/action and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-04-02 13:03:53 -0400 (Mon, 02 Apr 2012)
New Revision: 39969
Added:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteDomainAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteDomainActionProvider.java
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/AbstractAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractActionProvider.java
Log:
Delete OpenShift domain with JBoss toolingDelete OpenShift domain with JBoss tooling JBIDE-10666
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-04-02 16:13:40 UTC (rev 39968)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-04-02 17:03:53 UTC (rev 39969)
@@ -373,6 +373,17 @@
</enablement>
</actionProvider>
<actionProvider
+ class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.DeleteDomainActionProvider"
+ id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.deleteDomainActionProvider">
+ <enablement>
+ <and>
+ <instanceof
+ value="org.jboss.tools.openshift.express.internal.core.console.UserDelegate">
+ </instanceof>
+ </and>
+ </enablement>
+ </actionProvider>
+ <actionProvider
class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.DeleteConnectionActionProvider"
id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.DeleteConnectionActionProvider">
<enablement>
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/AbstractAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/AbstractAction.java 2012-04-02 16:13:40 UTC (rev 39968)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/AbstractAction.java 2012-04-02 17:03:53 UTC (rev 39969)
@@ -68,5 +68,9 @@
public void setViewer(StructuredViewer viewer) {
this.viewer = viewer;
}
+
+ public void validate(){
+
+ }
}
\ No newline at end of file
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteDomainAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteDomainAction.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteDomainAction.java 2012-04-02 17:03:53 UTC (rev 39969)
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * 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.tools.openshift.express.internal.ui.action;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITreeSelection;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
+import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
+import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
+
+import com.openshift.express.client.IDomain;
+import com.openshift.express.client.OpenShiftException;
+
+public class DeleteDomainAction extends AbstractAction {
+
+ public DeleteDomainAction() {
+ super(OpenShiftExpressUIMessages.DELETE_DOMAIN_ACTION);
+ setImageDescriptor(PlatformUI.getWorkbench().getSharedImages()
+ .getImageDescriptor(ISharedImages.IMG_ETOOL_DELETE));
+ }
+
+ @Override
+ public void validate() {
+ boolean enable = false;
+ if (selection instanceof ITreeSelection
+ && ((IStructuredSelection) selection).getFirstElement() instanceof UserDelegate
+ && ((ITreeSelection) selection).size() == 1) {
+ UserDelegate user = (UserDelegate) ((IStructuredSelection) selection)
+ .getFirstElement();
+ try {
+ IDomain domain = user.getDomain();
+
+ if (domain != null && user.getApplications().size() == 0) {
+ enable = true;
+ }
+ } catch (OpenShiftException e) {
+ Logger.warn(
+ "Failed to retrieve User domain, prompting for creation",
+ e);
+ }
+ }
+ setEnabled(enable);
+ }
+
+ @Override
+ public void run() {
+ final ITreeSelection treeSelection = (ITreeSelection) selection;
+ if (selection instanceof ITreeSelection
+ && treeSelection.getFirstElement() instanceof UserDelegate) {
+ UserDelegate user = (UserDelegate) treeSelection.getFirstElement();
+ try {
+ final IDomain domain = user.getDomain();
+ if (domain != null) {
+ boolean confirm = false;
+ confirm = MessageDialog.openConfirm(Display.getCurrent()
+ .getActiveShell(), "Domain deletion", NLS.bind(
+ "You are about to delete the \"{0}\" domain.\n"
+ + "Do you want to continue?",
+ domain.getNamespace()));
+ if (confirm) {
+ Job job = new Job("Deleting OpenShift Domain...") {
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ try {
+ domain.destroy();
+ } catch (OpenShiftException e) {
+ Logger.error(
+ NLS.bind(
+ "Failed to delete domain \"{0}\"",
+ domain.getNamespace()),
+ e);
+ }
+ } finally {
+ monitor.done();
+ }
+
+ return Status.OK_STATUS;
+ }
+ };
+ job.setPriority(Job.SHORT);
+ job.schedule(); // start as soon as possible
+ }
+
+ }
+ } catch (OpenShiftException e) {
+ Logger.warn(
+ "Failed to retrieve User domain, prompting for creation",
+ e);
+ }
+
+ }
+ }
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteDomainAction.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java 2012-04-02 16:13:40 UTC (rev 39968)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java 2012-04-02 17:03:53 UTC (rev 39969)
@@ -21,6 +21,8 @@
public static String CREATE_OR_EDIT_DOMAIN_ACTION;
+ public static String DELETE_DOMAIN_ACTION;
+
public static String SHOW_IN_ACTION_GROUP;
public static String SHOW_IN_BROWSER_ACTION;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties 2012-04-02 16:13:40 UTC (rev 39968)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties 2012-04-02 17:03:53 UTC (rev 39969)
@@ -3,6 +3,7 @@
#
CREATE_OR_EDIT_DOMAIN_ACTION=Create or Edit Domain
+DELETE_DOMAIN_ACTION=Delete Domain
#
SHOW_IN_ACTION_GROUP=Show In
SHOW_IN_BROWSER_ACTION=Web Browser
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractActionProvider.java 2012-04-02 16:13:40 UTC (rev 39968)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractActionProvider.java 2012-04-02 17:03:53 UTC (rev 39969)
@@ -46,7 +46,8 @@
@Override
public void fillContextMenu(IMenuManager menu) {
- if (action != null && action.isEnabled()) {
+ action.validate();
+ if (action != null/* && action.isEnabled()*/) {
menu.appendToGroup(group, action);
}
}
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteDomainActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteDomainActionProvider.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteDomainActionProvider.java 2012-04-02 17:03:53 UTC (rev 39969)
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * 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.tools.openshift.express.internal.ui.viewer.actionProvider;
+
+import org.jboss.tools.openshift.express.internal.ui.action.DeleteDomainAction;
+
+public class DeleteDomainActionProvider extends AbstractActionProvider {
+
+ public DeleteDomainActionProvider() {
+ super(new DeleteDomainAction(), "group.edition");
+ }
+
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteDomainActionProvider.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
12 years, 9 months
JBoss Tools SVN: r39968 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-04-02 12:13:40 -0400 (Mon, 02 Apr 2012)
New Revision: 39968
Modified:
trunk/build/parent/pom.xml
Log:
Use a static version instead of SNAPSHOT for jacoco-maven-plugin to avoid checking for updates all time
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-04-02 16:11:21 UTC (rev 39967)
+++ trunk/build/parent/pom.xml 2012-04-02 16:13:40 UTC (rev 39968)
@@ -251,7 +251,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.5.7-SNAPSHOT</version>
+ <version>0.5.6.201201232323</version>
<executions>
<execution>
<goals>
12 years, 9 months