JBoss Tools SVN: r31646 - branches/jbosstools-3.2.x/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2011-05-30 15:06:01 -0400 (Mon, 30 May 2011)
New Revision: 31646
Modified:
branches/jbosstools-3.2.x/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JBossASHandler.java
Log:
JBDS-1622 EWP Server detected during JBDS installation is not configured within JBDS after installation is finished.
Modified: branches/jbosstools-3.2.x/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JBossASHandler.java
===================================================================
--- branches/jbosstools-3.2.x/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JBossASHandler.java 2011-05-30 17:16:50 UTC (rev 31645)
+++ branches/jbosstools-3.2.x/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JBossASHandler.java 2011-05-30 19:06:01 UTC (rev 31646)
@@ -89,7 +89,7 @@
private static File getLocation(ServerDefinition serverDefinition) {
String type = serverDefinition.getType();
- if (SOA_P.equals(type) || EAP.equals(type) || EPP.equals(type) || EWP.equals(type)) {
+ if (SOA_P.equals(type) || EAP.equals(type) || EPP.equals(type)) {
return new File(serverDefinition.getLocation(), "jboss-as");
}
if (SOA_P_STD.equals(type)) {
13 years, 7 months
JBoss Tools SVN: r31643 - in trunk/vpe: tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2011-05-30 13:12:44 -0400 (Mon, 30 May 2011)
New Revision: 31643
Added:
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/article.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/article.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/aside.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/aside.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/audio.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/audio.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/command.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/command.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/details.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/details.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/figcaption.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/figcaption.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/figure.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/figure.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/footer.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/footer.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/header.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/header.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/hgroup.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/hgroup.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/mark.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/mark.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/meter.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/meter.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/nav.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/nav.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/output.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/output.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/progress.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/progress.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/rp.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/rp.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/rt.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/rt.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/ruby.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/ruby.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/section.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/section.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/summary.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/summary.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/time.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/time.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/video.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/video.html.xml
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/ve/EditorOverride.css
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-8479 : HTML 5 support in Visual Page Editor
- set styles for some HTML5 tags in the EditorOverride.css so they look like in FireFox 4.0
- created tests for all new tags in HTML5
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/ve/EditorOverride.css
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/ve/EditorOverride.css 2011-05-30 17:09:51 UTC (rev 31642)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/ve/EditorOverride.css 2011-05-30 17:12:44 UTC (rev 31643)
@@ -364,14 +364,22 @@
background-image: url("resource://gre/res/table-remove-row-active.gif");
}
+/*********** begin of FF 4.0/XULRunner 2.0 HTML5 elements emulation ***********/
mark {
- background-color: yellow;/*the same color as in XULRunner 2.0*/
+ background-color: yellow;
}
-section {
+aside, figure, figcaption, footer, header, hgroup, nav, section {
display: block;
}
+
+figure {
+ margin-left: 40px;
+ margin-right: 40px;
+}
+/*********** end of FF 4.0/XULRunner 2.0 HTML5 elements emulation *************/
+
/*JBIDE-3995 #1*/
select div {
display: inline;
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/article.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/article.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/article.html 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+ <article id="article-id">
+<a href="http://blog.netscape.com/2007/12/28/end-of-support-for-netscape-web-browsers">Netscape is dead</a>
+<br />
+AOL has a long history on the internet, being one of
+the first companies to really get people online.....
+</article>
+</body>
+</html>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/article.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/article.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/article.html.xml 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,5 @@
+<tests>
+ <test id="article-id">
+ <ARTICLE ID="article-id"><A><SPAN CLASS="vpe-text">Netscape is dead</SPAN></A><BR/></ARTICLE>
+ </test>
+</tests>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/aside.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/aside.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/aside.html 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+ <aside id="aside-id">
+<h4>Epcot Center</h4>
+The Epcot Center is a theme park in Disney World, Florida.
+</aside>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/aside.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/aside.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/aside.html.xml 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,14 @@
+<tests>
+ <test id="aside-id">
+ <ASIDE ID="aside-id">
+<H4>
+<SPAN CLASS="vpe-text">
+Epcot Center
+</SPAN>
+</H4>
+<SPAN CLASS="vpe-text">
+The Epcot Center is a theme park in Disney World, Florida.
+</SPAN>
+</ASIDE>
+ </test>
+</tests>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/audio.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/audio.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/audio.html 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+ <audio id="audio-id" src="http://www.w3schools.com/html5/horse.ogg" controls="controls">
+Your browser does not support the audio element.
+</audio>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/audio.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/audio.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/audio.html.xml 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,7 @@
+<tests>
+ <test id="audio-id">
+ <AUDIO ID="audio-id" SRC="http://www.w3schools.com/html5/horse.ogg" CONTROLS="controls" STYLE="-moz-us
+er-modify: read-only;" TABINDEX="0">
+</AUDIO>
+ </test>
+</tests>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/command.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/command.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/command.html 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+<menu>
+<command id="command-id" onclick="alert('Hello World')">
+Click Me!</command>
+</menu>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/command.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/command.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/command.html.xml 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,9 @@
+<tests>
+ <test id="command-id">
+ <COMMAND ID="command-id" ONCLICK="alert('Hello World')">
+<SPAN CLASS="vpe-text">
+Click Me!
+</SPAN>
+</COMMAND>
+ </test>
+</tests>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/details.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/details.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/details.html 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+ <details id="details-id">
+<summary>Copyright 1999-2011.</summary>
+<p>All pages and graphics on this web site are the property of the company Refsnes Data.</p>
+</details>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/details.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/details.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/details.html.xml 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,16 @@
+<tests>
+ <test id="details-id">
+ <DETAILS ID="details-id">
+<SUMMARY>
+<SPAN CLASS="vpe-text">
+Copyright 1999-2011.
+</SPAN>
+</SUMMARY>
+<P>
+<SPAN CLASS="vpe-text">
+All pages and graphics on this web site are the property of the company Refsnes Data.
+</SPAN>
+</P>
+</DETAILS>
+ </test>
+</tests>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/figcaption.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/figcaption.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/figcaption.html 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+ <figure>
+ <figcaption id="figcaption-id">A view of the pulpit rock in Norway</figcaption>
+ <img src="http://www.w3schools.com/html5/img_pulpit.jpg" width="304" height="228" />
+</figure>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/figcaption.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/figcaption.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/figcaption.html.xml 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,9 @@
+<tests>
+ <test id="figcaption-id">
+ <FIGCAPTION ID="figcaption-id">
+<SPAN CLASS="vpe-text">
+A view of the pulpit rock in Norway
+</SPAN>
+</FIGCAPTION>
+ </test>
+</tests>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/figure.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/figure.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/figure.html 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+ <figure id="figure-id">
+ <p>A view of the pulpit rock in Norway</p>
+ <img src="http://www.w3schools.com/html5/img_pulpit.jpg" width="304" height="228" />
+</figure>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/figure.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/figure.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/figure.html.xml 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,13 @@
+<tests>
+ <test id="figure-id">
+ <FIGURE ID="figure-id">
+<P>
+<SPAN CLASS="vpe-text">
+A view of the pulpit rock in Norway
+</SPAN>
+</P>
+<IMG WIDTH="304" HEIGHT="228" SRC="http://www.w3schools.com/html5/img_pulpit.jpg"/>
+
+</FIGURE>
+ </test>
+</tests>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/footer.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/footer.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/footer.html 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+ <footer id="footer-id">This document was written in 2009</footer>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/footer.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/footer.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/footer.html.xml 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,9 @@
+<tests>
+ <test id="footer-id">
+ <FOOTER ID="footer-id">
+<SPAN CLASS="vpe-text">
+This document was written in 2009
+</SPAN>
+</FOOTER>
+ </test>
+</tests>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/header.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/header.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/header.html 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+ <header id="header-id">
+<h1>Welcome to my homepage</h1>
+<p>My name is Donald Duck</p>
+</header>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/header.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/header.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/header.html.xml 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,16 @@
+<tests>
+ <test id="header-id">
+ <HEADER ID="header-id">
+<H1>
+<SPAN CLASS="vpe-text">
+Welcome to my homepage
+</SPAN>
+</H1>
+<P>
+<SPAN CLASS="vpe-text">
+My name is Donald Duck
+</SPAN>
+</P>
+</HEADER>
+ </test>
+</tests>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/hgroup.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/hgroup.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/hgroup.html 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+ <hgroup id="hgroup-id">
+<h1>Welcome to my WWF</h1>
+<h2>For a living planet</h2>
+</hgroup>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/hgroup.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/hgroup.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/hgroup.html.xml 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,16 @@
+<tests>
+ <test id="hgroup-id">
+ <HGROUP ID="hgroup-id">
+<H1>
+<SPAN CLASS="vpe-text">
+Welcome to my WWF
+</SPAN>
+</H1>
+<H2>
+<SPAN CLASS="vpe-text">
+For a living planet
+</SPAN>
+</H2>
+</HGROUP>
+ </test>
+</tests>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/mark.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/mark.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/mark.html 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+ <p>Do not forget to buy <mark id="mark-id">milk</mark> today.</p>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/mark.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/mark.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/mark.html.xml 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,9 @@
+<tests>
+ <test id="mark-id">
+ <MARK ID="mark-id">
+<SPAN CLASS="vpe-text">
+milk
+</SPAN>
+</MARK>
+ </test>
+</tests>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/meter.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/meter.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/meter.html 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+ <meter id="meter-id" value="2" min="0" max="10">2 out of 10</meter><br />
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/meter.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/meter.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/meter.html.xml 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,9 @@
+<tests>
+ <test id="meter-id">
+<METER ID="meter-id" VALUE="2" MIN="0" MAX="10" STYLE="-moz-user-modify: read-write;">
+<SPAN CLASS="vpe-text">
+2 out of 10
+</SPAN>
+</METER>
+ </test>
+</tests>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/nav.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/nav.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/nav.html 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+ <nav id="nav-id">
+<a href="http://www.w3schools.com/html5/default.asp">Home</a>
+<a href="http://www.w3schools.com/html5/tag_meter.asp">Previous</a>
+<a href="http://www.w3schools.com/html5/tag_noscript.asp">Next</a>
+</nav>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/nav.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/nav.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/nav.html.xml 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,9 @@
+<tests>
+ <test id="nav-id">
+ <NAV ID="nav-id"><A CLASS=
+""><SPAN CLASS="vpe-text">Home</SPAN></A><A CLASS=""><SPAN CLASS
+="vpe-text">Previous</SPAN></A><A CLASS=""><SPAN CLASS="vpe-text
+">Next</SPAN></A>
+</NAV>
+ </test>
+</tests>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/output.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/output.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/output.html 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+ <form action="http://www.w3schools.com/html5/demo_form.asp">
+<input name="numa" type="number"> +
+<input name="numb" type="number"> =
+<output id="output-id" name="result" onforminput="value=numa.valueAsNumber + numb.valueAsNumber"></output><br />
+<input type="submit" />
+</form>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/output.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/output.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/output.html.xml 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,5 @@
+<tests>
+ <test id="output-id">
+ <OUTPUT ID="output-id" NAME="result"/>
+ </test>
+</tests>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/progress.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/progress.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/progress.html 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+ The object's downloading progress:
+<progress id="progress-id">
+<span id="objprogress">76</span>%
+</progress>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/progress.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/progress.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/progress.html.xml 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,14 @@
+<tests>
+ <test id="progress-id">
+ <PROGRESS ID="progress-id">
+<SPAN ID="objprogress">
+<SPAN CLASS="vpe-text">
+76
+</SPAN>
+</SPAN>
+<SPAN CLASS="vpe-text">
+%
+</SPAN>
+</PROGRESS>
+ </test>
+</tests>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/rp.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/rp.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/rp.html 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+ <ruby>
+漢 <rt><rp id="rp-id">(</rp>ㄏㄢˋ<rp>)</rp></rt>
+</ruby>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/rp.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/rp.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/rp.html.xml 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,9 @@
+<tests>
+ <test id="rp-id">
+ <RP ID="rp-id">
+<SPAN CLASS="vpe-text">
+(
+</SPAN>
+</RP>
+ </test>
+</tests>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/rt.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/rt.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/rt.html 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+ <ruby>
+ 漢 <rt id="rt-id"> ㄏㄢˋ </rt>
+</ruby>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/rt.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/rt.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/rt.html.xml 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,9 @@
+<tests>
+ <test id="rt-id">
+ <RT ID="rt-id">
+ <SPAN CLASS="vpe-text">
+ ㄏㄢˋ
+ </SPAN>
+ </RT>
+ </test>
+</tests>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/ruby.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/ruby.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/ruby.html 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+ <ruby id="ruby-id">
+ 漢 <rt> ㄏㄢˋ </rt>
+</ruby>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/ruby.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/ruby.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/ruby.html.xml 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,14 @@
+<tests>
+ <test id="ruby-id">
+ <RUBY ID="ruby-id">
+ <SPAN CLASS="vpe-text">
+ 漢
+ </SPAN>
+ <RT>
+ <SPAN CLASS="vpe-text">
+ ㄏㄢˋ
+ </SPAN>
+ </RT>
+ </RUBY>
+ </test>
+</tests>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/section.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/section.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/section.html 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+ <section id="section-id">
+ <h1>WWF</h1>
+ <p>The World Wildlife Foundation was born in 1961...</p>
+</section>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/section.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/section.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/section.html.xml 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,16 @@
+<tests>
+ <test id="section-id">
+ <SECTION ID="section-id">
+<H1>
+<SPAN CLASS="vpe-text">
+WWF
+</SPAN>
+</H1>
+<P>
+<SPAN CLASS="vpe-text">
+The World Wildlife Foundation was born in 1961...
+</SPAN>
+</P>
+</SECTION>
+ </test>
+</tests>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/summary.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/summary.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/summary.html 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+ <details>
+<summary id="summary-id">Copyright 1999-2011.</summary>
+<p>All pages and graphics on this web site are the property of the company Refsnes Data.</p>
+</details>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/summary.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/summary.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/summary.html.xml 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,9 @@
+<tests>
+ <test id="summary-id">
+ <SUMMARY ID="summary-id">
+<SPAN CLASS="vpe-text">
+Copyright 1999-2011.
+</SPAN>
+</SUMMARY>
+ </test>
+</tests>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/time.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/time.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/time.html 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+ <p>
+We open at <time id="time-id">10:00</time> every morning.
+</p>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/time.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/time.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/time.html.xml 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,9 @@
+<tests>
+ <test id="time-id">
+ <TIME ID="time-id">
+<SPAN CLASS="vpe-text">
+10:00
+</SPAN>
+</TIME>
+ </test>
+</tests>
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/video.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/video.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/video.html 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+ <video id="video-id" src="http://www.w3schools.com/html5/movie.ogg" controls="controls">
+your browser does not support the video tag
+</video>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/video.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/video.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/html5/video.html.xml 2011-05-30 17:12:44 UTC (rev 31643)
@@ -0,0 +1,10 @@
+<tests>
+ <test id="video-id">
+ <VIDEO ID="video-id" SRC="http://www.w3schools.com/html5/movie.ogg" CONTROLS="controls" STYLE="-moz-us
+er-modify: read-write;" TABINDEX="0">
+<SPAN CLASS="vpe-text">
+your browser does not support the video tag
+</SPAN>
+</VIDEO>
+ </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 2011-05-30 17:09:51 UTC (rev 31642)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentContentTest.java 2011-05-30 17:12:44 UTC (rev 31643)
@@ -25,6 +25,76 @@
setCheckWarning(false);
}
+ /*
+ * tests for html5 tags
+ */
+ public void testArticle() throws Throwable {
+ performContentTest("components/html5/article.html"); //$NON-NLS-1$
+ }
+ public void testAside() throws Throwable {
+ performContentTest("components/html5/aside.html"); //$NON-NLS-1$
+ }
+ public void testAudio() throws Throwable {
+ performContentTest("components/html5/audio.html"); //$NON-NLS-1$
+ }
+ public void testCommand() throws Throwable {
+ performContentTest("components/html5/command.html"); //$NON-NLS-1$
+ }
+ public void testDetails() throws Throwable {
+ performContentTest("components/html5/details.html"); //$NON-NLS-1$
+ }
+ public void testFigcaption() throws Throwable {
+ performContentTest("components/html5/figcaption.html"); //$NON-NLS-1$
+ }
+ public void testFigure() throws Throwable {
+ performContentTest("components/html5/figure.html"); //$NON-NLS-1$
+ }
+ public void testFooter() throws Throwable {
+ performContentTest("components/html5/footer.html"); //$NON-NLS-1$
+ }
+ public void testHeader() throws Throwable {
+ performContentTest("components/html5/header.html"); //$NON-NLS-1$
+ }
+ public void testHgroup() throws Throwable {
+ performContentTest("components/html5/hgroup.html"); //$NON-NLS-1$
+ }
+ public void testMark() throws Throwable {
+ performContentTest("components/html5/mark.html"); //$NON-NLS-1$
+ }
+ public void testMeter() throws Throwable {
+ performContentTest("components/html5/meter.html"); //$NON-NLS-1$
+ }
+ public void testNav() throws Throwable {
+ performContentTest("components/html5/nav.html"); //$NON-NLS-1$
+ }
+ public void testOutput() throws Throwable {
+ performContentTest("components/html5/output.html"); //$NON-NLS-1$
+ }
+ public void testProgress() throws Throwable {
+ performContentTest("components/html5/progress.html"); //$NON-NLS-1$
+ }
+ public void testRp() throws Throwable {
+ performContentTest("components/html5/rp.html"); //$NON-NLS-1$
+ }
+ public void testRt() throws Throwable {
+ performContentTest("components/html5/rt.html"); //$NON-NLS-1$
+ }
+ public void testRuby() throws Throwable {
+ performContentTest("components/html5/ruby.html"); //$NON-NLS-1$
+ }
+ public void testSection() throws Throwable {
+ performContentTest("components/html5/section.html"); //$NON-NLS-1$
+ }
+ public void testSummary() throws Throwable {
+ performContentTest("components/html5/summary.html"); //$NON-NLS-1$
+ }
+ public void testTime() throws Throwable {
+ performContentTest("components/html5/time.html"); //$NON-NLS-1$
+ }
+ public void testVideo() throws Throwable {
+ performContentTest("components/html5/video.html"); //$NON-NLS-1$
+ }
+
/*
*
* test for block html tags
13 years, 7 months
JBoss Tools SVN: r31642 - branches/jbosstools-3.2.x/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2011-05-30 13:09:51 -0400 (Mon, 30 May 2011)
New Revision: 31642
Modified:
branches/jbosstools-3.2.x/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/DroolsHandler.java
branches/jbosstools-3.2.x/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JBossASHandler.java
branches/jbosstools-3.2.x/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JbpmHandler.java
Log:
JBIDE-8918 Recognize and define Drools Runtime from SOA-P standalone product
Modified: branches/jbosstools-3.2.x/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/DroolsHandler.java
===================================================================
--- branches/jbosstools-3.2.x/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/DroolsHandler.java 2011-05-30 16:57:16 UTC (rev 31641)
+++ branches/jbosstools-3.2.x/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/DroolsHandler.java 2011-05-30 17:09:51 UTC (rev 31642)
@@ -35,11 +35,11 @@
for (ServerDefinition serverDefinition : serverDefinitions) {
String type = serverDefinition.getType();
if (serverDefinition.isEnabled() && !droolsExists(serverDefinition)) {
- if (SOA_P.equals(type) || DROOLS.equals(type)) {
+ if (SOA_P.equals(type) || DROOLS.equals(type) || SOA_P_STD.equals(type)) {
File droolsRoot = serverDefinition.getLocation(); //$NON-NLS-1$
if (droolsRoot.isDirectory()) {
DroolsRuntime runtime = new DroolsRuntime();
- if (SOA_P.equals(type)) {
+ if (SOA_P.equals(type) || SOA_P_STD.equals(type)) {
runtime.setName("Drools - " + serverDefinition.getName()); //$NON-NLS-1$
} else {
runtime.setName("Drools " + serverDefinition.getVersion()+ " - " + serverDefinition.getName()); //$NON-NLS-1$
Modified: branches/jbosstools-3.2.x/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JBossASHandler.java
===================================================================
--- branches/jbosstools-3.2.x/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JBossASHandler.java 2011-05-30 16:57:16 UTC (rev 31641)
+++ branches/jbosstools-3.2.x/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JBossASHandler.java 2011-05-30 17:09:51 UTC (rev 31642)
@@ -386,7 +386,7 @@
String includeSeam = SeamHandler.included(serverDefinition);
append(builder, includeSeam);
}
- if (SOA_P.equals(type)) {
+ if (SOA_P.equals(type) || SOA_P_STD.equals(type)) {
String includeDrools = DroolsHandler.included(serverDefinition);
append(builder, includeDrools);
String includeJbpm = JbpmHandler.included(serverDefinition);
Modified: branches/jbosstools-3.2.x/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JbpmHandler.java
===================================================================
--- branches/jbosstools-3.2.x/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JbpmHandler.java 2011-05-30 16:57:16 UTC (rev 31641)
+++ branches/jbosstools-3.2.x/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/handlers/JbpmHandler.java 2011-05-30 17:09:51 UTC (rev 31642)
@@ -31,7 +31,7 @@
public static File getJbpmRoot(ServerDefinition serverDefinition) {
String type = serverDefinition.getType();
- if (SOA_P.equals(type)) {
+ if (SOA_P.equals(type) || SOA_P_STD.equals(type)) {
return new File(serverDefinition.getLocation(),"jbpm-jpdl"); //$NON-NLS-1$
}
if (JBPM.equals(type)) {
@@ -48,7 +48,7 @@
continue;
}
String type = serverDefinition.getType();
- if (SOA_P.equals(type)) {
+ if (SOA_P.equals(type) || SOA_P_STD.equals(type)) {
if (jbpmRoot.isDirectory()) {
String version = JBPM3;
if (isJbpm4(serverDefinition.getLocation().getAbsolutePath())) {
13 years, 7 months
JBoss Tools SVN: r31641 - in trunk: cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core and 9 other directories.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2011-05-30 12:57:16 -0400 (Mon, 30 May 2011)
New Revision: 31641
Added:
trunk/jst/tests/org.jboss.tools.jst.web.test/plugin.xml
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/.classpath
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/.project
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/bin/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/src/
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/BuilderTest.java
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/TestBuilder.java
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/TestNature.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java
trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.web.test/pom.xml
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
Log:
https://issues.jboss.org/browse/JBIDE-9021 fixed
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2011-05-30 16:47:09 UTC (rev 31640)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2011-05-30 16:57:16 UTC (rev 31641)
@@ -23,7 +23,8 @@
org.eclipse.equinox.preferences;bundle-version="3.4.0",
org.eclipse.wst.sse.core;bundle-version="1.1.600",
org.eclipse.jdt.ui;bundle-version="3.7.0",
- org.apache.ant;bundle-version="1.7.1"
+ org.apache.ant;bundle-version="1.7.1",
+ org.jboss.tools.jst.web
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: JBoss by Red Hat
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-05-30 16:47:09 UTC (rev 31640)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-05-30 16:57:16 UTC (rev 31641)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.cdi.core;
-
import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
@@ -55,13 +54,13 @@
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
import org.jboss.tools.cdi.internal.core.impl.ClassBean;
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.text.ITextSourceReference;
import org.jboss.tools.common.zip.UnzipOperation;
+import org.jboss.tools.jst.web.WebModelPlugin;
import org.jboss.tools.jst.web.kb.IKbProject;
import org.osgi.framework.Bundle;
@@ -83,8 +82,7 @@
if (!project.hasNature(IKbProject.NATURE_ID)) {
EclipseResourceUtil.addNatureToProject(project, IKbProject.NATURE_ID);
}
- EclipseUtil.addNatureToProject(project, CDICoreNature.NATURE_ID);
- EclipseResourceUtil.addBuilderToProject(project, ValidationPlugin.VALIDATION_BUILDER_ID);
+ WebModelPlugin.addNatureToProjectWithValidationSupport(project, CDICoreBuilder.BUILDER_ID, CDICoreNature.NATURE_ID);
if(genearteBeansXml) {
File beansXml = getBeansXml(project);
if(beansXml!=null && !beansXml.exists()) {
@@ -103,7 +101,7 @@
}
}
- /**
+ /**
* Removes CDI builder from the project.
*
* @param project
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2011-05-30 16:47:09 UTC (rev 31640)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2011-05-30 16:57:16 UTC (rev 31641)
@@ -21,7 +21,8 @@
org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
org.eclipse.jst.jsp.core;bundle-version="1.2.400",
org.eclipse.jst.j2ee.core;bundle-version="1.2.100",
- org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200"
+ org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200",
+ org.eclipse.wst.validation;bundle-version="1.2.300"
Bundle-Version: 3.3.0.qualifier
Export-Package:
org.jboss.tools.jst.web,
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java 2011-05-30 16:47:09 UTC (rev 31640)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java 2011-05-30 16:57:16 UTC (rev 31641)
@@ -13,6 +13,9 @@
import java.util.Iterator;
import java.util.Properties;
+import org.eclipse.core.resources.ICommand;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Platform;
@@ -20,6 +23,7 @@
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationType;
import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
import org.jboss.tools.common.log.BaseUIPlugin;
import org.jboss.tools.common.log.IPluginLog;
import org.jboss.tools.common.model.XModel;
@@ -116,4 +120,114 @@
public static IPluginLog getPluginLog() {
return getDefault();
}
+
+ private final static String JAVA_BUILDER_ID = "org.eclipse.jdt.core.javabuilder"; //$NON-NLS-1$
+
+ /**
+ * Adds the nature/builder to the project. Also adds WST validation builder. Sort Java, WST and the new builder in the following order: Java, WST, the new builder.
+ * @param project
+ * @param builderId
+ * @param natureId
+ * @throws CoreException
+ */
+ public static void addNatureToProjectWithValidationSupport(IProject project, String builderId, String natureId) throws CoreException {
+ IProjectDescription desc = project.getDescription();
+ ICommand[] existing = desc.getBuildSpec();
+ boolean updated = false;
+ int javaBuilderIndex = -1;
+ ICommand javaBuilder = null;
+ int wstValidationBuilderIndex = -1;
+ ICommand wstValidationBuilder = null;
+ int builderIndex = -1;
+ ICommand builder = null;
+ for (int i = 0; i < existing.length; i++) {
+ if(JAVA_BUILDER_ID.equals(existing[i].getBuilderName())) {
+ javaBuilderIndex = i;
+ javaBuilder = existing[i];
+ } else if(ValidationPlugin.VALIDATION_BUILDER_ID.equals(existing[i].getBuilderName())) {
+ wstValidationBuilderIndex = i;
+ wstValidationBuilder = existing[i];
+ } else if(builderId.equals(existing[i].getBuilderName())) {
+ builderIndex = i;
+ builder = existing[i];
+ }
+ }
+
+ if(javaBuilderIndex==-1) {
+ getDefault().logError("Can't enable " + builderId + " support on the project " + project.getName() + " without Java builder."); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$
+ return;
+ }
+
+ if(wstValidationBuilderIndex!=-1 && wstValidationBuilderIndex<javaBuilderIndex) {
+ existing[javaBuilderIndex] = wstValidationBuilder;
+ existing[wstValidationBuilderIndex] = javaBuilder;
+ int oldWstIndex = wstValidationBuilderIndex;
+ wstValidationBuilderIndex = javaBuilderIndex;
+ javaBuilderIndex = oldWstIndex;
+ updated = true;
+ }
+
+ if(builderIndex==-1) {
+ if(updated) {
+ desc.setBuildSpec(existing);
+ project.setDescription(desc, null);
+ updated = false;
+ }
+ EclipseResourceUtil.addNatureToProject(project, natureId);
+ desc = project.getDescription();
+ existing = desc.getBuildSpec();
+ builderIndex = existing.length-1;
+ builder = getBuilder(project, builderId);
+ }
+
+ if(wstValidationBuilderIndex==-1) {
+ existing = appendBuilder(project, existing, ValidationPlugin.VALIDATION_BUILDER_ID);
+ wstValidationBuilderIndex = existing.length-1;
+ wstValidationBuilder = existing[wstValidationBuilderIndex];
+ updated = true;
+ }
+
+ if(wstValidationBuilderIndex<builderIndex) {
+ existing[wstValidationBuilderIndex] = builder;
+ existing[builderIndex] = wstValidationBuilder;
+ int oldWstIndex = wstValidationBuilderIndex;
+ wstValidationBuilderIndex = builderIndex;
+ builderIndex = oldWstIndex;
+ updated = true;
+ }
+
+ if(builderIndex<javaBuilderIndex) {
+ existing[javaBuilderIndex] = builder;
+ existing[builderIndex] = javaBuilder;
+ int oldJavaIndex = javaBuilderIndex;
+ javaBuilderIndex = builderIndex;
+ builderIndex = oldJavaIndex;
+ updated = true;
+ }
+
+ if(updated) {
+ desc.setBuildSpec(existing);
+ project.setDescription(desc, null);
+ }
+ }
+
+ private static ICommand getBuilder(IProject project, String builderId) throws CoreException {
+ IProjectDescription desc = project.getDescription();
+ ICommand[] existing = desc.getBuildSpec();
+ for (ICommand command : existing) {
+ if(builderId.equals(command.getBuilderName())) {
+ return command;
+ }
+ }
+ return null;
+ }
+
+ private static ICommand[] appendBuilder(IProject project, ICommand[] commands, String builderId) throws CoreException {
+ ICommand[] cmds = new ICommand[commands.length + 1];
+ ICommand newcmd = project.getDescription().newCommand();
+ newcmd.setBuilderName(builderId);
+ cmds[commands.length] = newcmd;
+ System.arraycopy(commands, 0, cmds, 0, commands.length);
+ return cmds;
+ }
}
\ No newline at end of file
Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2011-05-30 16:47:09 UTC (rev 31640)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2011-05-30 16:57:16 UTC (rev 31641)
@@ -1,12 +1,14 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.jboss.tools.jst.web.test
-Bundle-Version: 3.2.0.qualifier
+Bundle-SymbolicName: org.jboss.tools.jst.web.test;singleton:=true
+Bundle-Version: 3.3.0.qualifier
Require-Bundle: org.jboss.tools.jst.web,
org.junit,
org.jboss.tools.tests,
- org.eclipse.jst.standard.schemas
+ org.eclipse.jst.standard.schemas,
+ org.eclipse.ui,
+ org.eclipse.wst.validation
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.jst.web.test
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/plugin.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/plugin.xml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/plugin.xml 2011-05-30 16:57:16 UTC (rev 31641)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+ <extension
+ id="testbuilder"
+ name="JBoss Tools JST Test Builder"
+ point="org.eclipse.core.resources.builders">
+ <builder
+ hasNature="false">
+ <run
+ class="org.jboss.tools.jst.web.test.TestBuilder">
+ </run>
+ </builder>
+ </extension>
+ <extension
+ id="testnature"
+ name="JBoss Tools JST Test Nature"
+ point="org.eclipse.core.resources.natures">
+ <runtime>
+ <run
+ class="org.jboss.tools.jst.web.test.TestNature">
+ </run>
+ </runtime>
+ <builder
+ id="org.jboss.tools.jst.web.test.testbuilder">
+ </builder>
+ </extension>
+</plugin>
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/plugin.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/pom.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/pom.xml 2011-05-30 16:47:09 UTC (rev 31640)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/pom.xml 2011-05-30 16:57:16 UTC (rev 31641)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.jboss.tools.jst.tests</groupId>
<artifactId>org.jboss.tools.jst.web.test</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
<emma.filter>org.jboss.tools.jst.web*</emma.filter>
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/.classpath
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/.classpath (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/.classpath 2011-05-30 16:57:16 UTC (rev 31641)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/.project
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/.project (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/.project 2011-05-30 16:57:16 UTC (rev 31641)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>testProject</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/BuilderTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/BuilderTest.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/BuilderTest.java 2011-05-30 16:57:16 UTC (rev 31641)
@@ -0,0 +1,208 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jst.web.test;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.ICommand;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.jboss.tools.common.EclipseUtil;
+import org.jboss.tools.jst.web.WebModelPlugin;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class BuilderTest extends TestCase {
+
+ private static final String PLUGIN_ID = "org.jboss.tools.jst.web.test";
+ private static final String PROJECT_PATH = "/projects/testProject";
+ private static final String JAVA_BUILDER_ID = "org.eclipse.jdt.core.javabuilder"; //$NON-NLS-1$
+
+ protected IProject project;
+
+ @Override
+ protected void setUp() throws Exception {
+ project = ResourcesUtils.importProject(PLUGIN_ID, PROJECT_PATH);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ ResourcesUtils.deleteProject(project.getName());
+ JobUtils.waitForIdle();
+ }
+
+ public void testJavaProject() throws Exception {
+ TestNature.APPEND_BUILDER = true;
+ assertEquals(1, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(JAVA_BUILDER_ID));
+
+ asserBuilderOrder();
+ }
+
+ public void testJavaWstProject() throws Exception {
+ TestNature.APPEND_BUILDER = true;
+ addBuilderToProject(false, project, ValidationPlugin.VALIDATION_BUILDER_ID);
+ assertEquals(2, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(JAVA_BUILDER_ID));
+ assertEquals(1, getBuilderIndex(ValidationPlugin.VALIDATION_BUILDER_ID));
+
+ asserBuilderOrder();
+ }
+
+ public void testWstJavaProject() throws Exception {
+ TestNature.APPEND_BUILDER = true;
+ addBuilderToProject(true, project, ValidationPlugin.VALIDATION_BUILDER_ID);
+ assertEquals(2, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(ValidationPlugin.VALIDATION_BUILDER_ID));
+ assertEquals(1, getBuilderIndex(JAVA_BUILDER_ID));
+
+ asserBuilderOrder();
+ }
+
+ public void testJavaTestProject() throws Exception {
+ TestNature.APPEND_BUILDER = true;
+ EclipseUtil.addNatureToProject(project, TestNature.ID);
+ assertEquals(2, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(JAVA_BUILDER_ID));
+ assertEquals(1, getBuilderIndex(TestBuilder.ID));
+
+ asserBuilderOrder();
+ }
+
+ public void testTestJavaProject() throws Exception {
+ TestNature.APPEND_BUILDER = false;
+ EclipseUtil.addNatureToProject(project, TestNature.ID);
+ assertEquals(2, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(TestBuilder.ID));
+ assertEquals(1, getBuilderIndex(JAVA_BUILDER_ID));
+
+ asserBuilderOrder();
+ }
+
+ public void testJavaWstTestProject() throws Exception {
+ TestNature.APPEND_BUILDER = true;
+ addBuilderToProject(false, project, ValidationPlugin.VALIDATION_BUILDER_ID);
+ EclipseUtil.addNatureToProject(project, TestNature.ID);
+ assertEquals(3, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(JAVA_BUILDER_ID));
+ assertEquals(1, getBuilderIndex(ValidationPlugin.VALIDATION_BUILDER_ID));
+ assertEquals(2, getBuilderIndex(TestBuilder.ID));
+
+ asserBuilderOrder();
+ }
+
+ public void testWstJavaTestProject() throws Exception {
+ TestNature.APPEND_BUILDER = true;
+ addBuilderToProject(true, project, ValidationPlugin.VALIDATION_BUILDER_ID);
+ EclipseUtil.addNatureToProject(project, TestNature.ID);
+ assertEquals(3, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(ValidationPlugin.VALIDATION_BUILDER_ID));
+ assertEquals(1, getBuilderIndex(JAVA_BUILDER_ID));
+ assertEquals(2, getBuilderIndex(TestBuilder.ID));
+
+ asserBuilderOrder();
+ }
+
+ public void testTestJavaWstProject() throws Exception {
+ TestNature.APPEND_BUILDER = false;
+ EclipseUtil.addNatureToProject(project, TestNature.ID);
+ addBuilderToProject(false, project, ValidationPlugin.VALIDATION_BUILDER_ID);
+ assertEquals(3, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(TestBuilder.ID));
+ assertEquals(1, getBuilderIndex(JAVA_BUILDER_ID));
+ assertEquals(2, getBuilderIndex(ValidationPlugin.VALIDATION_BUILDER_ID));
+
+ asserBuilderOrder();
+ }
+
+ public void testWstTestJavaProject() throws Exception {
+ TestNature.APPEND_BUILDER = false;
+ EclipseUtil.addNatureToProject(project, TestNature.ID);
+ addBuilderToProject(true, project, ValidationPlugin.VALIDATION_BUILDER_ID);
+ assertEquals(3, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(ValidationPlugin.VALIDATION_BUILDER_ID));
+ assertEquals(1, getBuilderIndex(TestBuilder.ID));
+ assertEquals(2, getBuilderIndex(JAVA_BUILDER_ID));
+
+ asserBuilderOrder();
+ }
+
+ public void testTestWstJavaProject() throws Exception {
+ TestNature.APPEND_BUILDER = false;
+ addBuilderToProject(true, project, ValidationPlugin.VALIDATION_BUILDER_ID);
+ EclipseUtil.addNatureToProject(project, TestNature.ID);
+ assertEquals(3, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(TestBuilder.ID));
+ assertEquals(1, getBuilderIndex(ValidationPlugin.VALIDATION_BUILDER_ID));
+ assertEquals(2, getBuilderIndex(JAVA_BUILDER_ID));
+
+ asserBuilderOrder();
+ }
+
+ public void testJavaTestWstProject() throws Exception {
+ TestNature.APPEND_BUILDER = true;
+ EclipseUtil.addNatureToProject(project, TestNature.ID);
+ addBuilderToProject(false, project, ValidationPlugin.VALIDATION_BUILDER_ID);
+ assertEquals(3, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(JAVA_BUILDER_ID));
+ assertEquals(1, getBuilderIndex(TestBuilder.ID));
+ assertEquals(2, getBuilderIndex(ValidationPlugin.VALIDATION_BUILDER_ID));
+
+ asserBuilderOrder();
+ }
+
+ public void asserBuilderOrder() throws Exception {
+ TestNature.APPEND_BUILDER = true;
+ WebModelPlugin.addNatureToProjectWithValidationSupport(project, TestBuilder.ID, TestNature.ID);
+ assertEquals(3, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(JAVA_BUILDER_ID));
+ assertEquals(1, getBuilderIndex(TestBuilder.ID));
+ assertEquals(2, getBuilderIndex(ValidationPlugin.VALIDATION_BUILDER_ID));
+ }
+
+ public static void addBuilderToProject(boolean beginning, IProject project, String builderId) throws CoreException {
+ IProjectDescription desc = project.getDescription();
+ ICommand[] existing = desc.getBuildSpec();
+ ICommand[] cmds = new ICommand[existing.length + 1];
+ ICommand newcmd = project.getDescription().newCommand();
+ newcmd.setBuilderName(builderId);
+ if(beginning) {
+ cmds[0] = newcmd;
+ System.arraycopy(existing, 0, cmds, 1, existing.length );
+ } else {
+ cmds[existing.length] = newcmd;
+ System.arraycopy(existing, 0, cmds, 0, existing.length);
+ }
+ desc.setBuildSpec(cmds);
+ project.setDescription(desc, null);
+ }
+
+ public int getBuilderIndex(String builderId) throws CoreException {
+ IProjectDescription desc = project.getDescription();
+ ICommand[] commands = desc.getBuildSpec();
+ for (int i = 0; i < commands.length; i++) {
+ if(builderId.equals(commands[i].getBuilderName())) {
+ return i;
+ }
+ }
+ return -1;
+ }
+
+ public int getBuilderNumbers() throws CoreException {
+ IProjectDescription desc = project.getDescription();
+ return desc.getBuildSpec().length;
+ }
+}
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/BuilderTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java 2011-05-30 16:47:09 UTC (rev 31640)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java 2011-05-30 16:57:16 UTC (rev 31641)
@@ -18,6 +18,7 @@
public static Test suite() {
TestSuite suite = new TestSuite(JstWebAllTests.class.getName());
suite.addTestSuite(WebContentAssistProviderTest.class);
+ suite.addTestSuite(BuilderTest.class);
return suite;
}
}
\ No newline at end of file
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/TestBuilder.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/TestBuilder.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/TestBuilder.java 2011-05-30 16:57:16 UTC (rev 31641)
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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.tools.jst.web.test;
+
+import java.util.Map;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class TestBuilder extends IncrementalProjectBuilder {
+
+ public static final String ID = "org.jboss.tools.jst.web.test.testbuilder";
+
+ /* (non-Javadoc)
+ * @see org.eclipse.core.resources.IncrementalProjectBuilder#build(int, java.util.Map, org.eclipse.core.runtime.IProgressMonitor)
+ */
+ @Override
+ protected IProject[] build(int kind, Map<String, String> args,
+ IProgressMonitor monitor) throws CoreException {
+ return null;
+ }
+}
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/TestBuilder.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/TestNature.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/TestNature.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/TestNature.java 2011-05-30 16:57:16 UTC (rev 31641)
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jst.web.test;
+
+import org.eclipse.core.resources.ICommand;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IProjectNature;
+import org.eclipse.core.runtime.CoreException;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class TestNature implements IProjectNature {
+
+ IProject project;
+ static String ID = "org.jboss.tools.jst.web.test.testnature";
+ static boolean APPEND_BUILDER = true;
+
+ public void configure() throws CoreException {
+ addToBuildSpec(TestBuilder.ID);
+ }
+
+ public void deconfigure() throws CoreException {
+ }
+
+ public IProject getProject() {
+ return project;
+ }
+
+ public void setProject(IProject project) {
+ this.project = project;
+ }
+
+ protected void addToBuildSpec(String builderID) throws CoreException {
+ IProjectDescription description = getProject().getDescription();
+ ICommand command = null;
+ ICommand commands[] = description.getBuildSpec();
+ for (int i = 0; i < commands.length && command == null; ++i) {
+ if (commands[i].getBuilderName().equals(builderID))
+ command = commands[i];
+ }
+ if (command == null) {
+ command = description.newCommand();
+ command.setBuilderName(builderID);
+ ICommand[] oldCommands = description.getBuildSpec();
+ ICommand[] newCommands = new ICommand[oldCommands.length + 1];
+
+ if(APPEND_BUILDER) {
+ System.arraycopy(oldCommands, 0, newCommands, 0, oldCommands.length);
+ newCommands[oldCommands.length] = command;
+ } else {
+ System.arraycopy(oldCommands, 0, newCommands, 1, oldCommands.length);
+ newCommands[0] = command;
+ }
+ description.setBuildSpec(newCommands);
+ getProject().setDescription(description, null);
+ }
+ }
+}
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/TestNature.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java 2011-05-30 16:47:09 UTC (rev 31640)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java 2011-05-30 16:57:16 UTC (rev 31641)
@@ -20,6 +20,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IField;
import org.eclipse.jdt.core.IJavaProject;
@@ -36,6 +37,8 @@
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.text.ITextSourceReference;
+import org.jboss.tools.jst.web.WebModelPlugin;
+import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.seam.core.project.facet.SeamRuntime;
import org.jboss.tools.seam.internal.core.AbstractContextVariable;
import org.jboss.tools.seam.internal.core.SeamComponentDeclaration;
@@ -45,6 +48,22 @@
*/
public class SeamUtil {
+ public static void enableSeamSupport(IProject project) {
+ if(project==null) {
+ return;
+ }
+ try {
+// EclipseResourceUtil.addNatureToProject(project, ISeamProject.NATURE_ID);
+ if(!project.hasNature(IKbProject.NATURE_ID)) {
+ EclipseResourceUtil.addNatureToProject(project, IKbProject.NATURE_ID);
+ }
+// EclipseResourceUtil.addBuilderToProject(project, ValidationPlugin.VALIDATION_BUILDER_ID);
+ WebModelPlugin.addNatureToProjectWithValidationSupport(project, SeamCoreBuilder.BUILDER_ID, ISeamProject.NATURE_ID);
+ } catch (CoreException e) {
+ SeamCorePlugin.getPluginLog().logError(e);
+ }
+ }
+
/**
* Returns Seam version from <Seam Runtime>/lib/jboss-seam.jar/META-INF/MANIFEST.MF
* from Seam Runtime which is set for the project.
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2011-05-30 16:47:09 UTC (rev 31640)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2011-05-30 16:57:16 UTC (rev 31641)
@@ -53,14 +53,12 @@
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.ui.IValidator;
import org.jboss.tools.common.ui.preferences.SettingsPage;
import org.jboss.tools.common.ui.widget.editor.IFieldEditor;
import org.jboss.tools.common.ui.widget.editor.IFieldEditorFactory;
import org.jboss.tools.common.ui.wizard.IParameter;
-import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.SeamProjectsSet;
@@ -758,8 +756,8 @@
@Override
public boolean performOk() {
if (isSeamSupported()) {
- addSeamSupport(project);
- addSeamSupport(warProject);
+ SeamUtil.enableSeamSupport(project);
+ SeamUtil.enableSeamSupport(warProject);
if (warProject != null) {
IEclipsePreferences prefs = SeamCorePlugin.getSeamPreferences(warProject);
prefs.putBoolean(ISeamFacetDataModelProperties.SEAM_SETTINGS_CHANGED_BY_USER, true);
@@ -957,21 +955,6 @@
}
}
- private void addSeamSupport(IProject project) {
- if(project==null) {
- return;
- }
- try {
- EclipseResourceUtil.addNatureToProject(project, ISeamProject.NATURE_ID);
- if(!project.hasNature(IKbProject.NATURE_ID)) {
- EclipseResourceUtil.addNatureToProject(project, IKbProject.NATURE_ID);
- }
- EclipseResourceUtil.addBuilderToProject(project, ValidationPlugin.VALIDATION_BUILDER_ID);
- } catch (CoreException e) {
- SeamGuiPlugin.getPluginLog().logError(e);
- }
- }
-
private SeamVersion[] getSeamVersions() {
// Let's allow user to select any available seam version regardless of installed seam facet. But we should warn user if he selects different versions of facet and seam runtime.
return SeamVersion.ALL_VERSIONS;
13 years, 7 months
JBoss Tools SVN: r31640 - in branches/jbosstools-3.2.x: cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core and 9 other directories.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2011-05-30 12:47:09 -0400 (Mon, 30 May 2011)
New Revision: 31640
Added:
branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/plugin.xml
branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/
branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/.classpath
branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/.project
branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/bin/
branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/src/
branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/BuilderTest.java
branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/TestBuilder.java
branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/TestNature.java
Modified:
branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java
branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java
branches/jbosstools-3.2.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java
branches/jbosstools-3.2.x/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
Log:
https://issues.jboss.org/browse/JBIDE-9021 Fixed
Modified: branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2011-05-30 16:17:53 UTC (rev 31639)
+++ branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2011-05-30 16:47:09 UTC (rev 31640)
@@ -23,7 +23,8 @@
org.eclipse.equinox.preferences,
org.eclipse.wst.sse.core,
org.eclipse.jdt.ui,
- org.apache.ant
+ org.apache.ant,
+ org.jboss.tools.jst.web
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: JBoss by Red Hat
Modified: branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
===================================================================
--- branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-05-30 16:17:53 UTC (rev 31639)
+++ branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-05-30 16:47:09 UTC (rev 31640)
@@ -55,13 +55,13 @@
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
import org.jboss.tools.cdi.internal.core.impl.ClassBean;
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.text.ITextSourceReference;
import org.jboss.tools.common.zip.UnzipOperation;
+import org.jboss.tools.jst.web.WebModelPlugin;
import org.jboss.tools.jst.web.kb.IKbProject;
import org.osgi.framework.Bundle;
@@ -83,8 +83,7 @@
if (!project.hasNature(IKbProject.NATURE_ID)) {
EclipseResourceUtil.addNatureToProject(project, IKbProject.NATURE_ID);
}
- EclipseUtil.addNatureToProject(project, CDICoreNature.NATURE_ID);
- EclipseResourceUtil.addBuilderToProject(project, ValidationPlugin.VALIDATION_BUILDER_ID);
+ WebModelPlugin.addNatureToProjectWithValidationSupport(project, CDICoreBuilder.BUILDER_ID, CDICoreNature.NATURE_ID);
if(genearteBeansXml) {
File beansXml = getBeansXml(project);
if(beansXml!=null && !beansXml.exists()) {
Modified: branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2011-05-30 16:17:53 UTC (rev 31639)
+++ branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2011-05-30 16:47:09 UTC (rev 31640)
@@ -21,7 +21,8 @@
org.eclipse.ltk.core.refactoring,
org.eclipse.jst.jsp.core,
org.eclipse.jst.j2ee.core;bundle-version="1.1.300",
- org.eclipse.wst.common.project.facet.core;bundle-version="1.4.0"
+ org.eclipse.wst.common.project.facet.core;bundle-version="1.4.0",
+ org.eclipse.wst.validation;bundle-version="1.2.201"
Bundle-Version: 3.2.1.qualifier
Export-Package:
org.jboss.tools.jst.web,
Modified: branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java
===================================================================
--- branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java 2011-05-30 16:17:53 UTC (rev 31639)
+++ branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java 2011-05-30 16:47:09 UTC (rev 31640)
@@ -13,6 +13,9 @@
import java.util.Iterator;
import java.util.Properties;
+import org.eclipse.core.resources.ICommand;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Platform;
@@ -20,6 +23,7 @@
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationType;
import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
import org.jboss.tools.common.log.BaseUIPlugin;
import org.jboss.tools.common.log.IPluginLog;
import org.jboss.tools.common.model.XModel;
@@ -116,4 +120,114 @@
public static IPluginLog getPluginLog() {
return getDefault();
}
+
+ private final static String JAVA_BUILDER_ID = "org.eclipse.jdt.core.javabuilder"; //$NON-NLS-1$
+
+ /**
+ * Adds the nature/builder to the project. Also adds WST validation builder. Sort Java, WST and the new builder in the following order: Java, WST, the new builder.
+ * @param project
+ * @param builderId
+ * @param natureId
+ * @throws CoreException
+ */
+ public static void addNatureToProjectWithValidationSupport(IProject project, String builderId, String natureId) throws CoreException {
+ IProjectDescription desc = project.getDescription();
+ ICommand[] existing = desc.getBuildSpec();
+ boolean updated = false;
+ int javaBuilderIndex = -1;
+ ICommand javaBuilder = null;
+ int wstValidationBuilderIndex = -1;
+ ICommand wstValidationBuilder = null;
+ int builderIndex = -1;
+ ICommand builder = null;
+ for (int i = 0; i < existing.length; i++) {
+ if(JAVA_BUILDER_ID.equals(existing[i].getBuilderName())) {
+ javaBuilderIndex = i;
+ javaBuilder = existing[i];
+ } else if(ValidationPlugin.VALIDATION_BUILDER_ID.equals(existing[i].getBuilderName())) {
+ wstValidationBuilderIndex = i;
+ wstValidationBuilder = existing[i];
+ } else if(builderId.equals(existing[i].getBuilderName())) {
+ builderIndex = i;
+ builder = existing[i];
+ }
+ }
+
+ if(javaBuilderIndex==-1) {
+ getDefault().logError("Can't enable " + builderId + " support on the project " + project.getName() + " without Java builder."); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$
+ return;
+ }
+
+ if(wstValidationBuilderIndex!=-1 && wstValidationBuilderIndex<javaBuilderIndex) {
+ existing[javaBuilderIndex] = wstValidationBuilder;
+ existing[wstValidationBuilderIndex] = javaBuilder;
+ int oldWstIndex = wstValidationBuilderIndex;
+ wstValidationBuilderIndex = javaBuilderIndex;
+ javaBuilderIndex = oldWstIndex;
+ updated = true;
+ }
+
+ if(builderIndex==-1) {
+ if(updated) {
+ desc.setBuildSpec(existing);
+ project.setDescription(desc, null);
+ updated = false;
+ }
+ EclipseResourceUtil.addNatureToProject(project, natureId);
+ desc = project.getDescription();
+ existing = desc.getBuildSpec();
+ builderIndex = existing.length-1;
+ builder = getBuilder(project, builderId);
+ }
+
+ if(wstValidationBuilderIndex==-1) {
+ existing = appendBuilder(project, existing, ValidationPlugin.VALIDATION_BUILDER_ID);
+ wstValidationBuilderIndex = existing.length-1;
+ wstValidationBuilder = existing[wstValidationBuilderIndex];
+ updated = true;
+ }
+
+ if(wstValidationBuilderIndex<builderIndex) {
+ existing[wstValidationBuilderIndex] = builder;
+ existing[builderIndex] = wstValidationBuilder;
+ int oldWstIndex = wstValidationBuilderIndex;
+ wstValidationBuilderIndex = builderIndex;
+ builderIndex = oldWstIndex;
+ updated = true;
+ }
+
+ if(builderIndex<javaBuilderIndex) {
+ existing[javaBuilderIndex] = builder;
+ existing[builderIndex] = javaBuilder;
+ int oldJavaIndex = javaBuilderIndex;
+ javaBuilderIndex = builderIndex;
+ builderIndex = oldJavaIndex;
+ updated = true;
+ }
+
+ if(updated) {
+ desc.setBuildSpec(existing);
+ project.setDescription(desc, null);
+ }
+ }
+
+ private static ICommand getBuilder(IProject project, String builderId) throws CoreException {
+ IProjectDescription desc = project.getDescription();
+ ICommand[] existing = desc.getBuildSpec();
+ for (ICommand command : existing) {
+ if(builderId.equals(command.getBuilderName())) {
+ return command;
+ }
+ }
+ return null;
+ }
+
+ private static ICommand[] appendBuilder(IProject project, ICommand[] commands, String builderId) throws CoreException {
+ ICommand[] cmds = new ICommand[commands.length + 1];
+ ICommand newcmd = project.getDescription().newCommand();
+ newcmd.setBuilderName(builderId);
+ cmds[commands.length] = newcmd;
+ System.arraycopy(commands, 0, cmds, 0, commands.length);
+ return cmds;
+ }
}
\ No newline at end of file
Modified: branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2011-05-30 16:17:53 UTC (rev 31639)
+++ branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2011-05-30 16:47:09 UTC (rev 31640)
@@ -1,12 +1,14 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.jboss.tools.jst.web.test
+Bundle-SymbolicName: org.jboss.tools.jst.web.test;singleton:=true
Bundle-Version: 3.2.0.qualifier
Require-Bundle: org.jboss.tools.jst.web,
org.junit,
org.jboss.tools.tests,
- org.eclipse.jst.standard.schemas
+ org.eclipse.jst.standard.schemas,
+ org.eclipse.ui,
+ org.eclipse.wst.validation
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.jst.web.test
Added: branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/plugin.xml
===================================================================
--- branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/plugin.xml (rev 0)
+++ branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/plugin.xml 2011-05-30 16:47:09 UTC (rev 31640)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+ <extension
+ id="testbuilder"
+ name="JBoss Tools JST Test Builder"
+ point="org.eclipse.core.resources.builders">
+ <builder
+ hasNature="false">
+ <run
+ class="org.jboss.tools.jst.web.test.TestBuilder">
+ </run>
+ </builder>
+ </extension>
+ <extension
+ id="testnature"
+ name="JBoss Tools JST Test Nature"
+ point="org.eclipse.core.resources.natures">
+ <runtime>
+ <run
+ class="org.jboss.tools.jst.web.test.TestNature">
+ </run>
+ </runtime>
+ <builder
+ id="org.jboss.tools.jst.web.test.testbuilder">
+ </builder>
+ </extension>
+</plugin>
\ No newline at end of file
Property changes on: branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/plugin.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/.classpath
===================================================================
--- branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/.classpath (rev 0)
+++ branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/.classpath 2011-05-30 16:47:09 UTC (rev 31640)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/.project
===================================================================
--- branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/.project (rev 0)
+++ branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/.project 2011-05-30 16:47:09 UTC (rev 31640)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>testProject</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/projects/testProject/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/BuilderTest.java
===================================================================
--- branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/BuilderTest.java (rev 0)
+++ branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/BuilderTest.java 2011-05-30 16:47:09 UTC (rev 31640)
@@ -0,0 +1,208 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jst.web.test;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.ICommand;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.jboss.tools.common.EclipseUtil;
+import org.jboss.tools.jst.web.WebModelPlugin;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class BuilderTest extends TestCase {
+
+ private static final String PLUGIN_ID = "org.jboss.tools.jst.web.test";
+ private static final String PROJECT_PATH = "/projects/testProject";
+ private static final String JAVA_BUILDER_ID = "org.eclipse.jdt.core.javabuilder"; //$NON-NLS-1$
+
+ protected IProject project;
+
+ @Override
+ protected void setUp() throws Exception {
+ project = ResourcesUtils.importProject(PLUGIN_ID, PROJECT_PATH);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ ResourcesUtils.deleteProject(project.getName());
+ JobUtils.waitForIdle();
+ }
+
+ public void testJavaProject() throws Exception {
+ TestNature.APPEND_BUILDER = true;
+ assertEquals(1, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(JAVA_BUILDER_ID));
+
+ asserBuilderOrder();
+ }
+
+ public void testJavaWstProject() throws Exception {
+ TestNature.APPEND_BUILDER = true;
+ addBuilderToProject(false, project, ValidationPlugin.VALIDATION_BUILDER_ID);
+ assertEquals(2, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(JAVA_BUILDER_ID));
+ assertEquals(1, getBuilderIndex(ValidationPlugin.VALIDATION_BUILDER_ID));
+
+ asserBuilderOrder();
+ }
+
+ public void testWstJavaProject() throws Exception {
+ TestNature.APPEND_BUILDER = true;
+ addBuilderToProject(true, project, ValidationPlugin.VALIDATION_BUILDER_ID);
+ assertEquals(2, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(ValidationPlugin.VALIDATION_BUILDER_ID));
+ assertEquals(1, getBuilderIndex(JAVA_BUILDER_ID));
+
+ asserBuilderOrder();
+ }
+
+ public void testJavaTestProject() throws Exception {
+ TestNature.APPEND_BUILDER = true;
+ EclipseUtil.addNatureToProject(project, TestNature.ID);
+ assertEquals(2, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(JAVA_BUILDER_ID));
+ assertEquals(1, getBuilderIndex(TestBuilder.ID));
+
+ asserBuilderOrder();
+ }
+
+ public void testTestJavaProject() throws Exception {
+ TestNature.APPEND_BUILDER = false;
+ EclipseUtil.addNatureToProject(project, TestNature.ID);
+ assertEquals(2, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(TestBuilder.ID));
+ assertEquals(1, getBuilderIndex(JAVA_BUILDER_ID));
+
+ asserBuilderOrder();
+ }
+
+ public void testJavaWstTestProject() throws Exception {
+ TestNature.APPEND_BUILDER = true;
+ addBuilderToProject(false, project, ValidationPlugin.VALIDATION_BUILDER_ID);
+ EclipseUtil.addNatureToProject(project, TestNature.ID);
+ assertEquals(3, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(JAVA_BUILDER_ID));
+ assertEquals(1, getBuilderIndex(ValidationPlugin.VALIDATION_BUILDER_ID));
+ assertEquals(2, getBuilderIndex(TestBuilder.ID));
+
+ asserBuilderOrder();
+ }
+
+ public void testWstJavaTestProject() throws Exception {
+ TestNature.APPEND_BUILDER = true;
+ addBuilderToProject(true, project, ValidationPlugin.VALIDATION_BUILDER_ID);
+ EclipseUtil.addNatureToProject(project, TestNature.ID);
+ assertEquals(3, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(ValidationPlugin.VALIDATION_BUILDER_ID));
+ assertEquals(1, getBuilderIndex(JAVA_BUILDER_ID));
+ assertEquals(2, getBuilderIndex(TestBuilder.ID));
+
+ asserBuilderOrder();
+ }
+
+ public void testTestJavaWstProject() throws Exception {
+ TestNature.APPEND_BUILDER = false;
+ EclipseUtil.addNatureToProject(project, TestNature.ID);
+ addBuilderToProject(false, project, ValidationPlugin.VALIDATION_BUILDER_ID);
+ assertEquals(3, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(TestBuilder.ID));
+ assertEquals(1, getBuilderIndex(JAVA_BUILDER_ID));
+ assertEquals(2, getBuilderIndex(ValidationPlugin.VALIDATION_BUILDER_ID));
+
+ asserBuilderOrder();
+ }
+
+ public void testWstTestJavaProject() throws Exception {
+ TestNature.APPEND_BUILDER = false;
+ EclipseUtil.addNatureToProject(project, TestNature.ID);
+ addBuilderToProject(true, project, ValidationPlugin.VALIDATION_BUILDER_ID);
+ assertEquals(3, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(ValidationPlugin.VALIDATION_BUILDER_ID));
+ assertEquals(1, getBuilderIndex(TestBuilder.ID));
+ assertEquals(2, getBuilderIndex(JAVA_BUILDER_ID));
+
+ asserBuilderOrder();
+ }
+
+ public void testTestWstJavaProject() throws Exception {
+ TestNature.APPEND_BUILDER = false;
+ addBuilderToProject(true, project, ValidationPlugin.VALIDATION_BUILDER_ID);
+ EclipseUtil.addNatureToProject(project, TestNature.ID);
+ assertEquals(3, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(TestBuilder.ID));
+ assertEquals(1, getBuilderIndex(ValidationPlugin.VALIDATION_BUILDER_ID));
+ assertEquals(2, getBuilderIndex(JAVA_BUILDER_ID));
+
+ asserBuilderOrder();
+ }
+
+ public void testJavaTestWstProject() throws Exception {
+ TestNature.APPEND_BUILDER = true;
+ EclipseUtil.addNatureToProject(project, TestNature.ID);
+ addBuilderToProject(false, project, ValidationPlugin.VALIDATION_BUILDER_ID);
+ assertEquals(3, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(JAVA_BUILDER_ID));
+ assertEquals(1, getBuilderIndex(TestBuilder.ID));
+ assertEquals(2, getBuilderIndex(ValidationPlugin.VALIDATION_BUILDER_ID));
+
+ asserBuilderOrder();
+ }
+
+ public void asserBuilderOrder() throws Exception {
+ TestNature.APPEND_BUILDER = true;
+ WebModelPlugin.addNatureToProjectWithValidationSupport(project, TestBuilder.ID, TestNature.ID);
+ assertEquals(3, getBuilderNumbers());
+ assertEquals(0, getBuilderIndex(JAVA_BUILDER_ID));
+ assertEquals(1, getBuilderIndex(TestBuilder.ID));
+ assertEquals(2, getBuilderIndex(ValidationPlugin.VALIDATION_BUILDER_ID));
+ }
+
+ public static void addBuilderToProject(boolean beginning, IProject project, String builderId) throws CoreException {
+ IProjectDescription desc = project.getDescription();
+ ICommand[] existing = desc.getBuildSpec();
+ ICommand[] cmds = new ICommand[existing.length + 1];
+ ICommand newcmd = project.getDescription().newCommand();
+ newcmd.setBuilderName(builderId);
+ if(beginning) {
+ cmds[0] = newcmd;
+ System.arraycopy(existing, 0, cmds, 1, existing.length );
+ } else {
+ cmds[existing.length] = newcmd;
+ System.arraycopy(existing, 0, cmds, 0, existing.length);
+ }
+ desc.setBuildSpec(cmds);
+ project.setDescription(desc, null);
+ }
+
+ public int getBuilderIndex(String builderId) throws CoreException {
+ IProjectDescription desc = project.getDescription();
+ ICommand[] commands = desc.getBuildSpec();
+ for (int i = 0; i < commands.length; i++) {
+ if(builderId.equals(commands[i].getBuilderName())) {
+ return i;
+ }
+ }
+ return -1;
+ }
+
+ public int getBuilderNumbers() throws CoreException {
+ IProjectDescription desc = project.getDescription();
+ return desc.getBuildSpec().length;
+ }
+}
\ No newline at end of file
Property changes on: branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/BuilderTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java
===================================================================
--- branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java 2011-05-30 16:17:53 UTC (rev 31639)
+++ branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java 2011-05-30 16:47:09 UTC (rev 31640)
@@ -18,6 +18,7 @@
public static Test suite() {
TestSuite suite = new TestSuite(JstWebAllTests.class.getName());
suite.addTestSuite(WebContentAssistProviderTest.class);
+ suite.addTestSuite(BuilderTest.class);
return suite;
}
}
\ No newline at end of file
Added: branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/TestBuilder.java
===================================================================
--- branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/TestBuilder.java (rev 0)
+++ branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/TestBuilder.java 2011-05-30 16:47:09 UTC (rev 31640)
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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.tools.jst.web.test;
+
+import java.util.Map;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class TestBuilder extends IncrementalProjectBuilder {
+
+ public static final String ID = "org.jboss.tools.jst.web.test.testbuilder";
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.core.resources.IncrementalProjectBuilder#build(int, java.util.Map, org.eclipse.core.runtime.IProgressMonitor)
+ */
+ @Override
+ protected IProject[] build(int arg0, Map arg1, IProgressMonitor arg2)
+ throws CoreException {
+ return null;
+ }
+}
\ No newline at end of file
Property changes on: branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/TestBuilder.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/TestNature.java
===================================================================
--- branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/TestNature.java (rev 0)
+++ branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/TestNature.java 2011-05-30 16:47:09 UTC (rev 31640)
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jst.web.test;
+
+import org.eclipse.core.resources.ICommand;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IProjectNature;
+import org.eclipse.core.runtime.CoreException;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class TestNature implements IProjectNature {
+
+ IProject project;
+ static String ID = "org.jboss.tools.jst.web.test.testnature";
+ static boolean APPEND_BUILDER = true;
+
+ public void configure() throws CoreException {
+ addToBuildSpec(TestBuilder.ID);
+ }
+
+ public void deconfigure() throws CoreException {
+ }
+
+ public IProject getProject() {
+ return project;
+ }
+
+ public void setProject(IProject project) {
+ this.project = project;
+ }
+
+ protected void addToBuildSpec(String builderID) throws CoreException {
+ IProjectDescription description = getProject().getDescription();
+ ICommand command = null;
+ ICommand commands[] = description.getBuildSpec();
+ for (int i = 0; i < commands.length && command == null; ++i) {
+ if (commands[i].getBuilderName().equals(builderID))
+ command = commands[i];
+ }
+ if (command == null) {
+ command = description.newCommand();
+ command.setBuilderName(builderID);
+ ICommand[] oldCommands = description.getBuildSpec();
+ ICommand[] newCommands = new ICommand[oldCommands.length + 1];
+
+ if(APPEND_BUILDER) {
+ System.arraycopy(oldCommands, 0, newCommands, 0, oldCommands.length);
+ newCommands[oldCommands.length] = command;
+ } else {
+ System.arraycopy(oldCommands, 0, newCommands, 1, oldCommands.length);
+ newCommands[0] = command;
+ }
+ description.setBuildSpec(newCommands);
+ getProject().setDescription(description, null);
+ }
+ }
+}
\ No newline at end of file
Property changes on: branches/jbosstools-3.2.x/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/TestNature.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: branches/jbosstools-3.2.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java
===================================================================
--- branches/jbosstools-3.2.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java 2011-05-30 16:17:53 UTC (rev 31639)
+++ branches/jbosstools-3.2.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java 2011-05-30 16:47:09 UTC (rev 31640)
@@ -20,6 +20,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IField;
import org.eclipse.jdt.core.IJavaProject;
@@ -36,6 +37,8 @@
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.text.ITextSourceReference;
+import org.jboss.tools.jst.web.WebModelPlugin;
+import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.seam.core.project.facet.SeamRuntime;
import org.jboss.tools.seam.internal.core.AbstractContextVariable;
import org.jboss.tools.seam.internal.core.SeamComponentDeclaration;
@@ -45,6 +48,22 @@
*/
public class SeamUtil {
+ public static void enableSeamSupport(IProject project) {
+ if(project==null) {
+ return;
+ }
+ try {
+// EclipseResourceUtil.addNatureToProject(project, ISeamProject.NATURE_ID);
+ if(!project.hasNature(IKbProject.NATURE_ID)) {
+ EclipseResourceUtil.addNatureToProject(project, IKbProject.NATURE_ID);
+ }
+// EclipseResourceUtil.addBuilderToProject(project, ValidationPlugin.VALIDATION_BUILDER_ID);
+ WebModelPlugin.addNatureToProjectWithValidationSupport(project, SeamCoreBuilder.BUILDER_ID, ISeamProject.NATURE_ID);
+ } catch (CoreException e) {
+ SeamCorePlugin.getPluginLog().logError(e);
+ }
+ }
+
/**
* Returns Seam version from <Seam Runtime>/lib/jboss-seam.jar/META-INF/MANIFEST.MF
* from Seam Runtime which is set for the project.
Modified: branches/jbosstools-3.2.x/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
===================================================================
--- branches/jbosstools-3.2.x/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2011-05-30 16:17:53 UTC (rev 31639)
+++ branches/jbosstools-3.2.x/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2011-05-30 16:47:09 UTC (rev 31640)
@@ -53,14 +53,12 @@
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.ui.IValidator;
import org.jboss.tools.common.ui.preferences.SettingsPage;
import org.jboss.tools.common.ui.widget.editor.IFieldEditor;
import org.jboss.tools.common.ui.widget.editor.IFieldEditorFactory;
import org.jboss.tools.common.ui.wizard.IParameter;
-import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.SeamProjectsSet;
@@ -758,8 +756,8 @@
@Override
public boolean performOk() {
if (isSeamSupported()) {
- addSeamSupport(project);
- addSeamSupport(warProject);
+ SeamUtil.enableSeamSupport(project);
+ SeamUtil.enableSeamSupport(warProject);
if (warProject != null) {
IEclipsePreferences prefs = SeamCorePlugin.getSeamPreferences(warProject);
prefs.putBoolean(ISeamFacetDataModelProperties.SEAM_SETTINGS_CHANGED_BY_USER, true);
@@ -957,21 +955,6 @@
}
}
- private void addSeamSupport(IProject project) {
- if(project==null) {
- return;
- }
- try {
- EclipseResourceUtil.addNatureToProject(project, ISeamProject.NATURE_ID);
- if(!project.hasNature(IKbProject.NATURE_ID)) {
- EclipseResourceUtil.addNatureToProject(project, IKbProject.NATURE_ID);
- }
- EclipseResourceUtil.addBuilderToProject(project, ValidationPlugin.VALIDATION_BUILDER_ID);
- } catch (CoreException e) {
- SeamGuiPlugin.getPluginLog().logError(e);
- }
- }
-
private SeamVersion[] getSeamVersions() {
// Let's allow user to select any available seam version regardless of installed seam facet. But we should warn user if he selects different versions of facet and seam runtime.
return SeamVersion.ALL_VERSIONS;
13 years, 7 months
JBoss Tools SVN: r31639 - in trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp: contentassist/computers and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: vrubezhny
Date: 2011-05-30 12:17:53 -0400 (Mon, 30 May 2011)
New Revision: 31639
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/FaceletsELCompletionProposalComputer.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java
Log:
JBIDE-3845
Code assist for #{messages['...']} should suggest properties when user types "[".
Fixed for ELs in JSP/XHTML tag attribute values and partially for ELs in XHTML Text
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java 2011-05-30 16:10:31 UTC (rev 31638)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java 2011-05-30 16:17:53 UTC (rev 31639)
@@ -52,7 +52,7 @@
ITextViewerConfiguration {
private static final char[] PROPOSAL_AUTO_ACTIVATION_CHARS = new char[] {
- '<', '=', '"', '\'', '.', '{'
+ '<', '=', '"', '\'', '.', '{', '['
};
TextViewerConfigurationDelegate configurationDelegate;
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java 2011-05-30 16:10:31 UTC (rev 31638)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java 2011-05-30 16:17:53 UTC (rev 31639)
@@ -38,7 +38,7 @@
@SuppressWarnings("restriction")
public class JSPTextViewerConfiguration extends StructuredTextViewerConfigurationJSP implements ITextViewerConfiguration {
private static final char[] PROPOSAL_AUTO_ACTIVATION_CHARS = new char[] {
- '<', '=', '"', '\'', '.', '{'
+ '<', '=', '"', '\'', '.', '{', '['
};
private TextViewerConfigurationDelegate configurationDelegate;
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/FaceletsELCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/FaceletsELCompletionProposalComputer.java 2011-05-30 16:10:31 UTC (rev 31638)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/FaceletsELCompletionProposalComputer.java 2011-05-30 16:17:53 UTC (rev 31639)
@@ -14,6 +14,8 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
import org.eclipse.swt.graphics.Image;
import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocument;
import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
@@ -191,8 +193,54 @@
String replacementString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString();
int cursorPosition = replacementString.length();
- if (!prefix.isELClosed()) {
- replacementString += "}"; //$NON-NLS-1$
+ // Check if it is a long named property to be inserted
+ if (replacementString.indexOf('[') != -1) {
+ // That's it - The long message property
+
+ // Need to get the rest of line from context.getInvocationOffset()
+ IDocument doc = context.getDocument();
+
+ String restOfLine = "";
+ String restOfValue = "";
+ int endPosition = -1;
+ try {
+ int line = doc.getLineOfOffset(context.getInvocationOffset());
+ int lineStart = doc.getLineOffset(line);
+ int lineLength = doc.getLineLength(line);
+ String sDoc = doc.get();
+ restOfValue = restOfLine = sDoc.substring(context.getInvocationOffset(), lineStart + lineLength);
+ if (endPosition != -1) {
+ // Use end of line
+ restOfValue = restOfValue.substring(0, endPosition);
+ }
+ } catch (BadLocationException e) {
+ // Ignore it
+ }
+
+ // Check if the replacementString is already configured
+ if (replacementString.indexOf(']') == -1) {
+ // Is closing ']' is in it?
+ int paraIndex = restOfValue.indexOf(']');
+ // Is the quotation is in it?
+ int quoteIndex = restOfValue.indexOf('\'');
+ if (quoteIndex == -1 || (paraIndex != -1 && quoteIndex > paraIndex)) {
+ // Need to insert closing single-quote
+ replacementString += '\'';
+ }
+ if (paraIndex == -1) {
+ // Closing ']' is to be added
+ replacementString += ']';
+ }
+ }
+
+ if (restOfLine.indexOf('}') == -1) {
+ // Add closing }-char
+ replacementString += '}';
+ }
+ } else {
+ if (!prefix.isELClosed()) {
+ replacementString += "}"; //$NON-NLS-1$
+ }
}
Image image = textProposal.getImage();
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2011-05-30 16:10:31 UTC (rev 31638)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2011-05-30 16:17:53 UTC (rev 31639)
@@ -220,18 +220,22 @@
// Ignore it
}
- // Is closing ']' is in it?
- int paraIndex = restOfValue.indexOf(']');
- // Is the quotation is in it?
- int quoteIndex = restOfValue.indexOf('\'');
- if (quoteIndex == -1 || (paraIndex != -1 && quoteIndex > paraIndex)) {
- // Need to insert closing single-quote
- replacementString += '\'';
+ // Check if the replacementString is already configured
+ if (replacementString.indexOf(']') == -1) {
+ // Is closing ']' is in it?
+ int paraIndex = restOfValue.indexOf(']');
+ // Is the quotation is in it?
+ int quoteIndex = restOfValue.indexOf('\'');
+ if (quoteIndex == -1 || (paraIndex != -1 && quoteIndex > paraIndex)) {
+ // Need to insert closing single-quote
+ replacementString += '\'';
+ }
+ if (paraIndex == -1) {
+ // Closing ']' is to be added
+ replacementString += ']';
+ }
}
- if (paraIndex == -1) {
- // Closing ']' is to be added
- replacementString += ']';
- }
+
if (prefix.isAttributeValue() && prefix.hasOpenQuote() && endPosition == -1) {
// Add closing attr-quote
replacementString += quoteChar;
@@ -328,10 +332,55 @@
String replacementString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString();
int cursorPosition = replacementString.length();
- if (!prefix.isELClosed()) {
- replacementString += "}"; //$NON-NLS-1$
+ // Check if it is a long named property to be inserted
+ if (replacementString.indexOf('[') != -1) {
+ // That's it - The long message property
+
+ // Need to get the rest of line from context.getInvocationOffset()
+ IDocument doc = context.getDocument();
+
+ String restOfLine = "";
+ String restOfValue = "";
+ int endPosition = -1;
+ try {
+ int line = doc.getLineOfOffset(context.getInvocationOffset());
+ int lineStart = doc.getLineOffset(line);
+ int lineLength = doc.getLineLength(line);
+ String sDoc = doc.get();
+ restOfValue = restOfLine = sDoc.substring(context.getInvocationOffset(), lineStart + lineLength);
+ if (endPosition != -1) {
+ // Use end of line
+ restOfValue = restOfValue.substring(0, endPosition);
+ }
+ } catch (BadLocationException e) {
+ // Ignore it
+ }
+
+ // Check if the replacementString is already configured
+ if (replacementString.indexOf(']') == -1) {
+ // Is closing ']' is in it?
+ int paraIndex = restOfValue.indexOf(']');
+ // Is the quotation is in it?
+ int quoteIndex = restOfValue.indexOf('\'');
+ if (quoteIndex == -1 || (paraIndex != -1 && quoteIndex > paraIndex)) {
+ // Need to insert closing single-quote
+ replacementString += '\'';
+ }
+ if (paraIndex == -1) {
+ // Closing ']' is to be added
+ replacementString += ']';
+ }
+ }
+
+ if (restOfLine.indexOf('}') == -1) {
+ // Add closing }-char
+ replacementString += '}';
+ }
+ } else {
+ if (!prefix.isELClosed()) {
+ replacementString += "}"; //$NON-NLS-1$
+ }
}
-
Image image = textProposal.getImage();
// JBIDE-512, JBIDE-2541 related changes ===>>>
13 years, 7 months
JBoss Tools SVN: r31638 - trunk/build/parent.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-05-30 12:10:31 -0400 (Mon, 30 May 2011)
New Revision: 31638
Modified:
trunk/build/parent/pom.xml
Log:
bump from M7 to RC2
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2011-05-30 16:10:19 UTC (rev 31637)
+++ trunk/build/parent/pom.xml 2011-05-30 16:10:31 UTC (rev 31638)
@@ -32,7 +32,7 @@
<jbosstools-target-site>http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo/l...</jbosstools-target-site>
<!-- 1b. or use -Plocal.site -Dlocal.site=file:///home/$user/trunk/build/target-platform/REPO/ -->
- <local.site>file:///home/hudson/static_build_env/jbds/target-platform_3.3.indigo/e37M7-wtp33M7.target/</local.site>
+ <local.site>file:///home/hudson/static_build_env/jbds/target-platform_3.3.indigo/e37RC2-wtp33RC2.target/</local.site>
<!-- 2a. URL of latest JBT nightly staging composite site (all the components in once place) -->
<jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/</jbosstools-nightly-staging-composite>
@@ -41,7 +41,7 @@
<local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/3.3.indigo/</local.composite>
<!-- 3a. URL of latest JBT requirements composite mirror -->
- <jboss-requirements-composite-mirror>http://download.jboss.org/jbosstools/updates/indigo/M7/</jboss-requirements-composite-mirror>
+ <jboss-requirements-composite-mirror>http://download.jboss.org/jbosstools/updates/indigo/RC2/</jboss-requirements-composite-mirror>
<!-- 3b., or use -Plocal.requirements -Dlocal.requirements=file:///path/to/mirror/of/composite/requirements/site -->
<local.requirements>file:///qa/services/http/binaries/RHDS/updates/indigo/</local.requirements>
13 years, 7 months