Author: dgolovin Date: 2012-07-05 06:19:26 -0400 (Thu, 05 Jul 2012) New Revision: 42403 Added: branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/installation/ branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/installation/CompatibilityChecker.java branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/installation/CompatibilityMessages.java branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/installation/EclipseVersionDialog.java branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/installation/messages.properties Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/common/plugins/org.jboss.tools.common.mylyn/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/deltacloud/tests/org.jboss.tools.deltacloud.test/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/jsf/features/org.jboss.tools.jsf.feature/feature.xml branches/jbosstools-3.3.x/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewXHTMLFileWizardPage.java branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/ProjectUtil.java branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.sourcelookup.ui/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.ui/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.express.test/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/portlet/features/org.jboss.tools.portlet.feature/feature.xml branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/IUsageReportPreferenceConstants.java branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportDispatcher.java branches/jbosstools-3.3.x/vpe/features/org.jboss.tools.vpe.feature/feature.xml branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF Log: https://issues.jboss.org/browse/JBIDE-12248 JBoss Tools (Indigo) Installation from Eclipse Marketplace fails for Eclipse Indigo 3.7.0 and 3.7.1 updated dependnecies to let install JBT on eclipse 3.7.0 fixed issues related to API missing in Indigo 3.7.0 and WTP 3.3.0 added dialog to warn user about JBT compatibility with eclipse 3.7.0/3.7.1 and WTP 3.3.0/3.3.1 Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -25,7 +25,7 @@ org.eclipse.pde.core;bundle-version="3.7.0", org.eclipse.jst.j2ee.web;bundle-version="1.1.500", org.jboss.ide.eclipse.as.management.core, - org.eclipse.equinox.security;bundle-version="1.1.1", + org.eclipse.equinox.security;bundle-version="1.1.0", org.jboss.ide.eclipse.as.dmr;bundle-version="2.3.0" Bundle-ActivationPolicy: lazy Export-Package: org.jboss.ide.eclipse.as.core, Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java =================================================================== --- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2012-07-05 10:19:26 UTC (rev 42403) @@ -15,13 +15,17 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; +import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; +import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit; +import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities; import org.eclipse.jst.j2ee.project.WebUtilities; import org.eclipse.jst.server.core.IWebModule; +import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServerWorkingCopy; @@ -185,13 +189,31 @@ } public URL getModuleRootURL(IModule[] module) { if( module.length == 2) { - String contextRoot = WebUtilities.getServerContextRoot(module[1].getProject(), + String contextRoot = getServerContextRoot(module[1].getProject(), module[0].getProject()); return getModuleRootURL(module[1], getServer().getHost(), getWebPort(), contextRoot); } else { return module.length > 0 ? getModuleRootURL(module[0]) : null; } } + + public static String getServerContextRoot(IProject webProject,IProject earProject) { + String contextRoot = null; + if (earProject == null || !JavaEEProjectUtilities.deploymentDescriptorExists(earProject)) + return ComponentUtilities.getServerContextRoot(webProject); + else if (JavaEEProjectUtilities.isEARProject(earProject) && JavaEEProjectUtilities.isDynamicWebProject(webProject)) { + EARArtifactEdit edit = null; + try { + edit = EARArtifactEdit.getEARArtifactEditForRead(earProject); + contextRoot = edit.getWebContextRoot(webProject); + } finally { + if (edit!=null) + edit.dispose(); + } + } + return contextRoot; + } + public URL getModuleRootURL(IModule module, String contextRoot) { return getModuleRootURL(module, getServer().getHost(), getWebPort(), contextRoot); } Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -58,7 +58,7 @@ org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100", org.jboss.ide.eclipse.as.management.core;bundle-version="1.0.0", org.jboss.ide.eclipse.as.dmr;bundle-version="2.3.0", - org.eclipse.ui.browser;bundle-version="3.3.101" + org.eclipse.ui.browser;bundle-version="3.3.100" Bundle-ActivationPolicy: lazy Export-Package: org.jboss.ide.eclipse.as.ui, org.jboss.ide.eclipse.as.ui.actions, Modified: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -43,7 +43,7 @@ org.eclipse.jst.jsf.core, org.eclipse.jpt.jpa.core, org.jboss.ide.eclipse.as.management.core;bundle-version="1.0.0", - org.eclipse.equinox.security;bundle-version="1.1.1" + org.eclipse.equinox.security;bundle-version="1.1.0" Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Modified: branches/jbosstools-3.3.x/common/plugins/org.jboss.tools.common.mylyn/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/common/plugins/org.jboss.tools.common.mylyn/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/common/plugins/org.jboss.tools.common.mylyn/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -6,11 +6,11 @@ Bundle-Vendor: JBoss by Red Hat Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.jboss.tools.common.mylyn, - org.eclipse.mylyn;bundle-version="3.6.5", + org.eclipse.mylyn;bundle-version="3.6.0", org.eclipse.mylyn.commons.core;bundle-version="3.6.0", - org.eclipse.mylyn.commons.ui;bundle-version="3.6.1", - org.eclipse.mylyn.tasks.core;bundle-version="3.6.1", - org.eclipse.mylyn.tasks.ui;bundle-version="3.6.5", + org.eclipse.mylyn.commons.ui;bundle-version="3.6.0", + org.eclipse.mylyn.tasks.core;bundle-version="3.6.0", + org.eclipse.mylyn.tasks.ui;bundle-version="3.6.0", org.eclipse.core.runtime;bundle-version="3.7.0", com.atlassian.connector.eclipse.commons.core;bundle-version="3.0.2";resolution:=optional, com.atlassian.connector.eclipse.commons.ui;bundle-version="3.0.2";resolution:=optional, Modified: branches/jbosstools-3.3.x/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -30,7 +30,7 @@ org.eclipse.ltk.core.refactoring;bundle-version="3.5.200", org.eclipse.jpt.common.core;bundle-version="1.0.0", org.eclipse.ltk.ui.refactoring;bundle-version="3.6.0", - org.eclipse.wst.server.ui;bundle-version="1.3.0", + org.eclipse.wst.server.ui;bundle-version="1.1.305", org.eclipse.jdt.junit;bundle-version="3.7.0" Export-Package: org.jboss.tools.common.ui, org.jboss.tools.common.ui.databinding, Modified: branches/jbosstools-3.3.x/deltacloud/tests/org.jboss.tools.deltacloud.test/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/deltacloud/tests/org.jboss.tools.deltacloud.test/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/deltacloud/tests/org.jboss.tools.deltacloud.test/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -9,7 +9,6 @@ org.jboss.tools.common;bundle-version="[3.2.0,4.0.0)", org.jboss.tools.deltacloud.core;bundle-version="[1.0.0,2.0.0)", org.jboss.tools.deltacloud.ui;bundle-version="0.1.0", - org.junit;bundle-version="[4.8.0,5.0.0)", - org.junit.source;bundle-version="4.8.2" + org.junit;bundle-version="[4.8.0,5.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.jboss.tools.common.ui.preferencevalue Modified: branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -40,7 +40,7 @@ org.eclipse.mylyn.discovery.core;bundle-version="3.6.0", org.eclipse.mylyn.commons.ui;bundle-version="[3.6.0,3.8.0)", org.apache.commons.lang;bundle-version="2.4.0", - org.eclipse.jdt.ui;bundle-version="3.7.1" + org.eclipse.jdt.ui;bundle-version="3.7.0" Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Export-Package: org.jboss.tools.project.examples, Modified: branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -18,9 +18,9 @@ org.jboss.tools.forge.core;bundle-version="1.0.0", org.eclipse.core.filesystem;bundle-version="1.3.100", org.eclipse.ui.navigator;bundle-version="3.5.100", - org.eclipse.rse.ui;bundle-version="3.2.1", - org.eclipse.rse.core;bundle-version="3.2.1", - org.eclipse.rse.subsystems.files.core;bundle-version="3.2.101", + org.eclipse.rse.ui;bundle-version="3.2.0", + org.eclipse.rse.core;bundle-version="3.2.0", + org.eclipse.rse.subsystems.files.core;bundle-version="3.2.100", org.eclipse.rse.subsystems.files.local;bundle-version="2.1.200", org.eclipse.core.expressions;bundle-version="3.4.300" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: branches/jbosstools-3.3.x/jsf/features/org.jboss.tools.jsf.feature/feature.xml =================================================================== --- branches/jbosstools-3.3.x/jsf/features/org.jboss.tools.jsf.feature/feature.xml 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/jsf/features/org.jboss.tools.jsf.feature/feature.xml 2012-07-05 10:19:26 UTC (rev 42403) @@ -22,7 +22,7 @@ <import feature="org.jboss.tools.common.feature" version="3.3.0" match="greaterOrEqual"/> <import feature="org.jboss.tools.jst.feature" version="3.3.0" match="greaterOrEqual"/> <import feature="org.jboss.tools.vpe.feature" version="3.3.0" match="greaterOrEqual"/> - <import feature="org.eclipse.wst.web_ui.feature" version="3.3.2" match="greaterOrEqual"/> + <import feature="org.eclipse.wst.web_ui.feature" version="3.3.0" match="greaterOrEqual"/> </requires> <plugin Modified: branches/jbosstools-3.3.x/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -1,57 +1,57 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-ActivationPolicy: lazy -Bundle-Name: %Bundle-Name.0 -Bundle-Activator: org.jboss.tools.jst.web.ui.WebUiPlugin -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.jboss.tools.jst.web.ui;singleton:=true -Bundle-Localization: plugin -Export-Package: org.jboss.tools.jst.web.ui, - org.jboss.tools.jst.web.ui.action, - org.jboss.tools.jst.web.ui.action.adf, - org.jboss.tools.jst.web.ui.attribute.adapter, - org.jboss.tools.jst.web.ui.editor.pref.template.contentassist, - org.jboss.tools.jst.web.ui.editors, - org.jboss.tools.jst.web.ui.editors.forms, - org.jboss.tools.jst.web.ui.editors.webapp.form, - org.jboss.tools.jst.web.ui.internal.preferences, - org.jboss.tools.jst.web.ui.navigator, - org.jboss.tools.jst.web.ui.navigator.decorator, - org.jboss.tools.jst.web.ui.operation, - org.jboss.tools.jst.web.ui.wizards.appregister, - org.jboss.tools.jst.web.ui.wizards.links, - org.jboss.tools.jst.web.ui.wizards.newfile, - org.jboss.tools.jst.web.ui.wizards.process, - org.jboss.tools.jst.web.ui.wizards.project -Require-Bundle: org.eclipse.ui.ide;bundle-version="3.7.0", - org.jboss.tools.common.model.ui, - org.jboss.tools.jst.web, - org.eclipse.ui.navigator;bundle-version="3.5.0", - org.eclipse.jdt.ui;bundle-version="3.7.0", - org.eclipse.wst.common.frameworks;bundle-version="1.2.0";visibility:=reexport, - org.eclipse.wst.server.core;bundle-version="1.1.302", - org.eclipse.wst.server.ui;bundle-version="1.1.305", - org.eclipse.jst.j2ee.web;bundle-version="1.1.500", - org.eclipse.jst.j2ee;bundle-version="1.1.500", - org.eclipse.jem.util;bundle-version="2.1.2", - org.eclipse.wst.common.frameworks;bundle-version="1.2.0", - org.eclipse.wst.common.project.facet.ui;bundle-version="1.4.200", - org.eclipse.debug.ui;bundle-version="3.7.0", - org.jboss.tools.jst.jsp;bundle-version="2.0.0", - org.eclipse.jface.text;bundle-version="3.7.0", - org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100", - org.apache.velocity;bundle-version="1.5.0", - org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0", - org.eclipse.wst.html.ui;bundle-version="1.0.600", - org.jboss.tools.common.el.core;bundle-version="3.2.0", - org.jboss.tools.common.ui, - org.jboss.tools.jst.web.kb, - org.eclipse.ui.forms;bundle-version="3.5.100", - org.apache.ant;bundle-version="1.7.1", - org.eclipse.datatools.connectivity.ui.dse;bundle-version="1.1.4", - org.eclipse.datatools.connectivity.db.generic.ui;bundle-version="1.0.1", - org.jboss.tools.common.el.ui, - org.eclipse.wst.html.core;bundle-version="1.1.502" -Bundle-Version: 3.3.1.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-ClassPath: . +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-ActivationPolicy: lazy +Bundle-Name: %Bundle-Name.0 +Bundle-Activator: org.jboss.tools.jst.web.ui.WebUiPlugin +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.jboss.tools.jst.web.ui;singleton:=true +Bundle-Localization: plugin +Export-Package: org.jboss.tools.jst.web.ui, + org.jboss.tools.jst.web.ui.action, + org.jboss.tools.jst.web.ui.action.adf, + org.jboss.tools.jst.web.ui.attribute.adapter, + org.jboss.tools.jst.web.ui.editor.pref.template.contentassist, + org.jboss.tools.jst.web.ui.editors, + org.jboss.tools.jst.web.ui.editors.forms, + org.jboss.tools.jst.web.ui.editors.webapp.form, + org.jboss.tools.jst.web.ui.internal.preferences, + org.jboss.tools.jst.web.ui.navigator, + org.jboss.tools.jst.web.ui.navigator.decorator, + org.jboss.tools.jst.web.ui.operation, + org.jboss.tools.jst.web.ui.wizards.appregister, + org.jboss.tools.jst.web.ui.wizards.links, + org.jboss.tools.jst.web.ui.wizards.newfile, + org.jboss.tools.jst.web.ui.wizards.process, + org.jboss.tools.jst.web.ui.wizards.project +Require-Bundle: org.eclipse.ui.ide;bundle-version="3.7.0", + org.jboss.tools.common.model.ui, + org.jboss.tools.jst.web, + org.eclipse.ui.navigator;bundle-version="3.5.0", + org.eclipse.jdt.ui;bundle-version="3.7.0", + org.eclipse.wst.common.frameworks;bundle-version="1.2.0";visibility:=reexport, + org.eclipse.wst.server.core;bundle-version="1.1.302", + org.eclipse.wst.server.ui;bundle-version="1.1.305", + org.eclipse.jst.j2ee.web;bundle-version="1.1.500", + org.eclipse.jst.j2ee;bundle-version="1.1.500", + org.eclipse.jem.util;bundle-version="2.1.2", + org.eclipse.wst.common.frameworks;bundle-version="1.2.0", + org.eclipse.wst.common.project.facet.ui;bundle-version="1.4.200", + org.eclipse.debug.ui;bundle-version="3.7.0", + org.jboss.tools.jst.jsp;bundle-version="2.0.0", + org.eclipse.jface.text;bundle-version="3.7.0", + org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100", + org.apache.velocity;bundle-version="1.5.0", + org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0", + org.eclipse.wst.html.ui;bundle-version="1.0.600", + org.jboss.tools.common.el.core;bundle-version="3.2.0", + org.jboss.tools.common.ui, + org.jboss.tools.jst.web.kb, + org.eclipse.ui.forms;bundle-version="3.5.100", + org.apache.ant;bundle-version="1.7.1", + org.eclipse.datatools.connectivity.ui.dse;bundle-version="1.1.4", + org.eclipse.datatools.connectivity.db.generic.ui;bundle-version="1.0.1", + org.jboss.tools.common.el.ui, + org.eclipse.wst.html.core;bundle-version="1.1.500" +Bundle-Version: 3.3.1.qualifier +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-ClassPath: . Modified: branches/jbosstools-3.3.x/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewXHTMLFileWizardPage.java =================================================================== --- branches/jbosstools-3.3.x/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewXHTMLFileWizardPage.java 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewXHTMLFileWizardPage.java 2012-07-05 10:19:26 UTC (rev 42403) @@ -14,6 +14,7 @@ import java.util.Arrays; import java.util.List; +import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspace; @@ -21,6 +22,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Preferences; import org.eclipse.core.runtime.content.IContentType; @@ -29,6 +31,9 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.dialogs.WizardNewFileCreationPage; +import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.ModuleCoreNature; +import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; import org.eclipse.wst.common.project.facet.core.IFacetedProject; import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; @@ -146,7 +151,14 @@ // if inside web project, check if inside webContent folder if (project != null && isWebProject(project)) { // check that the path is inside the webContent folder - IPath[] webContentPaths = FacetModuleCoreSupport.getAcceptableRootPaths(project); + IPath[] webContentPaths; + try { + webContentPaths = getAcceptableRootPaths(project); + } + catch (NoClassDefFoundError e) { + //ignore + webContentPaths = new IPath[]{project.getFullPath()}; + } boolean isPrefix = false; for (int i = 0; !isPrefix && i < webContentPaths.length; i++) { isPrefix |= webContentPaths[i].isPrefixOf(fullPath); @@ -160,6 +172,26 @@ return true; } + static IPath[] getAcceptableRootPaths(IProject project) { + if (!ModuleCoreNature.isFlexibleProject(project)) { + return new IPath[]{project.getFullPath()}; + } + + IPath[] paths = null; + IVirtualFolder componentFolder = ComponentCore.createFolder(project, Path.ROOT); + if (componentFolder != null && componentFolder.exists()) { + IContainer[] workspaceFolders = componentFolder.getUnderlyingFolders(); + paths = new IPath[workspaceFolders.length]; + for (int i = 0; i < workspaceFolders.length; i++) { + paths[i] = workspaceFolders[i].getFullPath(); + } + } + else { + paths = new IPath[]{project.getFullPath()}; + } + return paths; + } + /** * Get content type associated with this new file wizard * Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/ProjectUtil.java =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/ProjectUtil.java 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/ProjectUtil.java 2012-07-05 10:19:26 UTC (rev 42403) @@ -29,11 +29,11 @@ import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.jboss.tools.common.web.WebUtils; /** * A utility class for Eclipse Projects. @@ -125,7 +125,8 @@ IPath filePath = new Path(path); IVirtualFolder root = component.getRootFolder(); IContainer[] underlyingFolders = root.getUnderlyingFolders(); - IPath defaultDDFolderPath = J2EEModuleVirtualComponent.getDefaultDeploymentDescriptorFolder(root); +// IPath defaultDDFolderPath = J2EEModuleVirtualComponent.getDefaultDeploymentDescriptorFolder(root); + IPath defaultDDFolderPath = WebUtils.getDefaultDeploymentDescriptorFolder(root); for (IContainer underlyingFolder : underlyingFolders) { if (defaultDDFolderPath ==null || !defaultDDFolderPath.equals(underlyingFolder.getProjectRelativePath())) { IPath p = underlyingFolder.getProjectRelativePath().append(filePath); Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.sourcelookup.ui/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.sourcelookup.ui/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.sourcelookup.ui/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -8,7 +8,7 @@ org.eclipse.core.runtime, org.jboss.tools.maven.sourcelookup.core;bundle-version="1.0.0", org.eclipse.debug.ui;bundle-version="3.7.0", - org.eclipse.jdt.ui;bundle-version="3.7.1" + org.eclipse.jdt.ui;bundle-version="3.7.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %BundleVendor Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -17,7 +17,7 @@ org.eclipse.jface.text, org.eclipse.jdt.ui;bundle-version="3.7.0", org.eclipse.jdt;bundle-version="3.7.0", - org.eclipse.compare;bundle-version="3.5.202" + org.eclipse.compare;bundle-version="3.5.200" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %Bundle-Vendor Modified: branches/jbosstools-3.3.x/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -30,7 +30,7 @@ org.eclipse.m2e.lifecyclemapping.defaults;bundle-version="[1.0.0,1.2.0)", org.eclipse.m2e.launching;bundle-version="[1.0.0,1.2.0)", org.eclipse.m2e.tests.common;bundle-version="[1.0.0,1.2.0)", - org.eclipse.jpt.jpa.core;bundle-version="3.0.1", + org.eclipse.jpt.jpa.core;bundle-version="3.0.0", org.eclipse.jpt.common.core, org.eclipse.jpt.common.utility, org.jboss.tools.cdi.core, Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -7,7 +7,7 @@ Require-Bundle: org.jboss.ide.eclipse.as.core;bundle-version="2.3.0", org.eclipse.jgit;bundle-version="1.2.0", org.eclipse.egit;bundle-version="1.2.0", - com.jcraft.jsch;bundle-version="0.1.44", + com.jcraft.jsch;bundle-version="0.1.41", org.eclipse.egit.core;bundle-version="1.2.0", org.eclipse.team.core;bundle-version="3.6.0", org.eclipse.wst.server.core;bundle-version="1.1.302", Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.ui/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.ui/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.ui/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -8,7 +8,7 @@ org.eclipse.egit.core;bundle-version="[1.0.0,2.0.0)", org.eclipse.egit.ui;bundle-version="[1.0.0,2.0.0)", org.eclipse.jgit;bundle-version="[1.0.0,2.0.0)", - com.jcraft.jsch;bundle-version="[0.1.44,1.0.0)", + com.jcraft.jsch;bundle-version="[0.1.41,1.0.0)", org.eclipse.ui;bundle-version="[3.7.0,4.0.0)", org.eclipse.core.runtime, org.eclipse.core.expressions;bundle-version="[3.4.300,4.0.0)", Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -14,5 +14,5 @@ Export-Package: com.openshift.client, com.openshift.client.configuration, com.openshift.client.utils -Require-Bundle: com.jcraft.jsch;bundle-version="0.1.44" +Require-Bundle: com.jcraft.jsch;bundle-version="0.1.41" Import-Package: org.jboss.dmr Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -12,7 +12,7 @@ org.eclipse.egit.ui;bundle-version="[1.0.0,2.0.0)", org.eclipse.egit.core;bundle-version="[1.1.0,2.0.0)", org.eclipse.jgit;bundle-version="[1.1.0,2.1.0)", - com.jcraft.jsch;bundle-version="0.1.44", + com.jcraft.jsch;bundle-version="0.1.41", org.eclipse.jsch.core;bundle-version="[1.1.300,2.0.0)", org.jboss.ide.eclipse.as.core;bundle-version="2.3.0", org.eclipse.m2e.core;bundle-version="1.0.100", @@ -35,16 +35,15 @@ org.eclipse.ui.navigator;bundle-version="3.5.100", org.eclipse.ui.console;bundle-version="3.5.100", org.eclipse.core.expressions;bundle-version="3.4.300", - org.eclipse.wst.common.modulecore;bundle-version="1.2.101", org.jboss.ide.eclipse.as.wtp.core;bundle-version="2.3.0", org.eclipse.ui.forms;bundle-version="3.5.100", org.eclipse.jface.text;bundle-version="3.7.0", org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200", org.jboss.ide.eclipse.archives.webtools;bundle-version="2.3.0", - org.eclipse.equinox.security;bundle-version="1.1.1", + org.eclipse.equinox.security;bundle-version="1.1.0", org.jboss.ide.eclipse.as.dmr;bundle-version="2.3.0", org.eclipse.jsch.ui;bundle-version="1.1.300", - org.eclipse.jdt.debug.ui;bundle-version="3.6.1", + org.eclipse.jdt.debug.ui;bundle-version="3.6.0", org.jboss.tools.common.ui;bundle-version="3.3.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.express.test/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.express.test/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.express.test/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -10,5 +10,5 @@ org.eclipse.core.resources;bundle-version="[3.7.100,4.0.0)", org.eclipse.core.filesystem;bundle-version="1.3.100", org.junit;bundle-version="[4.8.2,5.0.0)", - com.jcraft.jsch;bundle-version="[0.1.44,1.0.0)" + com.jcraft.jsch;bundle-version="[0.1.41,1.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: branches/jbosstools-3.3.x/portlet/features/org.jboss.tools.portlet.feature/feature.xml =================================================================== --- branches/jbosstools-3.3.x/portlet/features/org.jboss.tools.portlet.feature/feature.xml 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/portlet/features/org.jboss.tools.portlet.feature/feature.xml 2012-07-05 10:19:26 UTC (rev 42403) @@ -20,8 +20,8 @@ <requires> <import feature="org.jboss.tools.seam.feature" version="3.2.0" match="greaterOrEqual"/> - <import feature="org.eclipse.jst.enterprise_ui.feature" version="3.3.1" match="greaterOrEqual"/> - <import feature="org.eclipse.jst.web_core.feature" version="3.3.1" match="greaterOrEqual"/> + <import feature="org.eclipse.jst.enterprise_ui.feature" version="3.3.0" match="greaterOrEqual"/> + <import feature="org.eclipse.jst.web_core.feature" version="3.3.0" match="greaterOrEqual"/> <import plugin="org.eclipse.wst.jsdt.web.core"/> <import plugin="org.eclipse.wst.jsdt.web.support.jsp"/> <import plugin="org.eclipse.wst.jsdt.web.ui"/> Added: branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/installation/CompatibilityChecker.java =================================================================== --- branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/installation/CompatibilityChecker.java (rev 0) +++ branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/installation/CompatibilityChecker.java 2012-07-05 10:19:26 UTC (rev 42403) @@ -0,0 +1,105 @@ +/******************************************************************************* + * 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.usage.installation; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.PlatformUI; +import org.jboss.tools.usage.internal.JBossToolsUsageActivator; +import org.jboss.tools.usage.internal.preferences.UsageReportPreferences; +import org.osgi.framework.Bundle; +import org.osgi.framework.Version; + +/** + * @author Alexey Kazakov + * + */ +public class CompatibilityChecker { + + private static final String SYSTEM_ENABLED_KEY = "eclipse_version_checking_enabled"; //$NON-NLS-1$ + + public void check() { + new CheckingJob(isCheckingEnabled() && UsageReportPreferences.isEclipseVersionCheckingEnabled()).schedule(); + } + + private boolean isEclipseOutOfDate() { + return isPluginOutOfDate("org.eclipse.jdt", 3, 7, 2); + } + + private boolean isWTPOfDate() { + return isPluginOutOfDate("org.eclipse.jst.j2ee.core", 1, 2, 102); + } + + private boolean isPluginOutOfDate(String pluginId, int major, int minor, int micro) { + Bundle plugin = Platform.getBundle(pluginId); + if(plugin!=null) { + Version version = plugin.getVersion(); + return version.compareTo(new Version(major, minor, micro)) < 0; + } + return false; + } + + private void askUser() { + Display.getDefault().syncExec(new Runnable() { + public void run() { + Shell shell = PlatformUI.getWorkbench().getModalDialogShellProvider().getShell(); + EclipseVersionDialog dialog = new EclipseVersionDialog(shell); + dialog.open(); + } + }); + } + + /** + * Returns <code>true</code> if checking is enabled in system settings. + * + * @return + */ + private boolean isCheckingEnabled() { + return Boolean.valueOf(System.getProperty(SYSTEM_ENABLED_KEY, "true")); + } + + private class CheckingJob extends Job { + private boolean showDialog; + + private CheckingJob(boolean showDialog) { + super(CompatibilityMessages.CheckingJob); + this.showDialog = showDialog; + } + + @Override + protected IStatus run(IProgressMonitor monitor) { + if (monitor.isCanceled()) { + return Status.CANCEL_STATUS; + } + monitor.beginTask(CompatibilityMessages.CheckingJob, 1); + if (monitor.isCanceled()) { + return Status.CANCEL_STATUS; + } + if (isEclipseOutOfDate() || isWTPOfDate()) { + if (monitor.isCanceled()) { + return Status.CANCEL_STATUS; + } + IStatus status = new Status(IStatus.WARNING, JBossToolsUsageActivator.PLUGIN_ID, CompatibilityMessages.CompatibilityCheckerEclipseLogWarningMessage); + JBossToolsUsageActivator.getDefault().getLog().log(status); + if(showDialog) { + askUser(); + } + } + monitor.done(); + return Status.OK_STATUS; + } + } +} \ No newline at end of file Added: branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/installation/CompatibilityMessages.java =================================================================== --- branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/installation/CompatibilityMessages.java (rev 0) +++ branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/installation/CompatibilityMessages.java 2012-07-05 10:19:26 UTC (rev 42403) @@ -0,0 +1,33 @@ +/******************************************************************************* + * 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.usage.installation; + +import org.eclipse.osgi.util.NLS; + +/** + * @author Alexey Kazakov + */ +public class CompatibilityMessages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.usage.installation.messages"; //$NON-NLS-1$ + + public static String CompatibilityCheckerDialogWarningMessage; + public static String CompatibilityCheckerEclipseLogWarningMessage; + public static String DoNotShowAgain; + public static String CheckingJob; + + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, CompatibilityMessages.class); + } + + private CompatibilityMessages() { + } +} \ No newline at end of file Added: branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/installation/EclipseVersionDialog.java =================================================================== --- branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/installation/EclipseVersionDialog.java (rev 0) +++ branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/installation/EclipseVersionDialog.java 2012-07-05 10:19:26 UTC (rev 42403) @@ -0,0 +1,125 @@ +/******************************************************************************* + * 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.usage.installation; + +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.layout.GridDataFactory; +import org.eclipse.jface.window.IShellProvider; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Link; +import org.eclipse.swt.widgets.Shell; +import org.jboss.tools.usage.internal.JBossToolsUsageActivator; +import org.jboss.tools.usage.internal.preferences.UsageReportPreferences; +import org.jboss.tools.usage.util.BrowserUtil; + +/** + * @author Alexey Kazakov + */ +public class EclipseVersionDialog extends Dialog { + + private Button doNotShowAgainButton; + + public EclipseVersionDialog(IShellProvider parentShell) { + super(parentShell); + } + + public EclipseVersionDialog(Shell parentShell) { + super(parentShell); + } + + /* + * (non-Javadoc) + * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) + */ + @Override + protected void createButtonsForButtonBar(Composite parent) { + createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); + getButton(IDialogConstants.OK_ID).setFocus(); + } + + /* + * (non-Javadoc) + * @see org.eclipse.jface.dialogs.Dialog#okPressed() + */ + @Override + protected void okPressed() { + if(doNotShowAgainButton.getSelection()) { + UsageReportPreferences.setEclipseVerionChecking(false); + } + super.okPressed(); + } + + /* + * (non-Javadoc) + * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) + */ + @Override + protected Control createDialogArea(Composite parent) { + Composite composite = (Composite) super.createDialogArea(parent); + createWidgets(parent, composite); + applyDialogFont(composite); + + return composite; + } + + private void createWidgets(Composite parent, Composite composite) { + Link link = new Link(composite, SWT.WRAP); + link.setFont(parent.getFont()); + + link.setText(CompatibilityMessages.CompatibilityCheckerDialogWarningMessage); + link.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + BrowserUtil.checkedCreateExternalBrowser( + e.text, + JBossToolsUsageActivator.PLUGIN_ID, + JBossToolsUsageActivator.getDefault().getLog()); + } + }); + GridDataFactory.fillDefaults() + .align(SWT.FILL, SWT.CENTER) + .grab(true, false) + .hint(500, SWT.DEFAULT) + .applyTo(link); + + doNotShowAgainButton = new Button(composite, SWT.CHECK); + doNotShowAgainButton.setSelection(false); + doNotShowAgainButton.setText(CompatibilityMessages.DoNotShowAgain); + GridData data = new GridData(GridData.FILL_HORIZONTAL); + data.horizontalSpan = 2; + doNotShowAgainButton.setLayoutData(data); + + // create a composite with standard margins and spacing + Composite comp = new Composite(parent, SWT.NONE); + comp.setLayout(createLayout()); + GridData childData = new GridData(GridData.FILL_BOTH); + childData.horizontalSpan = 2; + comp.setLayoutData(childData); + comp.setFont(parent.getFont()); + } + + private GridLayout createLayout() { + GridLayout gl = new GridLayout(2, false); + gl.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN); + gl.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN); + gl.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING); + gl.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING); + return gl; + } +} \ No newline at end of file Added: branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/installation/messages.properties =================================================================== --- branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/installation/messages.properties (rev 0) +++ branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/installation/messages.properties 2012-07-05 10:19:26 UTC (rev 42403) @@ -0,0 +1,4 @@ +CompatibilityCheckerDialogWarningMessage=Your current version of Eclipse and Web Tools are not compatible with this version of JBoss Tools. Please upgrade your installation to Eclipse 3.7.2 and Web Tools 3.3.2 (<a href="https://www.jboss.org/tools/download/installation/update_3_3#i... info</a>). You could alternatively install a fresh <a href="http://www.eclipse.org/downloads/packages/eclipse-ide-java-ee-... Indigo SR2</a> bundle, then install JBoss Tools. +CompatibilityCheckerEclipseLogWarningMessage=The current version of Eclipse and Web Tools are not compatible with this version of JBoss Tools. Please upgrade your installation to Eclipse 3.7.2 and Web Tools 3.3.2. +DoNotShowAgain=Do not show this dialog again +CheckingJob=Checking Eclipse and WTP versions \ No newline at end of file Modified: branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/IUsageReportPreferenceConstants.java =================================================================== --- branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/IUsageReportPreferenceConstants.java 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/IUsageReportPreferenceConstants.java 2012-07-05 10:19:26 UTC (rev 42403) @@ -31,6 +31,11 @@ public static final String ASK_USER_USAGEREPORT_ID = "ask_user_for_usage_report_preference"; //$NON-NLS-1$ /** + * The identifier to be used for the value that determines if eclipse version should be checked + */ + public static final String ECLIPSE_VERSION_CHECKING_ID = "eclipse_version_checking_preference"; //$NON-NLS-1$ + + /** * The identifier to be used for the value that determines this eclipse * instance. */ Modified: branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java =================================================================== --- branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferences.java 2012-07-05 10:19:26 UTC (rev 42403) @@ -54,6 +54,17 @@ } /** + * Returns <code>true</code> if eclipse version checking is set in the + * preferences. Returns <code>false</code> otherwise. + * + * @return + */ + public static boolean isEclipseVersionCheckingEnabled() { + return UsageReportPreferencesUtils.getPreferences().getBoolean( + IUsageReportPreferenceConstants.ECLIPSE_VERSION_CHECKING_ID, true); + } + + /** * Returns <code>true</code> if usage reporting is enabled * * @return true, if is enabled @@ -111,6 +122,17 @@ } /** + * Sets the ask user. + * + * @param askUser + * the new ask user + */ + public static void setEclipseVerionChecking(boolean askUser) { + UsageReportPreferencesUtils.getStore().putValue(IUsageReportPreferenceConstants.ECLIPSE_VERSION_CHECKING_ID, String.valueOf(askUser)); + save(); + } + + /** * Save. */ private static void save() { Modified: branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportDispatcher.java =================================================================== --- branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportDispatcher.java 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportDispatcher.java 2012-07-05 10:19:26 UTC (rev 42403) @@ -10,10 +10,12 @@ ******************************************************************************/ package org.jboss.tools.usage.internal.reporting; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IStartup; +import org.jboss.tools.usage.installation.CompatibilityChecker; import org.jboss.tools.usage.internal.JBossToolsUsageActivator; -import org.jboss.tools.usage.tracker.internal.UsagePluginLogger; /** * @author Andre Dieitsheim @@ -26,10 +28,13 @@ public void run() { try { new UsageReport().report(); + new CompatibilityChecker().check(); } catch (Exception e) { - new UsagePluginLogger(JBossToolsUsageActivator.getDefault()).error("could not start usage reporting"); + IStatus status = new Status(IStatus.ERROR, JBossToolsUsageActivator.PLUGIN_ID, 0, "could not start usage reporting", e); + JBossToolsUsageActivator.getDefault().getLog().log(status); +// new UsagePluginLogger(JBossToolsUsageActivator.getDefault()).error("could not start usage reporting"); } } }); } -} +} \ No newline at end of file Modified: branches/jbosstools-3.3.x/vpe/features/org.jboss.tools.vpe.feature/feature.xml =================================================================== --- branches/jbosstools-3.3.x/vpe/features/org.jboss.tools.vpe.feature/feature.xml 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/vpe/features/org.jboss.tools.vpe.feature/feature.xml 2012-07-05 10:19:26 UTC (rev 42403) @@ -69,4 +69,12 @@ version="0.0.0" unpack="false"/> + <plugin + id="org.jboss.tools.xulrunner.initializer" + download-size="0" + install-size="0" + version="0.0.0" + fragment="true" + unpack="false"/> + </feature> Modified: branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -8,20 +8,17 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200", - org.eclipse.wst.common.frameworks;bundle-version="1.2.101", + org.eclipse.wst.common.frameworks;bundle-version="1.2.100", org.eclipse.core.resources;bundle-version="3.7.0", - org.eclipse.jst.ws;bundle-version="1.0.509", + org.eclipse.jst.ws;bundle-version="1.0.508", org.eclipse.jdt.core;bundle-version="3.7.0", - org.eclipse.jdt.launching;bundle-version="3.6.1", - org.eclipse.jst.jsf.core;bundle-version="1.3.105", + org.eclipse.jdt.launching;bundle-version="3.6.0", + org.eclipse.jst.jsf.core;bundle-version="1.3.5", org.eclipse.jst.jsf.ui;bundle-version="1.3.2", - org.eclipse.wst.common.modulecore;bundle-version="1.2.101", - org.eclipse.jdt.launching;bundle-version="3.6.1", - org.eclipse.jst.jsf.core;bundle-version="1.3.105", + org.eclipse.wst.common.modulecore;bundle-version="1.2.100", org.eclipse.jst.jsf.ui;bundle-version="1.3.2", - org.eclipse.jdt.launching;bundle-version="3.6.1", - org.eclipse.jst.j2ee;bundle-version="1.1.501", - org.eclipse.jst.ws.consumption.ui;bundle-version="1.1.401", + org.eclipse.jst.j2ee;bundle-version="1.0.401", + org.eclipse.jst.ws.consumption.ui;bundle-version="1.1.400", org.jboss.ide.eclipse.as.classpath.core;bundle-version="2.3.0" Bundle-ActivationPolicy: lazy Bundle-Vendor: %PLUGIN_PROVIDER Modified: branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -7,39 +7,39 @@ Bundle-Vendor: %Bundle-Vendor.0 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", org.eclipse.core.runtime;bundle-version="3.7.0", - org.eclipse.wst.common.frameworks;bundle-version="1.2.101", + org.eclipse.wst.common.frameworks;bundle-version="1.2.100", org.eclipse.wst.ws;bundle-version="1.1.203", org.eclipse.core.resources;bundle-version="3.7.1", - org.eclipse.jst.ws;bundle-version="1.0.509", + org.eclipse.jst.ws;bundle-version="1.0.508", org.eclipse.jem.util;bundle-version="2.1.100", org.jboss.tools.ws.core, - org.eclipse.wst.wsdl;bundle-version="1.2.202", + org.eclipse.wst.wsdl;bundle-version="1.2.201", org.eclipse.wst.command.env.core;bundle-version="1.0.205", org.eclipse.wst.command.env;bundle-version="1.0.409", org.apache.ant;bundle-version="[1.8.2,1.9.0)", org.apache.xerces;bundle-version="[2.9.0,3.0.0)", - org.eclipse.jst.j2ee;bundle-version="1.1.501";visibility:=reexport, - org.eclipse.jst.j2ee.core;bundle-version="1.2.101";visibility:=reexport, + org.eclipse.jst.j2ee;bundle-version="1.1.500";visibility:=reexport, + org.eclipse.jst.j2ee.core;bundle-version="1.2.100";visibility:=reexport, org.eclipse.jst.jee;bundle-version="1.0.401", org.eclipse.emf.common;bundle-version="2.7.0", org.eclipse.emf.ecore;bundle-version="2.7.0", - org.eclipse.jdt.core;bundle-version="3.7.1", - org.eclipse.jface.text;bundle-version="3.7.1", + org.eclipse.jdt.core;bundle-version="3.7.0", + org.eclipse.jface.text;bundle-version="3.7.0", org.eclipse.core.filebuffers;bundle-version="3.5.200", - org.eclipse.jdt.ui;bundle-version="3.7.1", + org.eclipse.jdt.ui;bundle-version="3.7.0", org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200", - org.eclipse.wst.server.core;bundle-version="1.1.303", + org.eclipse.wst.server.core;bundle-version="1.1.302", org.eclipse.jem.util;bundle-version="2.1.100", org.jboss.tools.common, org.jboss.ide.eclipse.as.classpath.core, org.eclipse.jst.server.core;bundle-version="1.2.202", - org.eclipse.jdt;bundle-version="3.7.1", - org.eclipse.jdt.launching;bundle-version="3.6.1", + org.eclipse.jdt;bundle-version="3.7.0", + org.eclipse.jdt.launching;bundle-version="3.6.0", org.eclipse.debug.core;bundle-version="3.7.0", org.eclipse.jst.jee.web;bundle-version="1.0.301", javax.wsdl;visibility:=reexport, org.eclipse.jst.ws.annotations.core;bundle-version="1.1.0", - org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.101" + org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100" Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.ws.creation.core, org.jboss.tools.ws.creation.core.commands, Modified: branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -9,23 +9,23 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.core.resources;bundle-version="3.7.0", - org.eclipse.jst.ws.consumption.ui;bundle-version="1.1.401", + org.eclipse.jst.ws.consumption.ui;bundle-version="1.1.400", org.eclipse.wst.ws;bundle-version="1.1.203", org.eclipse.wst.common.environment;bundle-version="1.0.400", org.eclipse.wst.command.env.core;bundle-version="1.0.205", org.eclipse.emf.common;bundle-version="2.7.0", - org.eclipse.wst.common.frameworks;bundle-version="1.2.101", + org.eclipse.wst.common.frameworks;bundle-version="1.2.100", org.eclipse.wst.command.env.ui;bundle-version="1.1.103", - org.eclipse.jst.ws;bundle-version="1.0.509", + org.eclipse.jst.ws;bundle-version="1.0.508", org.eclipse.wst.command.env;bundle-version="1.0.409", - org.eclipse.jdt.core;bundle-version="3.7.1", + org.eclipse.jdt.core;bundle-version="3.7.0", org.eclipse.jst.ws.ui;bundle-version="1.0.403", org.jboss.tools.ws.creation.core, org.jboss.tools.ws.core, org.eclipse.jst.ws.creation.ui;bundle-version="1.0.609", - org.eclipse.wst.common.modulecore;bundle-version="1.2.101", + org.eclipse.wst.common.modulecore;bundle-version="1.2.100", org.jboss.tools.ws.ui, - org.eclipse.jdt.ui;bundle-version="3.7.1" + org.eclipse.jdt.ui;bundle-version="3.7.0" Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.ws.creation.ui.wsrt Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -26,8 +26,7 @@ org.eclipse.core.resources;bundle-version="3.5.1";visibility:=reexport, org.eclipse.jst.j2ee;bundle-version="1.1.301";visibility:=reexport, org.eclipse.emf.ecore;bundle-version="2.5.0";visibility:=reexport, - org.eclipse.wst.common.frameworks.ui;bundle-version="1.1.301", - org.eclipse.jface.text;bundle-version="3.7.1" + org.eclipse.wst.common.frameworks.ui;bundle-version="1.1.301" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Export-Package: javax.ws.rs, Modified: branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -34,9 +34,9 @@ org.eclipse.core.commands;bundle-version="3.6.0", org.eclipse.ltk.core.refactoring;bundle-version="3.5.200", org.eclipse.wst.validation;bundle-version="1.2.300", - org.eclipse.wst.server.core;bundle-version="1.1.303", + org.eclipse.wst.server.core;bundle-version="1.1.302", org.eclipse.debug.core;bundle-version="3.7.0", - org.eclipse.debug.ui;bundle-version="3.7.101" + org.eclipse.debug.ui;bundle-version="3.7.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: . Modified: branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2012-07-05 10:04:20 UTC (rev 42402) +++ branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2012-07-05 10:19:26 UTC (rev 42403) @@ -11,12 +11,12 @@ org.jboss.tools.ws.core, org.eclipse.ui.ide;bundle-version="3.7.0", org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200", - org.eclipse.jdt.core;bundle-version="3.7.1", - org.eclipse.jst.j2ee;bundle-version="1.1.501", + org.eclipse.jdt.core;bundle-version="3.7.0", + org.eclipse.jst.j2ee;bundle-version="1.1.500", org.eclipse.jem.util;bundle-version="2.1.100", org.jboss.tools.ws.creation.core, - org.eclipse.wst.common.frameworks;bundle-version="1.2.101", - org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.101", + org.eclipse.wst.common.frameworks;bundle-version="1.2.100", + org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100", org.jboss.tools.common.ui, org.eclipse.core.filesystem;bundle-version="1.3.100", org.eclipse.wst.common.project.facet.ui;bundle-version="1.4.200", @@ -24,13 +24,13 @@ org.eclipse.core.filesystem;bundle-version="1.3.100", com.ibm.icu, org.eclipse.wst.internet.monitor.core;bundle-version="1.0.505", - org.eclipse.wst.internet.monitor.ui;bundle-version="1.0.507", + org.eclipse.wst.internet.monitor.ui;bundle-version="1.0.506", javax.wsdl;bundle-version="1.6.2", org.jdom, org.eclipse.ui.forms;bundle-version="3.5.100", org.eclipse.emf.common;bundle-version="2.7.0", - org.eclipse.jdt.ui;bundle-version="3.7.1", - org.eclipse.osgi;bundle-version="3.7.1", + org.eclipse.jdt.ui;bundle-version="3.7.0", + org.eclipse.osgi;bundle-version="3.7.0", org.eclipse.jst.ws.annotations.core;bundle-version="1.1.0", org.apache.commons.codec;bundle-version="1.3.0", org.apache.commons.discovery;bundle-version="[0.2.0,1.0.0)",