JBoss Tools SVN: r30920 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-04-28 13:20:58 -0400 (Thu, 28 Apr 2011)
New Revision: 30920
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
Log:
17 Tests Failing due to npe
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-04-28 17:05:59 UTC (rev 30919)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-04-28 17:20:58 UTC (rev 30920)
@@ -39,7 +39,7 @@
@Deprecated
public static IPath makeRelative(IJBossServerRuntime rt, IPath p) {
- if( rt.getRuntime() != null )
+ if( rt != null && rt.getRuntime() != null )
return makeRelative(rt.getRuntime(), p);
return p;
}
@@ -56,7 +56,7 @@
@Deprecated
public static IPath makeGlobal(IJBossServerRuntime rt, IPath p) {
- if( rt == null || rt.getRuntime() != null )
+ if( rt != null && rt.getRuntime() != null )
return makeGlobal(rt.getRuntime(), p);
return p;
}
13 years, 8 months
JBoss Tools SVN: r30919 - in trunk: seam/tests/org.jboss.tools.seam.ui.test/META-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-04-28 13:05:59 -0400 (Thu, 28 Apr 2011)
New Revision: 30919
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml
trunk/tests/plugins/org.jboss.tools.tests/META-INF/MANIFEST.MF
trunk/tests/plugins/org.jboss.tools.tests/pom.xml
Log:
JBIDE-8805
Seam Component Search Dialog test cases fail
Issue is fixed
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF 2011-04-28 16:56:02 UTC (rev 30918)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF 2011-04-28 17:05:59 UTC (rev 30919)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.seam.ui.test
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.3.0.qualifier
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: org.junit,
org.jboss.tools.seam.ui,
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml 2011-04-28 16:56:02 UTC (rev 30918)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml 2011-04-28 17:05:59 UTC (rev 30919)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.jboss.tools.seam.tests</groupId>
<artifactId>org.jboss.tools.seam.ui.test</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
Modified: trunk/tests/plugins/org.jboss.tools.tests/META-INF/MANIFEST.MF
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/META-INF/MANIFEST.MF 2011-04-28 16:56:02 UTC (rev 30918)
+++ trunk/tests/plugins/org.jboss.tools.tests/META-INF/MANIFEST.MF 2011-04-28 17:05:59 UTC (rev 30919)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.tests;singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.2.0.qualifier
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Modified: trunk/tests/plugins/org.jboss.tools.tests/pom.xml
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/pom.xml 2011-04-28 16:56:02 UTC (rev 30918)
+++ trunk/tests/plugins/org.jboss.tools.tests/pom.xml 2011-04-28 17:05:59 UTC (rev 30919)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.tests</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
13 years, 8 months
JBoss Tools SVN: r30918 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-04-28 12:56:02 -0400 (Thu, 28 Apr 2011)
New Revision: 30918
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java
Log:
JBIDE-8805
Seam Component Search Dialog test cases fail
Issue is fixed
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2011-04-28 16:40:30 UTC (rev 30917)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2011-04-28 16:56:02 UTC (rev 30918)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2011 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -90,6 +90,7 @@
JobUtils.waitForIdle();
}
} );
+
return suite;
}
}
\ No newline at end of file
13 years, 8 months
JBoss Tools SVN: r30917 - in branches/jbosstools-3.2.x/bpel/plugins: org.eclipse.bpel.apache.ode.deploy.ui and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2011-04-28 12:40:30 -0400 (Thu, 28 Apr 2011)
New Revision: 30917
Modified:
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/plugin.properties
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.properties
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.xml
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/plugin.properties
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-8732
Added a new action group to Project Explorer popup menu. Also made some cosmetic label changes.
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/plugin.properties
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/plugin.properties 2011-04-28 16:15:12 UTC (rev 30916)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/plugin.properties 2011-04-28 16:40:30 UTC (rev 30917)
@@ -26,5 +26,5 @@
# %%% END OF TRANSLATED PROPERTIES %%%
# ====================================================================
-pluginName = ODE Deploy Descriptor EMF Model
+pluginName =BPEL Deployment Descriptor EMF Model
providerName = JBoss by Red Hat
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.properties
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.properties 2011-04-28 16:15:12 UTC (rev 30916)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.properties 2011-04-28 16:40:30 UTC (rev 30917)
@@ -26,5 +26,5 @@
# %%% END OF TRANSLATED PROPERTIES %%%
# ====================================================================
-pluginName = ODE Deploy Descriptor UI Plug-in
+pluginName = BPEL Deployment Descriptor UI Plug-in
providerName = JBoss by Red Hat
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.xml
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.xml 2011-04-28 16:15:12 UTC (rev 30916)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.xml 2011-04-28 16:40:30 UTC (rev 30917)
@@ -10,7 +10,7 @@
filenames="bpel-deploy.xml,deploy.xml"
icon="icons/obj16/ode.gif"
id="org.eclipse.bpel.apache.ode.deploy.ui.editors.ODEDeployMultiPageEditor"
- name="ODE Deployment Descriptor Editor">
+ name="BPEL Deployment Descriptor Editor">
<contentTypeBinding
contentTypeId="org.eclipse.bpel.apache.ode.deploy.ui.content-type">
</contentTypeBinding>
@@ -20,7 +20,7 @@
<extension
point="org.eclipse.ui.newWizards">
<wizard
- name="Apache ODE Deployment Descriptor"
+ name="BPEL Deployment Descriptor"
icon="icons/obj16/ode.gif"
category="org.eclipse.bpel.wizards"
class="org.eclipse.bpel.apache.ode.deploy.ui.wizards.NewODEDeployWizard"
@@ -34,7 +34,7 @@
default-charset="UTF-8"
file-names="deploy.xml,bpel-deploy.xml"
id="org.eclipse.bpel.apache.ode.deploy.ui.content-type"
- name="ODE BPEL Deployment Descriptor"
+ name="BPEL Deployment Descriptor"
priority="normal">
</content-type>
</extension>
@@ -44,7 +44,7 @@
adaptable="true"
icon="icons/obj16/ode.gif"
id="org.eclipse.bpel.apache.ode.deploy.ui.icondecorator"
- label="ODE DD Resource Decorator"
+ label="BPEL Deployment Descriptor Resource Decorator"
lightweight="true"
location="TOP_LEFT"
state="true">
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java 2011-04-28 16:15:12 UTC (rev 30916)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java 2011-04-28 16:40:30 UTC (rev 30917)
@@ -43,8 +43,8 @@
*/
public ODEDeployWizardPage(ISelection selection) {
super("ODEDeployDescriptorWizardPage");
- setTitle("Apache ODE Deployment Descriptor");
- setDescription("This wizard creates a new Apache ODE descriptor file (deploy.xml). Note that the file name cannot be changed.");
+ setTitle("BPEL Deployment Descriptor");
+ setDescription("This wizard creates a new BPEL deployment descriptor file (deploy.xml). Note that the file name cannot be changed.");
this.selection = selection;
}
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/plugin.properties
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/plugin.properties 2011-04-28 16:15:12 UTC (rev 30916)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/plugin.properties 2011-04-28 16:40:30 UTC (rev 30917)
@@ -50,7 +50,7 @@
COMPONENT_DESCRIPTION=Business Process
NEW_BPEL_CATEGORY=BPEL 2.0
-NEW_BPEL_FILE=New BPEL Process File
+NEW_BPEL_FILE=BPEL Process File
EXPORT_AS_IMAGE_TOOLTIP=Export BPEL as image...
EXPORT_AS_IMAGE_LABEL=Export as Image...
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/plugin.xml
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/plugin.xml 2011-04-28 16:15:12 UTC (rev 30916)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/plugin.xml 2011-04-28 16:40:30 UTC (rev 30917)
@@ -711,4 +711,29 @@
name="BPEL">
</perspective>
</extension>
+
+ <extension point="org.eclipse.ui.navigator.navigatorContent">
+ <commonWizard type="new" wizardId="org.jboss.tools.bpel.runtimes.wizards.newBPELProject" menuGroupId="org.eclipse.bpel.new.menuGroup">
+ <enablement>
+ <with variable="activeWorkbenchWindow.activePerspective">
+ <equals value="org.eclipse.bpel.ui.perspective"/>
+ </with>
+ </enablement>
+ </commonWizard>
+ <commonWizard type="new" wizardId="org.eclipse.bpel.ui.newFile" menuGroupId="org.eclipse.bpel.new.menuGroup">
+ <enablement>
+ <with variable="activeWorkbenchWindow.activePerspective">
+ <equals value="org.eclipse.bpel.ui.perspective"/>
+ </with>
+ </enablement>
+ </commonWizard>
+ <commonWizard type="new" wizardId="org.eclipse.bpel.apache.ode.deploy.ui.wizards.NewODEDeployWizard" menuGroupId="org.eclipse.bpel.new.menuGroup">
+ <enablement>
+ <with variable="activeWorkbenchWindow.activePerspective">
+ <equals value="org.eclipse.bpel.ui.perspective"/>
+ </with>
+ </enablement>
+ </commonWizard>
+ </extension>
+
</plugin>
13 years, 8 months
JBoss Tools SVN: r30916 - trunk/as/tests/org.jboss.ide.eclipse.as.test.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-28 12:15:12 -0400 (Thu, 28 Apr 2011)
New Revision: 30916
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml
Log:
use generic folder names for 6 and 7
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml 2011-04-28 16:14:11 UTC (rev 30915)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml 2011-04-28 16:15:12 UTC (rev 30916)
@@ -17,8 +17,8 @@
<jbosstools.test.jboss.home.4.2>${requirement.build.root}/jboss-4.2.3.GA</jbosstools.test.jboss.home.4.2>
<jbosstools.test.jboss.home.5.0>${requirement.build.root}/jboss-5.0.1.GA</jbosstools.test.jboss.home.5.0>
<jbosstools.test.jboss.home.5.1>${requirement.build.root}/jboss-5.1.0.GA</jbosstools.test.jboss.home.5.1>
- <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>
+ <jbosstools.test.jboss.home.6.0>${requirement.build.root}/jboss-6.0.0</jbosstools.test.jboss.home.6.0>
+ <jbosstools.test.jboss.home.7.0>${requirement.build.root}/jboss-7.0.0</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>
<emma.instrument.bundles>org.jboss.ide.eclipse.as.core</emma.instrument.bundles>
13 years, 8 months
JBoss Tools SVN: r30915 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-04-28 12:14:11 -0400 (Thu, 28 Apr 2011)
New Revision: 30915
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/OpenSeamComponentDialogTest.java
Log:
JBIDE-8805
Seam Component Search Dialog test cases fail
Issue is fixed
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/OpenSeamComponentDialogTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/OpenSeamComponentDialogTest.java 2011-04-28 16:12:23 UTC (rev 30914)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/OpenSeamComponentDialogTest.java 2011-04-28 16:14:11 UTC (rev 30915)
@@ -56,7 +56,7 @@
try {
JobUtils.waitForIdle();
if(project != null){
- project.close(new NullProgressMonitor());
+ try {project.close(new NullProgressMonitor());} catch (Exception e) {e.printStackTrace(System.out);}
project.delete(true, new NullProgressMonitor());
project = null;
JobUtils.waitForIdle();
@@ -104,6 +104,7 @@
assertNotNull("Component "+componentName+" not found with " + pattern, component);
} finally {
dialog.okPressed();
+ dialog.close();
}
}
13 years, 8 months
JBoss Tools SVN: r30914 - trunk/requirements/jbossas.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-28 12:12:23 -0400 (Thu, 28 Apr 2011)
New Revision: 30914
Modified:
trunk/requirements/jbossas/buildRequirement.xml
Log:
rename the jbossas 6 and 7 folders so they're more generic and useful for testing
Modified: trunk/requirements/jbossas/buildRequirement.xml
===================================================================
--- trunk/requirements/jbossas/buildRequirement.xml 2011-04-28 16:09:19 UTC (rev 30913)
+++ trunk/requirements/jbossas/buildRequirement.xml 2011-04-28 16:12:23 UTC (rev 30914)
@@ -1,59 +1,79 @@
<project default="build.requirement">
- <property file="build.properties"/>
-
+ <property file="build.properties" />
+
<target name="build-jbossas">
<ant antfile="../generic/build.xml" target="${action}" inheritall="true">
- <property name="requirement" value="jbossas"/>
+ <property name="requirement" value="jbossas" />
</ant>
</target>
-
+
<target name="build.requirement">
- <antcall target="build-all" >
+ <antcall target="build-all">
<param name="action" value="build.requirement" />
</antcall>
</target>
-
+
<target name="download.requirement">
- <antcall target="build-all" >
+ <antcall target="build-all">
<param name="action" value="download.requirement" />
</antcall>
</target>
-
- <target name="build-all" >
+
+ <target name="build-all">
<antcall target="build-jbossas">
- <param name="build.uri" value="${jboss32.build.uri}"/>
- <param name="build.archive" value="${jboss32.build.archive}"/>
- <param name="md5" value="${jboss32.build.archive.md5}"/>
+ <param name="build.uri" value="${jboss32.build.uri}" />
+ <param name="build.archive" value="${jboss32.build.archive}" />
+ <param name="md5" value="${jboss32.build.archive.md5}" />
</antcall>
<antcall target="build-jbossas">
- <param name="build.uri" value="${jboss40.build.uri}"/>
- <param name="build.archive" value="${jboss40.build.archive}"/>
- <param name="md5" value="${jboss40.build.archive.md5}"/>
+ <param name="build.uri" value="${jboss40.build.uri}" />
+ <param name="build.archive" value="${jboss40.build.archive}" />
+ <param name="md5" value="${jboss40.build.archive.md5}" />
</antcall>
<antcall target="build-jbossas">
- <param name="build.uri" value="${jboss42.build.uri}"/>
- <param name="build.archive" value="${jboss42.build.archive}"/>
- <param name="md5" value="${jboss42.build.archive.md5}"/>
+ <param name="build.uri" value="${jboss42.build.uri}" />
+ <param name="build.archive" value="${jboss42.build.archive}" />
+ <param name="md5" value="${jboss42.build.archive.md5}" />
</antcall>
<antcall target="build-jbossas">
- <param name="build.uri" value="${jboss50.build.uri}"/>
- <param name="build.archive" value="${jboss50.build.archive}"/>
- <param name="md5" value="${jboss50.build.archive.md5}"/>
+ <param name="build.uri" value="${jboss50.build.uri}" />
+ <param name="build.archive" value="${jboss50.build.archive}" />
+ <param name="md5" value="${jboss50.build.archive.md5}" />
</antcall>
<antcall target="build-jbossas">
- <param name="build.uri" value="${jboss51.build.uri}"/>
- <param name="build.archive" value="${jboss51.build.archive}"/>
- <param name="md5" value="${jboss51.build.archive.md5}"/>
+ <param name="build.uri" value="${jboss51.build.uri}" />
+ <param name="build.archive" value="${jboss51.build.archive}" />
+ <param name="md5" value="${jboss51.build.archive.md5}" />
</antcall>
+
<antcall target="build-jbossas">
- <param name="build.uri" value="${jboss60.build.uri}"/>
- <param name="build.archive" value="${jboss60.build.archive}"/>
- <param name="md5" value="${jboss60.build.archive.md5}"/>
+ <param name="build.uri" value="${jboss60.build.uri}" />
+ <param name="build.archive" value="${jboss60.build.archive}" />
+ <param name="md5" value="${jboss60.build.archive.md5}" />
</antcall>
+ <!-- rename target folder from 6.0.0.Final to 6.0.0 -->
+ <for param="dir">
+ <path>
+ <fileset dir="../target/" includes="jboss-6.0.0*" />
+ </path>
+ <sequential>
+ <rename src="@{dir}" dest="../target/jboss-6.0.0" />
+ </sequential>
+ </for>
+
<antcall target="build-jbossas">
- <param name="build.uri" value="${jboss70.build.uri}"/>
- <param name="build.archive" value="${jboss70.build.archive}"/>
- <param name="md5" value="${jboss70.build.archive.md5}"/>
+ <param name="build.uri" value="${jboss70.build.uri}" />
+ <param name="build.archive" value="${jboss70.build.archive}" />
+ <param name="md5" value="${jboss70.build.archive.md5}" />
</antcall>
+ <!-- rename target folder from 7.0.0.Beta3 to 7.0.0 -->
+ <for param="dir">
+ <path>
+ <fileset dir="../target/" includes="jboss-7.0.0*" />
+ </path>
+ <sequential>
+ <rename src="../target/jboss-7.0.0.Beta3" dest="../target/jboss-7.0.0" />
+ </sequential>
+ </for>
</target>
</project>
13 years, 8 months
JBoss Tools SVN: r30913 - trunk/as/tests/org.jboss.ide.eclipse.as.test.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-04-28 12:09:19 -0400 (Thu, 28 Apr 2011)
New Revision: 30913
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml
Log:
asExists test for jboss 6 and 7
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml 2011-04-28 16:03:03 UTC (rev 30912)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml 2011-04-28 16:09:19 UTC (rev 30913)
@@ -17,8 +17,8 @@
<jbosstools.test.jboss.home.4.2>${requirement.build.root}/jboss-4.2.3.GA</jbosstools.test.jboss.home.4.2>
<jbosstools.test.jboss.home.5.0>${requirement.build.root}/jboss-5.0.1.GA</jbosstools.test.jboss.home.5.0>
<jbosstools.test.jboss.home.5.1>${requirement.build.root}/jboss-5.1.0.GA</jbosstools.test.jboss.home.5.1>
- <jbosstools.test.jboss.home.6.0>${requirement.build.root}/jboss-6.0.0.GA</jbosstools.test.jboss.home.6.0>
- <jbosstools.test.jboss.home.7.0>${requirement.build.root}/jboss-7.0.0.GA</jbosstools.test.jboss.home.7.0>
+ <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>
<emma.instrument.bundles>org.jboss.ide.eclipse.as.core</emma.instrument.bundles>
13 years, 8 months
JBoss Tools SVN: r30912 - workspace/snjeza/testjbide8765.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-04-28 12:03:03 -0400 (Thu, 28 Apr 2011)
New Revision: 30912
Added:
workspace/snjeza/testjbide8765/jbide-8765.zip
Log:
Added: workspace/snjeza/testjbide8765/jbide-8765.zip
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/testjbide8765/jbide-8765.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
13 years, 8 months
JBoss Tools SVN: r30911 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-04-28 11:59:22 -0400 (Thu, 28 Apr 2011)
New Revision: 30911
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1645Test.java
Log:
JBIDE-8759
3 test failures in org.jboss.tools.seam.ui.test.SeamUiAllTests
Issue is fixed
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1645Test.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1645Test.java 2011-04-28 15:53:39 UTC (rev 30910)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1645Test.java 2011-04-28 15:59:22 UTC (rev 30911)
@@ -7,7 +7,6 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
import org.jboss.tools.common.el.core.ELCorePlugin;
import org.jboss.tools.common.el.core.ca.preferences.ELContentAssistPreferences;
import org.jboss.tools.common.el.ui.ca.ELProposalProcessor;
@@ -25,6 +24,7 @@
private static final String POSTFIX_STRING = " </h:commandButton>";
private static final String INSERT_BEFORE_STRING = "<rich:panel";
private static final String INSERTION_STRING = PREFIX_STRING + POSTFIX_STRING;
+ Throwable exception = null;
public static Test suite() {
return new TestSuite(SeamELContentAssistJbide1645Test.class);
@@ -33,14 +33,13 @@
public void setUp() throws Exception {
provider = new TestProjectProvider("org.jboss.tools.seam.ui.test", null, PROJECT_NAME, makeCopy);
project = provider.getProject();
- Throwable exception = null;
try {
project.refreshLocal(IResource.DEPTH_INFINITE, null);
} catch (Exception x) {
exception = x;
- x.printStackTrace();
}
- assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception);
+ // No asserts should be done in setUp() method
+// assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception);
}
protected void tearDown() throws Exception {
@@ -50,15 +49,20 @@
}
public void testSeamELContentAssistJbide1645() {
+ assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception);
+
ELCorePlugin.getDefault().getPreferenceStore().setValue(ELContentAssistPreferences.SHOW_METHODS_WITH_PARENTHESES_ONLY, false);
openEditor(PAGE_NAME);
-
+
+ JobUtils.waitForIdle();
+
try {
// Find start of <rich:panel> tag
String documentContent = document.get();
+
int start = (documentContent == null ? -1 : documentContent.indexOf(INSERT_BEFORE_STRING));
int offsetToTest = start + PREFIX_STRING.length();
-
+
assertTrue("Cannot find the starting point in the test file \"" + PAGE_NAME + "\"", (start != -1));
String documentContentModified = documentContent.substring(0, start) +
13 years, 8 months