JBoss Tools SVN: r30910 - workspace/jdoyle/teiid-designer.
by jbosstools-commits@lists.jboss.org
Author: elvisisking
Date: 2011-04-28 11:53:39 -0400 (Thu, 28 Apr 2011)
New Revision: 30910
Modified:
workspace/jdoyle/teiid-designer/StateServiceExampleProject.zip
Log:
JBIDE-8399
Modified: workspace/jdoyle/teiid-designer/StateServiceExampleProject.zip
===================================================================
(Binary files differ)
14 years, 8 months
JBoss Tools SVN: r30909 - 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 11:49:04 -0400 (Thu, 28 Apr 2011)
New Revision: 30909
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
Log:
Tests Failing
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 15:43:15 UTC (rev 30908)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-04-28 15:49:04 UTC (rev 30909)
@@ -56,7 +56,7 @@
@Deprecated
public static IPath makeGlobal(IJBossServerRuntime rt, IPath p) {
- if( rt.getRuntime() != null )
+ if( rt == null || rt.getRuntime() != null )
return makeGlobal(rt.getRuntime(), p);
return p;
}
14 years, 8 months
JBoss Tools SVN: r30908 - branches/jbosstools-3.2.x/build/aggregate/site.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-04-28 11:43:15 -0400 (Thu, 28 Apr 2011)
New Revision: 30908
Modified:
branches/jbosstools-3.2.x/build/aggregate/site/build.xml
Log:
aggregate site builder should pull from local /home/hudson/static_build_env/jbds/builds/staging cache if available, and be able to resolve '../../' as correct URL or path
Modified: branches/jbosstools-3.2.x/build/aggregate/site/build.xml
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/site/build.xml 2011-04-28 15:42:47 UTC (rev 30907)
+++ branches/jbosstools-3.2.x/build/aggregate/site/build.xml 2011-04-28 15:43:15 UTC (rev 30908)
@@ -59,27 +59,68 @@
<!-- fetch zip.list.txt file, if available -->
<var unset="true" name="ALL_ZIPS" />
<var unset="true" name="wget.return" />
- <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
- <arg line="${location.cleaned}/logs/zip.list.txt -q --no-clobber --tries=3" />
- </exec>
+ <if>
+ <contains string="${location.cleaned}" substring="http" />
+ <then>
+ <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
+ <arg line="${location.cleaned}/logs/zip.list.txt -q --no-clobber --tries=3" />
+ </exec>
+ </then>
+ <else>
+ <copy todir="${aggregate.zips.dir}" failonerror="false">
+ <fileset dir="${location.cleaned}/logs" includes="zip.list.txt" />
+ </copy>
+ </else>
+ </if>
+
<echo level="verbose">Fetch SVN_REVISION.txt if it exists (return 8 if not found)</echo>
<var name="svnRevTXT" value="${aggregate.zips.dir}/SVN_REVISION.txt" />
- <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
- <arg line="${location.cleaned}/logs/SVN_REVISION.txt -q --no-clobber --tries=3" />
- </exec>
+ <if>
+ <contains string="${location.cleaned}" substring="http" />
+ <then>
+ <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
+ <arg line="${location.cleaned}/logs/SVN_REVISION.txt -q --no-clobber --tries=3" />
+ </exec>
+ </then>
+ <else>
+ <copy todir="${aggregate.zips.dir}" failonerror="false">
+ <fileset dir="${location.cleaned}/logs" includes="SVN_REVISION.txt" />
+ </copy>
+ </else>
+ </if>
<echo level="verbose">Fetch SVN_REVISION.xml if it exists (return 8 if not found)</echo>
<var name="svnRevXML" value="${aggregate.zips.dir}/SVN_REVISION.xml" />
- <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
- <arg line="${location.cleaned}/logs/SVN_REVISION.xml -q --no-clobber --tries=3" />
- </exec>
+ <if>
+ <contains string="${location.cleaned}" substring="http" />
+ <then>
+ <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
+ <arg line="${location.cleaned}/logs/SVN_REVISION.xml -q --no-clobber --tries=3" />
+ </exec>
+ </then>
+ <else>
+ <copy todir="${aggregate.zips.dir}" failonerror="false">
+ <fileset dir="${location.cleaned}/logs" includes="SVN_REVISION.xml" />
+ </copy>
+ </else>
+ </if>
<echo level="verbose">Fetch build.properties if it exists (return 8 if not found)</echo>
<var name="buildProperties" value="${aggregate.zips.dir}/build.properties" />
- <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
- <arg line="${location.cleaned}/logs/build.properties -q --no-clobber --tries=3" />
- </exec>
+ <if>
+ <contains string="${location.cleaned}" substring="http" />
+ <then>
+ <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
+ <arg line="${location.cleaned}/logs/build.properties -q --no-clobber --tries=3" />
+ </exec>
+ </then>
+ <else>
+ <copy todir="${aggregate.zips.dir}" failonerror="false">
+ <fileset dir="${location.cleaned}/logs" includes="build.properties" />
+ </copy>
+ </else>
+ </if>
<if>
<and>
@@ -229,8 +270,17 @@
<!-- foreach entry repository.children.child.location -->
<for param="location" list="${repository.children.child.location}">
<sequential>
- <echo level="error">Site URL = @{location}</echo>
- <fetchZipsFromList repo="@{location}" />
+ <if>
+ <available file="/home/hudson/static_build_env/jbds/builds/staging" type="dir" />
+ <then>
+ <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="/home/hudson/static_build_env/jbds/builds/staging/" />
+ </then>
+ <else>
+ <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" />
+ </else>
+ </if>
+ <echo level="error">Site URL = ${location.cleaned} (@{location})</echo>
+ <fetchZipsFromList repo="${location.cleaned}" />
</sequential>
</for>
<delete file="${aggregate.zips.dir}/compositeArtifacts.xml" quiet="true" />
14 years, 8 months
JBoss Tools SVN: r30907 - workspace/snjeza.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2011-04-28 11:42:47 -0400 (Thu, 28 Apr 2011)
New Revision: 30907
Added:
workspace/snjeza/testjbide8765/
Log:
Initial import.
14 years, 8 months
JBoss Tools SVN: r30906 - trunk/build/aggregate/site.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-04-28 11:41:40 -0400 (Thu, 28 Apr 2011)
New Revision: 30906
Modified:
trunk/build/aggregate/site/index-template.html
trunk/build/aggregate/site/index.html
Log:
fix html on update site index.html page
Modified: trunk/build/aggregate/site/index-template.html
===================================================================
--- trunk/build/aggregate/site/index-template.html 2011-04-28 15:41:06 UTC (rev 30905)
+++ trunk/build/aggregate/site/index-template.html 2011-04-28 15:41:40 UTC (rev 30906)
@@ -37,7 +37,7 @@
<td class="bodyText">
<p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b>
<!-- see http://www.jboss.org/tools/download/dev#noteBirt for matching copy -->
-Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following update sites, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed.
+Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed.
</p>
<ul>
Modified: trunk/build/aggregate/site/index.html
===================================================================
--- trunk/build/aggregate/site/index.html 2011-04-28 15:41:06 UTC (rev 30905)
+++ trunk/build/aggregate/site/index.html 2011-04-28 15:41:40 UTC (rev 30906)
@@ -37,7 +37,7 @@
<td class="bodyText">
<p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b>
<!-- see http://www.jboss.org/tools/download/dev#noteBirt for matching copy -->
-Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following update sites, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed.
+Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed.
</p>
<ul>
14 years, 8 months
JBoss Tools SVN: r30904 - trunk/build/aggregate/site.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-04-28 11:39:20 -0400 (Thu, 28 Apr 2011)
New Revision: 30904
Modified:
trunk/build/aggregate/site/build.xml
Log:
aggregate site builder should pull from local /home/hudson/static_build_env/jbds/builds/staging cache if available, and be able to resolve '../../' as correct URL or path
Modified: trunk/build/aggregate/site/build.xml
===================================================================
--- trunk/build/aggregate/site/build.xml 2011-04-28 15:29:07 UTC (rev 30903)
+++ trunk/build/aggregate/site/build.xml 2011-04-28 15:39:20 UTC (rev 30904)
@@ -59,27 +59,68 @@
<!-- fetch zip.list.txt file, if available -->
<var unset="true" name="ALL_ZIPS" />
<var unset="true" name="wget.return" />
- <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
- <arg line="${location.cleaned}/logs/zip.list.txt -q --no-clobber --tries=3" />
- </exec>
+ <if>
+ <contains string="${location.cleaned}" substring="http" />
+ <then>
+ <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
+ <arg line="${location.cleaned}/logs/zip.list.txt -q --no-clobber --tries=3" />
+ </exec>
+ </then>
+ <else>
+ <copy todir="${aggregate.zips.dir}" failonerror="false">
+ <fileset dir="${location.cleaned}/logs" includes="zip.list.txt" />
+ </copy>
+ </else>
+ </if>
+
<echo level="verbose">Fetch SVN_REVISION.txt if it exists (return 8 if not found)</echo>
<var name="svnRevTXT" value="${aggregate.zips.dir}/SVN_REVISION.txt" />
- <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
- <arg line="${location.cleaned}/logs/SVN_REVISION.txt -q --no-clobber --tries=3" />
- </exec>
+ <if>
+ <contains string="${location.cleaned}" substring="http" />
+ <then>
+ <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
+ <arg line="${location.cleaned}/logs/SVN_REVISION.txt -q --no-clobber --tries=3" />
+ </exec>
+ </then>
+ <else>
+ <copy todir="${aggregate.zips.dir}" failonerror="false">
+ <fileset dir="${location.cleaned}/logs" includes="SVN_REVISION.txt" />
+ </copy>
+ </else>
+ </if>
<echo level="verbose">Fetch SVN_REVISION.xml if it exists (return 8 if not found)</echo>
<var name="svnRevXML" value="${aggregate.zips.dir}/SVN_REVISION.xml" />
- <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
- <arg line="${location.cleaned}/logs/SVN_REVISION.xml -q --no-clobber --tries=3" />
- </exec>
+ <if>
+ <contains string="${location.cleaned}" substring="http" />
+ <then>
+ <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
+ <arg line="${location.cleaned}/logs/SVN_REVISION.xml -q --no-clobber --tries=3" />
+ </exec>
+ </then>
+ <else>
+ <copy todir="${aggregate.zips.dir}" failonerror="false">
+ <fileset dir="${location.cleaned}/logs" includes="SVN_REVISION.xml" />
+ </copy>
+ </else>
+ </if>
<echo level="verbose">Fetch build.properties if it exists (return 8 if not found)</echo>
<var name="buildProperties" value="${aggregate.zips.dir}/build.properties" />
- <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
- <arg line="${location.cleaned}/logs/build.properties -q --no-clobber --tries=3" />
- </exec>
+ <if>
+ <contains string="${location.cleaned}" substring="http" />
+ <then>
+ <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
+ <arg line="${location.cleaned}/logs/build.properties -q --no-clobber --tries=3" />
+ </exec>
+ </then>
+ <else>
+ <copy todir="${aggregate.zips.dir}" failonerror="false">
+ <fileset dir="${location.cleaned}/logs" includes="build.properties" />
+ </copy>
+ </else>
+ </if>
<if>
<and>
@@ -229,8 +270,17 @@
<!-- foreach entry repository.children.child.location -->
<for param="location" list="${repository.children.child.location}">
<sequential>
- <echo level="error">Site URL = @{location}</echo>
- <fetchZipsFromList repo="@{location}" />
+ <if>
+ <available file="/home/hudson/static_build_env/jbds/builds/staging" type="dir" />
+ <then>
+ <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="/home/hudson/static_build_env/jbds/builds/staging/" />
+ </then>
+ <else>
+ <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" />
+ </else>
+ </if>
+ <echo level="error">Site URL = ${location.cleaned} (@{location})</echo>
+ <fetchZipsFromList repo="${location.cleaned}" />
</sequential>
</for>
<delete file="${aggregate.zips.dir}/compositeArtifacts.xml" quiet="true" />
14 years, 8 months
JBoss Tools SVN: r30903 - trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util.
by jbosstools-commits@lists.jboss.org
Author: vrubezhny
Date: 2011-04-28 11:29:07 -0400 (Thu, 28 Apr 2011)
New Revision: 30903
Modified:
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java
Log:
JBIDE-8811
TestProjectProvider.importProject() fails when project already exists in Workspace
issue is fixed
Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2011-04-28 15:16:02 UTC (rev 30902)
+++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2011-04-28 15:29:07 UTC (rev 30903)
@@ -243,7 +243,8 @@
try {
boolean state = ResourcesUtils.setBuildAutomatically(false);
project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- project.create(null);
+ if (!project.exists())
+ project.create(null);
project.open(null);
JobUtils.waitForIdle(IMPORT_DELAY);
14 years, 8 months
JBoss Tools SVN: r30902 - trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-04-28 11:16:02 -0400 (Thu, 28 Apr 2011)
New Revision: 30902
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java
Log:
as tests failing due to @Override tag (lame)
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java 2011-04-28 14:15:43 UTC (rev 30901)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java 2011-04-28 15:16:02 UTC (rev 30902)
@@ -92,7 +92,6 @@
public void stop(String host) throws JBoss7ManangerException {
}
- @Override
public void dispose() {
}
}
14 years, 8 months
JBoss Tools SVN: r30901 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test and 10 other directories.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2011-04-28 10:15:43 -0400 (Thu, 28 Apr 2011)
New Revision: 30901
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.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/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml
trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.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.ui.test/pom.xml
trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml
trunk/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml
Log:
https://issues.jboss.org/browse/JBIDE-8763 , "carbon" was removed from ws in feature.xml and pom.xml.
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 2011-04-28 14:02:27 UTC (rev 30900)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml 2011-04-28 14:15:43 UTC (rev 30901)
@@ -26,7 +26,6 @@
<explodedBundles>
<bundle>org.jboss.tools.jsf.vpe.ajax4jsf</bundle>
<bundle>org.jboss.tools.vpe</bundle>
- <bundle>org.mozilla.xulrunner.carbon.macosx</bundle>
<bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
<bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
<bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
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 2011-04-28 14:02:27 UTC (rev 30900)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml 2011-04-28 14:15:43 UTC (rev 30901)
@@ -28,7 +28,6 @@
<bundle>org.jboss.tools.vpe</bundle>
<bundle>org.jboss.tools.jsf.vpe.richfaces</bundle>
<bundle>org.jboss.tools.jsf.vpe.jsf.test</bundle>
- <bundle>org.mozilla.xulrunner.carbon.macosx</bundle>
<bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
<bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
<bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
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 2011-04-28 14:02:27 UTC (rev 30900)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml 2011-04-28 14:15:43 UTC (rev 30901)
@@ -27,7 +27,6 @@
<explodedBundles>
<bundle>org.jboss.tools.jsf.vpe.richfaces</bundle>
<bundle>org.jboss.tools.vpe</bundle>
- <bundle>org.mozilla.xulrunner.carbon.macosx</bundle>
<bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
<bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
<bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
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 2011-04-28 14:02:27 UTC (rev 30900)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml 2011-04-28 14:15:43 UTC (rev 30901)
@@ -28,7 +28,6 @@
<bundle>org.jboss.tools.vpe</bundle>
<bundle>org.jboss.tools.jsf.vpe.richfaces</bundle>
<bundle>org.jboss.tools.jsf.vpe.seam</bundle>
- <bundle>org.mozilla.xulrunner.carbon.macosx</bundle>
<bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
<bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
<bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
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 2011-04-28 14:02:27 UTC (rev 30900)
+++ trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml 2011-04-28 14:15:43 UTC (rev 30901)
@@ -26,7 +26,6 @@
<product>org.jboss.tools.tests</product>
<explodedBundles>
<bundle>org.jboss.tools.vpe</bundle>
- <bundle>org.mozilla.xulrunner.carbon.macosx</bundle>
<bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
<bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
<bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
Modified: trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml
===================================================================
--- trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2011-04-28 14:02:27 UTC (rev 30900)
+++ trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2011-04-28 14:15:43 UTC (rev 30901)
@@ -25,15 +25,6 @@
version="0.0.0"/>
<plugin
- id="org.mozilla.xulrunner.carbon.macosx"
- os="macosx"
- ws="carbon"
- arch="x86"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
id="org.mozilla.xulrunner.cocoa.macosx"
os="macosx"
ws="cocoa"
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml 2011-04-28 14:02:27 UTC (rev 30900)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml 2011-04-28 14:15:43 UTC (rev 30901)
@@ -25,7 +25,6 @@
<product>org.jboss.tools.tests</product>
<explodedBundles>
<bundle>org.jboss.tools.vpe</bundle>
- <bundle>org.mozilla.xulrunner.carbon.macosx</bundle>
<bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
<bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
<bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml 2011-04-28 14:02:27 UTC (rev 30900)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml 2011-04-28 14:15:43 UTC (rev 30901)
@@ -25,7 +25,6 @@
<product>org.jboss.tools.tests</product>
<explodedBundles>
<bundle>org.jboss.tools.vpe</bundle>
- <bundle>org.mozilla.xulrunner.carbon.macosx</bundle>
<bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
<bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
<bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/pom.xml 2011-04-28 14:02:27 UTC (rev 30900)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/pom.xml 2011-04-28 14:15:43 UTC (rev 30901)
@@ -22,7 +22,6 @@
<product>org.jboss.tools.tests</product>
<explodedBundles>
<bundle>org.jboss.tools.vpe</bundle>
- <bundle>org.mozilla.xulrunner.carbon.macosx</bundle>
<bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
<bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
<bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml 2011-04-28 14:02:27 UTC (rev 30900)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml 2011-04-28 14:15:43 UTC (rev 30901)
@@ -26,7 +26,6 @@
<explodedBundles>
<bundle>org.jboss.tools.vpe</bundle>
<bundle>org.jboss.tools.vpe.ui.test</bundle>
- <bundle>org.mozilla.xulrunner.carbon.macosx.x86</bundle>
<bundle>org.mozilla.xulrunner.cocoa.macosx.x86</bundle>
<bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
<bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml 2011-04-28 14:02:27 UTC (rev 30900)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml 2011-04-28 14:15:43 UTC (rev 30901)
@@ -25,7 +25,6 @@
<product>org.jboss.tools.tests</product>
<explodedBundles>
<bundle>org.jboss.tools.vpe</bundle>
- <bundle>org.mozilla.xulrunner.carbon.macosx</bundle>
<bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
<bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
<bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
Modified: trunk/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml
===================================================================
--- trunk/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml 2011-04-28 14:02:27 UTC (rev 30900)
+++ trunk/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml 2011-04-28 14:15:43 UTC (rev 30901)
@@ -5,7 +5,7 @@
version="1.9.216.qualifier"
provider-name="JBoss by Red Hat"
os="linux,macosx,win32"
- ws="carbon,cocoa,gtk,win32"
+ ws="cocoa,gtk,win32"
arch="x86,x86_64">
<description>
@@ -61,12 +61,4 @@
install-size="0"
version="0.0.0"/>
- <plugin
- id="org.mozilla.xulrunner.carbon.macosx"
- os="macosx"
- ws="carbon"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
</feature>
14 years, 8 months
JBoss Tools SVN: r30900 - trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-04-28 10:02:27 -0400 (Thu, 28 Apr 2011)
New Revision: 30900
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java
Log:
[JBIDE-8793] added workaround to swallow connectin closed exception that is thrown by the client if the server is shut down (AS7-689)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java 2011-04-28 11:17:28 UTC (rev 30899)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java 2011-04-28 14:02:27 UTC (rev 30900)
@@ -178,11 +178,9 @@
try {
client.execute(node);
} catch (Exception e) {
- if (isConnectionCloseException(e)) {
- // TODO: workaround for AS7-689
- // ignore
+ if (!isConnectionCloseException(e)) {
+ throw new JBoss7ManangerException(e);
}
- throw new JBoss7ManangerException(e);
}
}
14 years, 8 months