JBoss Tools SVN: r37274 - in trunk/download.jboss.org/jbosstools/updates: indigo/SR1-M and 7 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-12-13 12:26:58 -0500 (Tue, 13 Dec 2011)
New Revision: 37274
Added:
trunk/download.jboss.org/jbosstools/updates/indigo/SR1-M/
trunk/download.jboss.org/jbosstools/updates/indigo/SR1-M/compositeArtifac...
trunk/download.jboss.org/jbosstools/updates/indigo/SR1-M/compositeContent...
trunk/download.jboss.org/jbosstools/updates/requirements/ecf/build-3.5.2.xml
trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3....
trunk/download.jboss.org/jbosstools/updates/requirements/egit/build-1.1.0...
trunk/download.jboss.org/jbosstools/updates/requirements/emf/build-2.7.1.xml
trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build-3.6....
trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3...
Removed:
trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-SR...
trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-S...
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/ecf/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/egit/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/emf/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml
Log:
https://issues.jboss.org/browse/JBIDE-10289 new maintenance/nightly build reqs for indigo, eclipse, wtp, emf, egit, mylyn, ecf (7)
Added: trunk/download.jboss.org/jbosstools/updates/indigo/SR1-M/compositeArtifac...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/SR1-M/compositeArtifac... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/SR1-M/compositeArtifac... 2011-12-13 17:26:58 UTC (rev 37274)
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='JBoss Tools Requirements - Composite Indigo SR1 Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<property name='p2.timestamp' value='1323796610000'/>
+</properties>
+<children size='14'>
+<child location='../../requirements/indigo/201112121340-SR1-M/'/>
+<child location='../../requirements/birt/3.7.1/'/>
+<child location='../../requirements/bpel/0.8.0.v20111120-0746-H98-CI/'/>
+<child location='../../requirements/ecf/3.5.3/'/>
+<child location='../../requirements/eclipse/3.7.2.M20111201-1437/'/>
+
+<child location='../../requirements/egit/1.2.0.201112131611/'/>
+<child location='../../requirements/emf/2.7.2.v20111031-1121/'/>
+<!-- includes m2e, m2e-extras, m2e-wtp -->
+<child location='../../requirements/m2eclipse/20111005-1500/'/>
+<child location='../../requirements/mylyn/3.6.4.v20111118-0100/'/>
+<child location='../../requirements/orbit/R20110523182458/'/>
+
+<child location='../../requirements/swtbot/2.0.5/'/>
+<child location='../../requirements/webtools/3.3.2-20111207200956/'/>
+<child location='../../requirements/xulrunner-1.9.2/'/>
+<child location='http://dl.google.com/eclipse/plugin/3.7/'/>
+</children>
+</repository>
+
Added: trunk/download.jboss.org/jbosstools/updates/indigo/SR1-M/compositeContent...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/SR1-M/compositeContent... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/SR1-M/compositeContent... 2011-12-13 17:26:58 UTC (rev 37274)
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='JBoss Tools Requirements - Composite Indigo SR1 Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<property name='p2.timestamp' value='1323796610000'/>
+</properties>
+<children size='14'>
+<child location='../../requirements/indigo/201112121340-SR1-M/'/>
+<child location='../../requirements/birt/3.7.1/'/>
+<child location='../../requirements/bpel/0.8.0.v20111120-0746-H98-CI/'/>
+<child location='../../requirements/ecf/3.5.3/'/>
+<child location='../../requirements/eclipse/3.7.2.M20111201-1437/'/>
+
+<child location='../../requirements/egit/1.2.0.201112131611/'/>
+<child location='../../requirements/emf/2.7.2.v20111031-1121/'/>
+<!-- includes m2e, m2e-extras, m2e-wtp -->
+<child location='../../requirements/m2eclipse/20111005-1500/'/>
+<child location='../../requirements/mylyn/3.6.4.v20111118-0100/'/>
+<child location='../../requirements/orbit/R20110523182458/'/>
+
+<child location='../../requirements/swtbot/2.0.5/'/>
+<child location='../../requirements/webtools/3.3.2-20111207200956/'/>
+<child location='../../requirements/xulrunner-1.9.2/'/>
+<child location='http://dl.google.com/eclipse/plugin/3.7/'/>
+</children>
+</repository>
+
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/ecf/build-3.5.2.xml (from rev 37273, trunk/download.jboss.org/jbosstools/updates/requirements/ecf/build.xml)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/ecf/build-3.5.2.xml (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/ecf/build-3.5.2.xml 2011-12-13 17:26:58 UTC (rev 37274)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/ecf/build.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/ecf/build.xml -Ddestination=/tmp/ecf-repo
+ -->
+ <target name="mirror">
+ <property name="URL" value="http://download.eclipse.org/rt/ecf/3.5.2/site.p2" />
+
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/ecf/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/3.5.2/" name="ECF plugins for Eclipse 3.6 - 3.7" />
+ <source>
+ <repository location="${URL}" />
+ </source>
+
+ <slicingOptions includeFeatures="true" followStrict="true" />
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.5.2/" artifactRepository="file:${destination}/3.5.2/" publishartifacts="true" source="${destination}/3.5.2/" compress="${compress}" />
+ </target>
+</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/ecf/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/ecf/build.xml 2011-12-13 17:14:52 UTC (rev 37273)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/ecf/build.xml 2011-12-13 17:26:58 UTC (rev 37274)
@@ -16,13 +16,13 @@
-f ~/RHDS/updates/requirements/ecf/build.xml -Ddestination=/tmp/ecf-repo
-->
<target name="mirror">
- <property name="URL" value="http://download.eclipse.org/rt/ecf/3.5.2/site.p2" />
+ <property name="URL" value="http://download.eclipse.org/rt/ecf/3.5.3/site.p2" />
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/ecf/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/3.5.2/" name="ECF plugins for Eclipse 3.6 - 3.7" />
+ <repository location="file:${destination}/3.5.3/" name="ECF plugins for Eclipse 3.6 - 3.7" />
<source>
<repository location="${URL}" />
</source>
@@ -30,6 +30,6 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.5.2/" artifactRepository="file:${destination}/3.5.2/" publishartifacts="true" source="${destination}/3.5.2/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.5.3/" artifactRepository="file:${destination}/3.5.3/" publishartifacts="true" source="${destination}/3.5.3/" compress="${compress}" />
</target>
</project>
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3.... (from rev 37273, trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-SR...)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3.... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3.... 2011-12-13 17:26:58 UTC (rev 37274)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/eclipse/build.xml -Ddestination=/tmp/eclipse-repo
+ -->
+ <target name="mirror">
+ <property name="URL" value="http://download.eclipse.org/eclipse/updates/3.7.x/M20110909-1335/" />
+
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/eclipse/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/3.7.1/" name="Eclipse 3.7" />
+ <source>
+ <repository location="${URL}" />
+ </source>
+
+ <slicingOptions includeFeatures="true" followStrict="true" />
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.7.1/" artifactRepository="file:${destination}/3.7.1/" publishartifacts="true" source="${destination}/3.7.1/" compress="${compress}" />
+ </target>
+</project>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-SR...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-SR... 2011-12-13 17:14:52 UTC (rev 37273)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-SR... 2011-12-13 17:26:58 UTC (rev 37274)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="mirror">
- <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
-
- -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
- -consoleLog -nosplash -data /tmp
- -application org.eclipse.ant.core.antRunner
- -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml"
-
- or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
-
- export JAVA_HOME=/opt/jdk1.6.0; \
- ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
- org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
- -application org.eclipse.ant.core.antRunner \
- -f ~/RHDS/updates/requirements/eclipse/build.xml -Ddestination=/tmp/eclipse-repo
- -->
- <target name="mirror">
- <property name="URL" value="http://download.eclipse.org/eclipse/updates/3.7.x/M20110909-1335/" />
-
- <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/eclipse/" />
- <property name="compress" value="true" />
-
- <p2.mirror>
- <repository location="file:${destination}/3.7.1/" name="Eclipse 3.7" />
- <source>
- <repository location="${URL}" />
- </source>
-
- <slicingOptions includeFeatures="true" followStrict="true" />
- </p2.mirror>
-
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.7.1/" artifactRepository="file:${destination}/3.7.1/" publishartifacts="true" source="${destination}/3.7.1/" compress="${compress}" />
- </target>
-</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml 2011-12-13 17:14:52 UTC (rev 37273)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml 2011-12-13 17:26:58 UTC (rev 37274)
@@ -22,7 +22,7 @@
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/3.7.1a/" name="Eclipse 3.7" />
+ <repository location="file:${destination}/3.7.2.M20111201-1437/" name="Eclipse 3.7" />
<source>
<repository location="${URL}" />
</source>
@@ -30,6 +30,6 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.7.1a/" artifactRepository="file:${destination}/3.7.1a/" publishartifacts="true" source="${destination}/3.7.1a/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.7.2.M20111201-1437/" artifactRepository="file:${destination}/3.7.2.M20111201-1437/" publishartifacts="true" source="${destination}/3.7.2.M20111201-1437/" compress="${compress}" />
</target>
</project>
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/egit/build-1.1.0... (from rev 37273, trunk/download.jboss.org/jbosstools/updates/requirements/egit/build.xml)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/egit/build-1.1.0... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/egit/build-1.1.0... 2011-12-13 17:26:58 UTC (rev 37274)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/egit/build.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/egit/build.xml -Ddestination=/tmp/egit-repo
+ -->
+ <target name="mirror">
+ <property name="URL1" value="http://download.eclipse.org/egit/updates-1.1/" />
+ <property name="URL2" value="http://download.eclipse.org/egit/github/updates-1.1/" />
+ <!--
+ <property name="URL1" value="http://download.eclipse.org/egit/updates-nightly/" />
+ <property name="URL2" value="http://download.eclipse.org/egit/github/updates-nightly/" />
+ -->
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/egit/1.1.0.201109151100/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/1.1.0.201109151100/" name="egit + github plugins for Eclipse 3.6 - 3.7" />
+ <source>
+ <repository location="${URL1}" />
+ <repository location="${URL2}" />
+ </source>
+
+ <slicingOptions includeFeatures="true" followStrict="true" />
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/1.1.0.201109151100/" artifactRepository="file:${destination}/1.1.0.201109151100/" publishartifacts="true" source="${destination}/1.1.0.201109151100/" compress="${compress}" />
+ </target>
+</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/egit/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/egit/build.xml 2011-12-13 17:14:52 UTC (rev 37273)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/egit/build.xml 2011-12-13 17:26:58 UTC (rev 37274)
@@ -16,17 +16,17 @@
-f ~/RHDS/updates/requirements/egit/build.xml -Ddestination=/tmp/egit-repo
-->
<target name="mirror">
+ <property name="URL1" value="http://download.eclipse.org/egit/updates-nightly/" />
+ <property name="URL2" value="http://download.eclipse.org/egit/github/updates-nightly/" />
+ <!--
<property name="URL1" value="http://download.eclipse.org/egit/updates-1.1/" />
<property name="URL2" value="http://download.eclipse.org/egit/github/updates-1.1/" />
- <!--
- <property name="URL1" value="http://download.eclipse.org/egit/updates-nightly/" />
- <property name="URL2" value="http://download.eclipse.org/egit/github/updates-nightly/" />
-->
- <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/egit/1.1.0.201109151100/" />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/egit/1.2.0.201112131611/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/1.1.0.201109151100/" name="egit + github plugins for Eclipse 3.6 - 3.7" />
+ <repository location="file:${destination}/1.2.0.201112131611/" name="egit + github plugins for Eclipse 3.7" />
<source>
<repository location="${URL1}" />
<repository location="${URL2}" />
@@ -35,6 +35,6 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/1.1.0.201109151100/" artifactRepository="file:${destination}/1.1.0.201109151100/" publishartifacts="true" source="${destination}/1.1.0.201109151100/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/1.2.0.201112131611/" artifactRepository="file:${destination}/1.2.0.201112131611/" publishartifacts="true" source="${destination}/1.2.0.201112131611/" compress="${compress}" />
</target>
</project>
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/emf/build-2.7.1.xml (from rev 37273, trunk/download.jboss.org/jbosstools/updates/requirements/emf/build.xml)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/emf/build-2.7.1.xml (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/emf/build-2.7.1.xml 2011-12-13 17:26:58 UTC (rev 37274)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/emf/build.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/emf/build.xml -Ddestination=/tmp/emf-repo
+ -->
+ <target name="mirror">
+ <property name="URL1" value="http://download.eclipse.org/modeling/emf/emf/updates/2.7.x/base/M20111003..." />
+ <property name="URL2" value="http://download.eclipse.org/modeling/emf/emf/updates/2.7.x/core/M20111003..." />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/emf/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/2.7.1/" name="EMF plugins for Eclipse 3.7" />
+ <source>
+ <repository location="${URL1}" />
+ <repository location="${URL2}" />
+ </source>
+
+ <slicingOptions includeFeatures="true" followStrict="true" />
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/2.7.1/" artifactRepository="file:${destination}/2.7.1/" publishartifacts="true" source="${destination}/2.7.1/" compress="${compress}" />
+ </target>
+</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/emf/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/emf/build.xml 2011-12-13 17:14:52 UTC (rev 37273)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/emf/build.xml 2011-12-13 17:26:58 UTC (rev 37274)
@@ -16,13 +16,13 @@
-f ~/RHDS/updates/requirements/emf/build.xml -Ddestination=/tmp/emf-repo
-->
<target name="mirror">
- <property name="URL1" value="http://download.eclipse.org/modeling/emf/emf/updates/2.7.x/base/M20111003..." />
- <property name="URL2" value="http://download.eclipse.org/modeling/emf/emf/updates/2.7.x/core/M20111003..." />
+ <property name="URL1" value="http://download.eclipse.org/modeling/emf/emf/updates/2.7.x/base/M20111028..." />
+ <property name="URL2" value="http://download.eclipse.org/modeling/emf/emf/updates/2.7.x/core/M20111031..." />
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/emf/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/2.7.1/" name="EMF plugins for Eclipse 3.7" />
+ <repository location="file:${destination}/2.7.2.v20111031-1121/" name="EMF plugins for Eclipse 3.7" />
<source>
<repository location="${URL1}" />
<repository location="${URL2}" />
@@ -31,6 +31,6 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/2.7.1/" artifactRepository="file:${destination}/2.7.1/" publishartifacts="true" source="${destination}/2.7.1/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/2.7.2.v20111031-1121/" artifactRepository="file:${destination}/2.7.2.v20111031-1121/" publishartifacts="true" source="${destination}/2.7.2.v20111031-1121/" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml 2011-12-13 17:14:52 UTC (rev 37273)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml 2011-12-13 17:26:58 UTC (rev 37274)
@@ -23,7 +23,7 @@
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/201112121340-SR1a/" name="Indigo 201112121340-SR1a" />
+ <repository location="file:${destination}/201112121340-SR1-M/" name="Indigo 201112121340-SR1-M" />
<source>
<repository location="${URL}" />
</source>
@@ -31,6 +31,6 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/201112121340-SR1a/" artifactRepository="file:${destination}/201112121340-SR1a/" publishartifacts="true" source="${destination}/201112121340-SR1a/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/201112121340-SR1-M/" artifactRepository="file:${destination}/201112121340-SR1-M/" publishartifacts="true" source="${destination}/201112121340-SR1-M/" compress="${compress}" />
</target>
</project>
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build-3.6.... (from rev 37273, trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build-3.6.... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build-3.6.... 2011-12-13 17:26:58 UTC (rev 37274)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ <iu id="org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/mylyn/build.xml -Ddestination=/tmp/mylyn-repo
+ -->
+ <target name="mirror">
+ <!-- core mylyn, if not on Indigo site; includes Bugzilla -->
+ <!-- <property name="URL1" value="http://download.eclipse.org/mylyn/snapshots/weekly/" /> -->
+ <!-- <property name="URL1" value="http://download.eclipse.org/mylyn/archive/3.6.0/v20110608-1400/" /> -->
+ <property name="URL1" value="http://download.eclipse.org/mylyn/drops/3.6.2/v20110908-0706/" />
+ <!-- JIRA connector; note that Subclipse connector is on Subclipse req site, ../subclipse/ -->
+ <!-- <property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/weekly/e3.6/" /> -->
+ <property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/e3.7" />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/mylyn/3.6.2/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/3.6.2-v20110908-0706" name="mylyn plugins for Eclipse 3.6 - 3.7" />
+ <source>
+ <repository location="${URL1}" />
+ <repository location="${URL2}" />
+ </source>
+
+ <slicingoptions includefeatures="true" followstrict="true" latestversiononly="true" />
+
+ <iu id="org.eclipse.mylyn_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.commons.feature.group" />
+ <iu id="org.eclipse.mylyn.context_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.wikitext_feature.feature.group" />
+
+ <iu id="org.eclipse.mylyn.ide_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.java_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.pde_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.team_feature.feature.group" />
+
+ <iu id="org.eclipse.mylyn.bugzilla_feature.feature.group" />
+ <!-- IU no longer exists! <iu id="org.eclipse.mylyn.jira_feature.feature.group" /> -->
+ <iu id="org.eclipse.mylyn.git.feature.group" />
+ <iu id="org.eclipse.mylyn.cvs.feature.group" />
+ <iu id="org.eclipse.mylyn.versions.feature.group" />
+
+ <iu id="com.atlassian.connector.eclipse.feature.group" />
+ <iu id="com.atlassian.connector.eclipse.cvs.feature.group" />
+ <iu id="com.atlassian.connector.eclipse.jira.feature.group" />
+ <!-- these last two are described as "obsolete" on the update site -->
+ <iu id="com.atlassian.connector.eclipse.subclipse.feature.group" />
+ <iu id="com.atlassian.connector.eclipse.subversive.feature.group" />
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.6.2-v20110908-0706/" artifactRepository="file:${destination}/3.6.2-v20110908-0706/" publishartifacts="true" source="${destination}/3.6.2-v20110908-0706/" compress="${compress}" />
+ </target>
+</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml 2011-12-13 17:14:52 UTC (rev 37273)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml 2011-12-13 17:26:58 UTC (rev 37274)
@@ -19,15 +19,15 @@
<!-- core mylyn, if not on Indigo site; includes Bugzilla -->
<!-- <property name="URL1" value="http://download.eclipse.org/mylyn/snapshots/weekly/" /> -->
<!-- <property name="URL1" value="http://download.eclipse.org/mylyn/archive/3.6.0/v20110608-1400/" /> -->
- <property name="URL1" value="http://download.eclipse.org/mylyn/drops/3.6.2/v20110908-0706/" />
+ <property name="URL1" value="http://download.eclipse.org/mylyn/drops/3.6.4/v20111118-0100/" />
<!-- JIRA connector; note that Subclipse connector is on Subclipse req site, ../subclipse/ -->
<!-- <property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/weekly/e3.6/" /> -->
<property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/e3.7" />
- <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/mylyn/3.6.2/" />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/mylyn/3.6.4/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/3.6.2-v20110908-0706" name="mylyn plugins for Eclipse 3.6 - 3.7" />
+ <repository location="file:${destination}/3.6.4.v20111118-0100" name="mylyn plugins for Eclipse 3.6 - 3.7" />
<source>
<repository location="${URL1}" />
<repository location="${URL2}" />
@@ -35,22 +35,21 @@
<slicingoptions includefeatures="true" followstrict="true" latestversiononly="true" />
+ <!-- available on indigo site but older version (3.6.2) -->
<iu id="org.eclipse.mylyn_feature.feature.group" />
<iu id="org.eclipse.mylyn.commons.feature.group" />
<iu id="org.eclipse.mylyn.context_feature.feature.group" />
<iu id="org.eclipse.mylyn.wikitext_feature.feature.group" />
-
<iu id="org.eclipse.mylyn.ide_feature.feature.group" />
<iu id="org.eclipse.mylyn.java_feature.feature.group" />
<iu id="org.eclipse.mylyn.pde_feature.feature.group" />
<iu id="org.eclipse.mylyn.team_feature.feature.group" />
-
<iu id="org.eclipse.mylyn.bugzilla_feature.feature.group" />
- <!-- IU no longer exists! <iu id="org.eclipse.mylyn.jira_feature.feature.group" /> -->
- <iu id="org.eclipse.mylyn.git.feature.group" />
- <iu id="org.eclipse.mylyn.cvs.feature.group" />
<iu id="org.eclipse.mylyn.versions.feature.group" />
+ <!-- not on indigo -->
+ <iu id="org.eclipse.mylyn.cvs.feature.group" />
+ <iu id="org.eclipse.mylyn.git.feature.group" />
<iu id="com.atlassian.connector.eclipse.feature.group" />
<iu id="com.atlassian.connector.eclipse.cvs.feature.group" />
<iu id="com.atlassian.connector.eclipse.jira.feature.group" />
@@ -59,6 +58,6 @@
<iu id="com.atlassian.connector.eclipse.subversive.feature.group" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.6.2-v20110908-0706/" artifactRepository="file:${destination}/3.6.2-v20110908-0706/" publishartifacts="true" source="${destination}/3.6.2-v20110908-0706/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.6.4.v20111118-0100/" artifactRepository="file:${destination}/3.6.4.v20111118-0100/" publishartifacts="true" source="${destination}/3.6.4.v20111118-0100/" compress="${compress}" />
</target>
</project>
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3... (from rev 37273, trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-S...)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3... 2011-12-13 17:26:58 UTC (rev 37274)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/webtools/build-indigo.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/webtools/build-indigo.xml -Ddestination=/tmp/webtools-repo
+
+ or, on local:
+
+ java -cp /home/nboldt/eclipse/eclipse361/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner -f build-indigo.xml
+
+ -->
+ <target name="mirror">
+ <property name="URL" value="http://download.eclipse.org/webtools/downloads/drops/R3.3.1/R-3.3.1-20110..." />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/webtools/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/3.3.1-20110915193224/" name="Web Tools plugins for Eclipse 3.7 Indigo" />
+ <source>
+ <repository location="${URL}" />
+ </source>
+
+ <slicingOptions includeFeatures="true" followStrict="true" />
+
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.3.1-20110915193224/" artifactRepository="file:${destination}/3.3.1-20110915193224/" publishartifacts="true" source="${destination}/3.3.1-20110915193224/" compress="${compress}" />
+ </target>
+</project>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-S...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-S... 2011-12-13 17:14:52 UTC (rev 37273)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-S... 2011-12-13 17:26:58 UTC (rev 37274)
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="mirror">
- <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
-
- -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
- -consoleLog -nosplash -data /tmp
- -application org.eclipse.ant.core.antRunner
- -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/webtools/build-indigo.xml"
-
- or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
-
- export JAVA_HOME=/opt/jdk1.6.0; \
- ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
- org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
- -application org.eclipse.ant.core.antRunner \
- -f ~/RHDS/updates/requirements/webtools/build-indigo.xml -Ddestination=/tmp/webtools-repo
-
- or, on local:
-
- java -cp /home/nboldt/eclipse/eclipse361/plugins/org.eclipse.equinox.launcher_*.jar \
- org.eclipse.equinox.launcher.Main -consoleLog -nosplash -data /tmp \
- -application org.eclipse.ant.core.antRunner -f build-indigo.xml
-
- -->
- <target name="mirror">
- <property name="URL" value="http://download.eclipse.org/webtools/downloads/drops/R3.3.1/R-3.3.1-20110..." />
- <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/webtools/" />
- <property name="compress" value="true" />
-
- <p2.mirror>
- <repository location="file:${destination}/3.3.1-20110915193224/" name="Web Tools plugins for Eclipse 3.7 Indigo" />
- <source>
- <repository location="${URL}" />
- </source>
-
- <slicingOptions includeFeatures="true" followStrict="true" />
-
- </p2.mirror>
-
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.3.1-20110915193224/" artifactRepository="file:${destination}/3.3.1-20110915193224/" publishartifacts="true" source="${destination}/3.3.1-20110915193224/" compress="${compress}" />
- </target>
-</project>
14 years, 4 months
JBoss Tools SVN: r37273 - in trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui: marker and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-12-13 12:14:52 -0500 (Tue, 13 Dec 2011)
New Revision: 37273
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIMessages.java
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/messages.properties
Log:
Add @SuppressWarnings quick fix https://issues.jboss.org/browse/JBIDE-10187
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIMessages.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIMessages.java 2011-12-13 16:17:16 UTC (rev 37272)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIMessages.java 2011-12-13 17:14:52 UTC (rev 37273)
@@ -75,7 +75,10 @@
public static String MANDATORYSTRING_VALIDATOR_MUST_PROVIDE_VALUE;
public static String CONFIGURE_PROBLEM_SEVERITY;
- public static String ADD_SUPPRESS_WARNINGS;
+ public static String ADD_SUPPRESS_WARNINGS_TITLE;
+ public static String ADD_SUPPRESS_WARNINGS_MESSAGE;
+ public static String ADD_SUPPRESS_WARNINGS_QUESTION1;
+ public static String ADD_SUPPRESS_WARNINGS_QUESTION2;
static {
NLS.initializeMessages(BUNDLE_NAME, CommonUIMessages.class);
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2011-12-13 16:17:16 UTC (rev 37272)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2011-12-13 17:14:52 UTC (rev 37273)
@@ -63,7 +63,7 @@
this.file = file;
this.element = getAnnatatableElement(element);
this.preferenceKey = preferenceKey;
- label = NLS.bind(CommonUIMessages.ADD_SUPPRESS_WARNINGS, element.getElementName());
+ label = NLS.bind(CommonUIMessages.ADD_SUPPRESS_WARNINGS_TITLE, element.getElementName());
}
private IAnnotatable getAnnatatableElement(IJavaElement element){
@@ -133,8 +133,8 @@
if(projectValue != null){
MessageDialog dialog = new MessageDialog(getShell(), label, null,
- "This quick fix uses warning names that are not supported by Java Validator and will cause \"Unsupported @SuppressWarning\" problem message\n\n"+
- "Do you want to disable 'Unsupported @SuppressWarnings' validation",
+ CommonUIMessages.ADD_SUPPRESS_WARNINGS_MESSAGE+
+ CommonUIMessages.ADD_SUPPRESS_WARNINGS_QUESTION1,
MessageDialog.QUESTION_WITH_CANCEL,
new String[]{"Cancel", "Disable"},
0);
@@ -150,8 +150,8 @@
}
}else{
MessageDialog dialog = new MessageDialog(getShell(), label, null,
- "This quick fix uses warning names that are not supported by Java Validator and will cause \"Unsupported @SuppressWarning\" problem message\n\n"+
- "Do you want to disable 'Unsupported @SuppressWarnings' validation on the Workspace or only on the project '"+file.getProject().getName()+"'",
+ CommonUIMessages.ADD_SUPPRESS_WARNINGS_MESSAGE+
+ NLS.bind(CommonUIMessages.ADD_SUPPRESS_WARNINGS_QUESTION2, file.getProject().getName()),
MessageDialog.QUESTION_WITH_CANCEL,
new String[]{"Cancel", "Workspace", file.getProject().getName()},
0);
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/messages.properties
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/messages.properties 2011-12-13 16:17:16 UTC (rev 37272)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/messages.properties 2011-12-13 17:14:52 UTC (rev 37273)
@@ -34,4 +34,7 @@
MANDATORYSTRING_VALIDATOR_MUST_PROVIDE_VALUE=You have to provide a {0}.
CONFIGURE_PROBLEM_SEVERITY=Configure Problem Severity
-ADD_SUPPRESS_WARNINGS=Add @SuppressWarnings to ''{0}''
\ No newline at end of file
+ADD_SUPPRESS_WARNINGS_TITLE=Add @SuppressWarnings to ''{0}''
+ADD_SUPPRESS_WARNINGS_MESSAGE=This quick fix uses warning names that are not supported by Java Validator and will cause \"Unsupported @SuppressWarning\" problem message\n\n
+ADD_SUPPRESS_WARNINGS_QUESTION1=Do you want to disable 'Unsupported @SuppressWarnings' validation
+ADD_SUPPRESS_WARNINGS_QUESTION2=Do you want to disable 'Unsupported @SuppressWarnings' validation on the Workspace or only on the project ''{0}''
\ No newline at end of file
14 years, 4 months
JBoss Tools SVN: r37272 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-12-13 11:17:16 -0500 (Tue, 13 Dec 2011)
New Revision: 37272
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java
Log:
JBIDE-9725 - commit to ensure eap6 runtimes can be created
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java 2011-12-13 16:01:15 UTC (rev 37271)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java 2011-12-13 16:17:16 UTC (rev 37272)
@@ -18,6 +18,7 @@
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
+import org.jboss.ide.eclipse.as.core.util.IWTPConstants;
public class JBossServerType implements IJBossToolingConstants {
@@ -76,6 +77,17 @@
JBOSS_AS_PATH + File.separatorChar + BIN_PATH+ File.separatorChar + TWIDDLE_JAR_NAME,
new String[]{V4_2,V4_3,V5_0,V5_1}, new EAPServerTypeCondition());
+ public static final JBossServerType EAP6 = new JBossServerType(
+ "EAP", //$NON-NLS-1$
+ "Enterprise Application Platform", //$NON-NLS-1$
+ "modules" + File.separatorChar + //$NON-NLS-1$
+ "org" + File.separatorChar + //$NON-NLS-1$
+ "jboss" + File.separatorChar + //$NON-NLS-1$
+ "as" + File.separatorChar + //$NON-NLS-1$
+ "server" + File.separatorChar + //$NON-NLS-1$
+ "main", //$NON-NLS-1$
+ new String[]{V6_0}, new EAP6ServerTypeCondition());
+
public static final JBossServerType SOAP = new JBossServerType(
"SOA-P",//$NON-NLS-1$
"SOA Platform",//$NON-NLS-1$
@@ -144,7 +156,22 @@
return this.condition.isServerRoot(location);
}
+ private static final String IMPLEMENTATION_TITLE = "Implementation-Title"; //$NON-NLS-1$
+ private static final String JBEAP_RELEASE_VERSION = "JBossEAP-Release-Version"; //$NON-NLS-1$
+
public static boolean isEAP(File systemJarFile) {
+ String title = getJarProperty(systemJarFile, IMPLEMENTATION_TITLE);
+ return title != null && title.contains("EAP"); //$NON-NLS-1$
+ }
+
+ public static boolean isEAP6(File systemJarFile) {
+ String value = getJarProperty(systemJarFile, JBEAP_RELEASE_VERSION);
+ if( value != null && value.trim().startsWith("6.")) //$NON-NLS-1$
+ return true;
+ return false;
+ }
+
+ public static String getJarProperty(File systemJarFile, String propertyName) {
if (systemJarFile.canRead()) {
ZipFile jar = null;
try {
@@ -152,8 +179,8 @@
ZipEntry manifest = jar.getEntry("META-INF/MANIFEST.MF");//$NON-NLS-1$
Properties props = new Properties();
props.load(jar.getInputStream(manifest));
- String title = (String) props.get("Implementation-Title");//$NON-NLS-1$
- return title != null && title.contains("EAP"); //$NON-NLS-1$
+ String value = (String) props.get(propertyName);
+ return value;
} catch (IOException e) {
// ignore
} finally {
@@ -166,7 +193,7 @@
}
}
}
- return false;
+ return null;
}
public static final JBossServerType[] KNOWN_TYPES = {AS, EAP, SOAP, SOAP_STD, EWP, EPP};
@@ -183,6 +210,30 @@
}
}
+ public static class EAP6ServerTypeCondition implements Condition {
+ public boolean isServerRoot(File location) {
+ String mainFolder = new StringBuilder(location.getAbsolutePath())
+ .append(File.separator)
+ .append("modules").append(File.separator) //$NON-NLS-1$
+ .append("org").append(File.separator) //$NON-NLS-1$
+ .append("jboss").append(File.separator) //$NON-NLS-1$
+ .append("as").append(File.separator) //$NON-NLS-1$
+ .append("server").append(File.separator) //$NON-NLS-1$
+ .append("main").append(File.separator) //$NON-NLS-1$
+ .toString();
+ File f = new File(mainFolder);
+ if( f.exists() ) {
+ File[] children = f.listFiles();
+ for( int i = 0; i < children.length; i++ ) {
+ if( children[i].getName().endsWith(IWTPConstants.EXT_JAR)) {
+ return isEAP6(children[i]);
+ }
+ }
+ }
+ return false;
+ }
+ }
+
public static class EAPStandaloneServerTypeCondition implements Condition {
public boolean isServerRoot(File location) {
File asSystemJar = new File(location, JBossServerType.EAP_STD.getSystemJarPath());
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java 2011-12-13 16:01:15 UTC (rev 37271)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java 2011-12-13 16:17:16 UTC (rev 37272)
@@ -46,6 +46,8 @@
public JBossServerType getServerType(File location) {
if(JBossServerType.AS.isServerRoot(location)) {
return JBossServerType.AS;
+ } else if(JBossServerType.EAP6.isServerRoot(location)) {
+ return JBossServerType.EAP6;
} else if(JBossServerType.AS7.isServerRoot(location)) {
return JBossServerType.AS7;
} else if(JBossServerType.EAP_STD.isServerRoot(location)) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java 2011-12-13 16:01:15 UTC (rev 37271)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java 2011-12-13 16:17:16 UTC (rev 37272)
@@ -102,6 +102,8 @@
return createAS7Runtime(path, loader);
if( type == JBossServerType.EAP)
return createEAPRuntime(path, loader);
+ if( type == JBossServerType.EAP6)
+ return createEAP6Runtime(path, loader);
if( type == JBossServerType.SOAP)
return createSOAPRuntime(path, loader);
return null;
@@ -117,6 +119,16 @@
return null;
}
+ private static IRuntimeWorkingCopy createEAP6Runtime(IPath path, ServerBeanLoader loader) {
+ String runtimeTypeId = IJBossToolingConstants.EAP_60;
+ try {
+ IRuntimeWorkingCopy wc = createRuntimeWorkingCopy(runtimeTypeId, path.toOSString(), IJBossRuntimeResourceConstants.DEFAULT_CONFIGURATION);
+ return launchRuntimeWizard(wc);
+ } catch( CoreException ce) {
+ }
+ return null;
+ }
+
private static IRuntimeWorkingCopy createASRuntime(IPath path, ServerBeanLoader loader) {
String version = new ServerBeanLoader().getFullServerVersion(new File(path.toFile(), JBossServerType.AS.getSystemJarPath()));
String runtimeTypeId = null;
14 years, 4 months