JBoss Tools SVN: r39258 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2012-03-02 09:25:34 -0500 (Fri, 02 Mar 2012)
New Revision: 39258
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java
Log:
[JBIDE-11132] removed recursion when resetting remote name. changed logic of resetting remote name to a simplistic one.
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-03-02 14:23:28 UTC (rev 39257)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-03-02 14:25:34 UTC (rev 39258)
@@ -134,7 +134,6 @@
useDefaultRemoteNameButton = new Button(cloneGroup, SWT.CHECK);
useDefaultRemoteNameButton.setText("Use default remote name");
GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).span(3, 1).applyTo(useDefaultRemoteNameButton);
- useDefaultRemoteNameButton.addSelectionListener(onDefaultRemoteName());
this.remoteNameLabel = new Label(cloneGroup, SWT.NONE);
remoteNameLabel.setText("Remote name:");
@@ -205,16 +204,6 @@
};
}
- private SelectionListener onDefaultRemoteName() {
- return new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- pageModel.resetRemoteName();
- }
- };
- }
-
private SelectionAdapter onSshPrefs() {
return new SelectionAdapter() {
@@ -226,10 +215,6 @@
}
protected void onPageActivated(DataBindingContext dbc) {
- // allow to enable a proj only for as7 openshift applications
- // pageModel.resetRepositoryPath();
- pageModel.resetRemoteName();
- // pageModel.refreshApplicationName();
enableWidgets(pageModel.isNewProject());
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-03-02 14:23:28 UTC (rev 39257)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-03-02 14:25:34 UTC (rev 39258)
@@ -88,28 +88,11 @@
wizardModel.setRepositoryPath(repositoryPath));
}
- // public void resetRepositoryPath() {
- // if (wizardModel.isNewProject()
- // || getRepositoryPath() == null) {
- // setRepositoryPath(getDefaultRepositoryPath());
- // }
- // }
-
- public void resetRemoteName() {
+ private void resetRemoteName() {
if (!wizardModel.isNewProject()) {
- // if existing project and remote name is still 'origin'
- // -> switch to 'openshift' (leave as is if existing project and
- // remote name != 'origin')
- if (NEW_PROJECT_REMOTE_NAME_DEFAULT.equals(getRemoteName())) {
setRemoteName(EXISTING_PROJECT_REMOTE_NAME_DEFAULT);
- }
} else {
- // if new project and remote name is not 'origin'
- // -> restore 'origin'
- if (!NEW_PROJECT_REMOTE_NAME_DEFAULT.equals(getRemoteName())) {
- setUseDefaultRemoteName(true);
setRemoteName(NEW_PROJECT_REMOTE_NAME_DEFAULT);
- }
}
}
@@ -148,8 +131,6 @@
firePropertyChange(PROPERTY_USE_DEFAULT_REMOTE_NAME, useDefaultRemoteName,
this.useDefaultRemoteName = useDefaultRemoteName);
if (useDefaultRemoteName) {
- // setRemoteName(isNewProject() ? NEW_PROJECT_REMOTE_NAME_DEFAULT :
- // EXISTING_PROJECT_REMOTE_NAME_DEFAULT);
resetRemoteName();
}
}
13 years, 7 months
JBoss Tools SVN: r39257 - trunk/ws/tests/org.jboss.tools.ws.ui.test.
by jbosstools-commits@lists.jboss.org
Author: mickael_istria
Date: 2012-03-02 09:23:28 -0500 (Fri, 02 Mar 2012)
New Revision: 39257
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml
Log:
JBIDE-10537
Fix coverage.filter configuration for WS
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml 2012-03-02 13:45:25 UTC (rev 39256)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml 2012-03-02 14:23:28 UTC (rev 39257)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <coverage.filter>org.jboss.tools.ws.core*,org.jboss.tools.ws.ui*</coverage.filter>
+ <coverage.filter>org.jboss.tools.ws.*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.ws.core,org.jboss.tools.ws.ui</emma.instrument.bundles>
</properties>
</project>
\ No newline at end of file
13 years, 7 months
JBoss Tools SVN: r39256 - branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2012-03-02 08:45:25 -0500 (Fri, 02 Mar 2012)
New Revision: 39256
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
Log:
[JBIDE-11105] checking whether the user decided to create the adapter before creating it
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-03-02 12:35:09 UTC (rev 39255)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-03-02 13:45:25 UTC (rev 39256)
@@ -184,10 +184,12 @@
private void createServerAdapter(IProgressMonitor monitor, List<IProject> importedProjects)
throws OpenShiftException {
Assert.isTrue(importedProjects.size() > 0);
- IProject project = importedProjects.get(0);
- new ServerAdapterFactory().create(project, this, monitor);
+ if (isCreateServerAdapter()) {
+ IProject project = importedProjects.get(0);
+ new ServerAdapterFactory().create(project, this, monitor);
+ }
}
-
+
@Override
public File getRepositoryFile() {
String repositoryPath = getRepositoryPath();
13 years, 7 months
JBoss Tools SVN: r39255 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper.
by jbosstools-commits@lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-03-02 07:35:09 -0500 (Fri, 02 Mar 2012)
New Revision: 39255
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/OpenOnHelper.java
Log:
Fixes for 3.3.0.Beta1
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/OpenOnHelper.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/OpenOnHelper.java 2012-03-02 11:32:10 UTC (rev 39254)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/OpenOnHelper.java 2012-03-02 12:35:09 UTC (rev 39255)
@@ -18,6 +18,8 @@
import org.apache.log4j.Logger;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
+import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
+import org.eclipse.swtbot.swt.finder.results.VoidResult;
import org.jboss.tools.ui.bot.ext.SWTBotExt;
import org.jboss.tools.ui.bot.ext.SWTJBTExt;
import org.jboss.tools.ui.bot.ext.SWTUtilExt;
@@ -57,8 +59,13 @@
bot.sleep(Timing.time1S());
KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_F3);
-
- bot.sleep(Timing.time1S());
+ // process UI Events
+ UIThreadRunnable.syncExec(new VoidResult() {
+ @Override
+ public void run() {
+ }
+ });
+ bot.sleep(Timing.time3S());
new SWTUtilExt(bot).waitForNonIgnoredJobs();
openedEditor = bot.activeEditor();
13 years, 7 months
JBoss Tools SVN: r39254 - trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/META-INF.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-02 06:32:10 -0500 (Fri, 02 Mar 2012)
New Revision: 39254
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/META-INF/MANIFEST.MF
Log:
JBIDE-11115 to cr1
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/META-INF/MANIFEST.MF 2012-03-02 11:31:12 UTC (rev 39253)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.core/META-INF/MANIFEST.MF 2012-03-02 11:32:10 UTC (rev 39254)
@@ -10,3 +10,4 @@
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.jboss.ide.eclipse.as.management.core
+Bundle-Vendor: JBoss by Red Hat
13 years, 7 months
JBoss Tools SVN: r39253 - in trunk: archives/tests/org.jboss.ide.eclipse.archives.ui.test and 97 other directories.
by jbosstools-commits@lists.jboss.org
Author: mickael_istria
Date: 2012-03-02 06:31:12 -0500 (Fri, 02 Mar 2012)
New Revision: 39253
Modified:
trunk/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml
trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/pom.xml
trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/pom.xml
trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml
trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml
trunk/birt/tests/org.jboss.tools.birt.core.test/pom.xml
trunk/bpel/tests/org.jboss.tools.bpel.ui.test/pom.xml
trunk/bpmn/tests/org.eclipse.bpmn2.tests/pom.xml
trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/pom.xml
trunk/build/parent/pom.xml
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml
trunk/cdi/tests/pom.xml
trunk/common/tests/org.jboss.tools.common.verification.ui.test/pom.xml
trunk/common/tests/pom.xml
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/pom.xml
trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml
trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml
trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml
trunk/forge/tests/org.jboss.tools.forge.core.test/pom.xml
trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/pom.xml
trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/pom.xml
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/pom.xml
trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.multipage.test/pom.xml
trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/pom.xml
trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/pom.xml
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/pom.xml
trunk/jbpm/tests/org.jbpm.gd.jpdl.test/pom.xml
trunk/jmx/tests/org.jboss.tools.jmx.core.test/pom.xml
trunk/jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml
trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml
trunk/jsf/tests/org.jboss.tools.jsf.verification.test/pom.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml
trunk/jst/tests/org.jboss.tools.jst.css.test/pom.xml
trunk/jst/tests/org.jboss.tools.jst.jsp.test/pom.xml
trunk/jst/tests/org.jboss.tools.jst.text.ext.test/pom.xml
trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/pom.xml
trunk/jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/pom.xml
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml
trunk/jst/tests/org.jboss.tools.jst.web.test/pom.xml
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/pom.xml
trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/pom.xml
trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/pom.xml
trunk/portlet/tests/org.jboss.tools.portlet.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam.xml.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam211GA.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam212GA.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam212GA.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam220CR1.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam220GA.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam221GA.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam221GA.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam230.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam230.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml
trunk/smooks/tests/org.jboss.tools.smooks.core.test/pom.xml
trunk/smooks/tests/org.jboss.tools.smooks.templating.test/pom.xml
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml
trunk/smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml
trunk/struts/tests/org.jboss.tools.struts.text.ext.test/pom.xml
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml
trunk/usage/plugins/org.jboss.tools.usage/pom.xml
trunk/usage/tests/org.jboss.tools.usage.test/pom.xml
trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/pom.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml
trunk/vpe/tests/org.jboss.tools.vpe.spring.test/pom.xml
trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml
trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml
trunk/ws/tests/org.jboss.tools.ws.core.test/pom.xml
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml
trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml
trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml
Log:
JBIDE-10537
M1: generate jacoco.exec files in tests/target/jacoco.exec
* Configured maven-jacoco-plugin
* Replaced emma.filter by coverage.filter
* repeated tycho.testArgLine when necessary in tycho-surefire-plugin configuration
Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml
===================================================================
--- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -10,7 +10,7 @@
<artifactId>org.jboss.ide.eclipse.archives.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.ide.eclipse.archives.core*</emma.filter>
+ <coverage.filter>org.jboss.ide.eclipse.archives.core*</coverage.filter>
<emma.instrument.bundles>org.jboss.ide.eclipse.archives.core</emma.instrument.bundles>
</properties>
<build>
Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/pom.xml
===================================================================
--- trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -10,7 +10,7 @@
<artifactId>org.jboss.ide.eclipse.archives.ui.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.ide.eclipse.archives.ui*</emma.filter>
+ <coverage.filter>org.jboss.ide.eclipse.archives.ui*</coverage.filter>
<emma.instrument.bundles>org.jboss.ide.eclipse.archives.ui</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/pom.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -11,7 +11,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.ide.eclipse.archives.webtools*</emma.filter>
+ <coverage.filter>org.jboss.ide.eclipse.archives.webtools*</coverage.filter>
<emma.instrument.bundles>org.jboss.ide.eclipse.archives.webtools</emma.instrument.bundles>
</properties>
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -19,7 +19,7 @@
<jbosstools.test.jboss.home.6.0>${requirement.build.root}/jboss-6.0.0.Final</jbosstools.test.jboss.home.6.0>
<jbosstools.test.jboss.home.7.0>${requirement.build.root}/jboss-7.0.0.Beta3</jbosstools.test.jboss.home.7.0>
<systemProperties>-Djbosstools.test.jboss.home.3.2=${jbosstools.test.jboss.home.3.2} -Djbosstools.test.jboss.home.4.0=${jbosstools.test.jboss.home.4.0} -Djbosstools.test.jboss.home.4.2=${jbosstools.test.jboss.home.4.2} -Djbosstools.test.jboss.home.5.0=${jbosstools.test.jboss.home.5.0} -Djbosstools.test.jboss.home.5.1=${jbosstools.test.jboss.home.5.1} -Djbosstools.test.jboss.home.6.0=${jbosstools.test.jboss.home.6.0} -Djbosstools.test.jboss.home.7.0=${jbosstools.test.jboss.home.7.0} </systemProperties>
- <emma.filter>org.jboss.ide.eclipse.as.core*</emma.filter>
+ <coverage.filter>org.jboss.ide.eclipse.as.core*</coverage.filter>
<emma.instrument.bundles>org.jboss.ide.eclipse.as.core</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<properties>
<systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-4.2.3.GA</systemProperties>
- <emma.filter>org.jboss.ide.eclipse.as.ui*</emma.filter>
+ <coverage.filter>org.jboss.ide.eclipse.as.ui*</coverage.filter>
<emma.instrument.bundles>org.jboss.ide.eclipse.as.ui</emma.instrument.bundles>
</properties>
Modified: trunk/birt/tests/org.jboss.tools.birt.core.test/pom.xml
===================================================================
--- trunk/birt/tests/org.jboss.tools.birt.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/birt/tests/org.jboss.tools.birt.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -11,7 +11,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.birt.core*</emma.filter>
+ <coverage.filter>org.jboss.tools.birt.core*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.birt.core</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.test/pom.xml
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.eclipse.bpel*</emma.filter>
+ <coverage.filter>org.eclipse.bpel*</coverage.filter>
<emma.instrument.bundles>org.eclipse.bpel.ui,org.eclipse.bpel.common.ui,org.eclipse.bpel.common.model,org.eclipse.bpel.model</emma.instrument.bundles>
</properties>
Modified: trunk/bpmn/tests/org.eclipse.bpmn2.tests/pom.xml
===================================================================
--- trunk/bpmn/tests/org.eclipse.bpmn2.tests/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/bpmn/tests/org.eclipse.bpmn2.tests/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.bpmn.*</emma.filter>
+ <coverage.filter>org.jboss.tools.bpmn.*</coverage.filter>
<emma.instrument.bundles>org.eclipse.bpmn2,org.eclipse.bpmn2.edit,org.eclipse.bpmn2.editor,org.jboss.tools.bpmn2.model,org.jboss.tools.bpmn2.process.diagram,org.jboss.tools.jbpm</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/pom.xml
===================================================================
--- trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.eclipse.bpmn2.*</emma.filter>
+ <coverage.filter>org.eclipse.bpmn2.*</coverage.filter>
<emma.instrument.bundles>org.eclipse.bpmn2,org.eclipse.bpmn2.edit,org.eclipse.bpmn2.editor,org.jboss.tools.bpmn2.model,org.jboss.tools.bpmn2.process.diagram,org.jboss.tools.jbpm</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/build/parent/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -65,6 +65,9 @@
<!-- 5. extra requirements (for 3rd party "Extras" site) -->
<jboss-requirements-composite-extras-mirror>http://download.jboss.org/jbosstools/updates/indigo/extras/SR1a/</jboss-requirements-composite-extras-mirror>
+
+ <!-- Default coverage filter, to be overriden when necessary -->
+ <coverage.filter>org.jboss.tools.*</coverage.filter>
</properties>
<build>
@@ -170,7 +173,7 @@
<useUIHarness>true</useUIHarness>
<useUIThread>true</useUIThread>
<!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
- <argLine>${memoryOptions1} ${memoryOptions2} ${systemProperties} -Dusage_reporting_enabled=false</argLine>
+ <argLine>${tycho.testArgLine} ${memoryOptions1} ${memoryOptions2} ${systemProperties} -Dusage_reporting_enabled=false</argLine>
<!-- https://docs.sonatype.org/display/TYCHO/How+to+run+SWTBot+tests+with+Tycho -->
<!-- set useUIThread=true for regular ui tests -->
<!-- set useUIThread=false for swtbot tests (?) -->
@@ -242,6 +245,28 @@
<encoding>ISO-8859-1</encoding>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.5.7-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <!-- Where to put jacoco coverage report, basically in the tests/target folder
+ for each component -->
+ <destFile>../target/jacoco.exec</destFile>
+ <includes>
+ <include>${coverage.filter}</include>
+ </includes>
+ <!-- Merge reports from all executions -->
+ <append>true</append>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -547,7 +572,6 @@
</activation>
<properties>
<emma.session.out.file>${project.build.directory}/emma/coverage.es</emma.session.out.file>
- <emma.filter />
<emma.instrument.bundles />
</properties>
<build>
@@ -576,7 +600,7 @@
<configuration>
<systemProperties combine.children="append">
<emma.session.out.file>${emma.session.out.file}</emma.session.out.file>
- <emma.filter>${emma.filter}</emma.filter>
+ <emma.filter>${coverage.filter}</emma.filter>
<eclemma.instrument.bundles>${emma.instrument.bundles}</eclemma.instrument.bundles>
</systemProperties>
<frameworkExtensions>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -23,7 +23,7 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
- <argLine>-XX:+UseLinuxPosixThreadCPUClocks -agentpath:/home/eskimo/Java/netbeans-7.0.1/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so=/home/eskimo/Java/netbeans-7.0.1/profiler/lib,5140</argLine>
+ <argLine>${tycho.testArgLine} -XX:+UseLinuxPosixThreadCPUClocks -agentpath:/home/eskimo/Java/netbeans-7.0.1/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so=/home/eskimo/Java/netbeans-7.0.1/profiler/lib,5140</argLine>
</configuration>
</plugin>
</plugins>
Modified: trunk/cdi/tests/pom.xml
===================================================================
--- trunk/cdi/tests/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/cdi/tests/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -10,7 +10,7 @@
<artifactId>tests</artifactId>
<name>cdi.tests</name>
<properties>
- <emma.filter>org.jboss.tools.cdi*</emma.filter>
+ <coverage.filter>org.jboss.tools.cdi*</coverage.filter>
</properties>
<packaging>pom</packaging>
<profiles>
Modified: trunk/common/tests/org.jboss.tools.common.verification.ui.test/pom.xml
===================================================================
--- trunk/common/tests/org.jboss.tools.common.verification.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/common/tests/org.jboss.tools.common.verification.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -11,7 +11,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.common.verification.ui*</emma.filter>
+ <coverage.filter>org.jboss.tools.common.verification.ui*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.common,org.jboss.tools.common.model,org.jboss.tools.common.verification,org.jboss.tools.common.verification.ui</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/common/tests/pom.xml
===================================================================
--- trunk/common/tests/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/common/tests/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -11,7 +11,7 @@
</parent>
<packaging>pom</packaging>
<properties>
- <emma.filter>org.jboss.tools.*</emma.filter>
+ <coverage.filter>org.jboss.tools.*</coverage.filter>
</properties>
<profiles>
Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/pom.xml
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-plugin</packaging>
<properties>
- <emma.filter />
+ <coverage.filter />
<emma.instrument.bundles />
</properties>
<build>
Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.esb.core*</emma.filter>
+ <coverage.filter>org.jboss.tools.esb.core*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.esb.core,org.jboss.tools.esb.project.core</emma.instrument.bundles>
</properties>
</project>
\ No newline at end of file
Modified: trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -14,7 +14,7 @@
<properties>
<systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-soa-p.5.0.0/jboss-as -Djbosstools.test.jboss.home.5.0=${requirement.build.root}/jboss-soa-p.5.0.0/jboss-as -Djbosstools.test.jboss.home.5.1=${requirement.build.root}/jboss-5.1.0.GA -Djbosstools.test.soap.home.4.3=${requirement.build.root}/jboss-soa-p.4.3.0 -Djbosstools.test.soap.home.5.0=${requirement.build.root}/jboss-soa-p.5.0.0</systemProperties>
- <emma.filter>org.jboss.tools.esb.core*</emma.filter>
+ <coverage.filter>org.jboss.tools.esb.core*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.esb.project.core</emma.instrument.bundles>
</properties>
Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.esb.*</emma.filter>
+ <coverage.filter>org.jboss.tools.esb.*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.esb.core,org.jboss.tools.esb.validator,org.jboss.tools.esb.project.core</emma.instrument.bundles>
</properties>
</project>
\ No newline at end of file
Modified: trunk/forge/tests/org.jboss.tools.forge.core.test/pom.xml
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/forge/tests/org.jboss.tools.forge.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.forge.core*</emma.filter>
+ <coverage.filter>org.jboss.tools.forge.core*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.forge.core</emma.instrument.bundles>
</properties>
Modified: trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml
===================================================================
--- trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -11,7 +11,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.ide.eclipse.freemarker*</emma.filter>
+ <coverage.filter>org.jboss.ide.eclipse.freemarker*</coverage.filter>
<emma.instrument.bundles>org.jboss.ide.eclipse.freemarker</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.hibernate.eclipse*</emma.filter>
+ <coverage.filter>org.hibernate.eclipse*</coverage.filter>
<emma.instrument.bundles>org.hibernate.eclipse.console</emma.instrument.bundles>
</properties>
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/pom.xml
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.hibernate.eclipse.jdt.ui*</emma.filter>
+ <coverage.filter>org.hibernate.eclipse.jdt.ui*</coverage.filter>
<emma.instrument.bundles>org.hibernate.eclipse.jdt.ui</emma.instrument.bundles>
</properties>
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/pom.xml
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.hibernate.jpt.core*</emma.filter>
+ <coverage.filter>org.jboss.tools.hibernate.jpt.core*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.hibernate.jpt.core</emma.instrument.bundles>
</properties>
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/pom.xml
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.hibernate.ui*</emma.filter>
+ <coverage.filter>org.jboss.tools.hibernate.ui*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.hibernate.ui</emma.instrument.bundles>
</properties>
Modified: trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.multipage.test/pom.xml
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.multipage.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.multipage.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<version>4.3.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.flow.jpdl4.multipage*</emma.filter>
+ <coverage.filter>org.jboss.tools.flow.jpdl4.multipage*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.flow.jpdl4.multipage</emma.instrument.bundles>
</properties>
</project>
\ No newline at end of file
Modified: trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/pom.xml
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.flow.jpdl4*</emma.filter>
+ <coverage.filter>org.jboss.tools.flow.jpdl4*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.flow.jpdl4</emma.instrument.bundles>
</properties>
</project>
\ No newline at end of file
Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/pom.xml
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jbpm*</emma.filter>
+ <coverage.filter>org.jboss.tools.jbpm*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jbpm.common</emma.instrument.bundles>
</properties>
</project>
\ No newline at end of file
Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/pom.xml
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jbpm.convert*</emma.filter>
+ <coverage.filter>org.jboss.tools.jbpm.convert*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jbpm.convert</emma.instrument.bundles>
</properties>
Modified: trunk/jbpm/tests/org.jbpm.gd.jpdl.test/pom.xml
===================================================================
--- trunk/jbpm/tests/org.jbpm.gd.jpdl.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jbpm/tests/org.jbpm.gd.jpdl.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jbpm.gd*</emma.filter>
+ <coverage.filter>org.jbpm.gd*</coverage.filter>
<emma.instrument.bundles>org.jbpm.gd.jpdl</emma.instrument.bundles>
</properties>
</project>
\ No newline at end of file
Modified: trunk/jmx/tests/org.jboss.tools.jmx.core.test/pom.xml
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -11,7 +11,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jmx.core*</emma.filter>
+ <coverage.filter>org.jboss.tools.jmx.core*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jmx.core</emma.instrument.bundles>
</properties>
<build>
Modified: trunk/jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -11,7 +11,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jmx.ui*</emma.filter>
+ <coverage.filter>org.jboss.tools.jmx.ui*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jmx.ui</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jsf*</emma.filter>
+ <coverage.filter>org.jboss.tools.jsf*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jsf</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jsf.text.ext*</emma.filter>
+ <coverage.filter>org.jboss.tools.jsf.text.ext*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jsf.text.ext,org.jboss.tools.jsf.text.ext.facelets,org.jboss.tools.jsf.text.ext.richfaces</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jsf.ui*</emma.filter>
+ <coverage.filter>org.jboss.tools.jsf.ui*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jsf.ui</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jsf.verification*</emma.filter>
+ <coverage.filter>org.jboss.tools.jsf.verification*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jsf.verification</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jsf.vpe.ajax4jsf*</emma.filter>
+ <coverage.filter>org.jboss.tools.jsf.vpe.ajax4jsf*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jsf.vpe.ajax4jsf</emma.instrument.bundles>
</properties>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jsf.vpe.facelets*</emma.filter>
+ <coverage.filter>org.jboss.tools.jsf.vpe.facelets*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jsf.vpe.facelets</emma.instrument.bundles>
</properties>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jsf.vpe.jbpm*</emma.filter>
+ <coverage.filter>org.jboss.tools.jsf.vpe.jbpm*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jsf.vpe.jbpm</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jsf.vpe.jsf*</emma.filter>
+ <coverage.filter>org.jboss.tools.jsf.vpe.jsf*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jsf.vpe.jsf</emma.instrument.bundles>
</properties>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jsf.vpe.jstl*</emma.filter>
+ <coverage.filter>org.jboss.tools.jsf.vpe.jstl*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jsf.vpe.jstl</emma.instrument.bundles>
</properties>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jsf.vpe.myfaces*</emma.filter>
+ <coverage.filter>org.jboss.tools.jsf.vpe.myfaces*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jsf.vpe.myfaces</emma.instrument.bundles>
</properties>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jsf.vpe.richfaces*</emma.filter>
+ <coverage.filter>org.jboss.tools.jsf.vpe.richfaces*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jsf.vpe.richfaces</emma.instrument.bundles>
</properties>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jsf.vpe.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.jsf.vpe.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jsf.vpe.seam</emma.instrument.bundles>
</properties>
Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/pom.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.css.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jst/tests/org.jboss.tools.jst.css.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jst.css*</emma.filter>
+ <coverage.filter>org.jboss.tools.jst.css*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jst.css</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/pom.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jst.jsp*</emma.filter>
+ <coverage.filter>org.jboss.tools.jst.jsp*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jst.jsp</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/pom.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jst.text.ext*</emma.filter>
+ <coverage.filter>org.jboss.tools.jst.text.ext*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jst.text.ext</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/pom.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -11,7 +11,7 @@
<packaging>eclipse-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jst*</emma.filter>
+ <coverage.filter>org.jboss.tools.jst*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jst*</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/pom.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jst*</emma.filter>
+ <coverage.filter>org.jboss.tools.jst*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jst*</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jst.web.kb*</emma.filter>
+ <coverage.filter>org.jboss.tools.jst.web.kb*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jst.web.kb</emma.instrument.bundles>
</properties>
Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/pom.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -11,7 +11,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jst.web*</emma.filter>
+ <coverage.filter>org.jboss.tools.jst.web*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jst.web</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/pom.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jst.web.ui*</emma.filter>
+ <coverage.filter>org.jboss.tools.jst.web.ui*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jst.web.ui</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/pom.xml
===================================================================
--- trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.modeshape.rest*</emma.filter>
+ <coverage.filter>org.jboss.tools.modeshape.rest*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.modeshape.rest</emma.instrument.bundles>
</properties>
</project>
\ No newline at end of file
Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/pom.xml
===================================================================
--- trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.modeshape.rest.ui*</emma.filter>
+ <coverage.filter>org.jboss.tools.modeshape.rest.ui*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.modeshape.rest</emma.instrument.bundles>
</properties>
Modified: trunk/portlet/tests/org.jboss.tools.portlet.core.test/pom.xml
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/portlet/tests/org.jboss.tools.portlet.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -14,7 +14,7 @@
<properties>
<emma.session.out.file>${project.build.directory}/emma/coverage.es</emma.session.out.file>
- <emma.filter>org.jboss.tools.portlet.core*</emma.filter>
+ <coverage.filter>org.jboss.tools.portlet.core*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.portlet.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.1.2.1.eap.home=${requirement.build.root}/requirements/target/jboss-eap-4.3/seam -Djbosstools.test.seam.2fp.eap.home=${requirement.build.root}/requirements/target/jboss-eap-4.3/seamfp -Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/requirements/target/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.1.0.GA.home=${requirement.build.root}/requirements/target/jboss-seam-2.1.1.GA</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -11,7 +11,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.pages.xml</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-4.2.3.GA -Djbosstools.test.seam.1.2.1.eap.home=${requirement.build.root}/jboss-eap-4.3/seam -Djbosstools.test.seam.2fp.eap.home=${requirement.build.root}/jboss-eap-4.3/seamfp -Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.1.0.GA.home=${requirement.build.root}/jboss-seam-2.1.1.GA</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.core,org.jboss.tools.seam.ui</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seam.xml.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.xml.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam.xml.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.xml</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.1.2.1.eap.home=${requirement.build.root}/jboss-eap-4.3/seam</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.1.2.1.eap.home=${requirement.build.root}/jboss-eap-4.3/seam</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.1.GA</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.1.GA</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.2.SP1</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.2.SP1</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.3.CR1</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.3.CR1</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seam211GA.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam211GA.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam211GA.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.1.1.GA</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.1.1.GA</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seam212GA.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam212GA.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam212GA.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.1.2</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seam212GA.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam212GA.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam212GA.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.1.2</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seam220CR1.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam220CR1.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam220CR1.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.2.0.CR1</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.2.0.CR1</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seam220GA.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam220GA.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam220GA.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.2.0.GA</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.2.0.GA</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seam221GA.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam221GA.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam221GA.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.2.1.Final</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seam221GA.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam221GA.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam221GA.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.2.1.Final</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seam230.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam230.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam230.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.3.0</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seam230.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam230.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seam230.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.3.0</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-eap-4.3/seamfp</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<properties>
<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-eap-4.3/seamfp</systemProperties>
- <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
Modified: trunk/smooks/tests/org.jboss.tools.smooks.core.test/pom.xml
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/smooks/tests/org.jboss.tools.smooks.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.smooks*</emma.filter>
+ <coverage.filter>org.jboss.tools.smooks*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.smooks.core</emma.instrument.bundles>
</properties>
Modified: trunk/smooks/tests/org.jboss.tools.smooks.templating.test/pom.xml
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.templating.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/smooks/tests/org.jboss.tools.smooks.templating.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.smooks.templating*</emma.filter>
+ <coverage.filter>org.jboss.tools.smooks.templating*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.smooks.templating</emma.instrument.bundles>
</properties>
</project>
\ No newline at end of file
Modified: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.smooks.*</emma.filter>
+ <coverage.filter>org.jboss.tools.smooks.*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.smooks.ui,org.jboss.tools.smooks.core</emma.instrument.bundles>
<systemProperties>-Djbosstools.test.smooks.1.2.4=${requirement.build.root}/smooks-1.2.4</systemProperties>
</properties>
Modified: trunk/smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.smooks.*</emma.filter>
+ <coverage.filter>org.jboss.tools.smooks.*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.smooks.ui,org.jboss.tools.smooks.core</emma.instrument.bundles>
</properties>
Modified: trunk/struts/tests/org.jboss.tools.struts.text.ext.test/pom.xml
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.text.ext.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/struts/tests/org.jboss.tools.struts.text.ext.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -11,7 +11,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools*</emma.filter>
+ <coverage.filter>org.jboss.tools*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.struts,org.jboss.tools.struts.text.ext</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -11,7 +11,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools*</emma.filter>
+ <coverage.filter>org.jboss.tools*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.struts,org.jboss.tools.struts.text.ext,org.jboss.tools.struts.vpe.struts</emma.instrument.bundles>
</properties>
<build>
Modified: trunk/usage/plugins/org.jboss.tools.usage/pom.xml
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/usage/plugins/org.jboss.tools.usage/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.usage*</emma.filter>
+ <coverage.filter>org.jboss.tools.usage*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.usage</emma.instrument.bundles>
</properties>
</project>
\ No newline at end of file
Modified: trunk/usage/tests/org.jboss.tools.usage.test/pom.xml
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/usage/tests/org.jboss.tools.usage.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.usage*</emma.filter>
+ <coverage.filter>org.jboss.tools.usage*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.usage</emma.instrument.bundles>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -11,7 +11,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.vpe.docbook*</emma.filter>
+ <coverage.filter>org.jboss.tools.vpe.docbook*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.vpe.docbook</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -14,7 +14,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.vpe.html*</emma.filter>
+ <coverage.filter>org.jboss.tools.vpe.html*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.vpe.html</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.vpe*</emma.filter>
+ <coverage.filter>org.jboss.tools.vpe*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.vpe,org.jboss.tools.vpe.jsp</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.vpe.spring*</emma.filter>
+ <coverage.filter>org.jboss.tools.vpe.spring*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.vpe.spring</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.vpe*</emma.filter>
+ <coverage.filter>org.jboss.tools.vpe*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.vpe</emma.instrument.bundles>
</properties>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.vpe*</emma.filter>
+ <coverage.filter>org.jboss.tools.vpe*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.vpe,org.jboss.tools.vpe.resref,org.jboss.tools.vpe.ui.palette</emma.instrument.bundles>
</properties>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.vpe.xulrunner*</emma.filter>
+ <coverage.filter>org.jboss.tools.vpe.xulrunner*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.vpe.xulrunner</emma.instrument.bundles>
</properties>
</project>
Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.ws.core*</emma.filter>
+ <coverage.filter>org.jboss.tools.ws.core*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.ws.core</emma.instrument.bundles>
</properties>
</project>
\ No newline at end of file
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -14,7 +14,7 @@
<properties>
<systemProperties>-Djbosstools.test.jre.6=${jbosstools.test.jre.6} -Djbosstools.test.jre.5=${jbosstools.test.jre.5} -Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-4.2.3.GA</systemProperties>
- <emma.filter>org.jboss.tools.ws.creation.core*</emma.filter>
+ <coverage.filter>org.jboss.tools.ws.creation.core*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.ws.creation.core</emma.instrument.bundles>
</properties>
Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.ws.creation.core*</emma.filter>
+ <coverage.filter>org.jboss.tools.ws.creation.core*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.ws.creation.core</emma.instrument.bundles>
</properties>
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml 2012-03-02 11:27:47 UTC (rev 39252)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml 2012-03-02 11:31:12 UTC (rev 39253)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.ws.core*,org.jboss.tools.ws.ui*</emma.filter>
+ <coverage.filter>org.jboss.tools.ws.core*,org.jboss.tools.ws.ui*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.ws.core,org.jboss.tools.ws.ui</emma.instrument.bundles>
</properties>
</project>
\ No newline at end of file
13 years, 7 months
JBoss Tools SVN: r39252 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-02 06:27:47 -0500 (Fri, 02 Mar 2012)
New Revision: 39252
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/AbstractOpenBrowserServerAction.java
Log:
JBIDE-11138 commit to cr1
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/AbstractOpenBrowserServerAction.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/AbstractOpenBrowserServerAction.java 2012-03-02 11:17:19 UTC (rev 39251)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/AbstractOpenBrowserServerAction.java 2012-03-02 11:27:47 UTC (rev 39252)
@@ -91,6 +91,7 @@
private class OpenBrowserAction extends AbstractServerAction {
public OpenBrowserAction(ISelectionProvider sp) {
super(sp, getActionText());
+ selectionChanged(getStructuredSelection());
}
public boolean accept(IServer server) {
13 years, 7 months
JBoss Tools SVN: r39251 - branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2012-03-02 06:17:19 -0500 (Fri, 02 Mar 2012)
New Revision: 39251
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewOpenShiftExpressApplicationWizard.java
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
Log:
[JBIDE-11090] preselect "use existing application" when File->Import->Existing OpenShift Express Application"
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-03-02 11:11:42 UTC (rev 39250)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-03-02 11:17:19 UTC (rev 39251)
@@ -221,8 +221,8 @@
setApplicationName(application.getName());
setSelectedCartridge(application.getCartridge());
setSelectedEmbeddableCartridges(new HashSet<IEmbeddableCartridge>(application.getEmbeddedCartridges()));
+ wizardModel.setApplication(application);
}
- wizardModel.setApplication(application);
}
public void resetExistingApplication() throws OpenShiftException {
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java 2012-03-02 11:11:42 UTC (rev 39250)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java 2012-03-02 11:17:19 UTC (rev 39251)
@@ -18,7 +18,7 @@
* Constructor
*/
public ImportOpenShiftExpressApplicationWizard() {
- super("Import OpenShift Express Application");
+ super(true, "Import OpenShift Express Application");
}
/**
@@ -28,6 +28,6 @@
* @param application
*/
public ImportOpenShiftExpressApplicationWizard(IUser user, IProject project, IApplication application) {
- super(user, project, application, "Import OpenShift Express Application");
+ super(user, project, application, true, "Import OpenShift Express Application");
}
}
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewOpenShiftExpressApplicationWizard.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewOpenShiftExpressApplicationWizard.java 2012-03-02 11:11:42 UTC (rev 39250)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewOpenShiftExpressApplicationWizard.java 2012-03-02 11:17:19 UTC (rev 39251)
@@ -15,10 +15,10 @@
* Constructor
*/
public NewOpenShiftExpressApplicationWizard() {
- super("New OpenShift Express Application");
+ super(false, "New OpenShift Express Application");
}
public NewOpenShiftExpressApplicationWizard(IUser user) {
- super(user, null, null, "New OpenShift Express Application");
+ super(user, null, null, false, "New OpenShift Express Application");
}
}
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-03-02 11:11:42 UTC (rev 39250)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-03-02 11:17:19 UTC (rev 39251)
@@ -58,15 +58,12 @@
private OpenShiftExpressApplicationWizardModel wizardModel;
- /**
- * @see #setUser called by CredentialsWizardPageModel#getValidityStatus
- */
- public OpenShiftExpressApplicationWizard(String wizardTitle) {
- this(null, null, null, wizardTitle);
+ public OpenShiftExpressApplicationWizard(boolean useExistingApplication, String wizardTitle) {
+ this(null, null, null, useExistingApplication, wizardTitle);
}
-
- public OpenShiftExpressApplicationWizard(IUser user, IProject project, IApplication application, String wizardTitle) {
- setWizardModel(new OpenShiftExpressApplicationWizardModel(user, project, application));
+
+ public OpenShiftExpressApplicationWizard(IUser user, IProject project, IApplication application, boolean useExistingApplication, String wizardTitle) {
+ setWizardModel(new OpenShiftExpressApplicationWizardModel(user, project, application, useExistingApplication));
setWindowTitle(wizardTitle);
setNeedsProgressMonitor(true);
}
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-03-02 11:11:42 UTC (rev 39250)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-03-02 11:17:19 UTC (rev 39251)
@@ -44,15 +44,16 @@
private static final String KEY_SELECTED_EMBEDDABLE_CARTRIDGES = "selectedEmbeddableCartridges";
public OpenShiftExpressApplicationWizardModel(IUser user) {
- this(user, null, null);
+ this(user, null, null, false);
}
- public OpenShiftExpressApplicationWizardModel(IUser user, IProject project, IApplication application) {
+ public OpenShiftExpressApplicationWizardModel(IUser user, IProject project, IApplication application, boolean useExistingApplication) {
// default value(s)
setUser(user);
setProject(project);
setNewProject(true);
setApplication(application);
+ setUseExistingApplication(useExistingApplication);
setCreateServerAdapter(true);
setRepositoryPath(DEFAULT_REPOSITORY_PATH);
setRemoteName(NEW_PROJECT_REMOTE_NAME_DEFAULT);
13 years, 7 months
JBoss Tools SVN: r39250 - in branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss: tools/as/wst/server/ui/xpl and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-02 06:11:42 -0500 (Fri, 02 Mar 2012)
New Revision: 39250
Modified:
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java
Log:
JBIDE-11080 to beta1 branch (exceptions in actions caused by multiple selection)
Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java 2012-03-02 11:02:42 UTC (rev 39249)
+++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java 2012-03-02 11:11:42 UTC (rev 39250)
@@ -29,7 +29,7 @@
protected boolean shouldAddForSelection(IStructuredSelection sel) {
IServer server = getSingleServer(sel);
- return accepts(server);
+ return server != null && accepts(server);
}
protected boolean accepts(IServer server) {
Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java 2012-03-02 11:02:42 UTC (rev 39249)
+++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java 2012-03-02 11:11:42 UTC (rev 39250)
@@ -119,7 +119,7 @@
public void fillContextMenu(IMenuManager menu) {
if( getModuleServer() != null )
menu.insertBefore(ServerActionProvider.CONTROL_MODULE_SECTION_END_SEPARATOR, exploreAction);
- else
+ else if( getServer() != null )
menu.insertBefore(ServerActionProvider.SERVER_ETC_SECTION_END_SEPARATOR, exploreAction);
exploreAction.setEnabled(true);
}
@@ -147,8 +147,8 @@
ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite) site;
selection = (IStructuredSelection) wsSite.getSelectionProvider()
.getSelection();
- Object first = selection.getFirstElement();
- return first;
+ if( selection.size() == 1 )
+ return selection.getFirstElement();
}
return null;
}
13 years, 7 months
JBoss Tools SVN: r39249 - branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-02 06:02:42 -0500 (Fri, 02 Mar 2012)
New Revision: 39249
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
Log:
/JBIDE-10981 to beta1
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-03-02 11:00:11 UTC (rev 39248)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-03-02 11:02:42 UTC (rev 39249)
@@ -94,7 +94,7 @@
protected Button verifyButton, browseDestButton;
// Data / Model
- protected boolean showVerify;
+ protected boolean showVerify, showImportLink;
private String user, pass, app, remote, deployProject, deployFolder;
private IApplication fapplication;
private IUser fuser;
@@ -113,6 +113,7 @@
this.mode = mode;
this.composite = fill;
this.showVerify = showVerify;
+ this.showImportLink = showVerify;
initModel();
createWidgets(fill);
fillWidgets();
@@ -148,16 +149,12 @@
if( tmpUser != null && app != null ) {
// started from express console with a user and an app
try {
- this.fuser = tmpUser;
- this.user = fuser.getRhlogin();
- this.appList = fuser.getApplications();
- this.appListNames = getAppNamesAsStrings(this.appList);
- this.fapplication = app;
this.app = app.getName();
+ updateModelForNewUser(tmpUser);
+ postLongRunningValidate();
showVerify = false;
- ExpressServerUtils.fillServerWithOpenShiftDetails(
- callback.getServer(), fapplication, fuser, mode,
- deployProject, deployFolder, remote);
+ IProject[] p = projectsPerApp.get(app);
+ showImportLink = p == null || p.length == 0;
} catch( OpenShiftException ose ) {
// ignore, allow appList and appListNames to be null / empty
}
@@ -198,6 +195,8 @@
this.deployProjectCombo.setItems(new String[]{deployProject});
this.deployProjectCombo.select(0);
this.deployProjectCombo.setEnabled(false);
+ } else {
+ this.browseDestButton.setEnabled(false);
}
}
}
@@ -216,6 +215,9 @@
if( names.length > 0 ) {
deployProjectCombo.select(0);
this.deployProject = names[0];
+ browseDestButton.setEnabled(true);
+ } else {
+ browseDestButton.setEnabled(false);
}
}
@@ -247,10 +249,12 @@
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, false).applyTo(deployProjectCombo);
deployLocationLabel.setText("Deploy Project: " );
- if( showVerify ) {
+ if( showImportLink ) {
importLink = new Link(composite, SWT.DEFAULT);
importLink.setText("<a>Import this application</a>"); //$NON-NLS-1$
- importLink.setEnabled(false);
+ // if we show verify, start import link disabled (wait for verify pressed to enable)
+ // Otherwise, not showing verify means we're inside new wizard fragment with no suitable projects
+ importLink.setEnabled(!showVerify);
GridData gd = GridDataFactory.fillDefaults().span(2, 1).create();
importLink.setLayoutData(gd);
}
@@ -347,7 +351,7 @@
});
- if (verifyButton != null) {
+ if (showImportLink ) {
importLink.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
OpenShiftExpressApplicationWizard wizard = new ImportOpenShiftExpressApplicationWizard();
@@ -369,7 +373,8 @@
public void widgetDefaultSelected(SelectionEvent e) {
}
});
-
+ }
+ if (showVerify) {
verifyButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
verifyPressed();
@@ -389,6 +394,9 @@
}
private IFolder chooseFolder() {
+ if( this.deployProject == null )
+ return null;
+
IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(this.deployProject);
ILabelProvider lp= new WorkbenchLabelProvider();
@@ -570,6 +578,9 @@
projectsPerApp.put(appList.get(i), ExpressServerUtils.findProjectsForApplication(appList.get(i)));
}
+ IProject[] possibleProjects = projectsPerApp.get(fapplication);
+ this.deployProject = possibleProjects == null || possibleProjects.length == 0 ? null : possibleProjects[0].getName();
+
// Fill the server working copy
// update the values
IServerWorkingCopy wc = callback.getServer();
13 years, 7 months