JBoss Tools SVN: r40127 - in trunk/download.jboss.org/jbosstools/updates/requirements: eclipse and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-04-11 11:07:40 -0400 (Wed, 11 Apr 2012)
New Revision: 40127
Added:
trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3....
trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3....
trunk/download.jboss.org/jbosstools/updates/requirements/juno/
trunk/download.jboss.org/jbosstools/updates/requirements/juno/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3...
trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3...
Removed:
trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3....
trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3....
trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3....
trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-he...
trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-he...
trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3...
trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3...
trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3...
trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-h...
trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-h...
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml
Log:
purge old build scripts for eclipse & wtp; add new builders for juno, eclipse 4.2, and wtp 3.4
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3.... (from rev 40126, trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-he...)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3.... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3.... 2012-04-11 15:07:40 UTC (rev 40127)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="run">
+ <!-- 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-helios.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-helios.xml -Ddestination=/tmp/eclipse-repo
+ -->
+ <target name="run" depends="mirror,regen"/>
+ <target name="mirror">
+ <property name="URL" value="http://download.eclipse.org/eclipse/updates/3.6/" />
+
+ <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.6/" name="Eclipse 3.6" />
+ <source>
+ <repository location="${URL}" />
+ </source>
+
+ <slicingOptions includeFeatures="true" followStrict="true" />
+ </p2.mirror>
+ </target>
+ <target name="regen">
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.6/" artifactRepository="file:${destination}/3.6/" publishartifacts="true" source="${destination}/3.6/" compress="${compress}" />
+ </target>
+</project>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3....
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3.... 2012-04-11 14:41:12 UTC (rev 40126)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3.... 2012-04-11 15:07:40 UTC (rev 40127)
@@ -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>
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3.... (from rev 40126, trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3.... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3.... 2012-04-11 15:07:40 UTC (rev 40127)
@@ -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/R-3.7.2-201202080800/"/>
+
+ <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.2-201202080800/" name="Eclipse 3.7.2" />
+ <source>
+ <repository location="${URL}" />
+ </source>
+
+ <slicingOptions includeFeatures="true" followStrict="true" />
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.7.2-201202080800/" artifactRepository="file:${destination}/3.7.2-201202080800/" publishartifacts="true" source="${destination}/3.7.2-201202080800/" compress="${compress}" />
+ </target>
+</project>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3....
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3.... 2012-04-11 14:41:12 UTC (rev 40126)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3.... 2012-04-11 15:07:40 UTC (rev 40127)
@@ -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.7milestones/S-3.7M6-2011031..." />
-
- <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.7M6/" name="Eclipse 3.7" />
- <source>
- <repository location="${URL}" />
- </source>
-
- <slicingOptions includeFeatures="true" followStrict="true" />
- </p2.mirror>
-
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.7M6/" artifactRepository="file:${destination}/3.7M6/" publishartifacts="true" source="${destination}/3.7M6/" compress="${compress}" />
- </target>
-</project>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3....
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3.... 2012-04-11 14:41:12 UTC (rev 40126)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3.... 2012-04-11 15:07:40 UTC (rev 40127)
@@ -1,36 +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.7milestones/S-3.7RC3-I20110..." /> -->
- <property name="URL" value="http://download.eclipse.org/eclipse/updates/3.7-I-builds/I20110613-1736/" />
-
- <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.7RC5/" name="Eclipse 3.7" />
- <source>
- <repository location="${URL}" />
- </source>
-
- <slicingOptions includeFeatures="true" followStrict="true" />
- </p2.mirror>
-
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.7RC5/" artifactRepository="file:${destination}/3.7RC5/" publishartifacts="true" source="${destination}/3.7RC5/" compress="${compress}" />
- </target>
-</project>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-he...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-he... 2012-04-11 14:41:12 UTC (rev 40126)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-he... 2012-04-11 15:07:40 UTC (rev 40127)
@@ -1,26 +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-helios.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-helios.xml -Ddestination=/tmp/eclipse-repo
- -->
- <target name="mirror">
- <property name="URL" value="http://download.eclipse.org/eclipse/updates/3.6/" />
-
- <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/eclipse/" />
- <property name="compress" value="true" />
-
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.6/" artifactRepository="file:${destination}/3.6/" publishartifacts="true" source="${destination}/3.6/" compress="${compress}" />
- </target>
-</project>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-he...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-he... 2012-04-11 14:41:12 UTC (rev 40126)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-he... 2012-04-11 15:07:40 UTC (rev 40127)
@@ -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-helios.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-helios.xml -Ddestination=/tmp/eclipse-repo
- -->
- <target name="mirror">
- <property name="URL" value="http://download.eclipse.org/eclipse/updates/3.6/" />
-
- <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.6/" name="Eclipse 3.6" />
- <source>
- <repository location="${URL}" />
- </source>
-
- <slicingOptions includeFeatures="true" followStrict="true" />
- </p2.mirror>
-
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.6/" artifactRepository="file:${destination}/3.6/" publishartifacts="true" source="${destination}/3.6/" 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 2012-04-11 14:41:12 UTC (rev 40126)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml 2012-04-11 15:07:40 UTC (rev 40127)
@@ -16,13 +16,14 @@
-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/R-3.7.2-201202080800/"/>
+ <!-- <property name="URL" value="http://download.eclipse.org/eclipse/updates/3.8milestones/S-3.8M6-2012031..."/> -->
+ <property name="URL" value="http://download.eclipse.org/eclipse/updates/4.2milestones/S-4.2M6-2012031..."/>
<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.2-201202080800/" name="Eclipse 3.7.2" />
+ <repository location="file:${destination}/S-4.2M6-201203151300/" name="Eclipse S-4.2M6-201203151300" />
<source>
<repository location="${URL}" />
</source>
@@ -30,6 +31,6 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.7.2-201202080800/" artifactRepository="file:${destination}/3.7.2-201202080800/" publishartifacts="true" source="${destination}/3.7.2-201202080800/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/S-4.2M6-201203151300/" artifactRepository="file:${destination}/S-4.2M6-201203151300/" publishartifacts="true" source="${destination}/S-4.2M6-201203151300/" compress="${compress}" />
</target>
</project>
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/juno/build.xml (from rev 40126, trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-3....)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/juno/build.xml (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/juno/build.xml 2012-04-11 15:07:40 UTC (rev 40127)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="run">
+ <!-- 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/juno/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/juno/build.xml -Ddestination=/tmp/juno-repo
+ -->
+ <target name="run" depends="mirror,regen"/>
+ <target name="mirror">
+ <property name="URL1" value="http://download.eclipse.org/releases/juno/201203230900/" />
+
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/juno/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/201203230900-M6/" name="Indigo 201203230900-M6" />
+ <source>
+ <repository location="${URL1}" />
+ </source>
+
+ <slicingOptions includeFeatures="true" followStrict="true" />
+ </p2.mirror>
+ </target>
+ <target name="regen">
+ <!-- remove OTDT patched version of o.e.jdt.core, and all other o.e.ot.otdt features/plugins -->
+ <delete>
+ <fileset dir="${destination}/201203230900-M6/" includes="**/org.eclipse.jdt.core_*OTDT*.jar*, **/org.eclipse.objectteams.otdt*.jar.*"/>
+ </delete>
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/201203230900-M6/" artifactRepository="file:${destination}/201203230900-M6/" publishartifacts="true" source="${destination}/201203230900-M6/" compress="${compress}" />
+ </target>
+</project>
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3... (from rev 40126, trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-h...)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3... 2012-04-11 15:07:40 UTC (rev 40127)
@@ -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-helios.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-helios.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-helios.xml
+
+ -->
+ <target name="mirror">
+ <property name="URL" value="http://download.eclipse.org/webtools/downloads/drops/R3.2.5/M-3.2.5-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.2.5-20110915223420" name="Web Tools plugins for Eclipse 3.6 Helios" />
+ <source>
+ <repository location="${URL}" />
+ </source>
+
+ <slicingOptions includeFeatures="true" followStrict="true" />
+
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.2.5-20110915223420" artifactRepository="file:${destination}/3.2.5-20110915223420" publishartifacts="true" source="${destination}/3.2.5-20110915223420" compress="${compress}" />
+ </target>
+</project>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3... 2012-04-11 14:41:12 UTC (rev 40126)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3... 2012-04-11 15:07:40 UTC (rev 40127)
@@ -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>
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3... (from rev 40126, trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3... 2012-04-11 15:07:40 UTC (rev 40127)
@@ -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.2/R-3.3.2-20120..." />
+ <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.2-20120210195245/" 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.2-20120210195245/" artifactRepository="file:${destination}/3.3.2-20120210195245/" publishartifacts="true" source="${destination}/3.3.2-20120210195245/" compress="${compress}" />
+ </target>
+</project>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3... 2012-04-11 14:41:12 UTC (rev 40126)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3... 2012-04-11 15:07:40 UTC (rev 40127)
@@ -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.0/S-3.3.0M6-201..." />
- <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.3M6/" 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.3M6/" artifactRepository="file:${destination}/3.3M6/" publishartifacts="true" source="${destination}/3.3M6/" compress="${compress}" />
- </target>
-</project>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3... 2012-04-11 14:41:12 UTC (rev 40126)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-3... 2012-04-11 15:07:40 UTC (rev 40127)
@@ -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.0/S-3.3.0RC2-20..." />
- <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.3RC2/" 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.3RC2/" artifactRepository="file:${destination}/3.3RC2/" publishartifacts="true" source="${destination}/3.3RC2/" compress="${compress}" />
- </target>
-</project>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-h...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-h... 2012-04-11 14:41:12 UTC (rev 40126)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-h... 2012-04-11 15:07:40 UTC (rev 40127)
@@ -1,43 +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-helios.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-helios.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-helios.xml
-
- -->
- <target name="mirror">
- <!-- <property name="URL" value="http://download.eclipse.org/webtools/downloads/drops/R3.2.3/R-3.2.3-20110..."/> -->
- <property name="URL" value="http://download.eclipse.org/webtools/downloads/drops/R3.2.4/R-3.2.4-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.2.4" name="Web Tools plugins for Eclipse 3.6 Helios" />
- <source>
- <repository location="${URL}" />
- </source>
-
- <slicingOptions includeFeatures="true" followStrict="true" />
-
- </p2.mirror>
-
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.2.4" artifactRepository="file:${destination}/3.2.4" publishartifacts="true" source="${destination}/3.2.4" compress="${compress}" />
- </target>
-</project>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-h...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-h... 2012-04-11 14:41:12 UTC (rev 40126)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-h... 2012-04-11 15:07:40 UTC (rev 40127)
@@ -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-helios.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-helios.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-helios.xml
-
- -->
- <target name="mirror">
- <property name="URL" value="http://download.eclipse.org/webtools/downloads/drops/R3.2.5/M-3.2.5-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.2.5-20110915223420" name="Web Tools plugins for Eclipse 3.6 Helios" />
- <source>
- <repository location="${URL}" />
- </source>
-
- <slicingOptions includeFeatures="true" followStrict="true" />
-
- </p2.mirror>
-
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.2.5-20110915223420" artifactRepository="file:${destination}/3.2.5-20110915223420" publishartifacts="true" source="${destination}/3.2.5-20110915223420" compress="${compress}" />
- </target>
-</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml 2012-04-11 14:41:12 UTC (rev 40126)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml 2012-04-11 15:07:40 UTC (rev 40127)
@@ -5,7 +5,7 @@
-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"
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml"
or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
@@ -13,22 +13,23 @@
${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
+ -f ~/RHDS/updates/requirements/webtools/build.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
+ -application org.eclipse.ant.core.antRunner -f build.xml
-->
<target name="mirror">
- <property name="URL" value="http://download.eclipse.org/webtools/downloads/drops/R3.3.2/R-3.3.2-20120..." />
+ <property name="URL" value="http://download.eclipse.org/webtools/downloads/drops/R3.4.0/S-3.4.0M6-201..."/>
+
<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.2-20120210195245/" name="Web Tools plugins for Eclipse 3.7 Indigo" />
+ <repository location="file:${destination}/3.4.0M6-20120319200442/" name="Web Tools plugins for Eclipse Juno" />
<source>
<repository location="${URL}" />
</source>
@@ -37,6 +38,6 @@
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.3.2-20120210195245/" artifactRepository="file:${destination}/3.3.2-20120210195245/" publishartifacts="true" source="${destination}/3.3.2-20120210195245/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.4.0M6-20120319200442/" artifactRepository="file:${destination}/3.4.0M6-20120319200442/" publishartifacts="true" source="${destination}/3.4.0M6-20120319200442/" compress="${compress}" />
</target>
</project>
13 years, 12 months
JBoss Tools SVN: r40126 - in trunk/vpe/tests/org.jboss.tools.vpe.html.test: src/org/jboss/tools/vpe/html/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-04-11 10:41:12 -0400 (Wed, 11 Apr 2012)
New Revision: 40126
Added:
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/bdi.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/bdi.html.xml
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentContentTest.java
Log:
https://issues.jboss.org/browse/JBIDE-11290 - junit was added.
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/bdi.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/bdi.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/bdi.html 2012-04-11 14:41:12 UTC (rev 40126)
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+ <ul>
+ <li>User <bdi>hrefs</bdi>: 60 points</li>
+ <li>User <bdi>jdoe</bdi>: 80 points</li>
+ <li>User <bdi id="bdi1">إيان</bdi>: 90 points</li>
+</ul>
+</body>
+</html>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/bdi.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/bdi.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/bdi.html.xml 2012-04-11 14:41:12 UTC (rev 40126)
@@ -0,0 +1,9 @@
+<tests>
+ <test id="bdi1">
+ <DIV STYLE="display: inline; -moz-user-modify: read-write;">
+ <SPAN CLASS="vpe-text">
+ إيان
+ </SPAN>
+ </DIV>
+ </test>
+</tests>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentContentTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentContentTest.java 2012-04-11 14:03:33 UTC (rev 40125)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentContentTest.java 2012-04-11 14:41:12 UTC (rev 40126)
@@ -37,6 +37,9 @@
public void testAudio() throws Throwable {
performContentTest("components/html5/audio.html"); //$NON-NLS-1$
}
+ public void testBdi() throws Throwable {
+ performContentTest("components/html5/bdi.html"); //$NON-NLS-1$
+ }
public void testCommand() throws Throwable {
performContentTest("components/html5/command.html"); //$NON-NLS-1$
}
13 years, 12 months
JBoss Tools SVN: r40125 - trunk/vpe/plugins/org.jboss.tools.vpe.html/templates.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-04-11 10:03:33 -0400 (Wed, 11 Apr 2012)
New Revision: 40125
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml
Log:
https://issues.jboss.org/browse/JBIDE-11290 - <bdi> tag was implemented as inline div
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2012-04-11 10:33:17 UTC (rev 40124)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2012-04-11 14:03:33 UTC (rev 40125)
@@ -199,6 +199,30 @@
</vpe:template>
</vpe:tag>
+ <vpe:tag name="bdi" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <div style="display: inline;"/>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes" />
+ <vpe:drop container="yes" />
+ </vpe:dnd>
+ <vpe:textFormatting use-default-formats="yes">
+ <vpe:format type="BlockFormat" addChildren="allow" handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BlockFormatHandler" />
+ <vpe:format type="BoldFormat">
+ <vpe:formatAttribute type="style" />
+ </vpe:format>
+ <vpe:format type="UnderlineFormat" addChildren="allow" handler="org.jboss.tools.vpe.editor.toolbar.format.handler.UnderlineFormatHandler" />
+ <vpe:format type="UnderlineFormat">
+ <vpe:formatAttribute type="style" />
+ </vpe:format>
+ <vpe:format type="ItalicFormat" addChildren="allow" handler="org.jboss.tools.vpe.editor.toolbar.format.handler.ItalicFormatHandler" />
+ <vpe:format type="ItalicFormat">
+ <vpe:formatAttribute type="style" />
+ </vpe:format>
+ </vpe:textFormatting>
+ </vpe:template>
+ </vpe:tag>
+
<vpe:tag name="bdo" case-sensitive="no">
<vpe:template children="yes" modify="yes">
<vpe:copy />
13 years, 12 months
JBoss Tools SVN: r40124 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal: extendedproperties and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-04-11 06:33:17 -0400 (Wed, 11 Apr 2012)
New Revision: 40124
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss6ModuleStateVerifier.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS6ExtendedProperties.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossLT6ModuleStateVerifier.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ModuleStateVerifier.java
Log:
JBIDE-11514 - changing as6 to fast-return on module state
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java 2012-04-11 07:56:30 UTC (rev 40123)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java 2012-04-11 10:33:17 UTC (rev 40124)
@@ -16,6 +16,7 @@
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerAttributes;
+import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossAS6ExtendedProperties;
import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossAS710ExtendedProperties;
import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossAS7ExtendedProperties;
import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossEAP60ExtendedProperties;
@@ -66,7 +67,7 @@
if( SERVER_AS_51.equals(typeId) || AS_51.equals(typeId))
return new JBossExtendedProperties(adaptable);
if( SERVER_AS_60.equals(typeId) || AS_60.equals(typeId))
- return new JBossExtendedProperties(adaptable);
+ return new JBossAS6ExtendedProperties(adaptable);
if( SERVER_EAP_43.equals(typeId) || EAP_43.equals(typeId))
return new JBossExtendedProperties(adaptable);
if( SERVER_EAP_50.equals(typeId) || EAP_50.equals(typeId))
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss6ModuleStateVerifier.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss6ModuleStateVerifier.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss6ModuleStateVerifier.java 2012-04-11 10:33:17 UTC (rev 40124)
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.core.server.internal;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.server.IServerModuleStateVerifier;
+
+public class JBoss6ModuleStateVerifier /* extends JBossLT6ModuleStateVerifier */ implements IServerModuleStateVerifier {
+
+ @Override
+ public boolean isModuleStarted(IServer server, IModule module,
+ IProgressMonitor monitor) {
+ // NO IDEA
+ return true;
+ }
+
+ @Override
+ public void waitModuleStarted(IServer server, IModule module,
+ IProgressMonitor monitor) {
+ return;
+ }
+
+ @Override
+ public void waitModuleStarted(IServer server, IModule module, int maxDelay) {
+ return;
+ }
+
+ // If proper mbeans are found, uncomment this and customize it
+
+// protected boolean checkNestedWebModuleStarted(IServer server, IModule module, MBeanServerConnection connection) throws Exception {
+// String mbeanName = "jboss.deployment:id=\"jboss.web.deployment:war=/" + module.getName() + "\",type=Component"; //$NON-NLS-1$//$NON-NLS-2$
+// String stateAttribute = "State"; //$NON-NLS-1$
+// Object result = getAttributeResult(connection, mbeanName, stateAttribute);
+// if( result == null || !result.toString().equals("DEPLOYED")) //$NON-NLS-1$
+// return false;
+// return true;
+// }
+//
+// protected boolean checkStandaloneWebModuleStarted(IServer server, IModule module, MBeanServerConnection connection) throws Exception {
+// String mbeanName = "jboss.web:J2EEApplication=none,J2EEServer=none,j2eeType=WebModule,name=//localhost/" + module.getName(); //$NON-NLS-1$
+// String stateAttribute = "state"; //$NON-NLS-1$
+// Object result = getAttributeResult(connection, mbeanName, stateAttribute);
+// if(result == null || !(result instanceof Integer) || ((Integer)result).intValue() != 1 ) {
+// return false;
+// }
+// return true;
+// }
+
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossLT6ModuleStateVerifier.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossLT6ModuleStateVerifier.java 2012-04-11 07:56:30 UTC (rev 40123)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossLT6ModuleStateVerifier.java 2012-04-11 10:33:17 UTC (rev 40124)
@@ -33,6 +33,9 @@
import org.jboss.ide.eclipse.as.core.server.IServerModuleStateVerifier;
public class JBossLT6ModuleStateVerifier implements IServerModuleStateVerifier {
+ public JBossLT6ModuleStateVerifier() {
+ // Nothing
+ }
public boolean isModuleStarted(final IServer server, final IModule module,
final IProgressMonitor monitor) {
final boolean[] result = new boolean[1];
@@ -75,7 +78,7 @@
// call is over, can notify the thread to go finish itself
synchronized(monitor) {
if( !monitor.isCanceled() )
- t.notify();
+ t.interrupt();
}
}
public void waitModuleStarted(IServer server, IModule module,
@@ -119,33 +122,42 @@
protected boolean checkDeploymentStarted(final IServer server, final IModule module,
final MBeanServerConnection connection, IProgressMonitor monitor) throws Exception {
- String typeId;
- typeId = module.getModuleType().getId();
-
+ String typeId = module.getModuleType().getId();
if( typeId.equals("wst.web") || typeId.equals("jst.web")) { //$NON-NLS-1$ //$NON-NLS-2$
- String mbeanName = null;
- IModule earParent = findEarParent(server, module);
- String stateAttribute;
- Object result;
- if( earParent == null ) {
- mbeanName = "jboss.web:J2EEApplication=none,J2EEServer=none,j2eeType=WebModule,name=//localhost/" + module.getName(); //$NON-NLS-1$
- stateAttribute = "state"; //$NON-NLS-1$
- result = getAttributeResult(connection, mbeanName, stateAttribute);
- if(result == null || !(result instanceof Integer) || ((Integer)result).intValue() != 1 ) {
- return false;
- }
- } else {
- mbeanName = "jboss.deployment:id=\"jboss.web.deployment:war=/" + module.getName() + "\",type=Component"; //$NON-NLS-1$//$NON-NLS-2$
- stateAttribute = "State"; //$NON-NLS-1$
- result = getAttributeResult(connection, mbeanName, stateAttribute);
- if( result == null || !result.toString().equals("DEPLOYED")) //$NON-NLS-1$
- return false;
- }
+ return checkWebModuleStarted(server, module, connection);
}
return true;
}
- private Object getAttributeResult(final MBeanServerConnection connection, String mbeanName, String stateAttribute) throws Exception {
+ protected boolean checkWebModuleStarted(IServer server, IModule module, MBeanServerConnection connection) throws Exception {
+ IModule earParent = findEarParent(server, module);
+ if( earParent == null ) {
+ return checkStandaloneWebModuleStarted(server, module, connection);
+ } else {
+ return checkNestedWebModuleStarted(server, module, connection);
+ }
+ }
+
+ protected boolean checkNestedWebModuleStarted(IServer server, IModule module, MBeanServerConnection connection) throws Exception {
+ String mbeanName = "jboss.deployment:id=\"jboss.web.deployment:war=/" + module.getName() + "\",type=Component"; //$NON-NLS-1$//$NON-NLS-2$
+ String stateAttribute = "State"; //$NON-NLS-1$
+ Object result = getAttributeResult(connection, mbeanName, stateAttribute);
+ if( result == null || !result.toString().equals("DEPLOYED")) //$NON-NLS-1$
+ return false;
+ return true;
+ }
+
+ protected boolean checkStandaloneWebModuleStarted(IServer server, IModule module, MBeanServerConnection connection) throws Exception {
+ String mbeanName = "jboss.web:J2EEApplication=none,J2EEServer=none,j2eeType=WebModule,name=//localhost/" + module.getName(); //$NON-NLS-1$
+ String stateAttribute = "state"; //$NON-NLS-1$
+ Object result = getAttributeResult(connection, mbeanName, stateAttribute);
+ if(result == null || !(result instanceof Integer) || ((Integer)result).intValue() != 1 ) {
+ return false;
+ }
+ return true;
+ }
+
+ protected Object getAttributeResult(final MBeanServerConnection connection, String mbeanName, String stateAttribute) throws Exception {
ObjectName on = new ObjectName(mbeanName);
try {
return connection.getAttribute(on, stateAttribute);
@@ -155,7 +167,7 @@
}
/* TODO Unify findEarParent with findRootModule */
- private IModule findEarParent(IServer server, IModule module) {
+ protected IModule findEarParent(IServer server, IModule module) {
try {
IModule[] deployed = server.getModules();
ArrayList<IModule> deployedAsList = new ArrayList<IModule>();
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS6ExtendedProperties.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS6ExtendedProperties.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS6ExtendedProperties.java 2012-04-11 10:33:17 UTC (rev 40124)
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.core.server.internal.extendedproperties;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.jboss.ide.eclipse.as.core.server.IServerModuleStateVerifier;
+import org.jboss.ide.eclipse.as.core.server.internal.JBoss6ModuleStateVerifier;
+
+public class JBossAS6ExtendedProperties extends JBossExtendedProperties {
+
+ public JBossAS6ExtendedProperties(IAdaptable adaptable) {
+ super(adaptable);
+ }
+
+ public IServerModuleStateVerifier getModuleStateVerifier() {
+ return new JBoss6ModuleStateVerifier();
+ }
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ModuleStateVerifier.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ModuleStateVerifier.java 2012-04-11 07:56:30 UTC (rev 40123)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ModuleStateVerifier.java 2012-04-11 10:33:17 UTC (rev 40124)
@@ -43,6 +43,9 @@
} catch(InterruptedException ie) {
return;
}
+ synchronized(monitor) {
+ monitor.setCanceled(true);
+ }
}
};
t.start();
13 years, 12 months
JBoss Tools SVN: r40123 - in trunk/documentation/movies: css and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-04-11 03:56:30 -0400 (Wed, 11 Apr 2012)
New Revision: 40123
Modified:
trunk/documentation/movies/css/movies.css
trunk/documentation/movies/index.html
Log:
add maven and wider video
Modified: trunk/documentation/movies/css/movies.css
===================================================================
--- trunk/documentation/movies/css/movies.css 2012-04-11 07:53:56 UTC (rev 40122)
+++ trunk/documentation/movies/css/movies.css 2012-04-11 07:56:30 UTC (rev 40123)
@@ -8,7 +8,7 @@
font-family:'Lucida Grande', Geneva, Verdana, Arial, sans-serif;
font-size:12px;
- max-width:55em;
+ max-width:100em;
padding:0em 2em;
color:#333;
line-height:150%;
@@ -23,7 +23,7 @@
color:#333;
line-height:150%;
text-align:justify;
- width: 57em;
+ align: center;
}
div.chapter, #title{
@@ -32,20 +32,12 @@
}
.multicolumns {
- -moz-column-count: 2; -moz-column-gap: 20px;
- -webkit-column-count: 2; -webkit-column-gap: 20px;
- column-count: 2; column-gap: 20px;
+ -moz-column-count: 3; -moz-column-gap: 20px;
+ -webkit-column-count: 3; -webkit-column-gap: 20px;
+ column-count: 3; column-gap: 20px;
}
-ul.docnav {
- margin:0px;
- width: 57em;
- ! height:40px;
- display:block;
-}
-
-
/* Links */
a:link {color:#0066cc;}
@@ -74,7 +66,6 @@
color:#182737;
font-size:2em;
padding:1.5em;
- text-align: center;
}
h2 {font-size:1.6em;}
Modified: trunk/documentation/movies/index.html
===================================================================
--- trunk/documentation/movies/index.html 2012-04-11 07:53:56 UTC (rev 40122)
+++ trunk/documentation/movies/index.html 2012-04-11 07:56:30 UTC (rev 40123)
@@ -27,12 +27,12 @@
<body>
-<div class="book" style="align:center; margin-left:30px;">
+<div class="book" style="align:center">
<br/> <p>       <img border="0" src="images/community/jbosstools_horiz_450.png"/></p>
<h2 style="margin-left:150px">Video Tutorials</h2>
- <div id="player"> <iframe src="http://player.vimeo.com/video/39743315?portrait=0" width="480" height="324" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe> </div>
+ <div id="player"> <iframe src="http://player.vimeo.com/video/39743315?portrait=0" width="940" height="529" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe> </div>
<br/>
<div id="directory" align="left">
@@ -50,7 +50,7 @@
<li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39607711?portrait=0">Richfaces 4 Desktop & Mobile</a></li>
<li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39608223?portrait=0">Forge</a></li>
<li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39743919?portrait=0">Google Web Toolkit</a></li>
- </ul>
+<li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39796236?portrait=0">Maven</a></li> </ul>
<h2>Reverse Engineering/CRUD Generation</h2>
@@ -61,7 +61,7 @@
</div>
- <br/><p><a href="../archive/movies">More videos available in our archive</a>.</p>
+ <br/><p>More videos available in our <a href="../archive/movies">archive</a>.</p>
</div>
</body>
13 years, 12 months
JBoss Tools SVN: r40122 - trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-04-11 03:53:56 -0400 (Wed, 11 Apr 2012)
New Revision: 40122
Modified:
trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFUtils.java
Log:
JBIDE-11416: Don't call home when reading the descriptor (in case oracle killed java.sun.com, again)
https://issues.jboss.org/browse/JBIDE-11416
Modified: trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFUtils.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFUtils.java 2012-04-10 21:07:25 UTC (rev 40121)
+++ trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFUtils.java 2012-04-11 07:53:56 UTC (rev 40122)
@@ -31,6 +31,7 @@
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.common.util.EclipseJavaUtil;
+import org.jboss.tools.common.xml.DtdResolver;
import org.jboss.tools.maven.core.ProjectUtil;
import org.jboss.tools.maven.jsf.utils.FacesConfigQuickPeek;
import org.jboss.tools.maven.jsf.utils.xpl.JSFAppConfigUtils;
@@ -124,6 +125,7 @@
domFactory.setNamespaceAware(false); // never forget this!
domFactory.setValidating(false);
DocumentBuilder builder = domFactory.newDocumentBuilder();
+ builder.setEntityResolver(new DtdResolver());
Document doc = builder.parse(input);
XPath xpath = XPathFactory.newInstance().newXPath();
13 years, 12 months