February 2010 - jbosstools-commits

JBoss Tools SVN: r20454 - workspace/Denny/esb-example-soa-p5.0.

by jbosstools-commits＠lists.jboss.org

Author: bfitzpat Date: 2010-02-23 17:05:06 -0500 (Tue, 23 Feb 2010) New Revision: 20454 Modified: workspace/Denny/esb-example-soa-p5.0/webservice_producer_client.zip Log: Fix for JBIDE-5659 Modified: workspace/Denny/esb-example-soa-p5.0/webservice_producer_client.zip =================================================================== (Binary files differ)

14 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r20453 - in branches/jbosstools-3.1.x/jsf: plugins/org.jboss.tools.jsf.vpe.facelets/templates and 11 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2010-02-23 15:11:55 -0500 (Tue, 23 Feb 2010) New Revision: 20453 Added: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml.xml branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/message.css branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/messages.css branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/page.css branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/panel.css branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/message.xhtml branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/messages.xhtml branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/page.xhtml branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/panel.xhtml branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/includes/ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/includes/navigation.xhtml branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/main.xhtml branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RenderFacetAndInsertChildrenTest.java Modified: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/templates/vpe-templates-facelets.xml branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java Log: https://jira.jboss.org/jira/browse/JBIDE-5908 Modified: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java =================================================================== --- branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java 2010-02-23 19:45:21 UTC (rev 20452) +++ branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java 2010-02-23 20:11:55 UTC (rev 20453) @@ -31,9 +31,14 @@ public class VpeInsertTemplate extends VpeAbstractTemplate { + private static final String DEFINE_ELEMENT_NAME_PARAM="defineElementName"; //$NON-NLS-1$ + private String defineElementName=Facelets.TAG_DEFINE; + + @Override protected void init(Element templateElement) { children = true; modify = false; + this.defineElementName = templateElement.getAttribute(DEFINE_ELEMENT_NAME_PARAM)!=null?templateElement.getAttribute(DEFINE_ELEMENT_NAME_PARAM):Facelets.TAG_DEFINE; initTemplateSections(templateElement, false, true, false, false, false); } @@ -89,7 +94,7 @@ Node child = children.item(i); if (child.getNodeType() == Node.ELEMENT_NODE) { Element childElement = (Element) child; - if (Facelets.TAG_DEFINE.equals(childElement.getLocalName()) + if (this.defineElementName.equals(childElement.getLocalName()) && defineName.equals(childElement .getAttribute(Facelets.ATTR_NAME))) { defineElement = childElement; @@ -113,7 +118,9 @@ Node child = children.item(i); if ((child.getNodeType() == Node.ELEMENT_NODE||child.getNodeType() == Node.TEXT_NODE)) { - if(child.getNodeType() == Node.ELEMENT_NODE&&!Facelets.TAG_DEFINE.equals(child.getLocalName())&&((Element)child).getAttribute("name")==null) { //$NON-NLS-1$ + if(child.getNodeType() == Node.ELEMENT_NODE&&!this.defineElementName.equals(child.getLocalName()) + //&&((Element)child).getAttribute("name")==null + ) { result.add(child); } else if(child.getNodeType() == Node.TEXT_NODE&&((Text)child).getNodeValue()!=null&& Modified: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/templates/vpe-templates-facelets.xml =================================================================== --- branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/templates/vpe-templates-facelets.xml 2010-02-23 19:45:21 UTC (rev 20452) +++ branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/templates/vpe-templates-facelets.xml 2010-02-23 20:11:55 UTC (rev 20453) @@ -32,7 +32,7 @@ </vpe:tag> <vpe:tag name="ui:insert" case-sensitive="yes" > - <vpe:template class="org.jboss.tools.jsf.vpe.facelets.template.VpeInsertTemplate"/> + <vpe:template class="org.jboss.tools.jsf.vpe.facelets.template.VpeInsertTemplate" defineElementName="define"/> </vpe:tag> <vpe:tag name="ui.component" case-sensitive="yes"> Modified: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml =================================================================== --- branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2010-02-23 19:45:21 UTC (rev 20452) +++ branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2010-02-23 20:11:55 UTC (rev 20453) @@ -1116,6 +1116,18 @@  </vpe:tag> + <vpe:tag name="composite:renderFacet"> + <vpe:template class="org.jboss.tools.jsf.vpe.facelets.template.VpeInsertTemplate" namespaceIdentifier="org.jboss.tools.jsf.vpe.facelets" + defineElementName="facet"> + </vpe:template> + </vpe:tag> + + <vpe:tag name="composite:insertChildren"> + <vpe:template class="org.jboss.tools.jsf.vpe.facelets.template.VpeInsertTemplate" namespaceIdentifier="org.jboss.tools.jsf.vpe.facelets" + defineElementName="facet"> + </vpe:template> + </vpe:tag> + <vpe:tag name="composite:interface" case-sensitive="yes">  @@ -1124,6 +1136,7 @@  </vpe:tag> + <vpe:tag name="composite:attribute" case-sensitive="yes">  Added: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml =================================================================== --- branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml (rev 0) +++ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml 2010-02-23 20:11:55 UTC (rev 20453) @@ -0,0 +1,14 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + + <ui:composition template="/templates/main.xhtml" id="jbide5908"> + <ui:define name="body"> + Welcome To RichFaces 4.x Demo + </ui:define> + + </ui:composition> + +</html> \ No newline at end of file Added: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml.xml =================================================================== --- branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml.xml (rev 0) +++ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml.xml 2010-02-23 20:11:55 UTC (rev 20453) @@ -0,0 +1,158 @@ +<tests> +<test id="jbide5908"> +<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;"> +<DIV STYLE="-moz-user-modify: read-only;"> +<DIV STYLE="display: none; -moz-user-modify: read-only;"> +</DIV> +<DIV STYLE="-moz-user-modify: read-only;"> +<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;"> +<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;"> +<DIV STYLE="-moz-user-modify: read-only;"> +<DIV STYLE="display: none; -moz-user-modify: read-only;"> +<H1 STYLE="-moz-user-modify: read-only;"> +page +</H1> +</DIV> +<DIV STYLE="-moz-user-modify: read-only;"> +<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;"> +<SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;"> +</SPAN> +<DIV STYLE="-moz-user-modify: read-only;"> +<DIV STYLE="display: none; -moz-user-modify: read-only;"> +<H1 STYLE="-moz-user-modify: read-only;"> +#{cc.attrs.pageTitle} +</H1> +<DIV STYLE="-moz-user-modify: read-only;"> +</DIV> +</DIV> +<DIV STYLE="-moz-user-modify: read-only;"> +<TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" CLASS="rich-page #{cc.attrs.pageClass}" STYLE="-moz-user-modify: read-only;"> +<TBODY STYLE="-moz-user-modify: read-only;"> +<TR STYLE="-moz-user-modify: read-only;"> +<TD CLASS="header_bg" STYLE="-moz-user-modify: read-only;"> +<DIV CLASS="header_content rich-page-header #{cc.attrs.headerClass}" STYLE="-moz-user-modify: read-only;"> +<DIV STYLE="-moz-user-modify: read-only;"> +<H1 STYLE="-moz-user-modify: read-only;"> +<SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;"> +Welcome to RichFaces demo! +</SPAN> +</H1> +</DIV> +</DIV> +</TD> +</TR> +<TR STYLE="-moz-user-modify: read-only;"> +<TD HEIGHT="100%" WIDTH="100%" CLASS="bg_tabbody" STYLE="-moz-user-modify: read-only;"> +<TABLE HEIGHT="100%" WIDTH="100%" CELLSPACING="0" CELLPADDING="0" BORDER="0" CLASS="rich-page-content #{cc.attrs.contentClass}" STYLE="-moz-user-modify: read-only;"> +<TBODY STYLE="-moz-user-modify: read-only;"> +<TR STYLE="-moz-user-modify: read-only;"> +<TD CLASS="menu_col rich-page-sidebar #{cc.attrs.sidebarClass}" STYLE="-moz-user-modify: read-only;"> +<DIV CLASS="menu_width spacer" STYLE="-moz-user-modify: read-only;"><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> + +</DIV> +<DIV STYLE="-moz-user-modify: read-only;"> +<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;"> +<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;"> +<DIV STYLE="-moz-user-modify: read-only;"> +<DIV STYLE="display: none; -moz-user-modify: read-only;"> +<H1 STYLE="-moz-user-modify: read-only;"> +panel +</H1> +</DIV> +<DIV STYLE="-moz-user-modify: read-only;"> +<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;"> +<DIV CLASS="rich-panel #{compositeComponent.attrs.styleClass}" STYLE="-moz-user-modify: read-only;"> +<SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;"> +<DIV CLASS="rich-panel-header #{compositeComponent.attrs.headerClass}" STYLE="-moz-user-modify: read-only;"> +<DIV STYLE="-moz-user-modify: read-only;"> +<SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;"> +Navigation +</SPAN> +</DIV> +</DIV> +</SPAN> +<DIV CLASS="rich-panel-body #{compositeComponent.attrs.bodyClass}" STYLE="-moz-user-modify: read-only;"> +<TABLE BORDER="0" STYLE="-moz-user-modify: read-only;"> +<TBODY> +<TR> +<TD><A STYLE="-moz-user-modify: read-only;" CLASS=""><SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">a4j:ajax</SPAN></A> +</TD> +</TR> +<TR> +<TD><A STYLE="-moz-user-modify: read-only;" CLASS=""><SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">a4j:jsFunction</SPAN></A> +</TD> +</TR> +<TR> +<TD><A STYLE="-moz-user-modify: read-only;" CLASS=""><SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">a4j:mediaOutput</SPAN></A> +</TD> +</TR> +<TR> +<TD><A STYLE="-moz-user-modify: read-only;" CLASS=""><SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">a4j:push</SPAN></A> +</TD> +</TR> +<TR> +<TD><A STYLE="-moz-user-modify: read-only;" CLASS=""><SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">a4j:status</SPAN></A> +</TD> +</TR> +<TR> +<TD><A STYLE="-moz-user-modify: read-only;" CLASS=""><SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">a4j:outputPanel</SPAN></A> +</TD> +</TR> +<TR> +<TD><A STYLE="-moz-user-modify: read-only;" CLASS=""><SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">a4j:commandButton</SPAN></A> +</TD> +</TR> +<TR> +<TD><A STYLE="-moz-user-modify: read-only;" CLASS=""><SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">a4j:commandLink</SPAN></A> +</TD> +</TR> +<TR> +<TD><A STYLE="-moz-user-modify: read-only;" CLASS=""><SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">a4j:log</SPAN></A> +</TD> +</TR> +</TBODY> +</TABLE> +</DIV> +</DIV> +</DIV> +</DIV> +</DIV> +</DIV> +</DIV> +</DIV> +</TD> +<TD CLASS="content_col rich-page-body #{cc.attrs.bodyClass}" STYLE="-moz-user-modify: read-only;"> +<SPAN CLASS="vpe-text"> +Welcome To RichFaces 4.x Demo +</SPAN> +</TD> +</TR> +</TBODY> +</TABLE> +</TD> +</TR> +<TR STYLE="-moz-user-modify: read-only;"> +<TD CLASS="footer_bg" STYLE="-moz-user-modify: read-only;"> +<DIV CLASS="footer_bg_content rich-page-footer #{cc.attrs.footerClass}" STYLE="-moz-user-modify: read-only;"> +<DIV STYLE="-moz-user-modify: read-only;"> +<SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;"> +footer +</SPAN> +</DIV> +</DIV> +</TD> +</TR> +</TBODY> +</TABLE> +</DIV> +</DIV> +</DIV> +</DIV> +</DIV> +</DIV> +</DIV> +</DIV> +</DIV> +</DIV> +</test> +</tests> \ No newline at end of file Added: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/message.css =================================================================== --- branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/message.css (rev 0) +++ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/message.css 2010-02-23 20:11:55 UTC (rev 20453) @@ -0,0 +1,3 @@ +rich-message{ + color:red; +} \ No newline at end of file Added: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/messages.css =================================================================== --- branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/messages.css (rev 0) +++ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/messages.css 2010-02-23 20:11:55 UTC (rev 20453) @@ -0,0 +1,3 @@ +rich-messages{ + color:red; +} \ No newline at end of file Added: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/page.css =================================================================== --- branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/page.css (rev 0) +++ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/page.css 2010-02-23 20:11:55 UTC (rev 20453) @@ -0,0 +1,77 @@ +.rich-page{width:100%;} +.body{ + background: #FFFFFF; + margin:0px; +} +*{ + font-size:11px; +} +.header_bg{ + background-image:url(#{resource['rich/img/header_background.png']}); + border-bottom:1px solid; + border-bottom-color:#FFFFFF; + background-color:#BED6F8; + background-repeat:repeat-x; + background-position:top left; +} + +.footer_bg{ + background-image:url(#{resource['rich/img/footer_background.png']}); + border-top:1px solid; + border-top-color:#FFFFFF; + background-color:#BED6F8; + background-repeat:repeat-x; + background-position:center left; +} + +.menu_col{ + background:#FFFFFF; + vertical-align:top; + border-top:2px solid; + border-top-color:#BED6F8; + border-right:2px solid; + border-right-color:#BED6F8; + border-bottom:2px solid; + border-bottom-color:#BED6F8; +} + +.content_col{ + background:#FFFFFF; + vertical-align:top; + width:100%; + border-top:2px solid; + border-top-color:#BED6F8; + border-bottom:2px solid; + border-bottom-color:#BED6F8; +} +*.menu_col, *.content_col, *.footer_bg{ + font-family:Arial, Verdana, sans-serif ; + color:#000000; + font-size:11px; +} +*.header_content{ + font-family:Arial, Verdana, sans-serif; + color:#000000; + font-size:11px; +} + + +.page_size { + width : 100% + height : 100% +} + + +.header_content { + margin : 0px 0px 0px 0px + height : 95px position : relative +} + +.spacer{font-size : 1px} + + +.footer_bg_content { + margin : 0px 0px 0px 0px + height : 45px + position : relative +} \ No newline at end of file Added: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/panel.css =================================================================== --- branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/panel.css (rev 0) +++ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/panel.css 2010-02-23 20:11:55 UTC (rev 20453) @@ -0,0 +1,26 @@ +.rich-panel{ + border-width: 1px; + border-style: solid; + padding : 1px; + color:#000000; + font-family:Arial,Verdana,sans-serif; + font-size:11px; + background-color:#FFFFFF; + border-color:#BED6F8; +} + +.rich-panel-header{ + padding : 2px; + border-width: 1px; + border-style: solid; + background-color:#BED6F8; + border-color:#BED6F8; + font-weight:bold; + background-position:left top; + background-repeat:repeat-x; + background-image: url(#{resource['rich/img/panel_header.png']}) +} + +.rich-panel-body{ + padding : 10px; +} Added: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/message.xhtml =================================================================== --- branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/message.xhtml (rev 0) +++ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/message.xhtml 2010-02-23 20:11:55 UTC (rev 20453) @@ -0,0 +1,30 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:composite="http://java.sun.com/jsf/composite" + xmlns:a4j="http://richfaces.org/a4j"> +<head> +<title>panel</title> +</head> +<body> + +<composite:interface> + <composite:attribute name="for" required="true" /> + <composite:attribute name="style" required="false" /> + <composite:attribute name="styleClass" required="false" /> +</composite:interface> + +<composite:implementation> + <h:outputStylesheet name="rich/css/message.css" /> + <a4j:outputPanel ajaxRendered="true" layout="none"> + <h:message for="#{cc.attrs.for}" showDetail="#{cc.attrs.showDetails}" + showSummary="#{cc.attrs.showSummary}" style="#{cc.attrs.style}" + styleClass="rich-message #{cc.attrs.styleClass}" /> + </a4j:outputPanel> +</composite:implementation> +</body> +</html> Added: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/messages.xhtml =================================================================== --- branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/messages.xhtml (rev 0) +++ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/messages.xhtml 2010-02-23 20:11:55 UTC (rev 20453) @@ -0,0 +1,29 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:composite="http://java.sun.com/jsf/composite" + xmlns:a4j="http://richfaces.org/a4j"> +<head> +<title>panel</title> +</head> +<body> + +<composite:interface> + <composite:attribute name="style" required="false" /> + <composite:attribute name="styleClass" required="false" /> +</composite:interface> + +<composite:implementation> + <h:outputStylesheet name="rich/css/messages.css" /> + <a4j:outputPanel ajaxRendered="true" layout="none"> + <h:messages layout="#{cc.attrs.layout}" + showSummary="true" style="#{cc.attrs.style}" + styleClass="rich-message #{cc.attrs.styleClass}" /> + </a4j:outputPanel> +</composite:implementation> +</body> +</html> Added: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/page.xhtml =================================================================== --- branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/page.xhtml (rev 0) +++ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/page.xhtml 2010-02-23 20:11:55 UTC (rev 20453) @@ -0,0 +1,69 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:composite="http://java.sun.com/jsf/composite"> + <head> + <title>page</title> + </head> +<body> + +<composite:interface> + <composite:attribute name="style" /> + <composite:attribute name="styleClass"/> + <composite:attribute name="headerClass"/> + <composite:attribute name="bodyClass"/> + <composite:attribute name="sidebarClass"/> +</composite:interface> +<composite:implementation> +<h:outputText value="<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">" escape="false"/> +<html xmlns="http://www.w3.org/1999/xhtml"> +<h:head> + <title>#{cc.attrs.pageTitle}</title> + <composite:renderFacet name="pageHeader"/> +</h:head> +<h:body> + <h:outputStylesheet name="rich/css/page.css" /> + <table border="0" cellpadding="0" cellspacing="0" class="rich-page #{cc.attrs.pageClass}"> + <tbody> + <tr> + <td class="header_bg"> + <div class="header_content rich-page-header #{cc.attrs.headerClass}"> + <composite:renderFacet name="header"/> + </div> + </td> + </tr> + <tr> + <td width="100%" height="100%" class="bg_tabbody"> + <table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%" class="rich-page-content #{cc.attrs.contentClass}"> + <tbody> + <tr> + <td class="menu_col rich-page-sidebar #{cc.attrs.sidebarClass}"> + <div class="menu_width spacer" style="width:#{cc.attrs.sidebarWidth}px"></div> + <composite:renderFacet name="sidebar"/> + </td> + <td class="content_col rich-page-body #{cc.attrs.bodyClass}"> + <composite:insertChildren /> + </td> + </tr> + </tbody> + </table> + </td> + </tr> + <tr> + <td class="footer_bg"> + <div class="footer_bg_content rich-page-footer #{cc.attrs.footerClass}"> + <composite:renderFacet name="footer"/> + </div> + </td> + </tr> + </tbody> + </table> +</h:body> +</html> +</composite:implementation> +</body> +</html> Added: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/panel.xhtml =================================================================== --- branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/panel.xhtml (rev 0) +++ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/panel.xhtml 2010-02-23 20:11:55 UTC (rev 20453) @@ -0,0 +1,49 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:composite="http://java.sun.com/jsf/composite"> + <head> + <title>panel</title> + </head> +<body> + +<composite:interface> + <composite:attribute name="style" required="false"/> + <composite:attribute name="styleClass" required="false"/> + <composite:attribute name="headerClass" required="false"/> + <composite:attribute name="bodyClass" required="true"/> +</composite:interface> + +<composite:implementation> + <h:outputStylesheet name="rich/css/panel.css" /> + + <div class="rich-panel #{compositeComponent.attrs.styleClass}" + style="#{compositeComponent.attrs.style}" + onclick="#{compositeComponent.attrs.onclick}" + ondblclick="#{compositeComponent.attrs.ondblclick}" + onkeydown="#{compositeComponent.attrs.onkeydown}" + onkeypress="#{compositeComponent.attrs.onkeypress}" + onkeyup="#{compositeComponent.attrs.onkeyup}" + onmousedown="#{compositeComponent.attrs.onmousedown}" + onmousemove="#{compositeComponent.attrs.onmousemove}" + onmouseout="#{compositeComponent.attrs.onmouseout}" + onmouseover="#{compositeComponent.attrs.onmouseover}" + onmouseup="#{compositeComponent.attrs.onmouseup}"> + + <h:panelGroup rendered="#{not empty cc.facets.header}"> + <div class="rich-panel-header #{compositeComponent.attrs.headerClass}"> + <composite:renderFacet name="header"/> + </div> + </h:panelGroup> + <div class="rich-panel-body #{compositeComponent.attrs.bodyClass}" > + <composite:insertChildren /> + </div> + + </div> +</composite:implementation> +</body> +</html> Added: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/includes/navigation.xhtml =================================================================== --- branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/includes/navigation.xhtml (rev 0) +++ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/includes/navigation.xhtml 2010-02-23 20:11:55 UTC (rev 20453) @@ -0,0 +1,32 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://java.sun.com/jsf/composite/rich"> + <rich:panel> + <f:facet name="header"> + <h:outputText value="Navigation" /> + </f:facet> + <h:panelGrid columns="1"> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/ajax.jsf">a4j:ajax</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/jsFunction.jsf">a4j:jsFunction</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/mediaOutput.jsf">a4j:mediaOutput</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/push.jsf">a4j:push</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/status.jsf">a4j:status</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/outputPanel.jsf">a4j:outputPanel</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/commandButton.jsf">a4j:commandButton</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/commandLink.jsf">a4j:commandLink</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/log.jsf">a4j:log</h:outputLink> + </h:panelGrid> + </rich:panel> +</ui:composition> Added: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/main.xhtml =================================================================== --- branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/main.xhtml (rev 0) +++ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/main.xhtml 2010-02-23 20:11:55 UTC (rev 20453) @@ -0,0 +1,26 @@ +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:rich="http://java.sun.com/jsf/composite/rich"> +<h:head> +</h:head> +<h:body> + <ui:composition> + <rich:page id="page"> + <f:facet name="header"> + <h1>Welcome to RichFaces demo!</h1> + </f:facet> + <f:facet name="sidebar"> + <ui:include src="/templates/includes/navigation.xhtml" /> + </f:facet> + <ui:insert name="body"> + Body content missed + </ui:insert> + <f:facet name="footer"> + footer + </f:facet> + </rich:page> + </ui:composition> +</h:body> +</html> \ No newline at end of file Modified: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java =================================================================== --- branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-02-23 19:45:21 UTC (rev 20452) +++ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-02-23 20:11:55 UTC (rev 20453) @@ -77,6 +77,7 @@ import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnTLDPackedInJar_JBIDE5693; import org.jboss.tools.jsf.vpe.jsf.test.jbide.PreferencesForEditors_JBIDE5692; import org.jboss.tools.jsf.vpe.jsf.test.jbide.RefreshBundles_JBIDE5460; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.RenderFacetAndInsertChildrenTest; import org.jboss.tools.jsf.vpe.jsf.test.jbide.TaglibXMLUnformatedDTD_JBIDE5642; import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestFViewLocaleAttribute_JBIDE5218; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test; @@ -123,6 +124,7 @@ TestSuite suite = new TestSuite("Tests for Vpe Jsf components"); //$NON-NLS-1$ // $JUnit-BEGIN$ + suite.addTestSuite(RenderFacetAndInsertChildrenTest.class); suite.addTestSuite(EditFontFamilyTest_JBIDE5872.class); suite.addTestSuite(ChangeMessageBundleTest_JBIDE5818.class); suite.addTestSuite(TestForUsingComponentsLibrariesWithDefaultNamespace.class); Added: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RenderFacetAndInsertChildrenTest.java =================================================================== --- branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RenderFacetAndInsertChildrenTest.java (rev 0) +++ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RenderFacetAndInsertChildrenTest.java 2010-02-23 20:11:55 UTC (rev 20453) @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 2007-2010 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.vpe.jsf.test.jbide; + +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.vpe.ui.test.ComponentContentTest; + +/** + * https://jira.jboss.org/jira/browse/JBIDE-5908 + * + * @author mareshkau + * + */ +public class RenderFacetAndInsertChildrenTest extends ComponentContentTest{ + + public RenderFacetAndInsertChildrenTest(String name) { + super(name); + } + public void testRenderFacetAndInsertChildren() throws Throwable { + performContentTest("JBIDE/5908/welcome.xhtml"); //$NON-NLS-1$ + } + @Override + protected String getTestProjectName() { + return JsfAllTests.IMPORT_JSF_20_PROJECT_NAME; + } + +}

14 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r20452 - in trunk/jsf: tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908 and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2010-02-23 14:45:21 -0500 (Tue, 23 Feb 2010) New Revision: 20452 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml.xml Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml Log: https://jira.jboss.org/jira/browse/JBIDE-5908 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2010-02-23 18:54:25 UTC (rev 20451) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2010-02-23 19:45:21 UTC (rev 20452) @@ -1121,12 +1121,6 @@ defineElementName="facet"> </vpe:template> </vpe:tag> - - <vpe:tag name="composite:renderFacet"> - <vpe:template class="org.jboss.tools.jsf.vpe.facelets.template.VpeInsertTemplate" namespaceIdentifier="org.jboss.tools.jsf.vpe.facelets" - defineElementName="facet"> - </vpe:template> - </vpe:tag> <vpe:tag name="composite:insertChildren"> <vpe:template class="org.jboss.tools.jsf.vpe.facelets.template.VpeInsertTemplate" namespaceIdentifier="org.jboss.tools.jsf.vpe.facelets" defineElementName="facet"> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml.xml 2010-02-23 19:45:21 UTC (rev 20452) @@ -0,0 +1,158 @@ +<tests> +<test id="jbide5908"> +<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;"> +<DIV STYLE="-moz-user-modify: read-only;"> +<DIV STYLE="display: none; -moz-user-modify: read-only;"> +</DIV> +<DIV STYLE="-moz-user-modify: read-only;"> +<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;"> +<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;"> +<DIV STYLE="-moz-user-modify: read-only;"> +<DIV STYLE="display: none; -moz-user-modify: read-only;"> +<H1 STYLE="-moz-user-modify: read-only;"> +page +</H1> +</DIV> +<DIV STYLE="-moz-user-modify: read-only;"> +<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;"> +<SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;"> +</SPAN> +<DIV STYLE="-moz-user-modify: read-only;"> +<DIV STYLE="display: none; -moz-user-modify: read-only;"> +<H1 STYLE="-moz-user-modify: read-only;"> +#{cc.attrs.pageTitle} +</H1> +<DIV STYLE="-moz-user-modify: read-only;"> +</DIV> +</DIV> +<DIV STYLE="-moz-user-modify: read-only;"> +<TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" CLASS="rich-page #{cc.attrs.pageClass}" STYLE="-moz-user-modify: read-only;"> +<TBODY STYLE="-moz-user-modify: read-only;"> +<TR STYLE="-moz-user-modify: read-only;"> +<TD CLASS="header_bg" STYLE="-moz-user-modify: read-only;"> +<DIV CLASS="header_content rich-page-header #{cc.attrs.headerClass}" STYLE="-moz-user-modify: read-only;"> +<DIV STYLE="-moz-user-modify: read-only;"> +<H1 STYLE="-moz-user-modify: read-only;"> +<SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;"> +Welcome to RichFaces demo! +</SPAN> +</H1> +</DIV> +</DIV> +</TD> +</TR> +<TR STYLE="-moz-user-modify: read-only;"> +<TD HEIGHT="100%" WIDTH="100%" CLASS="bg_tabbody" STYLE="-moz-user-modify: read-only;"> +<TABLE HEIGHT="100%" WIDTH="100%" CELLSPACING="0" CELLPADDING="0" BORDER="0" CLASS="rich-page-content #{cc.attrs.contentClass}" STYLE="-moz-user-modify: read-only;"> +<TBODY STYLE="-moz-user-modify: read-only;"> +<TR STYLE="-moz-user-modify: read-only;"> +<TD CLASS="menu_col rich-page-sidebar #{cc.attrs.sidebarClass}" STYLE="-moz-user-modify: read-only;"> +<DIV CLASS="menu_width spacer" STYLE="-moz-user-modify: read-only;"><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> + +</DIV> +<DIV STYLE="-moz-user-modify: read-only;"> +<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;"> +<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;"> +<DIV STYLE="-moz-user-modify: read-only;"> +<DIV STYLE="display: none; -moz-user-modify: read-only;"> +<H1 STYLE="-moz-user-modify: read-only;"> +panel +</H1> +</DIV> +<DIV STYLE="-moz-user-modify: read-only;"> +<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;"> +<DIV CLASS="rich-panel #{compositeComponent.attrs.styleClass}" STYLE="-moz-user-modify: read-only;"> +<SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;"> +<DIV CLASS="rich-panel-header #{compositeComponent.attrs.headerClass}" STYLE="-moz-user-modify: read-only;"> +<DIV STYLE="-moz-user-modify: read-only;"> +<SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;"> +Navigation +</SPAN> +</DIV> +</DIV> +</SPAN> +<DIV CLASS="rich-panel-body #{compositeComponent.attrs.bodyClass}" STYLE="-moz-user-modify: read-only;"> +<TABLE BORDER="0" STYLE="-moz-user-modify: read-only;"> +<TBODY> +<TR> +<TD><A STYLE="-moz-user-modify: read-only;" CLASS=""><SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">a4j:ajax</SPAN></A> +</TD> +</TR> +<TR> +<TD><A STYLE="-moz-user-modify: read-only;" CLASS=""><SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">a4j:jsFunction</SPAN></A> +</TD> +</TR> +<TR> +<TD><A STYLE="-moz-user-modify: read-only;" CLASS=""><SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">a4j:mediaOutput</SPAN></A> +</TD> +</TR> +<TR> +<TD><A STYLE="-moz-user-modify: read-only;" CLASS=""><SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">a4j:push</SPAN></A> +</TD> +</TR> +<TR> +<TD><A STYLE="-moz-user-modify: read-only;" CLASS=""><SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">a4j:status</SPAN></A> +</TD> +</TR> +<TR> +<TD><A STYLE="-moz-user-modify: read-only;" CLASS=""><SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">a4j:outputPanel</SPAN></A> +</TD> +</TR> +<TR> +<TD><A STYLE="-moz-user-modify: read-only;" CLASS=""><SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">a4j:commandButton</SPAN></A> +</TD> +</TR> +<TR> +<TD><A STYLE="-moz-user-modify: read-only;" CLASS=""><SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">a4j:commandLink</SPAN></A> +</TD> +</TR> +<TR> +<TD><A STYLE="-moz-user-modify: read-only;" CLASS=""><SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;">a4j:log</SPAN></A> +</TD> +</TR> +</TBODY> +</TABLE> +</DIV> +</DIV> +</DIV> +</DIV> +</DIV> +</DIV> +</DIV> +</DIV> +</TD> +<TD CLASS="content_col rich-page-body #{cc.attrs.bodyClass}" STYLE="-moz-user-modify: read-only;"> +<SPAN CLASS="vpe-text"> +Welcome To RichFaces 4.x Demo +</SPAN> +</TD> +</TR> +</TBODY> +</TABLE> +</TD> +</TR> +<TR STYLE="-moz-user-modify: read-only;"> +<TD CLASS="footer_bg" STYLE="-moz-user-modify: read-only;"> +<DIV CLASS="footer_bg_content rich-page-footer #{cc.attrs.footerClass}" STYLE="-moz-user-modify: read-only;"> +<DIV STYLE="-moz-user-modify: read-only;"> +<SPAN CLASS="vpe-text" STYLE="-moz-user-modify: read-only;"> +footer +</SPAN> +</DIV> +</DIV> +</TD> +</TR> +</TBODY> +</TABLE> +</DIV> +</DIV> +</DIV> +</DIV> +</DIV> +</DIV> +</DIV> +</DIV> +</DIV> +</DIV> +</test> +</tests> \ No newline at end of file

14 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r20451 - branches/jbosstools-3.1.x/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: bfitzpat Date: 2010-02-23 13:54:25 -0500 (Tue, 23 Feb 2010) New Revision: 20451 Added: branches/jbosstools-3.1.x/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AddApplicationXMLCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AddApplicationXMLCommand.java Modified: branches/jbosstools-3.1.x/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF branches/jbosstools-3.1.x/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java branches/jbosstools-3.1.x/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebServiceClient.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebServiceClient.java Log: Fixes for JBIDE-5870 to add an application.xml to web service ear deployments Modified: branches/jbosstools-3.1.x/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.1.x/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2010-02-23 18:53:29 UTC (rev 20450) +++ branches/jbosstools-3.1.x/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2010-02-23 18:54:25 UTC (rev 20451) @@ -19,6 +19,7 @@ org.apache.xerces, org.eclipse.jst.j2ee;visibility:=reexport, org.eclipse.jst.j2ee.core;visibility:=reexport, + org.eclipse.jst.jee, org.eclipse.emf.common, org.eclipse.emf.ecore, org.eclipse.jdt.core, @@ -28,11 +29,12 @@ org.eclipse.wst.common.project.facet.core, org.eclipse.wst.server.core, org.jboss.tools.common, - org.jboss.ide.eclipse.as.classpath.core;bundle-version="1.0.0", - org.eclipse.jst.server.core;bundle-version="1.1.0", - org.eclipse.jdt;bundle-version="3.4.0", - org.eclipse.jdt.launching;bundle-version="3.4.0", - org.eclipse.debug.core;bundle-version="3.4.0" + org.jboss.ide.eclipse.as.classpath.core, + org.eclipse.jst.server.core, + org.eclipse.jdt, + org.eclipse.jdt.launching, + org.eclipse.debug.core, + org.eclipse.jst.jee.web Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.ws.creation.core, org.jboss.tools.ws.creation.core.commands, Added: branches/jbosstools-3.1.x/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AddApplicationXMLCommand.java =================================================================== --- branches/jbosstools-3.1.x/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AddApplicationXMLCommand.java (rev 0) +++ branches/jbosstools-3.1.x/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AddApplicationXMLCommand.java 2010-02-23 18:54:25 UTC (rev 20451) @@ -0,0 +1,98 @@ +/******************************************************************************* + * Copyright (c) 2010 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.ws.creation.core.commands; + +import java.io.File; + +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Status; +import org.eclipse.jst.jee.project.facet.EarCreateDeploymentFilesDataModelProvider; +import org.eclipse.jst.jee.project.facet.ICreateDeploymentFilesDataModelProperties; +import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; +import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation; + +/** + * @author Grid Qian + */ +public class AddApplicationXMLCommand extends AbstractDataModelOperation { + + private String earProject; + IStatus status; + + private static String APPLICATION_XML = "application.xml"; //$NON-NLS-1$ + + public AddApplicationXMLCommand(String earProject){ + this.earProject = earProject; + } + + @Override + public IStatus execute(IProgressMonitor monitor, IAdaptable info) + throws ExecutionException { + status = Status.OK_STATUS; + IProject pro = ResourcesPlugin.getWorkspace().getRoot().getProject(earProject); + + // we only are concerned with creating the application.xml if it doesn't exist. + // the WTP code updates any existing application.xml appropriately if it finds it. + if(!hasApplicationXML(pro)){ + IVirtualComponent vc = ComponentCore.createComponent(pro); + IDataModel model = DataModelFactory.createDataModel(new EarCreateDeploymentFilesDataModelProvider()); + model.setProperty(ICreateDeploymentFilesDataModelProperties.GENERATE_DD, vc); + model.setProperty(ICreateDeploymentFilesDataModelProperties.TARGET_PROJECT, pro); + IDataModelOperation op = model.getDefaultOperation(); + try { + op.execute(new NullProgressMonitor(), null); + } catch (ExecutionException e1) { + // Ignore + } + } + return status; + } + + private boolean hasApplicationXML(IProject pro) { + // we are looking for this recursively because though application.xml + // is always in META-INF, it's not always in "earcontent" since the + // earcontent folder name can be custom + File file = findFileByPath(APPLICATION_XML, pro.getLocation().toOSString()); + if(file == null){ + return false; + } + return true; + } + + private static File findFileByPath(String name, String path) { + File ret = null; + File folder = new File(path); + if (folder.isDirectory()) { + File[] files = folder.listFiles(); + for (File file : files) { + ret = findFileByPath(name, file.getAbsolutePath()); + if (ret != null) { + break; + } + } + } else { + if (name.equals(folder.getName())) { + ret = folder; + } + } + return ret; + } +} Property changes on: branches/jbosstools-3.1.x/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AddApplicationXMLCommand.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/jbosstools-3.1.x/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java =================================================================== --- branches/jbosstools-3.1.x/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java 2010-02-23 18:53:29 UTC (rev 20450) +++ branches/jbosstools-3.1.x/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java 2010-02-23 18:54:25 UTC (rev 20451) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2010 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.ws.creation.ui.wsrt; import java.util.Vector; @@ -5,11 +15,13 @@ import org.eclipse.wst.command.internal.env.core.ICommandFactory; import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory; import org.eclipse.wst.common.environment.IEnvironment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.wsrt.AbstractWebService; import org.eclipse.wst.ws.internal.wsrt.IContext; import org.eclipse.wst.ws.internal.wsrt.ISelection; import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo; import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; +import org.jboss.tools.ws.creation.core.commands.AddApplicationXMLCommand; import org.jboss.tools.ws.creation.core.commands.BindingFilesValidationCommand; import org.jboss.tools.ws.creation.core.commands.ImplementationClassCreationCommand; import org.jboss.tools.ws.creation.core.commands.InitialCommand; @@ -19,6 +31,10 @@ import org.jboss.tools.ws.creation.core.commands.WSDL2JavaCommand; import org.jboss.tools.ws.creation.core.data.ServiceModel; +/** + * @author Grid Qian + */ +@SuppressWarnings("restriction") public class JBossWebService extends AbstractWebService { public JBossWebService(WebServiceInfo info){ @@ -28,18 +44,18 @@ @Override public ICommandFactory assemble(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject) { - // TODO Auto-generated method stub - return null; + Vector<AbstractDataModelOperation> commands = new Vector<AbstractDataModelOperation>(); + commands.add(new AddApplicationXMLCommand(earProject)); + return new SimpleCommandFactory(commands); } @Override public ICommandFactory deploy(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject) { - // TODO Auto-generated method stub return null; } - @SuppressWarnings({ "restriction", "unchecked" }) + @SuppressWarnings({ "unchecked" }) @Override public ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject) { @@ -68,14 +84,12 @@ @Override public ICommandFactory install(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject) { - // TODO Auto-generated method stub return null; } @Override public ICommandFactory run(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject) { - // TODO Auto-generated method stub return null; } Modified: branches/jbosstools-3.1.x/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebServiceClient.java =================================================================== --- branches/jbosstools-3.1.x/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebServiceClient.java 2010-02-23 18:53:29 UTC (rev 20450) +++ branches/jbosstools-3.1.x/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebServiceClient.java 2010-02-23 18:54:25 UTC (rev 20451) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 Red Hat, Inc. + * Copyright (c) 2008, 2010 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, @@ -33,9 +33,9 @@ /** * @author Grid Qian */ +@SuppressWarnings({ "restriction", "unused" }) public class JBossWebServiceClient extends AbstractWebServiceClient { - @SuppressWarnings("restriction") public JBossWebServiceClient(WebServiceClientInfo info) { super(info); } @@ -52,7 +52,7 @@ public ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject) { - Vector<AbstractDataModelOperation> commands = new Vector(); + Vector<AbstractDataModelOperation> commands = new Vector<AbstractDataModelOperation>(); ServiceModel model = new ServiceModel(); model.setWebProjectName(project); commands.add(new InitialClientCommand(model, this, WebServiceScenario.CLIENT)); @@ -71,7 +71,6 @@ @Override public ICommandFactory install(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject) { - // TODO Auto-generated method stub return null; } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2010-02-23 18:53:29 UTC (rev 20450) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2010-02-23 18:54:25 UTC (rev 20451) @@ -19,6 +19,7 @@ org.apache.xerces, org.eclipse.jst.j2ee;visibility:=reexport, org.eclipse.jst.j2ee.core;visibility:=reexport, + org.eclipse.jst.jee, org.eclipse.emf.common, org.eclipse.emf.ecore, org.eclipse.jdt.core, @@ -28,11 +29,12 @@ org.eclipse.wst.common.project.facet.core, org.eclipse.wst.server.core, org.jboss.tools.common, - org.jboss.ide.eclipse.as.classpath.core;bundle-version="1.0.0", - org.eclipse.jst.server.core;bundle-version="1.1.0", - org.eclipse.jdt;bundle-version="3.4.0", - org.eclipse.jdt.launching;bundle-version="3.4.0", - org.eclipse.debug.core;bundle-version="3.4.0" + org.jboss.ide.eclipse.as.classpath.core, + org.eclipse.jst.server.core, + org.eclipse.jdt, + org.eclipse.jdt.launching, + org.eclipse.debug.core, + org.eclipse.jst.jee.web Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.ws.creation.core, org.jboss.tools.ws.creation.core.commands, Added: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AddApplicationXMLCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AddApplicationXMLCommand.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AddApplicationXMLCommand.java 2010-02-23 18:54:25 UTC (rev 20451) @@ -0,0 +1,98 @@ +/******************************************************************************* + * Copyright (c) 2010 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.ws.creation.core.commands; + +import java.io.File; + +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Status; +import org.eclipse.jst.jee.project.facet.EarCreateDeploymentFilesDataModelProvider; +import org.eclipse.jst.jee.project.facet.ICreateDeploymentFilesDataModelProperties; +import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; +import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; +import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation; + +/** + * @author Grid Qian + */ +public class AddApplicationXMLCommand extends AbstractDataModelOperation { + + private String earProject; + IStatus status; + + private static String APPLICATION_XML = "application.xml"; //$NON-NLS-1$ + + public AddApplicationXMLCommand(String earProject){ + this.earProject = earProject; + } + + @Override + public IStatus execute(IProgressMonitor monitor, IAdaptable info) + throws ExecutionException { + status = Status.OK_STATUS; + IProject pro = ResourcesPlugin.getWorkspace().getRoot().getProject(earProject); + + // we only are concerned with creating the application.xml if it doesn't exist. + // the WTP code updates any existing application.xml appropriately if it finds it. + if(!hasApplicationXML(pro)){ + IVirtualComponent vc = ComponentCore.createComponent(pro); + IDataModel model = DataModelFactory.createDataModel(new EarCreateDeploymentFilesDataModelProvider()); + model.setProperty(ICreateDeploymentFilesDataModelProperties.GENERATE_DD, vc); + model.setProperty(ICreateDeploymentFilesDataModelProperties.TARGET_PROJECT, pro); + IDataModelOperation op = model.getDefaultOperation(); + try { + op.execute(new NullProgressMonitor(), null); + } catch (ExecutionException e1) { + // Ignore + } + } + return status; + } + + private boolean hasApplicationXML(IProject pro) { + // we are looking for this recursively because though application.xml + // is always in META-INF, it's not always in "earcontent" since the + // earcontent folder name can be custom + File file = findFileByPath(APPLICATION_XML, pro.getLocation().toOSString()); + if(file == null){ + return false; + } + return true; + } + + private static File findFileByPath(String name, String path) { + File ret = null; + File folder = new File(path); + if (folder.isDirectory()) { + File[] files = folder.listFiles(); + for (File file : files) { + ret = findFileByPath(name, file.getAbsolutePath()); + if (ret != null) { + break; + } + } + } else { + if (name.equals(folder.getName())) { + ret = folder; + } + } + return ret; + } +} Property changes on: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AddApplicationXMLCommand.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java 2010-02-23 18:53:29 UTC (rev 20450) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java 2010-02-23 18:54:25 UTC (rev 20451) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2010 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.ws.creation.ui.wsrt; import java.util.Vector; @@ -5,11 +15,13 @@ import org.eclipse.wst.command.internal.env.core.ICommandFactory; import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory; import org.eclipse.wst.common.environment.IEnvironment; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.wsrt.AbstractWebService; import org.eclipse.wst.ws.internal.wsrt.IContext; import org.eclipse.wst.ws.internal.wsrt.ISelection; import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo; import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; +import org.jboss.tools.ws.creation.core.commands.AddApplicationXMLCommand; import org.jboss.tools.ws.creation.core.commands.BindingFilesValidationCommand; import org.jboss.tools.ws.creation.core.commands.ImplementationClassCreationCommand; import org.jboss.tools.ws.creation.core.commands.InitialCommand; @@ -19,6 +31,10 @@ import org.jboss.tools.ws.creation.core.commands.WSDL2JavaCommand; import org.jboss.tools.ws.creation.core.data.ServiceModel; +/** + * @author Grid Qian + */ +@SuppressWarnings("restriction") public class JBossWebService extends AbstractWebService { public JBossWebService(WebServiceInfo info){ @@ -28,18 +44,18 @@ @Override public ICommandFactory assemble(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject) { - // TODO Auto-generated method stub - return null; + Vector<AbstractDataModelOperation> commands = new Vector<AbstractDataModelOperation>(); + commands.add(new AddApplicationXMLCommand(earProject)); + return new SimpleCommandFactory(commands); } @Override public ICommandFactory deploy(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject) { - // TODO Auto-generated method stub return null; } - @SuppressWarnings({ "restriction", "unchecked" }) + @SuppressWarnings({ "unchecked" }) @Override public ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject) { @@ -68,14 +84,12 @@ @Override public ICommandFactory install(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject) { - // TODO Auto-generated method stub return null; } @Override public ICommandFactory run(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject) { - // TODO Auto-generated method stub return null; } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebServiceClient.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebServiceClient.java 2010-02-23 18:53:29 UTC (rev 20450) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebServiceClient.java 2010-02-23 18:54:25 UTC (rev 20451) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 Red Hat, Inc. + * Copyright (c) 2008, 2010 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, @@ -33,9 +33,9 @@ /** * @author Grid Qian */ +@SuppressWarnings({ "restriction", "unused" }) public class JBossWebServiceClient extends AbstractWebServiceClient { - @SuppressWarnings("restriction") public JBossWebServiceClient(WebServiceClientInfo info) { super(info); } @@ -52,7 +52,7 @@ public ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject) { - Vector<AbstractDataModelOperation> commands = new Vector(); + Vector<AbstractDataModelOperation> commands = new Vector<AbstractDataModelOperation>(); ServiceModel model = new ServiceModel(); model.setWebProjectName(project); commands.add(new InitialClientCommand(model, this, WebServiceScenario.CLIENT)); @@ -71,7 +71,6 @@ @Override public ICommandFactory install(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject) { - // TODO Auto-generated method stub return null; }

14 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r20450 - in trunk/jsf: plugins/org.jboss.tools.jsf.vpe.facelets/templates and 13 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2010-02-23 13:53:29 -0500 (Tue, 23 Feb 2010) New Revision: 20450 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/jbide5906-on-server.png trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/message.css trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/messages.css trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/page.css trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/panel.css trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/img/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/img/footer_background.png trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/img/header_background.png trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/img/panel_header.png trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/message.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/messages.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/page.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/panel.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/includes/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/includes/navigation.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/main.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RenderFacetAndInsertChildrenTest.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/templates/vpe-templates-facelets.xml trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.jboss.tools.jst.web.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java Log: https://jira.jboss.org/jira/browse/JBIDE-5908 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java 2010-02-23 18:03:26 UTC (rev 20449) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java 2010-02-23 18:53:29 UTC (rev 20450) @@ -31,9 +31,14 @@ public class VpeInsertTemplate extends VpeAbstractTemplate { + private static final String DEFINE_ELEMENT_NAME_PARAM="defineElementName"; //$NON-NLS-1$ + private String defineElementName=Facelets.TAG_DEFINE; + + @Override protected void init(Element templateElement) { children = true; modify = false; + this.defineElementName = templateElement.getAttribute(DEFINE_ELEMENT_NAME_PARAM)!=null?templateElement.getAttribute(DEFINE_ELEMENT_NAME_PARAM):Facelets.TAG_DEFINE; initTemplateSections(templateElement, false, true, false, false, false); } @@ -89,7 +94,7 @@ Node child = children.item(i); if (child.getNodeType() == Node.ELEMENT_NODE) { Element childElement = (Element) child; - if (Facelets.TAG_DEFINE.equals(childElement.getLocalName()) + if (this.defineElementName.equals(childElement.getLocalName()) && defineName.equals(childElement .getAttribute(Facelets.ATTR_NAME))) { defineElement = childElement; @@ -113,7 +118,9 @@ Node child = children.item(i); if ((child.getNodeType() == Node.ELEMENT_NODE||child.getNodeType() == Node.TEXT_NODE)) { - if(child.getNodeType() == Node.ELEMENT_NODE&&!Facelets.TAG_DEFINE.equals(child.getLocalName())&&((Element)child).getAttribute("name")==null) { //$NON-NLS-1$ + if(child.getNodeType() == Node.ELEMENT_NODE&&!this.defineElementName.equals(child.getLocalName()) + //&&((Element)child).getAttribute("name")==null + ) { result.add(child); } else if(child.getNodeType() == Node.TEXT_NODE&&((Text)child).getNodeValue()!=null&& Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/templates/vpe-templates-facelets.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/templates/vpe-templates-facelets.xml 2010-02-23 18:03:26 UTC (rev 20449) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/templates/vpe-templates-facelets.xml 2010-02-23 18:53:29 UTC (rev 20450) @@ -32,7 +32,7 @@ </vpe:tag> <vpe:tag name="ui:insert" case-sensitive="yes" > - <vpe:template class="org.jboss.tools.jsf.vpe.facelets.template.VpeInsertTemplate"/> + <vpe:template class="org.jboss.tools.jsf.vpe.facelets.template.VpeInsertTemplate" defineElementName="define"/> </vpe:tag> <vpe:tag name="ui.component" case-sensitive="yes"> Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2010-02-23 18:03:26 UTC (rev 20449) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2010-02-23 18:53:29 UTC (rev 20450) @@ -1116,6 +1116,23 @@  </vpe:tag> + <vpe:tag name="composite:renderFacet"> + <vpe:template class="org.jboss.tools.jsf.vpe.facelets.template.VpeInsertTemplate" namespaceIdentifier="org.jboss.tools.jsf.vpe.facelets" + defineElementName="facet"> + </vpe:template> + </vpe:tag> + + <vpe:tag name="composite:renderFacet"> + <vpe:template class="org.jboss.tools.jsf.vpe.facelets.template.VpeInsertTemplate" namespaceIdentifier="org.jboss.tools.jsf.vpe.facelets" + defineElementName="facet"> + </vpe:template> + </vpe:tag> + <vpe:tag name="composite:insertChildren"> + <vpe:template class="org.jboss.tools.jsf.vpe.facelets.template.VpeInsertTemplate" namespaceIdentifier="org.jboss.tools.jsf.vpe.facelets" + defineElementName="facet"> + </vpe:template> + </vpe:tag> + <vpe:tag name="composite:interface" case-sensitive="yes">  @@ -1124,6 +1141,7 @@  </vpe:tag> + <vpe:tag name="composite:attribute" case-sensitive="yes">  Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.jboss.tools.jst.web.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.jboss.tools.jst.web.xml 2010-02-23 18:03:26 UTC (rev 20449) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.jboss.tools.jst.web.xml 2010-02-23 18:53:29 UTC (rev 20450) @@ -15,10 +15,6 @@ location="%workspace.home%/lib/commons-digester.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-commons-logging.jar" info="hidden=yes" location="%workspace.home%/lib/commons-logging.jar" model-entity="FileSystemJar"/> - <file-system NAME="lib-jsf-api.jar" info="hidden=yes" - location="%workspace.home%/lib/jsf-api.jar" model-entity="FileSystemJar"/> - <file-system NAME="lib-jsf-impl.jar" info="hidden=yes" - location="%workspace.home%/lib/jsf-impl.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-jstl.jar" info="hidden=yes" location="%workspace.home%/lib/jstl.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-standard.jar" info="hidden=yes" @@ -36,6 +32,6 @@ location="%workspace.home%/lib/common-annotations.jar" model-entity="FileSystemJar"/> <web SERVLET_VERSION="2.5" model-entity="JstWeb" model-path="/web.xml"> <module URI="/WEB-INF/faces-config.xml" model-entity="WebJSFModule" - model-path="/faces-config.xml" root="WEB-ROOT" src="src"/> + model-path="/faces-config.xml" src="src" web-root="WEB-ROOT"/> </web> </file-systems> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/jbide5906-on-server.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/jbide5906-on-server.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,14 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + + <ui:composition template="/templates/main.xhtml" id="jbide5908"> + <ui:define name="body"> + Welcome To RichFaces 4.x Demo + </ui:define> + + </ui:composition> + +</html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/message.css =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/message.css (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/message.css 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,3 @@ +rich-message{ + color:red; +} \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/messages.css =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/messages.css (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/messages.css 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,3 @@ +rich-messages{ + color:red; +} \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/page.css =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/page.css (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/page.css 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,77 @@ +.rich-page{width:100%;} +.body{ + background: #FFFFFF; + margin:0px; +} +*{ + font-size:11px; +} +.header_bg{ + background-image:url(#{resource['rich/img/header_background.png']}); + border-bottom:1px solid; + border-bottom-color:#FFFFFF; + background-color:#BED6F8; + background-repeat:repeat-x; + background-position:top left; +} + +.footer_bg{ + background-image:url(#{resource['rich/img/footer_background.png']}); + border-top:1px solid; + border-top-color:#FFFFFF; + background-color:#BED6F8; + background-repeat:repeat-x; + background-position:center left; +} + +.menu_col{ + background:#FFFFFF; + vertical-align:top; + border-top:2px solid; + border-top-color:#BED6F8; + border-right:2px solid; + border-right-color:#BED6F8; + border-bottom:2px solid; + border-bottom-color:#BED6F8; +} + +.content_col{ + background:#FFFFFF; + vertical-align:top; + width:100%; + border-top:2px solid; + border-top-color:#BED6F8; + border-bottom:2px solid; + border-bottom-color:#BED6F8; +} +*.menu_col, *.content_col, *.footer_bg{ + font-family:Arial, Verdana, sans-serif ; + color:#000000; + font-size:11px; +} +*.header_content{ + font-family:Arial, Verdana, sans-serif; + color:#000000; + font-size:11px; +} + + +.page_size { + width : 100% + height : 100% +} + + +.header_content { + margin : 0px 0px 0px 0px + height : 95px position : relative +} + +.spacer{font-size : 1px} + + +.footer_bg_content { + margin : 0px 0px 0px 0px + height : 45px + position : relative +} \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/panel.css =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/panel.css (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/panel.css 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,26 @@ +.rich-panel{ + border-width: 1px; + border-style: solid; + padding : 1px; + color:#000000; + font-family:Arial,Verdana,sans-serif; + font-size:11px; + background-color:#FFFFFF; + border-color:#BED6F8; +} + +.rich-panel-header{ + padding : 2px; + border-width: 1px; + border-style: solid; + background-color:#BED6F8; + border-color:#BED6F8; + font-weight:bold; + background-position:left top; + background-repeat:repeat-x; + background-image: url(#{resource['rich/img/panel_header.png']}) +} + +.rich-panel-body{ + padding : 10px; +} Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/img/footer_background.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/img/footer_background.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/img/header_background.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/img/header_background.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/img/panel_header.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/img/panel_header.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/message.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/message.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/message.xhtml 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,30 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:composite="http://java.sun.com/jsf/composite" + xmlns:a4j="http://richfaces.org/a4j"> +<head> +<title>panel</title> +</head> +<body> + +<composite:interface> + <composite:attribute name="for" required="true" /> + <composite:attribute name="style" required="false" /> + <composite:attribute name="styleClass" required="false" /> +</composite:interface> + +<composite:implementation> + <h:outputStylesheet name="rich/css/message.css" /> + <a4j:outputPanel ajaxRendered="true" layout="none"> + <h:message for="#{cc.attrs.for}" showDetail="#{cc.attrs.showDetails}" + showSummary="#{cc.attrs.showSummary}" style="#{cc.attrs.style}" + styleClass="rich-message #{cc.attrs.styleClass}" /> + </a4j:outputPanel> +</composite:implementation> +</body> +</html> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/messages.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/messages.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/messages.xhtml 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,29 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:composite="http://java.sun.com/jsf/composite" + xmlns:a4j="http://richfaces.org/a4j"> +<head> +<title>panel</title> +</head> +<body> + +<composite:interface> + <composite:attribute name="style" required="false" /> + <composite:attribute name="styleClass" required="false" /> +</composite:interface> + +<composite:implementation> + <h:outputStylesheet name="rich/css/messages.css" /> + <a4j:outputPanel ajaxRendered="true" layout="none"> + <h:messages layout="#{cc.attrs.layout}" + showSummary="true" style="#{cc.attrs.style}" + styleClass="rich-message #{cc.attrs.styleClass}" /> + </a4j:outputPanel> +</composite:implementation> +</body> +</html> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/page.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/page.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/page.xhtml 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,69 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:composite="http://java.sun.com/jsf/composite"> + <head> + <title>page</title> + </head> +<body> + +<composite:interface> + <composite:attribute name="style" /> + <composite:attribute name="styleClass"/> + <composite:attribute name="headerClass"/> + <composite:attribute name="bodyClass"/> + <composite:attribute name="sidebarClass"/> +</composite:interface> +<composite:implementation> +<h:outputText value="<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">" escape="false"/> +<html xmlns="http://www.w3.org/1999/xhtml"> +<h:head> + <title>#{cc.attrs.pageTitle}</title> + <composite:renderFacet name="pageHeader"/> +</h:head> +<h:body> + <h:outputStylesheet name="rich/css/page.css" /> + <table border="0" cellpadding="0" cellspacing="0" class="rich-page #{cc.attrs.pageClass}"> + <tbody> + <tr> + <td class="header_bg"> + <div class="header_content rich-page-header #{cc.attrs.headerClass}"> + <composite:renderFacet name="header"/> + </div> + </td> + </tr> + <tr> + <td width="100%" height="100%" class="bg_tabbody"> + <table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%" class="rich-page-content #{cc.attrs.contentClass}"> + <tbody> + <tr> + <td class="menu_col rich-page-sidebar #{cc.attrs.sidebarClass}"> + <div class="menu_width spacer" style="width:#{cc.attrs.sidebarWidth}px"></div> + <composite:renderFacet name="sidebar"/> + </td> + <td class="content_col rich-page-body #{cc.attrs.bodyClass}"> + <composite:insertChildren /> + </td> + </tr> + </tbody> + </table> + </td> + </tr> + <tr> + <td class="footer_bg"> + <div class="footer_bg_content rich-page-footer #{cc.attrs.footerClass}"> + <composite:renderFacet name="footer"/> + </div> + </td> + </tr> + </tbody> + </table> +</h:body> +</html> +</composite:implementation> +</body> +</html> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/panel.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/panel.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/panel.xhtml 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,49 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:composite="http://java.sun.com/jsf/composite"> + <head> + <title>panel</title> + </head> +<body> + +<composite:interface> + <composite:attribute name="style" required="false"/> + <composite:attribute name="styleClass" required="false"/> + <composite:attribute name="headerClass" required="false"/> + <composite:attribute name="bodyClass" required="true"/> +</composite:interface> + +<composite:implementation> + <h:outputStylesheet name="rich/css/panel.css" /> + + <div class="rich-panel #{compositeComponent.attrs.styleClass}" + style="#{compositeComponent.attrs.style}" + onclick="#{compositeComponent.attrs.onclick}" + ondblclick="#{compositeComponent.attrs.ondblclick}" + onkeydown="#{compositeComponent.attrs.onkeydown}" + onkeypress="#{compositeComponent.attrs.onkeypress}" + onkeyup="#{compositeComponent.attrs.onkeyup}" + onmousedown="#{compositeComponent.attrs.onmousedown}" + onmousemove="#{compositeComponent.attrs.onmousemove}" + onmouseout="#{compositeComponent.attrs.onmouseout}" + onmouseover="#{compositeComponent.attrs.onmouseover}" + onmouseup="#{compositeComponent.attrs.onmouseup}"> + + <h:panelGroup rendered="#{not empty cc.facets.header}"> + <div class="rich-panel-header #{compositeComponent.attrs.headerClass}"> + <composite:renderFacet name="header"/> + </div> + </h:panelGroup> + <div class="rich-panel-body #{compositeComponent.attrs.bodyClass}" > + <composite:insertChildren /> + </div> + + </div> +</composite:implementation> +</body> +</html> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/includes/navigation.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/includes/navigation.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/includes/navigation.xhtml 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,32 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://java.sun.com/jsf/composite/rich"> + <rich:panel> + <f:facet name="header"> + <h:outputText value="Navigation" /> + </f:facet> + <h:panelGrid columns="1"> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/ajax.jsf">a4j:ajax</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/jsFunction.jsf">a4j:jsFunction</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/mediaOutput.jsf">a4j:mediaOutput</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/push.jsf">a4j:push</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/status.jsf">a4j:status</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/outputPanel.jsf">a4j:outputPanel</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/commandButton.jsf">a4j:commandButton</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/commandLink.jsf">a4j:commandLink</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/log.jsf">a4j:log</h:outputLink> + </h:panelGrid> + </rich:panel> +</ui:composition> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/main.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/main.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/main.xhtml 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,26 @@ +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:rich="http://java.sun.com/jsf/composite/rich"> +<h:head> +</h:head> +<h:body> + <ui:composition> + <rich:page id="page"> + <f:facet name="header"> + <h1>Welcome to RichFaces demo!</h1> + </f:facet> + <f:facet name="sidebar"> + <ui:include src="/templates/includes/navigation.xhtml" /> + </f:facet> + <ui:insert name="body"> + Body content missed + </ui:insert> + <f:facet name="footer"> + footer + </f:facet> + </rich:page> + </ui:composition> +</h:body> +</html> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-02-23 18:03:26 UTC (rev 20449) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-02-23 18:53:29 UTC (rev 20450) @@ -86,6 +86,7 @@ import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnTLDPackedInJar_JBIDE5693; import org.jboss.tools.jsf.vpe.jsf.test.jbide.PreferencesForEditors_JBIDE5692; import org.jboss.tools.jsf.vpe.jsf.test.jbide.RefreshBundles_JBIDE5460; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.RenderFacetAndInsertChildrenTest; import org.jboss.tools.jsf.vpe.jsf.test.jbide.SelectAllAndCut_JBIDE4853; import org.jboss.tools.jsf.vpe.jsf.test.jbide.SelectWholeElement_JBIDE4713; import org.jboss.tools.jsf.vpe.jsf.test.jbide.TaglibXMLUnformatedDTD_JBIDE5642; @@ -118,6 +119,7 @@ TestSuite suite = new TestSuite("Tests for Vpe Jsf components"); //$NON-NLS-1$ // $JUnit-BEGIN$ + suite.addTestSuite(RenderFacetAndInsertChildrenTest.class); suite.addTestSuite(EditFontFamilyTest_JBIDE5872.class); suite.addTestSuite(ChangeMessageBundleTest_JBIDE5818.class); suite.addTestSuite(TestForUsingComponentsLibrariesWithDefaultNamespace.class); Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RenderFacetAndInsertChildrenTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RenderFacetAndInsertChildrenTest.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RenderFacetAndInsertChildrenTest.java 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 2007-2010 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.vpe.jsf.test.jbide; + +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.vpe.ui.test.ComponentContentTest; + +/** + * https://jira.jboss.org/jira/browse/JBIDE-5908 + * + * @author mareshkau + * + */ +public class RenderFacetAndInsertChildrenTest extends ComponentContentTest{ + + public RenderFacetAndInsertChildrenTest(String name) { + super(name); + } + public void testRenderFacetAndInsertChildren() throws Throwable { + performContentTest("JBIDE/5908/welcome.xhtml"); //$NON-NLS-1$ + } + @Override + protected String getTestProjectName() { + return JsfAllTests.IMPORT_JSF_20_PROJECT_NAME; + } + +}

14 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r20449 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test and 24 other directories.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2010-02-23 13:03:26 -0500 (Tue, 23 Feb 2010) New Revision: 20449 Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ProjectsLoader.java Removed: trunk/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/tests/ImportBean.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/plugin.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfAllTests.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/plugin.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/plugin.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4213Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4510Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4534Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnInJarPackageFragment_JBIDE5682.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnTLDPackedInJar_JBIDE5693.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RefreshBundles_JBIDE5460.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/plugin.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlAllTests.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlTestPlugin.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/plugin.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesAllTests.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/plugin.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/plugin.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/plugin.xml trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsAllTests.java trunk/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java trunk/vpe/tests/org.jboss.tools.vpe.ui.test/plugin.xml trunk/vpe/tests/org.jboss.tools.vpe.ui.test/schema/vpe.tests.exsd trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeAllTests.java trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTestSetup.java trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java Log: https://jira.jboss.org/jira/browse/JBIDE-5837 Make possible to run VPE JUnit tests one by one - testProject element was added to the vpe.tests extension point (this is the new way to declare necessary projects now). - ProjectsLoader created. Now it is used to access all test projects. - All references to the ImportBean (the old way) were removed. Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/plugin.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/plugin.xml 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/plugin.xml 2010-02-23 18:03:26 UTC (rev 20449) @@ -2,6 +2,9 @@ <extension point="org.jboss.tools.vpe.ui.tests"> <tests testSuite="org.jboss.tools.jsf.vpe.ajax4jsf.test.Ajax4JsfAllTests" name="Tests For Ajax For JSF Components"/> + <testProject + name="ajax4jsfTests" + path="resources/ajax4jsfTests"/> </extension> -</plugin> \ No newline at end of file +</plugin> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfAllTests.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfAllTests.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -10,10 +10,6 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.ajax4jsf.test; -import java.util.ArrayList; -import java.util.List; - -import org.jboss.tools.tests.ImportBean; import org.jboss.tools.vpe.ui.test.VpeTestSetup; import junit.framework.Test; @@ -26,14 +22,7 @@ public static Test suite() { TestSuite suite = new TestSuite("Tests for Vpe Ajax For JSF components"); //$NON-NLS-1$ suite.addTestSuite(Ajax4JsfComponentContentTest.class); - List<ImportBean> projectToImport = new ArrayList<ImportBean>(); - ImportBean importBean = new ImportBean(); - importBean.setImportProjectName(Ajax4JsfAllTests.IMPORT_PROJECT_NAME); - importBean.setImportProjectPath(Ajax4JsfTestPlugin. - getPluginResourcePath()); - projectToImport.add(importBean); - - return new VpeTestSetup(suite, projectToImport); - + + return new VpeTestSetup(suite); } } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/plugin.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/plugin.xml 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/plugin.xml 2010-02-23 18:03:26 UTC (rev 20449) @@ -8,6 +8,10 @@ name="Facelets Tests" testSuite="org.jboss.tools.jsf.vpe.facelets.test.FaceletsAllTests"> </tests> + <testProject + name="faceletsTest" + path="resources/faceletsTest"> + </testProject> </extension> </plugin> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -10,14 +10,10 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.facelets.test; -import java.util.ArrayList; -import java.util.List; - import junit.framework.Test; import junit.framework.TestSuite; import org.jboss.tools.jsf.vpe.facelets.test.jbide.JBIDE3416Test; -import org.jboss.tools.tests.ImportBean; import org.jboss.tools.vpe.ui.test.VpeTestSetup; public class FaceletsAllTests { @@ -26,21 +22,14 @@ public static final String IMPORT_PROJECT_NAME = "faceletsTest"; //$NON-NLS-1$ public static Test suite() { - - TestSuite suite = new TestSuite("Tests for Vpe Facelets components"); - // $JUnit-BEGIN$ - - suite.addTestSuite(FaceletsComponentTest.class); - suite.addTestSuite(JBIDE3416Test.class); - suite.addTestSuite(FaceletsComponentContentTest.class); - - // $JUnit-END$ - List<ImportBean> importProjects = new ArrayList<ImportBean>(); - ImportBean importBean = new ImportBean(); - importBean.setImportProjectName(IMPORT_PROJECT_NAME); - importBean.setImportProjectPath(FaceletsTestPlugin.getPluginResourcePath()); - importProjects.add(importBean); - return new VpeTestSetup(suite,importProjects); - + TestSuite suite = new TestSuite("Tests for Vpe Facelets components"); + // $JUnit-BEGIN$ + + suite.addTestSuite(FaceletsComponentTest.class); + suite.addTestSuite(JBIDE3416Test.class); + suite.addTestSuite(FaceletsComponentContentTest.class); + + // $JUnit-END$ + return new VpeTestSetup(suite); } } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/plugin.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/plugin.xml 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/plugin.xml 2010-02-23 18:03:26 UTC (rev 20449) @@ -4,9 +4,32 @@ <extension point="org.jboss.tools.vpe.ui.tests"> <tests - name="JSf Tests" - testSuite="org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests"> - </tests> + name="JsfAllTests" + testSuite="org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests"/> + <testProject + name="jsfTest" + path="resources/jsfTest"/> + <testProject + name="jsf2test" + path="resources/jsf2test"/> + <testProject + name="customFaceletsTestProject" + path="resources/customFaceletsTestProject"/> + <testProject + name="JBIDE3247" + path="resources/JBIDE3247"/> + <testProject + name="i18nTest" + path="resources/i18nTest"/> + <testProject + name="naturesCheckTest" + path="resources/naturesCheckTest"/> + <testProject + name="jsfLocales" + path="resources/jsfLocales"/> + <testProject + name="JBIDE5460TestProject" + path="resources/JBIDE5460TestProject"/> </extension> </plugin> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -95,13 +95,4 @@ protected String getTestProjectName() { return JsfAllTests.IMPORT_JSF_20_PROJECT_NAME; } - - @Override - protected void setUp() throws Exception { - if(!ResourcesPlugin.getWorkspace().getRoot().getProject(JsfAllTests.IMPORT_JSF_20_PROJECT_NAME).isAccessible()) { - ResourcesUtils.importProjectIntoWorkspace((JsfTestPlugin.getPluginResourcePath() - + File.separator+JsfAllTests.IMPORT_JSF_20_PROJECT_NAME),JsfAllTests.IMPORT_JSF_20_PROJECT_NAME); - } - } - } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -10,9 +10,6 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.jsf.test; -import java.util.ArrayList; -import java.util.List; - import junit.framework.Test; import junit.framework.TestSuite; @@ -61,7 +58,6 @@ import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3632Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3650Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3734Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.EditingSPecialSymbolsVPE_JBIDE3810; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3969Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4037Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4179Test; @@ -70,35 +66,34 @@ import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4509Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4510Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4534Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.MessageResolutionInPreviewTabTest; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.NaturesChecker_JBIDE5701; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnInJarPackageFragment_JBIDE5682; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnJsf20Test_JBIDE5382; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnTLDPackedInJar_JBIDE5693; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.PreferencesForEditors_JBIDE5692; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.RefreshBundles_JBIDE5460; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.TaglibXMLUnformatedDTD_JBIDE5642; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestFViewLocaleAttribute_JBIDE5218; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE924Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.MozDirtyTest_JBIDE5105; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.NullPointerWithStyleProperty_JBIDE5193; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestForUsingComponentsLibrariesWithDefaultNamespace; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestOpenOnForXhtmlFiles_JBIDE5577; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.VpeI18nTest_JBIDE4887; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1467Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1501Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1568Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1718Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide2170Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide2362Test; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.MessageResolutionInPreviewTabTest; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.MozDirtyTest_JBIDE5105; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.NaturesChecker_JBIDE5701; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.NullPointerWithStyleProperty_JBIDE5193; import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnCssClassTest_JBIDE4775; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnInJarPackageFragment_JBIDE5682; import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnInsideJspRoot_JBIDE4852; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnJsf20Test_JBIDE5382; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnTLDPackedInJar_JBIDE5693; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.PreferencesForEditors_JBIDE5692; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.RefreshBundles_JBIDE5460; import org.jboss.tools.jsf.vpe.jsf.test.jbide.SelectAllAndCut_JBIDE4853; import org.jboss.tools.jsf.vpe.jsf.test.jbide.SelectWholeElement_JBIDE4713; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.TaglibXMLUnformatedDTD_JBIDE5642; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestFViewLocaleAttribute_JBIDE5218; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestForUsingComponentsLibrariesWithDefaultNamespace; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestOpenOnForXhtmlFiles_JBIDE5577; import org.jboss.tools.jsf.vpe.jsf.test.jbide.VPERefreshTest; -import org.jboss.tools.tests.ImportBean; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.VpeI18nTest_JBIDE4887; import org.jboss.tools.vpe.ui.test.VpeTestSetup; /** @@ -118,7 +113,7 @@ public static final String IMPORT_NATURES_CHECKER_PROJECT = "naturesCheckTest"; //$NON-NLS-1$ public static final String IMPORT_JSF_LOCALES_PROJECT_NAME = "jsfLocales"; //$NON-NLS-1$ public static final String IMPORT_JBIDE5460_PROJECT_NAME = "JBIDE5460TestProject"; //$NON-NLS-1$ - + public static Test suite() { TestSuite suite = new TestSuite("Tests for Vpe Jsf components"); //$NON-NLS-1$ @@ -209,51 +204,8 @@ suite.addTestSuite(NaturesChecker_JBIDE5701.class); suite.addTestSuite(FacetProcessingTest.class); suite.addTestSuite(RefreshBundles_JBIDE5460.class); - - // $JUnit-END$ - // added by Max Areshkau - // add here projects which should be imported for junit tests - List<ImportBean> projectToImport = new ArrayList<ImportBean>(); - ImportBean importBeanJsf1 = new ImportBean(); - importBeanJsf1.setImportProjectName(JsfAllTests.IMPORT_PROJECT_NAME); - importBeanJsf1.setImportProjectPath(JsfTestPlugin.getPluginResourcePath()); - projectToImport.add(importBeanJsf1); - - ImportBean importBeanJBIDE5460 = new ImportBean(); - importBeanJBIDE5460.setImportProjectName(JsfAllTests.IMPORT_JBIDE5460_PROJECT_NAME); - importBeanJBIDE5460.setImportProjectPath(JsfTestPlugin.getPluginResourcePath()); - projectToImport.add(importBeanJBIDE5460); - - ImportBean importBeanJsf20 = new ImportBean(); - importBeanJsf20.setImportProjectName(JsfAllTests.IMPORT_JSF_20_PROJECT_NAME); - importBeanJsf20.setImportProjectPath(JsfTestPlugin.getPluginResourcePath()); - projectToImport.add(importBeanJsf20); - ImportBean customFaceletsTestProject = new ImportBean(); - customFaceletsTestProject.setImportProjectName(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT); - customFaceletsTestProject.setImportProjectPath(JsfTestPlugin.getPluginResourcePath()); - projectToImport.add(customFaceletsTestProject); - - ImportBean jbide3247TestProject = new ImportBean(); - jbide3247TestProject.setImportProjectName(JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME); - jbide3247TestProject.setImportProjectPath(JsfTestPlugin.getPluginResourcePath()); - projectToImport.add(jbide3247TestProject); - - ImportBean i18nTestProject = new ImportBean(); - i18nTestProject.setImportProjectName(JsfAllTests.IMPORT_I18N_PROJECT_NAME); - i18nTestProject.setImportProjectPath(JsfTestPlugin.getPluginResourcePath()); - projectToImport.add(i18nTestProject); - - ImportBean naturesCheckTestProject = new ImportBean(); - naturesCheckTestProject.setImportProjectName(JsfAllTests.IMPORT_NATURES_CHECKER_PROJECT); - naturesCheckTestProject.setImportProjectPath(JsfTestPlugin.getPluginResourcePath()); - projectToImport.add(naturesCheckTestProject); - - ImportBean jsfLocalesProject = new ImportBean(); - jsfLocalesProject.setImportProjectName(JsfAllTests.IMPORT_JSF_LOCALES_PROJECT_NAME); - jsfLocalesProject.setImportProjectPath(JsfTestPlugin.getPluginResourcePath()); - projectToImport.add(jsfLocalesProject); - - return new VpeTestSetup(suite, projectToImport); + // $JUnit-END$ + return new VpeTestSetup(suite); } } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4213Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4213Test.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4213Test.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -10,21 +10,16 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.jsf.test.jbide; -import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.swt.custom.StyledText; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.part.FileEditorInput; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.project.IModelNature; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.jst.web.model.helpers.WebAppHelper; import org.jboss.tools.jst.web.project.WebProject; import org.jboss.tools.jst.web.tld.ITaglibMapping; import org.jboss.tools.jst.web.tld.TaglibMapping; +import org.jboss.tools.vpe.ui.test.ProjectsLoader; import org.jboss.tools.vpe.ui.test.TestUtil; import org.jboss.tools.vpe.ui.test.VpeTest; @@ -45,7 +40,8 @@ TestUtil.waitForJobs(); setException(null); - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("customFaceletsTestProject"); + IProject project = ProjectsLoader.getInstance() + .getProject(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT); assertNotNull(project); IModelNature nature = EclipseResourceUtil.getModelNature(project); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -10,13 +10,9 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.jsf.test.jbide; -import java.lang.reflect.Method; - import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IncrementalProjectBuilder; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragmentRoot; @@ -24,10 +20,6 @@ import org.eclipse.jdt.internal.core.JarEntryFile; import org.eclipse.jdt.internal.core.JarPackageFragmentRoot; import org.eclipse.jdt.internal.ui.javaeditor.JarEntryEditorInput; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.text.hyperlink.IHyperlink; -import org.eclipse.jface.text.hyperlink.IHyperlinkDetector; -import org.eclipse.jface.text.source.SourceViewerConfiguration; import org.eclipse.ui.IEditorDescriptor; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; @@ -36,14 +28,9 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.editors.text.EditorsUI; import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.ui.part.MultiPageEditorPart; -import org.eclipse.ui.texteditor.AbstractTextEditor; -import org.eclipse.wst.sse.ui.StructuredTextEditor; -import org.jboss.tools.common.model.ui.editor.EditorPartWrapper; -import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.ui.test.OpenOnUtil; +import org.jboss.tools.vpe.ui.test.ProjectsLoader; import org.jboss.tools.vpe.ui.test.TestUtil; import org.jboss.tools.vpe.ui.test.VpeTest; @@ -58,8 +45,8 @@ } //tests openOn from taglib public void testOpenOnTaglibDefinitionFile() throws Throwable { - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( - JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT); + IProject project = ProjectsLoader.getInstance() + .getProject(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT); IFile file = (IFile) project.findMember("WebContent/tags/facelets.taglib.xml"); //$NON-NLS-1$ IEditorInput editorInput = new FileEditorInput(file); OpenOnUtil.checkOpenOnInEditor(editorInput, getEditorId(file.getName()), 12, 17, "paginator.xhtml"); //$NON-NLS-1$ @@ -79,8 +66,8 @@ //test for <function-class> public void testJBIDE4638OpenOnForFunctionClass() throws Throwable{ - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( - JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT); + IProject project = ProjectsLoader.getInstance() + .getProject(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT); IFile file = (IFile) project.findMember("WebContent/tags/facelets.taglib.xml"); //$NON-NLS-1$ IEditorInput editorInput = new FileEditorInput(file); OpenOnUtil.checkOpenOnInEditor(editorInput, getEditorId(file.getName()), 31, 37, "FaceletFunctions.java"); //$NON-NLS-1$ @@ -88,31 +75,32 @@ //test for <function-class> public void testJBIDE4638OpenOnForLibraryClass() throws Throwable{ - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( - JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME); + IProject project = ProjectsLoader.getInstance() + .getProject(JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME); IFile file = (IFile) project.findMember("WebContent/WEB-INF/test.taglib.xml"); //$NON-NLS-1$ IEditorInput editorInput = new FileEditorInput(file); OpenOnUtil.checkOpenOnInEditor(editorInput, getEditorId(file.getName()), 6, 25, "CoreLibrary.java"); //$NON-NLS-1$ } //test for <function-class> public void testJBIDE4638OpenOnForHandlerClass() throws Throwable{ - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( - JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT); + IProject project = ProjectsLoader.getInstance() + .getProject(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT); IFile file = (IFile) project.findMember("WebContent/tags/facelets.taglib.xml"); //$NON-NLS-1$ IEditorInput editorInput = new FileEditorInput(file); OpenOnUtil.checkOpenOnInEditor(editorInput, getEditorId(file.getName()), 22, 23, "IfHandler.java"); //$NON-NLS-1$ } //test for <handler-class> in tag public void testJBIDE4638OpenOnForHandlerClassWithTagAxis() throws Throwable{ - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( - JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT); + IProject project = ProjectsLoader.getInstance() + .getProject(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT); IFile file = (IFile) project.findMember("WebContent/tags/facelets.taglib.xml"); //$NON-NLS-1$ IEditorInput editorInput = new FileEditorInput(file); OpenOnUtil.checkOpenOnInEditor(editorInput, getEditorId(file.getName()), 36, 29, "IfHandler.java"); //$NON-NLS-1$ } //test for https://jira.jboss.org/jira/browse/JBIDE-4635 public void testJBIDE4635OpenOn() throws Throwable{ - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME); + IProject project = ProjectsLoader.getInstance() + .getProject(JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME); IFile file = (IFile) project.findMember("WebContent/pages/index.xhtml"); //$NON-NLS-1$ IEditorInput editorInput = new FileEditorInput(file); OpenOnUtil.checkOpenOnInEditor(editorInput, getEditorId(file.getName()), 11, 11, "mareshkau.taglib.xml"); //$NON-NLS-1$ @@ -124,7 +112,8 @@ //test for https://jira.jboss.org/jira/browse/JBIDE-5099 public void testJBIDE5099OpenOn() throws Throwable{ - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(JsfAllTests.IMPORT_JSF_20_PROJECT_NAME); + IProject project = ProjectsLoader.getInstance() + .getProject(JsfAllTests.IMPORT_JSF_20_PROJECT_NAME); project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor()); IFile file = (IFile) project.findMember("WebContent/pages/JBIDE/5015/login.xhtml"); //$NON-NLS-1$ IEditorInput editorInput = new FileEditorInput(file); @@ -133,7 +122,8 @@ //test for https://jira.jboss.org/jira/browse/JBIDE-5099 public void testJBIDE5099JarOpenOn() throws Throwable{ - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(JsfAllTests.IMPORT_JSF_20_PROJECT_NAME); + IProject project = ProjectsLoader.getInstance() + .getProject(JsfAllTests.IMPORT_JSF_20_PROJECT_NAME); project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor()); IFile file = (IFile) project.findMember("WebContent/pages/JBIDE/5015/login.xhtml"); //$NON-NLS-1$ IEditorInput editorInput = new FileEditorInput(file); @@ -154,8 +144,8 @@ @SuppressWarnings("restriction") private static final void checkOpenOnFromJarFile(final String jarFilePath,final String jarEntryPath, final int line, final int position,final String expectedResult) throws Throwable { - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( - JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME); + IProject project = ProjectsLoader.getInstance() + .getProject(JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME); IJavaProject javaProject = JavaCore.create(project); IFile jarArchive = (IFile) project.findMember(jarFilePath); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4510Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4510Test.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4510Test.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -24,6 +24,7 @@ import org.eclipse.jdt.internal.ui.javaeditor.JarEntryEditorInput; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.ui.test.ProjectsLoader; import org.jboss.tools.vpe.ui.test.TestUtil; import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; @@ -41,8 +42,8 @@ } public void testCorrectDoctypeOnFileFromJarArchive() throws Throwable { - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( - JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME); + IProject project = ProjectsLoader.getInstance() + .getProject(JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME); /* * Project should exist in the workspace */ Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4534Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4534Test.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4534Test.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -28,6 +28,7 @@ import org.jboss.tools.jst.web.project.WebProject; import org.jboss.tools.jst.web.tld.TaglibMapping; import org.jboss.tools.vpe.editor.VpeController; +import org.jboss.tools.vpe.ui.test.ProjectsLoader; import org.jboss.tools.vpe.ui.test.TestUtil; import org.jboss.tools.vpe.ui.test.VpeTest; @@ -47,8 +48,8 @@ protected void setUp() throws Exception { super.setUp(); setVpeController(null); - this.project = ResourcesPlugin.getWorkspace().getRoot().getProject( - JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME); + this.project = ProjectsLoader.getInstance() + .getProject(JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME); this.nonUIJob = new Job("Revalidate Taglibs Test Job name"){ //$NON-NLS-1$ @SuppressWarnings("synthetic-access") @Override Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnInJarPackageFragment_JBIDE5682.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnInJarPackageFragment_JBIDE5682.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnInJarPackageFragment_JBIDE5682.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -26,6 +26,7 @@ import org.eclipse.ui.editors.text.EditorsUI; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.vpe.ui.test.OpenOnUtil; +import org.jboss.tools.vpe.ui.test.ProjectsLoader; import org.jboss.tools.vpe.ui.test.VpeTest; /** @@ -47,8 +48,8 @@ } public void testOpenOnInJarPackageFragment() throws Throwable { - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( - JsfAllTests.IMPORT_JSF_20_PROJECT_NAME); + IProject project = ProjectsLoader.getInstance() + .getProject(JsfAllTests.IMPORT_JSF_20_PROJECT_NAME); IJavaProject javaProject = JavaCore.create(project); IPackageFragmentRoot fragmentRoot = javaProject .getPackageFragmentRoot(javaProject.getPath().toString() + "/" //$NON-NLS-1$ Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnTLDPackedInJar_JBIDE5693.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnTLDPackedInJar_JBIDE5693.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnTLDPackedInJar_JBIDE5693.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -27,6 +27,7 @@ import org.eclipse.ui.editors.text.EditorsUI; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.vpe.ui.test.OpenOnUtil; +import org.jboss.tools.vpe.ui.test.ProjectsLoader; import org.jboss.tools.vpe.ui.test.VpeTest; /** @@ -47,8 +48,8 @@ } public void testOpenOnTLDPackedInJar() throws Throwable{ - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( - JsfAllTests.IMPORT_JSF_20_PROJECT_NAME); + IProject project = ProjectsLoader.getInstance() + .getProject(JsfAllTests.IMPORT_JSF_20_PROJECT_NAME); IJavaProject javaProject = JavaCore.create(project); IPackageFragmentRoot fragmentRoot = javaProject .getPackageFragmentRoot(""+project.getLocation() + "/" //$NON-NLS-1$ //$NON-NLS-2$ Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RefreshBundles_JBIDE5460.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RefreshBundles_JBIDE5460.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RefreshBundles_JBIDE5460.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -31,14 +31,15 @@ public class RefreshBundles_JBIDE5460 extends VpeTest { - private static String TEST_PAGE = "tableBasic/tableBasic.xhtml"; //$NON-NLS-1$ + private static String TEST_PAGE = "html/tableBasic/tableBasic.xhtml"; //$NON-NLS-1$ public RefreshBundles_JBIDE5460(String name) { super(name); } public void testRefreshBundles() throws Throwable{ - IFile file = (IFile) getFile(TEST_PAGE, JsfAllTests.IMPORT_JBIDE5460_PROJECT_NAME); + IFile file = (IFile) TestUtil.getWebContentPath( + TEST_PAGE, JsfAllTests.IMPORT_JBIDE5460_PROJECT_NAME); assertNotNull("Could not open specified file. componentPage = " //$NON-NLS-1$ + TEST_PAGE @@ -55,15 +56,4 @@ TestUtil.delay(2000); } - - private IResource getFile(String pagePath, String projectName) throws CoreException{ - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( - projectName); - if (project != null) { - return project.getFolder("WebContent/html").findMember(pagePath); - - } - return null; - } - } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/plugin.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/plugin.xml 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/plugin.xml 2010-02-23 18:03:26 UTC (rev 20449) @@ -2,6 +2,10 @@ <extension point="org.jboss.tools.vpe.ui.tests"> <tests testSuite="org.jboss.tools.jsf.vpe.jstl.test.JstlAllTests" name="Tests For Jstl Components"/> + <testProject + name="jstlTests" + path="resources/jstlTests"> + </testProject> </extension> -</plugin> \ No newline at end of file +</plugin> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlAllTests.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlAllTests.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -10,31 +10,18 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.jstl.test; -import java.util.ArrayList; -import java.util.List; - -import org.jboss.tools.tests.ImportBean; -import org.jboss.tools.vpe.ui.test.VpeTestSetup; - import junit.framework.Test; import junit.framework.TestSuite; +import org.jboss.tools.vpe.ui.test.VpeTestSetup; + public class JstlAllTests { public static final String IMPORT_PROJECT_NAME = "jstlTests"; //$NON-NLS-1$ public static Test suite() { - - TestSuite suite = new TestSuite("Tests for Vpe JSTL components"); //$NON-NLS-1$ - - suite.addTestSuite(JstlComponentContentTest.class); - - List<ImportBean> projectToImport = new ArrayList<ImportBean>(); - ImportBean importBean = new ImportBean(); - importBean.setImportProjectName(JstlAllTests.IMPORT_PROJECT_NAME); - importBean.setImportProjectPath(JstlTestPlugin.getPluginResourcePath()); - projectToImport.add(importBean); - - return new VpeTestSetup(suite, projectToImport); + TestSuite suite = new TestSuite("Tests for Vpe JSTL components"); //$NON-NLS-1$ + suite.addTestSuite(JstlComponentContentTest.class); + return new VpeTestSetup(suite); } } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlTestPlugin.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlTestPlugin.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlTestPlugin.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -1,11 +1,6 @@ package org.jboss.tools.jsf.vpe.jstl.test; -import java.net.URL; - -import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.Platform; import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; /** @@ -51,22 +46,4 @@ public static JstlTestPlugin getDefault() { return plugin; } - - /** - * Gets the path to the "resources" folder. - * - * @return the path string - */ - public static String getPluginResourcePath() { - Bundle bundle = Platform.getBundle(PLUGIN_ID); - URL url = null; - try { - url = bundle == null ? null : FileLocator.resolve(bundle - .getEntry("/resources")); //$NON-NLS-1$ //$NON-NLS-1$ - } catch (Exception e) { - url = bundle.getEntry("/resources"); //$NON-NLS-1$ //$NON-NLS-1$ - } - return (url == null) ? null : url.getPath(); - } - } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/plugin.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/plugin.xml 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/plugin.xml 2010-02-23 18:03:26 UTC (rev 20449) @@ -7,6 +7,10 @@ name="MyFaces Tests" testSuite="org.jboss.tools.jsf.vpe.myfaces.test.MyFacesAllTests"> </tests> + <testProject + name="myFacesTest" + path="resources/myFacesTest"> + </testProject> </extension> -</plugin> \ No newline at end of file +</plugin> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesAllTests.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesAllTests.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -1,12 +1,8 @@ package org.jboss.tools.jsf.vpe.myfaces.test; -import java.util.ArrayList; -import java.util.List; - import junit.framework.Test; import junit.framework.TestSuite; -import org.jboss.tools.tests.ImportBean; import org.jboss.tools.vpe.ui.test.VpeTestSetup; /** @@ -26,15 +22,6 @@ // $JUnit-BEGIN$ suite.addTestSuite(MyFacesComponentTest.class); // $JUnit-END$ - - List<ImportBean> projectToImport = new ArrayList<ImportBean>(); - ImportBean importBean = new ImportBean(); - importBean - .setImportProjectName(MyFacesComponentTest.IMPORT_PROJECT_NAME); - importBean.setImportProjectPath(MyFacesTestPlugin - .getPluginResourcePath()); - projectToImport.add(importBean); - - return new VpeTestSetup(suite, projectToImport); + return new VpeTestSetup(suite); } } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/plugin.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/plugin.xml 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/plugin.xml 2010-02-23 18:03:26 UTC (rev 20449) @@ -3,7 +3,12 @@ <plugin> <extension point="org.jboss.tools.vpe.ui.tests"> - <tests testSuite="org.jboss.tools.jsf.vpe.richfaces.test.RichFacesAllTests" name="Tests For Rich Faces Components"/> + <tests + testSuite="org.jboss.tools.jsf.vpe.richfaces.test.RichFacesAllTests" + name="Tests For Rich Faces Components"/> + <testProject + name="richFacesTest" + path="resources/richFacesTest"/> </extension> </plugin> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -10,9 +10,6 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.richfaces.test; -import java.util.ArrayList; -import java.util.List; - import junit.framework.Test; import junit.framework.TestSuite; @@ -26,7 +23,6 @@ import org.jboss.tools.jsf.vpe.richfaces.test.jbide.Jbide1639Test; import org.jboss.tools.jsf.vpe.richfaces.test.jbide.Jbide1682Test; import org.jboss.tools.jsf.vpe.richfaces.test.jbide.RichFacesJBIDE1169Test; -import org.jboss.tools.tests.ImportBean; import org.jboss.tools.vpe.ui.test.VpeTestSetup; /** @@ -65,16 +61,6 @@ suite.addTestSuite(RichFacesComponentContentTest.class); // $JUnit-END$ - - List<ImportBean> projectToImport = new ArrayList<ImportBean>(); - ImportBean importBean = new ImportBean(); - importBean.setImportProjectName(RichFacesAllTests.IMPORT_PROJECT_NAME); - importBean.setImportProjectPath(RichFacesTestPlugin - .getPluginResourcePath()); - projectToImport.add(importBean); - - return new VpeTestSetup(suite, projectToImport); - + return new VpeTestSetup(suite); } - } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/plugin.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/plugin.xml 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/plugin.xml 2010-02-23 18:03:26 UTC (rev 20449) @@ -5,8 +5,10 @@ point="org.jboss.tools.vpe.ui.tests"> <tests name="Vpe test's for seam ui components" - testSuite="org.jboss.tools.jsf.vpe.seam.test.SeamAllTests"> - </tests> + testSuite="org.jboss.tools.jsf.vpe.seam.test.SeamAllTests"/> + <testProject + name="SeamTest" + path="resources/SeamTest"/> </extension> </plugin> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -10,15 +10,11 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.seam.test; -import java.util.ArrayList; -import java.util.List; +import org.jboss.tools.vpe.ui.test.VpeTestSetup; import junit.framework.Test; import junit.framework.TestSuite; -import org.jboss.tools.tests.ImportBean; -import org.jboss.tools.vpe.ui.test.VpeTestSetup; - /** * Class for testing all Seam components * @@ -31,17 +27,11 @@ public static final String IMPORT_PROJECT_NAME = "SeamTest"; //$NON-NLS-1$ public static Test suite() { - TestSuite suite = new TestSuite("Tests for Vpe Seam components"); //$NON-NLS-1$ - // $JUnit-BEGIN$ - suite.addTestSuite(SeamComponentTest.class); - suite.addTestSuite(SeamComponentContentTest.class); - // $JUnit-END$ - List<ImportBean> importProjects = new ArrayList<ImportBean>(); - ImportBean importBean = new ImportBean(); - importBean.setImportProjectName(SeamAllTests.IMPORT_PROJECT_NAME); - importBean.setImportProjectPath(SeamTestPlugin.getPluginResourcePath()); - importProjects.add(importBean); - return new VpeTestSetup(suite, importProjects); - + TestSuite suite = new TestSuite("Tests for Vpe Seam components"); //$NON-NLS-1$ + // $JUnit-BEGIN$ + suite.addTestSuite(SeamComponentTest.class); + suite.addTestSuite(SeamComponentContentTest.class); + // $JUnit-END$ + return new VpeTestSetup(suite); } } Modified: trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/plugin.xml =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/plugin.xml 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/plugin.xml 2010-02-23 18:03:26 UTC (rev 20449) @@ -6,8 +6,10 @@ <tests description="Unit tests for Struts support in VPE" name="Struts Tests" - testSuite="org.jboss.tools.struts.vpe.struts.test.StrutsAllTests"> - </tests> + testSuite="org.jboss.tools.struts.vpe.struts.test.StrutsAllTests"/> + <testProject + name="StrutsTest" + path="resources/StrutsTest"/> </extension> </plugin> Modified: trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsAllTests.java =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsAllTests.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsAllTests.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -10,14 +10,11 @@ ******************************************************************************/ package org.jboss.tools.struts.vpe.struts.test; -import static org.jboss.tools.vpe.ui.test.TestUtil.createImportBeanList; +import org.jboss.tools.vpe.ui.test.VpeTestSetup; + import junit.framework.Test; import junit.framework.TestSuite; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTestSetup; - - /** * Class for testing all RichFaces components * @@ -28,7 +25,6 @@ public class StrutsAllTests { public static Test suite() { - TestSuite suite = new TestSuite("Tests for Vpe Struts components"); //$NON-NLS-1$ // $JUnit-BEGIN$ suite.addTestSuite(StrutsHTMLComponentTest.class); @@ -39,8 +35,6 @@ suite.addTestSuite(StrutsTilesComponentTest.class); //cleanUpTests(); // $JUnit-END$ - return new VpeTestSetup(suite,createImportBeanList(StrutsHTMLComponentTest.IMPORT_PROJECT_NAME, StrutsTestPlugin.getPluginResourcePath())); - + return new VpeTestSetup(suite); } - } Deleted: trunk/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/tests/ImportBean.java =================================================================== --- trunk/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/tests/ImportBean.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/tests/ImportBean.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -1,52 +0,0 @@ -/******************************************************************************* -* Copyright (c) 2007 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.tests; - -/** - * @author Max Areshkau - * - * Contains information about projects which should be imported - */ -public class ImportBean { - /** - * Contains import project Name - */ - private String importProjectName; - /** - * Contains import project path - */ - private String importProjectPath; - /** - * @return the importProjectName - */ - public String getImportProjectName() { - return importProjectName; - } - /** - * @param importProjectName the importProjectName to set - */ - public void setImportProjectName(String importProjectName) { - this.importProjectName = importProjectName; - } - /** - * @return the importProjectPath - */ - public String getImportProjectPath() { - return importProjectPath; - } - /** - * @param importProjectPath the importProjectPath to set - */ - public void setImportProjectPath(String importProjectPath) { - this.importProjectPath = importProjectPath; - } - -} Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml 2010-02-23 18:03:26 UTC (rev 20449) @@ -6,8 +6,10 @@ <tests description="Tests for Html templates" name="Tests for Html templates" - testSuite="org.jboss.tools.vpe.html.test.HtmlAllTests"> - </tests> + testSuite="org.jboss.tools.vpe.html.test.HtmlAllTests"/> + <testProject + name="htmlTest" + path="resources/htmlTest"/> </extension> </plugin> Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -10,13 +10,9 @@ ******************************************************************************/ package org.jboss.tools.vpe.html.test; -import java.util.ArrayList; -import java.util.List; - import junit.framework.Test; import junit.framework.TestSuite; -import org.jboss.tools.tests.ImportBean; import org.jboss.tools.vpe.html.test.jbide.JBIDE3280Test; import org.jboss.tools.vpe.ui.test.VpeTestSetup; @@ -40,13 +36,8 @@ suite.addTestSuite(JBIDE3280Test.class); suite.addTestSuite(HtmlComponentTest.class); suite.addTestSuite(HtmlComponentContentTest.class); - - List<ImportBean> projectToImport = new ArrayList<ImportBean>(); - ImportBean importBean = new ImportBean(); - importBean.setImportProjectName(IMPORT_PROJECT_NAME); - importBean.setImportProjectPath(HtmlTestPlugin.getPluginResourcePath()); - projectToImport.add(importBean); - return new VpeTestSetup(suite,projectToImport); + + return new VpeTestSetup(suite); } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml 2010-02-23 18:03:26 UTC (rev 20449) @@ -6,8 +6,10 @@ <tests description="JSP Tests" name="JSP Tests" - testSuite="org.jboss.tools.vpe.jsp.test.JSPAllTests"> - </tests> + testSuite="org.jboss.tools.vpe.jsp.test.JSPAllTests"/> + <testProject + name="jspTest" + path="resources/jspTest"/> </extension> </plugin> Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -10,30 +10,19 @@ ******************************************************************************/ package org.jboss.tools.vpe.jsp.test; -import java.util.ArrayList; -import java.util.List; +import org.jboss.tools.vpe.ui.test.VpeTestSetup; import junit.framework.Test; import junit.framework.TestSuite; -import org.jboss.tools.tests.ImportBean; -import org.jboss.tools.vpe.ui.test.VpeTestSetup; - public class JSPAllTests { public static Test suite() { - - TestSuite suite = new TestSuite("Tests for Vpe JSP components"); //$NON-NLS-1$ - // $JUnit-BEGIN$ - - suite.addTestSuite(JSPComponentTest.class); - - // $JUnit-END$ - List<ImportBean> importProjects = new ArrayList<ImportBean>(); - ImportBean importBean = new ImportBean(); - importBean.setImportProjectName(JSPComponentTest.IMPORT_PROJECT_NAME); - importBean.setImportProjectPath(JSPTestPlugin.getPluginResourcePath()); - importProjects.add(importBean); - return new VpeTestSetup(suite,importProjects); - + TestSuite suite = new TestSuite("Tests for Vpe JSP components"); //$NON-NLS-1$ + // $JUnit-BEGIN$ + + suite.addTestSuite(JSPComponentTest.class); + + // $JUnit-END$ + return new VpeTestSetup(suite); } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -10,14 +10,10 @@ ******************************************************************************/ package org.jboss.tools.vpe.test; -import java.util.ArrayList; -import java.util.List; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.jboss.tools.jsf.vpe.jsf.test.JsfComponentTest; -import org.jboss.tools.jsf.vpe.jsf.test.JsfTestPlugin; -import org.jboss.tools.tests.ImportBean; + import org.jboss.tools.vpe.editor.template.VpeTemplateManagerTest; import org.jboss.tools.vpe.ui.test.VpeTestSetup; @@ -37,12 +33,7 @@ suite.addTestSuite(TemplateSchemeValidateTest.class); suite.addTestSuite(TemplatesExpressionParsingTest.class); suite.addTestSuite(VpeTemplateManagerTest.class); - List<ImportBean> projectToImport = new ArrayList<ImportBean>(); - ImportBean importBean = new ImportBean(); - importBean.setImportProjectName(JsfComponentTest.IMPORT_PROJECT_NAME); - importBean.setImportProjectPath(JsfTestPlugin.getPluginResourcePath()); - projectToImport.add(importBean); - return new VpeTestSetup(suite, projectToImport); + return new VpeTestSetup(suite); } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/plugin.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/plugin.xml 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/plugin.xml 2010-02-23 18:03:26 UTC (rev 20449) @@ -9,5 +9,8 @@ name="UI tests of VPE" testSuite="org.jboss.tools.vpe.ui.test.VpeUiTests"> </tests> + <testProject + name="TestProject" + path="resources/TestProject"/> </extension> </plugin> Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/schema/vpe.tests.exsd =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/schema/vpe.tests.exsd 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/schema/vpe.tests.exsd 2010-02-23 18:03:26 UTC (rev 20449) @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?>  -<schema targetNamespace="org.jboss.tools.vpe.ui.test"> +<schema targetNamespace="org.jboss.tools.vpe.ui.test" xmlns="http://www.w3.org/2001/XMLSchema"> <annotation> <appInfo> <meta.schema plugin="org.jboss.tools.vpe.ui.test" id="vpe.tests" name="Visual Editor Tests"/> @@ -11,9 +11,15 @@ </annotation> <element name="extension"> + <annotation> + <appInfo> + <meta.element /> + </appInfo> + </annotation> <complexType> <sequence> <element ref="tests"/> + <element ref="testProject" minOccurs="0" maxOccurs="unbounded"/> </sequence> <attribute name="point" type="string" use="required"> <annotation> @@ -71,6 +77,35 @@ </complexType> </element> + <element name="testProject"> + <annotation> + <documentation> + Project to be loaded to perform the tests. +Example of using: +<testProject name="jsfTest" path="resources/jsfTest"/> + </documentation> + </annotation> + <complexType> + <attribute name="name" type="string" use="required"> + <annotation> + <documentation> + Name of the project. + </documentation> + </annotation> + </attribute> + <attribute name="path" type="string" use="required"> + <annotation> + <documentation> + Path to the project within the plugin. + </documentation> + <appInfo> + <meta.attribute kind="resource"/> + </appInfo> + </annotation> + </attribute> + </complexType> + </element> + <annotation> <appInfo> <meta.section type="since"/> @@ -107,13 +142,5 @@ </documentation> </annotation> - <annotation> - <appInfo> - <meta.section type="copyright"/> - </appInfo> - <documentation> - - </documentation> - </annotation> </schema> Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ProjectsLoader.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ProjectsLoader.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ProjectsLoader.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -0,0 +1,171 @@ +/******************************************************************************* + * Copyright (c) 2007-2010 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.ui.test; + +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IExtension; +import org.eclipse.core.runtime.IExtensionPoint; +import org.eclipse.core.runtime.IExtensionRegistry; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Platform; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ResourcesUtils; +import org.osgi.framework.Bundle; + +/** + * Singleton class to operate on test projects. + * + * @see {@code org.jboss.tools.vpe.ui.tests} extension point + * @author Yahor Radtsevich (yradtsevich) + */ +public class ProjectsLoader { + private static final String TEST_PROJECT_ELEMENT = "testProject"; + private static final String TEST_PROJECT_PATH_ATTRIBUTE = "path"; + private static final String TEST_PROJECT_NAME_ATTRIBUTE = "name"; + private Map<String, String> projectNameToPath; + private static ProjectsLoader instance = null; + + private ProjectsLoader() { + loadProjectPaths(); + } + + /** + * Returns the instance of {@link ProjectsLoader} + */ + public static ProjectsLoader getInstance() { + if (instance == null) { + instance = new ProjectsLoader(); + } + + return instance; + } + + /** + * Returns instance of {@link IProject} by {@code projectName}. + * If the project does not exist in the workspace, imports it from the + * resources specified by extensions of {@code org.jboss.tools.vpe.ui.tests} + * extension point. Returns {@code null} if the project is not declared in + * the extensions. + */ + public IProject getProject(String projectName) { + IProject project = getExistingProject(projectName); + + if (project == null) { + String projectPath = projectNameToPath.get(projectName); + if (projectPath != null) { + project = ResourcesUtils.importProjectIntoWorkspace( + projectPath, projectName); + } + } + + return project; + } + + /** + * Returns a workspace project by its {@code projectName}, or {@code null} + * if there is no project with this name in the workspace. + */ + public static IProject getExistingProject(String projectName) { + IProject project = ResourcesPlugin.getWorkspace().getRoot() + .getProject(projectName); + if (project.isAccessible()) { + return project; + } else { + return null; + } + } + + /** + * Loads project names and paths to them from the extensions of + * {@link VpeAllTests#VPE_TEST_EXTENTION_POINT_ID}. And stores + * loaded data in {@link #projectNameToPath}. + */ + private void loadProjectPaths() { + projectNameToPath = new HashMap<String, String>(); + IExtensionRegistry extensionRepository = Platform + .getExtensionRegistry(); + + IExtensionPoint extensionPoint = extensionRepository + .getExtensionPoint(VpeAllTests.VPE_TEST_EXTENTION_POINT_ID); + IExtension[] extensions = extensionPoint.getExtensions(); + for (IExtension extension : extensions) { + IConfigurationElement[] confElements = extension + .getConfigurationElements(); + for (IConfigurationElement configurationElement : confElements) { + if (TEST_PROJECT_ELEMENT.equals(configurationElement.getName())) { + try { + Bundle bundle = Platform.getBundle(configurationElement + .getNamespaceIdentifier()); + + String pluginRoot = FileLocator + .resolve(bundle.getEntry("/")).getPath(); + String name = configurationElement.getAttribute(TEST_PROJECT_NAME_ATTRIBUTE); + String path = configurationElement.getAttribute(TEST_PROJECT_PATH_ATTRIBUTE); + projectNameToPath.put(name, pluginRoot + path); + } catch (Exception e) { + VPETestPlugin.getDefault().logError(e); + } + } + } + } + } + + /** + * Removes the project with the {@code projectName} from the workspace. + * + * @param projectName the project name + * @throws CoreException the core exception + */ + static public void removeProject(String projectName) throws CoreException { + IProject project = ProjectsLoader.getExistingProject(projectName); + removeProject(project); + } + + /** + * Removes given {@code project} from the workspace + * + * @param project project to remove + * @throws CoreException + */ + private static void removeProject(IProject project) throws CoreException { + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + try { + if (project != null) { + project.delete(IResource.ALWAYS_DELETE_PROJECT_CONTENT, + new NullProgressMonitor()); + JobUtils.waitForIdle(); + } + } finally { + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + } + } + + /** + * Removes all projects from the workspace + * + * @throws CoreException + */ + static public void removeAllProjects() throws CoreException { + IProject[] projects = ResourcesPlugin.getWorkspace().getRoot() + .getProjects(); + for (IProject project: projects) { + removeProject(project); + } + } +} Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -11,7 +11,6 @@ package org.jboss.tools.vpe.ui.test; import java.io.File; -import java.util.ArrayList; import java.util.List; import junit.framework.Assert; @@ -19,9 +18,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.text.ITextViewer; import org.eclipse.swt.widgets.Display; @@ -31,9 +28,6 @@ import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; -import org.jboss.tools.test.util.JobUtils; -import org.jboss.tools.test.util.ResourcesUtils; -import org.jboss.tools.tests.ImportBean; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.VpeEditorPart; import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor; @@ -63,19 +57,7 @@ /** The Constant MAX_IDLE. */ public static final long MAX_IDLE = 15*1000L; - /** - * Import project into workspace. - * - * @param path the path - * @param projectName the project name - * @deprecated Use {@link ResourcesUtils#importProjectIntoWorkspace(String,String)} instead - */ - static public void importProjectIntoWorkspace(String path, String projectName) { - ResourcesUtils.importProjectIntoWorkspace(path, projectName); - } - - /** * Gets the component path. * * @param componentPage the component page @@ -87,8 +69,7 @@ */ public static IResource getComponentPath(String componentPage, String projectName) throws CoreException { - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( - projectName); + IProject project = ProjectsLoader.getInstance().getProject(projectName); if (project != null) { return project.getFolder(COMPONENTS_PATH).findMember(componentPage); @@ -99,8 +80,7 @@ public static IResource getResource(String path, String projectName) throws CoreException { - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( - projectName); + IProject project = ProjectsLoader.getInstance().getProject(projectName); if (project != null) { return project.findMember(path); } @@ -120,8 +100,7 @@ */ public static IResource getWebContentPath(String componentPage, String projectName) throws CoreException { - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( - projectName); + IProject project = ProjectsLoader.getInstance().getProject(projectName); if (project != null) { return project.getFolder(WEBCONTENT_PATH).findMember(componentPage); } @@ -140,28 +119,6 @@ } /** - * Removes the project. - * - * @param projectName the project name - * - * @throws CoreException the core exception - */ - static public void removeProject(String projectName) throws CoreException { - boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); - try { - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( - projectName); - if (project != null) { - project.delete(IResource.ALWAYS_DELETE_PROJECT_CONTENT, - new NullProgressMonitor()); - JobUtils.waitForIdle(); - } - } finally { - ResourcesUtils.setBuildAutomatically(saveAutoBuild); - } - } - - /** * Process UI input but do not return for the specified time interval. * * @param waitTimeMillis the number of milliseconds @@ -275,37 +232,6 @@ } /** - * Creates the import bean list. - * - * @param projectName the project name - * @param resourcePath the resource path - * - * @return the list< import bean> - */ - static public List<ImportBean> createImportBeanList(String projectName, - String resourcePath) { - List<ImportBean> projectToImport = new ArrayList<ImportBean>(); - projectToImport.add(createImportBean(projectName, resourcePath)); - return projectToImport; - } - - /** - * Creates the import bean. - * - * @param projectName the project name - * @param resourcePath the resource path - * - * @return the import bean - */ - static public ImportBean createImportBean(String projectName, - String resourcePath) { - ImportBean importBean = new ImportBean(); - importBean.setImportProjectName(projectName); - importBean.setImportProjectPath(resourcePath); - return importBean; - } - - /** * Utility function which returns node mapping by source position(line and position in line). * * @param linePosition the line position Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeAllTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeAllTests.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeAllTests.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.vpe.ui.test; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import junit.framework.Test; @@ -30,10 +29,9 @@ */ public class VpeAllTests { + public static final String TESTS_ELEMENT = "tests"; public static final String VPE_TEST_EXTENTION_POINT_ID = "org.jboss.tools.vpe.ui.tests"; //$NON-NLS-1$ - - public static final String TEST_SUITE_PARAM = "testSuite"; //$NON-NLS-1$ - + public static final String TEST_SUITE_PARAM = "testSuite"; //$NON-NLS-1$ public static final String METHOD_SUITE_NAME = "suite"; //$NON-NLS-1$ public static final String VPE_TEST_PROJECT_NAME = "vpeTest"; //$NON-NLS-1$ @@ -52,29 +50,21 @@ for (IConfigurationElement configurationElement : confElements) { String clazz = configurationElement .getAttribute(TEST_SUITE_PARAM); - try { - Bundle bundle = Platform.getBundle(configurationElement - .getNamespaceIdentifier()); - Class<?> testObject = bundle.loadClass(clazz); - Method method = testObject.getMethod(METHOD_SUITE_NAME, null); - // null -because static method - Object res = method.invoke(null, null); - if (res instanceof Test) { - Test testSuite = (Test) res; - result.addTest(testSuite); + if (TESTS_ELEMENT.equals(configurationElement.getName())) { + try { + Bundle bundle = Platform.getBundle(configurationElement + .getNamespaceIdentifier()); + Class<?> testObject = bundle.loadClass(clazz); + Method method = testObject.getMethod(METHOD_SUITE_NAME, null); + // null -because static method + Object res = method.invoke(null, null); + if (res instanceof Test) { + Test testSuite = (Test) res; + result.addTest(testSuite); + } + } catch (Exception e) { + VPETestPlugin.getDefault().logError(e); } - } catch (ClassNotFoundException e) { - VPETestPlugin.getDefault().logError(e); - } catch (SecurityException e) { - VPETestPlugin.getDefault().logError(e); - } catch (NoSuchMethodException e) { - VPETestPlugin.getDefault().logError(e); - } catch (IllegalArgumentException e) { - VPETestPlugin.getDefault().logError(e); - } catch (IllegalAccessException e) { - VPETestPlugin.getDefault().logError(e); - } catch (InvocationTargetException e) { - VPETestPlugin.getDefault().logError(e); } } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTestSetup.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTestSetup.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTestSetup.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2007 Red Hat, Inc. +* Copyright (c) 2007-2010 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, @@ -10,37 +10,24 @@ ******************************************************************************/ package org.jboss.tools.vpe.ui.test; -import java.io.File; -import java.util.List; +import org.eclipse.ui.IViewReference; +import org.eclipse.ui.PlatformUI; import junit.extensions.TestSetup; import junit.framework.TestSuite; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.ui.IViewReference; -import org.eclipse.ui.PlatformUI; -import org.jboss.tools.test.util.ResourcesUtils; -import org.jboss.tools.tests.ImportBean; - /** * @author Max Areshkau + * @author Yahor Radtsevich (yradtsevich) * - * Class for setup-tear down junit tests(import project - * into workspace and remove project from workspace) + * Class for tear down JUnit tests (remove projects from workspace) + * */ public class VpeTestSetup extends TestSetup { + private static final String CONTENT_OUTLINE_VIEW_ID = "org.eclipse.ui.views.ContentOutline"; - /** - * Contains test project names, which will be imported - * in setUp method and removed in tear down method - */ - private List<ImportBean> testProjectNames; - - private static final String CONTENT_OUTLINE_VIEW_ID = "org.eclipse.ui.views.ContentOutline"; //$NON-NLS-1$ - - public VpeTestSetup(TestSuite test, List<ImportBean> testProjectNames) { + public VpeTestSetup(TestSuite test) { super(test); - setTestProjects(testProjectNames); } /* (non-Javadoc) @@ -48,13 +35,6 @@ */ @Override protected void setUp() throws Exception { - super.setUp(); - for (ImportBean importBean : getTestProjects()) { - if (ResourcesPlugin.getWorkspace().getRoot().findMember(importBean.getImportProjectName()) == null) { - ResourcesUtils.importProjectIntoWorkspace((importBean.getImportProjectPath() - + File.separator+importBean.getImportProjectName()),importBean.getImportProjectName()); - } - } //added by Maksim Areshkau, Fix for https://jira.jboss.org/jira/browse/JBIDE-5820 https://jira.jboss.org/jira/browse/JBIDE-5821 //remove this code when we will move on wtp 3.2 IViewReference[] iviewReferences= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getViewReferences(); @@ -70,25 +50,6 @@ */ @Override protected void tearDown() throws Exception { - - for(ImportBean importBean:getTestProjects()) { - TestUtil.removeProject(importBean.getImportProjectName()); - } - super.tearDown(); + ProjectsLoader.removeAllProjects(); } - - /** - * @return the testProjectNames - */ - private List<ImportBean> getTestProjects() { - return testProjectNames; - } - - /** - * @param testProjectNames the testProjectNames to set - */ - private void setTestProjects(List<ImportBean> testProjectNames) { - this.testProjectNames = testProjectNames; - } - } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java 2010-02-23 17:54:07 UTC (rev 20448) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java 2010-02-23 18:03:26 UTC (rev 20449) @@ -10,10 +10,9 @@ ******************************************************************************/ package org.jboss.tools.vpe.ui.test; -import java.util.ArrayList; -import java.util.List; +import junit.framework.Test; +import junit.framework.TestSuite; -import org.jboss.tools.tests.ImportBean; import org.jboss.tools.vpe.editor.menu.VpePopupMenuTest; import org.jboss.tools.vpe.ui.test.dialog.VpeEditAnyDialogTest; import org.jboss.tools.vpe.ui.test.dialog.VpeResourcesDialogTest; @@ -21,9 +20,6 @@ import org.jboss.tools.vpe.ui.test.preferences.VpeEditorPreferencesPageTest; import org.jboss.tools.vpe.ui.test.wizard.VpeImportExportUnknownTagsWizardsTest; -import junit.framework.Test; -import junit.framework.TestSuite; - /** * @author mareshkau * @@ -39,15 +35,6 @@ suite.addTestSuite(VpeEditAnyDialogTest.class); suite.addTestSuite(VpeImportExportUnknownTagsWizardsTest.class); - /* - * Add projects that will be used in junit tests. - */ - List<ImportBean> projectToImport = new ArrayList<ImportBean>(); - ImportBean importBean = new ImportBean(); - importBean.setImportProjectName(VpeUiTests.IMPORT_PROJECT_NAME); - importBean.setImportProjectPath(VPETestPlugin.getPluginResourcePath()); - projectToImport.add(importBean); - - return new VpeTestSetup(suite, projectToImport); + return new VpeTestSetup(suite); } }

14 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r20448 - branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.core/resources/meta.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-02-23 12:54:07 -0500 (Tue, 23 Feb 2010) New Revision: 20448 Modified: branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta Log: https://jira.jboss.org/jira/browse/JBIDE-5491 Changes for the SOAP Wise Client configuration in the ESB editor typo was fixed Modified: branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta =================================================================== --- branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-02-23 17:51:10 UTC (rev 20447) +++ branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-02-23 17:54:07 UTC (rev 20448) @@ -1735,7 +1735,7 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="SOAP wize client action" + <XModelAttribute default="SOAP Wise Client Action" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute>

14 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r20447 - in trunk/hibernatetools/docs/reference/en: modules and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: smukhina Date: 2010-02-23 12:51:10 -0500 (Tue, 23 Feb 2010) New Revision: 20447 Added: trunk/hibernatetools/docs/reference/en/images/plugins/dali_integration10.png trunk/hibernatetools/docs/reference/en/images/plugins/dali_integration11.png trunk/hibernatetools/docs/reference/en/images/plugins/dali_integration7.png trunk/hibernatetools/docs/reference/en/images/plugins/dali_integration8.png trunk/hibernatetools/docs/reference/en/images/plugins/dali_integration9.png Modified: trunk/hibernatetools/docs/reference/en/modules/plugins.xml Log: https://jira.jboss.org/jira/browse/JBDS-880 New annotations support in Hibernate platform for Dali - new screens are added together with description Added: trunk/hibernatetools/docs/reference/en/images/plugins/dali_integration10.png =================================================================== (Binary files differ) Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/dali_integration10.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/hibernatetools/docs/reference/en/images/plugins/dali_integration11.png =================================================================== (Binary files differ) Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/dali_integration11.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/hibernatetools/docs/reference/en/images/plugins/dali_integration7.png =================================================================== (Binary files differ) Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/dali_integration7.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/hibernatetools/docs/reference/en/images/plugins/dali_integration8.png =================================================================== (Binary files differ) Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/dali_integration8.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/hibernatetools/docs/reference/en/images/plugins/dali_integration9.png =================================================================== (Binary files differ) Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/dali_integration9.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/hibernatetools/docs/reference/en/modules/plugins.xml =================================================================== --- trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2010-02-23 17:51:05 UTC (rev 20446) +++ trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2010-02-23 17:51:10 UTC (rev 20447) @@ -2461,6 +2461,8 @@ <para>Starting from 3.0.0 Alpha1 version of <property>JBoss Tools</property> Hibernate plugins support Eclipse Dali integration what now makes it possible to use a Hibernate as a complete JPA development platform.</para> + <section id="jpa_project_with_hibernate"> + <title>Creating JPA project with Hibernate support</title> <para>When starting a new JPA project from <emphasis> <property>New > Other > JPA > JPA Project</property> </emphasis> (or simply <emphasis> @@ -2499,7 +2501,10 @@ finishes its work. It allows a full usage of <property>Hibernate Tools</property> features without additional setup.</para> </note> - <para>By enabling Hibernate platform specific features you can now generate DDL and Entities. + </section> + <section id="generate_ddl_entities_with_hibernate"> + <title>Generating DDL and Entities</title> + <para>By enabling Hibernate platform specific features you can now generate DDL and Entities. For that find <emphasis> <property>JPA Tools > Generate Tables from Entities/Generate Entities from Tables</property> </emphasis> options in the context menu of your JPA project.</para> @@ -2531,10 +2536,10 @@ <listitem> <para>a Hibernate Console Configuration (proposed by default)</para> <para>Just make sure that the <emphasis> - <property>Use Console Configuration</property> - </emphasis> checkbox is selected and choose a needed configuration from the <emphasis> - <property>Console configurations</property> - </emphasis> list box.</para> + <property>Use Console Configuration</property> + </emphasis> checkbox is selected and choose a needed configuration from the <emphasis> + <property>Console configurations</property> + </emphasis> list box.</para> <figure> <title>Generate Entities Wizard</title> <mediaobject> @@ -2565,5 +2570,80 @@ </mediaobject> </figure> <para>Thus, you can now have the Hibernate runtime support in Eclipse JPA projects.</para> + </section> + <section id="hibernate_annotations_support"> + <title>Hibernate Annotations Support</title> + <para>Also Hibernate Annotations are supported in <property>Dali Java Persistence Tools</property>. + The next annotations are integrated with <property>JPA Details</property> view:</para> + <itemizedlist> + <listitem> + <para>Id Generator annotations - <property>@GenericGenerator</property> and <property>@GeneratedValue</property></para> + <figure> + <title>@GenericGenerator support in Dali</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/plugins/dali_integration7.png"/> + + </imageobject> + + </mediaobject> + </figure> + <figure> + <title>@GeneratedValue support in Dali</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/plugins/dali_integration8.png"/> + </imageobject> + + </mediaobject> + </figure> + </listitem> + <listitem> + <para>Property annotations- <property>@DiscriminatorFormula</property>, <property>@Generated Annotation</property>, <property>@Index annotation</property></para> + <figure> + <title>@Index support in Dali</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/plugins/dali_integration9.png"/> + </imageobject> + + </mediaobject> + </figure> + + </listitem> + <listitem> + <para>Mapping Queries annotations - <property>@NamedQuery</property> and <property>@NamedNativeQuery</property></para> + <figure> + <title>Add New Named Query Dialog with Hibernate Support</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/plugins/dali_integration10.png"/> + </imageobject> + + </mediaobject> + </figure> + + + + <figure> + <title>@NamedQuery support in Dali</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/plugins/dali_integration11.png"/> + </imageobject> + + </mediaobject> + </figure> + </listitem> + </itemizedlist> + <para>More information about Hibernate Annotation you can find in <ulink url="http://docs.jboss.org/hibernate/stable/annotations/reference/en/html/">Hibernate Annotations Reference Guide</ulink>. </para> + + </section> + <section> + <title>Relevant Resources Links</title> + <para>There is full information about native Dali plugin features on <ulink url="http://help.eclipse.org/galileo/index.jsp?nav=/8">Eclipse Documentation page</ulink>.</para> + </section> + </section> + </chapter>

14 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r20446 - trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-02-23 12:51:05 -0500 (Tue, 23 Feb 2010) New Revision: 20446 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta Log: https://jira.jboss.org/jira/browse/JBIDE-5491 Changes for the SOAP Wise Client configuration in the ESB editor typo was fixed Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-02-23 16:46:03 UTC (rev 20445) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-02-23 17:51:05 UTC (rev 20446) @@ -1735,7 +1735,7 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="SOAP wize client action" + <XModelAttribute default="SOAP Wise Client Action" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute>

14 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r20445 - trunk/download.jboss.org/jbosstools/examples.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-02-23 11:46:03 -0500 (Tue, 23 Feb 2010) New Revision: 20445 Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-3.0.xml Log: https://jira.jboss.org/jira/browse/JBIDE-5645 Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-3.0.xml =================================================================== --- trunk/download.jboss.org/jbosstools/examples/project-examples-3.0.xml 2010-02-23 16:38:33 UTC (rev 20444) +++ trunk/download.jboss.org/jbosstools/examples/project-examples-3.0.xml 2010-02-23 16:46:03 UTC (rev 20445) @@ -9,11 +9,26 @@ <shortDescription>Seam DVD Store Example - EAR</shortDescription> <description>This example demonstrates the use of Seam with jBPM pageflow and business process management. It includes the dvdstore,dvdstore-ear and dvdstore-ejb projects. +It requires JBoss EAP 4.3/JBoss AS 4.2.x and Seam 2.0. </description> <size>6926336</size> <url> http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/... </url> + <fixes> + <fix type="wtpruntime"> + <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property> + <property name="eclipse-projects">dvdstore,dvdstore-ejb,dvdstore-ear</property> + <property name="description">This project example requires the JBoss EAP 4.3 or JBoss AS 4.2.x</property> + </fix> + + <fix type="seam"> + <property name="allowed-versions">2.0.0, 2.0.1, 2.0.2</property> + <property name="eclipse-projects">dvdstore</property> + <property name="description">This project example requires Seam version 2.0</property> + </fix> + + </fixes> </project> <project> @@ -25,12 +40,32 @@ </included-projects> <shortDescription>Seam DVD Store Example - EAR (including a test project)</shortDescription> <description>This example demonstrates the use of Seam with jBPM pageflow and business process management. It includes the dvdstore,dvdstore-ear,dvdstore-test and dvdstore-ejb projects. +It requires JBoss EAP 4.3/JBoss AS 4.2.x, Seam 2.0 and TestNG plugin. </description> <size>30380032</size> <url> http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/... </url> + <fixes> + <fix type="wtpruntime"> + <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property> + <property name="eclipse-projects">dvdstore,dvdstore-ejb,dvdstore-ear</property> + <property name="description">This project example requires the JBoss EAP 4.3 or JBoss AS 4.2.x</property> + </fix> + + <fix type="seam"> + <property name="allowed-versions">2.0.0, 2.0.1, 2.0.2</property> + <property name="eclipse-projects">dvdstore</property> + <property name="description">This project example requires Seam version 2.0</property> + </fix> + + <fix type="plugin"> + <property name="id">org.testng.eclipse</property> + <property name="versions">5.8.0, 5.9.0</property> + <property name="description">The TestNG plugin is required if you want to run Seam tests. You can install it using the following update site: http://beust.com/eclipse</property> + </fix> + </fixes> </project> <project> @@ -43,14 +78,27 @@ <shortDescription>Seam Booking Example - EAR</shortDescription> <description>This example demonstrates the use of Seam in a Java EE 5 environment. Transaction and persistence context management is handled by the EJB container. -This example can also run in Tomcat with JBoss Embedded. +This example requires JBoss EAP 4.3/JBoss AS 4.2.x and Seam 2.0. It includes the booking, booking-ear and booking-ejb projects. </description> <size>8127000</size> <url> http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/... </url> - + <fixes> + <fix type="wtpruntime"> + <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property> + <property name="eclipse-projects">booking,booking-ejb,booking-ear</property> + <property name="description">This project example requires the JBoss EAP 4.3 or JBoss AS 4.2.x</property> + </fix> + + <fix type="seam"> + <property name="allowed-versions">2.0.0</property> + <property name="eclipse-projects">booking</property> + <property name="description">This project example requires Seam version 2.0</property> + </fix> + + </fixes> </project> <project> @@ -63,13 +111,31 @@ <description>This example demonstrates the use of Seam in a Java EE 5 environment. Transaction and persistence context management is handled by the EJB container. -This example can also run in Tomcat with JBoss Embedded. +This example requires JBoss EAP 4.3/JBoss AS 4.2.x, Seam 2.0 and TestNG plugin. It includes the booking, booking-ear,booking-test and booking-ejb projects. </description> <size>36036608</size> <url> http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/... </url> + <fixes> + <fix type="wtpruntime"> + <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property> + <property name="eclipse-projects">booking,booking-ejb,booking-ear</property> + <property name="description">This project example requires the JBoss EAP 4.3 or JBoss AS 4.2.x</property> + </fix> + + <fix type="seam"> + <property name="allowed-versions">2.0.0</property> + <property name="eclipse-projects">booking</property> + <property name="description">This project example requires Seam version 2.0</property> + </fix> + <fix type="plugin"> + <property name="id">org.testng.eclipse</property> + <property name="versions">5.8.0, 5.9.0</property> + <property name="description">The TestNG plugin is required if you want to run Seam tests. You can install it using the following update site: http://beust.com/eclipse</property> + </fix> + </fixes> </project> <project> @@ -83,33 +149,81 @@ <description>This example demonstrates the use of Seam in a Java EE 5 environment. Transaction and persistence context management is handled by the EJB container. It includes the booking, booking-ear, booking-ejb,booking-test and booking-parent projects. -Requires the m2eclipse and testng plugins +Requires JBoss EAP 4.3/JBoss AS 4.2.x, Seam 2.0, m2eclipse and testng plugins. </description> <size>203639</size> <url> http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/... </url> + <fixes> + <fix type="wtpruntime"> + <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property> + <property name="eclipse-projects">booking,booking-ejb,booking-ear</property> + <property name="description">This project example requires the JBoss EAP 4.3 or JBoss AS 4.2.x</property> + </fix> + + <fix type="seam"> + <property name="allowed-versions">2.0.0, 2.0.1, 2.0.2</property> + <property name="eclipse-projects">booking</property> + <property name="description">This project example requires Seam version 2.0</property> + </fix> + <fix type="plugin"> + <property name="id">org.testng.eclipse</property> + <property name="versions">5.8.0, 5.9.0</property> + <property name="description">The TestNG plugin is required if you want to run Seam tests. You can install it using the following update site: http://beust.com/eclipse</property> + </fix> + + <fix type="plugin"> + <property name="id">org.maven.ide.eclipse.wtp</property> + <property name="versions">0.9.9, 0.10.0</property> + <property name="description">This project example requires m2eclipse. You can install it using the following update sites: http://m2eclipse.sonatype.org/sites/m2e and http://m2eclipse.sonatype.org/sites/m2e-extras</property> + </fix> + + </fixes> </project> <project> <category>Seam</category> <name>booking3</name> <included-projects> - booking,booking-ear,booking-ejb,booking-parent,booking-test </included-projects> <shortDescription>Seam Booking Example - EAR mavenized - Seam 2.1.1.GA</shortDescription> <description>This example demonstrates the use of Seam in a Java EE 5 environment. Transaction and persistence context management is handled by the EJB container. It includes the booking, booking-ear, booking-ejb, booking-test and booking-parent projects. -Requires the m2eclipse and testng plugins +Requires JBoss EAP 4.3/JBoss AS 4.2.x, Seam 2.1, m2eclipse and testng plugins. </description> <size>196608</size> <url> http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/... </url> + <fixes> + <fix type="wtpruntime"> + <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property> + <property name="eclipse-projects">booking,booking-ejb,booking-ear</property> + <property name="description">This project example requires the JBoss EAP 4.3 or JBoss AS 4.2.x</property> + </fix> + + <fix type="seam"> + <property name="allowed-versions">2.1.0, 2.1.1, 2.1.2</property> + <property name="eclipse-projects">booking</property> + <property name="description">This project example requires Seam version 2.1</property> + </fix> + <fix type="plugin"> + <property name="id">org.testng.eclipse</property> + <property name="versions">5.8.0, 5.9.0</property> + <property name="description">The TestNG plugin is required if you want to run Seam tests. You can install it using the following update site: http://beust.com/eclipse</property> + </fix> + <fix type="plugin"> + <property name="id">org.maven.ide.eclipse.wtp</property> + <property name="versions">0.9.9, 0.10.0</property> + <property name="description">This project example requires m2eclipse. You can install it using the following update sites: http://m2eclipse.sonatype.org/sites/m2e and http://m2eclipse.sonatype.org/sites/m2e-extras</property> + </fix> + + </fixes> </project> <project> @@ -118,13 +232,27 @@ <shortDescription>Seam Booking Example - WAR Standalone</shortDescription> <description>This example demonstrates the use of Seam in a Java EE 5 environment. Transaction and persistence context management is handled by the EJB container. -This example can also run in Tomcat with JBoss Embedded. +This example requires JBoss EAP 4.3/JBoss AS 4.2.x and Seam 2.0. </description> <size>5595136</size> <url> http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/... </url> + <fixes> + <fix type="wtpruntime"> + <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property> + <property name="eclipse-projects">jboss-seam-jpa</property> + <property name="description">This project example requires the JBoss EAP 4.3 or JBoss AS 4.2.x</property> + </fix> + + <fix type="seam"> + <property name="allowed-versions">2.0.0, 2.0.1, 2.0.2</property> + <property name="eclipse-projects">jboss-seam-jpa</property> + <property name="description">This project example requires Seam version 2.0</property> + </fix> + + </fixes> </project> <project> @@ -137,13 +265,32 @@ <shortDescription>Seam Booking Example - WAR Standalone (including a test project)</shortDescription> <description>This example demonstrates the use of Seam in a Java EE 5 environment. Transaction and persistence context management is handled by the EJB container. -This example can also run in Tomcat with JBoss Embedded. +Requires JBoss EAP 4.3/JBoss AS 4.2.x, Seam 2.0 and testng plugins. It includes the jboss-seam-jpa and jboss-seam-jpa-test projects. </description> <size>33357824</size> <url> http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/... </url> + <fixes> + <fix type="wtpruntime"> + <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property> + <property name="eclipse-projects">jboss-seam-jpa</property> + <property name="description">This project example requires the JBoss EAP 4.3 or JBoss AS 4.2.x</property> + </fix> + + <fix type="seam"> + <property name="allowed-versions">2.0.0, 2.0.1, 2.0.2</property> + <property name="eclipse-projects">jboss-seam-jpa</property> + <property name="description">This project example requires Seam version 2.0</property> + </fix> + + <fix type="plugin"> + <property name="id">org.testng.eclipse</property> + <property name="versions">5.8.0, 5.9.0</property> + <property name="description">The TestNG plugin is required if you want to run Seam tests. You can install it using the following update site: http://beust.com/eclipse</property> + </fix> + </fixes> </project> <project> @@ -151,13 +298,21 @@ <category>Portlet</category> <name>testjavaportlet</name> <shortDescription>JBoss Java Portlet Example</shortDescription> - <description>This example demonstrates the use of JBoss Java Portlet. It runs on JBoss Portal 2.7.0.</description> + <description>This example demonstrates the use of JBoss Java Portlet. It runs on JBoss EPP 4.3 or JBoss Portal 2.7.x.</description> <size>10000</size> <url> http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/portlet-exampl... </url> <welcome type="cheatsheets" url="/testjavaportlet/javaportletcs.xml"/> + <fixes> + <fix type="wtpruntime"> + <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property> + <property name="eclipse-projects">testjavaportlet</property> + <property name="description">This project example requires the JBoss EPP 4.3 or JBoss Portal 2.7.x</property> + </fix> + + </fixes> </project> <project> @@ -165,11 +320,19 @@ <name>testjsfportlet</name> <shortDescription>JBoss JSF Portlet Example</shortDescription> - <description>This example demonstrates the use of JBoss JSF Portlet. It runs on JBoss Portal 2.7.0.</description> + <description>This example demonstrates the use of JBoss JSF Portlet. It runs on JBoss EPP 4.3 or JBoss Portal 2.7.x.</description> <size>4000000</size> <url> http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/portlet-exampl... </url> + <fixes> + <fix type="wtpruntime"> + <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property> + <property name="eclipse-projects">testjsfportlet</property> + <property name="description">This project example requires the JBoss EPP 4.3 or JBoss Portal 2.7.x</property> + </fix> + + </fixes> </project> <project> @@ -177,12 +340,23 @@ <name>testseamportlet</name> <shortDescription>JBoss Seam Portlet Example</shortDescription> - <description>This example demonstrates the use of JBoss Seam Portlet. It runs on JBoss Portal 2.7.0.</description> + <description>This example demonstrates the use of JBoss Seam Portlet. It runs on JBoss EPP 4.3/JBoss Portal 2.7.x and Seam 2.0.</description> <size>10000000</size> <url> http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/portlet-exampl... </url> - + <fixes> + <fix type="wtpruntime"> + <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property> + <property name="eclipse-projects">testseamportlet</property> + <property name="description">This project example requires the JBoss EPP 4.3 or JBoss Portal 2.7.x</property> + </fix> + <fix type="seam"> + <property name="allowed-versions">2.0.0, 2.0.1, 2.0.2</property> + <property name="eclipse-projects">testseamportlet</property> + <property name="description">This project example requires Seam version 2.0</property> + </fix> + </fixes> </project> <project> @@ -427,34 +601,21 @@ </project> <project> <category>RichFaces</category> - <name>RichFaces 3.2.2.SP1 Demo Application for JBoss AS 4.2.X</name> <included-projects>richfaces-demo</included-projects> <shortDescription>RichFaces 3.2.2.SP1 Demo Application - WAR</shortDescription> - <description>This example contains RichFaces 3.2.2.SP1 Demo Application</description> + <description>This example contains RichFaces 3.2.2.SP1 Demo Application. It requires JBoss EAP 4.3 or JBoss AS 4.2.x.</description> <size>10640749</size> <url> - http://anonsvn.jboss.org/repos/jbosstools/workspace/dgolovin/examples/rf/... </url> + <fixes> + <fix type="wtpruntime"> + <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property> + <property name="description">This project example requires the JBoss EAP 4.3 or JBoss AS 4.2.x</property> + </fix> + </fixes> </project> - - <project> - <category>RESTEasy</category> - <name>simple</name> - <included-projects> - simple - </included-projects> - <shortDescription>RESTEasy Simple Example</shortDescription> - <description>This project is a simple example showing usage of @Path, @GET, PUT, POST, and @PathParam. It uses pure streaming output and includes the 'simple' project. -Requires m2eclipse >= 0.9.7.20081001-2217. You can install it using the following update site: http://m2eclipse.sonatype.org/update-dev/ - </description> - <size>16939</size> - <url> - http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/resteasy-examp... - </url> - </project> - </projects>

14 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits February 2010