JBoss Tools SVN: r11158 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test: src/org/jboss/tools/jsf/vpe/richfaces/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-10-24 09:53:00 -0400 (Fri, 24 Oct 2008)
New Revision: 11158
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataOrderedList.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataOrderedList.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2810, tests for rich:dataDefinitionList, rich:dataOrderedList.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml 2008-10-24 13:52:52 UTC (rev 11157)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml 2008-10-24 13:53:00 UTC (rev 11158)
@@ -9,9 +9,13 @@
<head>
</head>
<body>
- <!-- DataDefenitionList -->
- <rich:dataDefinitionList rows="5">
- <h:outputText value="testDefinitionList" />
+<f:view>
+ <rich:dataDefinitionList id="dataDefinitionList" rows="5">
+ <h:outputText value="row=1" />
+ <h:outputText value="row=2" />
+ <h:outputText value="row=3" />
+ <h:outputText value="row=4" />
</rich:dataDefinitionList>
+</f:view>
</body>
</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml 2008-10-24 13:53:00 UTC (rev 11158)
@@ -0,0 +1,18 @@
+<tests>
+ <test id="dataDefinitionList">
+ <DL CLASS="listClass">
+ <DD CLASS="columnClass">
+ <SPAN> row=1 </SPAN>
+ </DD>
+ <DD CLASS="columnClass">
+ <SPAN> row=2 </SPAN>
+ </DD>
+ <DD CLASS="columnClass">
+ <SPAN> row=3 </SPAN>
+ </DD>
+ <DD CLASS="columnClass">
+ <SPAN> row=4 </SPAN>
+ </DD>
+ </DL>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataOrderedList.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataOrderedList.xhtml 2008-10-24 13:52:52 UTC (rev 11157)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataOrderedList.xhtml 2008-10-24 13:53:00 UTC (rev 11158)
@@ -9,9 +9,13 @@
<head>
</head>
<body>
- <!-- Data Ordered List -->
- <rich:dataOrderedList rows="5">
- <h:outputText value="testOrderedList" />
- </rich:dataOrderedList>
+ <rich:dataOrderedList id="dataOrderedList" value="" rows="5" type="A">
+ <h:outputText value="row=1" />
+ <h:outputText value="row=2" />
+ <h:outputText value="row=3" />
+ <h:outputText value="row=4" />
+ <h:outputText value="row=5" />
+ <h:outputText value="row=6" />
+</rich:dataOrderedList>
</body>
</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataOrderedList.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataOrderedList.xhtml.xml 2008-10-24 13:52:52 UTC (rev 11157)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataOrderedList.xhtml.xml 2008-10-24 13:53:00 UTC (rev 11158)
@@ -1,5 +1,30 @@
<tests>
- <test id="dataOrderedList">
-
- </test>
-</tests>
\ No newline at end of file
+ <test id="dataOrderedList">
+ <OL TYPE="A" VALUE="" ROWS="5" CLASS="dr-list rich-orderedlist">
+ <LI CLASS="dr-list-item rich-list-item">
+ <SPAN> row=1 </SPAN>
+ <SPAN> row=2 </SPAN>
+ <SPAN> row=3 </SPAN>
+ <SPAN> row=4 </SPAN>
+ <SPAN> row=5 </SPAN>
+ <SPAN> row=6 </SPAN>
+ </LI>
+ <LI CLASS="dr-list-item rich-list-item">
+ <SPAN> row=1 </SPAN>
+ <SPAN> row=2 </SPAN>
+ <SPAN> row=3 </SPAN>
+ <SPAN> row=4 </SPAN>
+ <SPAN> row=5 </SPAN>
+ <SPAN> row=6 </SPAN>
+ </LI>
+ <LI CLASS="dr-list-item rich-list-item">
+ <SPAN> row=1 </SPAN>
+ <SPAN> row=2 </SPAN>
+ <SPAN> row=3 </SPAN>
+ <SPAN> row=4 </SPAN>
+ <SPAN> row=5 </SPAN>
+ <SPAN> row=6 </SPAN>
+ </LI>
+ </OL>
+ </test>
+</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-24 13:52:52 UTC (rev 11157)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-24 13:53:00 UTC (rev 11158)
@@ -91,11 +91,11 @@
}
public void testDataOrderedList() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/dataOrderedList.xhtml");//$NON-NLS-1$
}
public void testDataDefinitionList() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/dataDefinitionList.xhtml");//$NON-NLS-1$
}
public void testDataTable() throws Throwable {
17 years, 2 months
JBoss Tools SVN: r11157 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-10-24 09:52:52 -0400 (Fri, 24 Oct 2008)
New Revision: 11157
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPActiveContentAssistProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2397 Make EL code completions beautifull and context relevant
Proposal relevance is fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPActiveContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPActiveContentAssistProcessor.java 2008-10-24 13:52:39 UTC (rev 11156)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPActiveContentAssistProcessor.java 2008-10-24 13:52:52 UTC (rev 11157)
@@ -138,7 +138,7 @@
int relevance = kbProposal.getRelevance();
if(relevance==KbProposal.R_NONE) {
- relevance = XMLRelevanceConstants.R_XML_ATTRIBUTE_VALUE;
+ relevance = KbProposal.R_XML_ATTRIBUTE_VALUE;
}
if(kbProposal.getStart() < 0) {
@@ -190,7 +190,7 @@
continue; // Process the only EL-proposals here!!!
int relevance = kbProposal.getRelevance();
if(relevance==KbProposal.R_NONE) {
- relevance = XMLRelevanceConstants.R_XML_ATTRIBUTE_VALUE;
+ relevance = KbProposal.R_JSP_JSF_EL_VARIABLE_ATTRIBUTE_VALUE;
}
if(kbProposal.getStart() >= 0) {
17 years, 2 months
JBoss Tools SVN: r11156 - trunk/portlet/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-10-24 09:52:39 -0400 (Fri, 24 Oct 2008)
New Revision: 11156
Modified:
trunk/portlet/docs/reference/en/modules/portlets_support.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-447 - adding a concluding part to the guide on the hole;
Modified: trunk/portlet/docs/reference/en/modules/portlets_support.xml
===================================================================
--- trunk/portlet/docs/reference/en/modules/portlets_support.xml 2008-10-24 13:46:39 UTC (rev 11155)
+++ trunk/portlet/docs/reference/en/modules/portlets_support.xml 2008-10-24 13:52:39 UTC (rev 11156)
@@ -32,8 +32,8 @@
</mediaobject>
</figure>
- <para>The wizard fills in The Web Project and Source Folder fields for you. Then you need to specify
- the Java package and the Class name and click <emphasis>
+ <para>The wizard fills in The Web Project and Source Folder fields for you. Then you need to
+ specify the Java package and the Class name and click <emphasis>
<property>Next</property>
</emphasis>.</para>
@@ -205,9 +205,9 @@
</imageobject>
</mediaobject>
</figure>
-
+
<para>The JSF Portlet looks in the Browser as follows.</para>
-
+
<figure>
<title>JSF Portlet in the Browser Window</title>
<mediaobject>
@@ -217,4 +217,13 @@
</mediaobject>
</figure>
</section>
+
+ <para>With this document you've learnt how to get started with <property>JBoss
+ Portal</property> using <property>JBoss Tools</property> suite of Eclipse plugins. The
+ above chapters walked you through the steps on how to organize a web project with portlets
+ which includes a sample staff and deploy it onto the <property>JBoss Portal</property>.</para>
+
+ <para>If you still have questions or suggestions you are always welcome on our <ulink
+ url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201"
+ >Forum</ulink>. Your feedback will be very much appreciated.</para>
</chapter>
17 years, 2 months
JBoss Tools SVN: r11155 - branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-10-24 09:46:39 -0400 (Fri, 24 Oct 2008)
New Revision: 11155
Modified:
branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2397 Make EL code completions beautifull and context relevant
Proposal relevance is fixed
Modified: branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-10-24 13:44:56 UTC (rev 11154)
+++ branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-10-24 13:46:39 UTC (rev 11155)
@@ -211,7 +211,7 @@
kbProposal.postProcess(currentValue, offset);
int relevance = kbProposal.getRelevance();
if(relevance==KbProposal.R_NONE) {
- relevance = XMLRelevanceConstants.R_XML_ATTRIBUTE_VALUE;
+ relevance = KbProposal.R_XML_ATTRIBUTE_VALUE;
}
if(kbProposal.getStart() >= 0) {
17 years, 2 months
JBoss Tools SVN: r11154 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-10-24 09:44:56 -0400 (Fri, 24 Oct 2008)
New Revision: 11154
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2397 Make EL code completions beautifull and context relevant
Proposal relevance is fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-10-24 13:38:15 UTC (rev 11153)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-10-24 13:44:56 UTC (rev 11154)
@@ -211,7 +211,7 @@
kbProposal.postProcess(currentValue, offset);
int relevance = kbProposal.getRelevance();
if(relevance==KbProposal.R_NONE) {
- relevance = XMLRelevanceConstants.R_XML_ATTRIBUTE_VALUE;
+ relevance = KbProposal.R_XML_ATTRIBUTE_VALUE;
}
if(kbProposal.getStart() >= 0) {
17 years, 2 months
JBoss Tools SVN: r11153 - branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-10-24 09:38:15 -0400 (Fri, 24 Oct 2008)
New Revision: 11153
Modified:
branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbProposal.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2397 Make EL code completions beautifull and context relevant
Proposal relevance is fixed
Modified: branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbProposal.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbProposal.java 2008-10-24 13:36:38 UTC (rev 11152)
+++ branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbProposal.java 2008-10-24 13:38:15 UTC (rev 11153)
@@ -23,10 +23,10 @@
}
public static final int R_NONE = 0;
- public static final int R_JSP_JSF_EL_VARIABLE_ATTRIBUTE_VALUE = 650;
- public static final int R_JSP_ATTRIBUTE_VALUE = 700;
- public static final int R_XML_ATTRIBUTE_VALUE = 800;
- public static final int R_XML_ATTRIBUTE_NAME = 900;
+ public static final int R_JSP_JSF_EL_VARIABLE_ATTRIBUTE_VALUE = 810;
+ public static final int R_JSP_ATTRIBUTE_VALUE = 830;
+ public static final int R_XML_ATTRIBUTE_VALUE = 850;
+ public static final int R_XML_ATTRIBUTE_NAME = 910;
private static final long serialVersionUID = 3257007635692926512L;
17 years, 2 months
JBoss Tools SVN: r11152 - trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-10-24 09:36:38 -0400 (Fri, 24 Oct 2008)
New Revision: 11152
Modified:
trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbProposal.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2397 Make EL code completions beautifull and context relevant
Proposal relevance is fixed
Modified: trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbProposal.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbProposal.java 2008-10-24 13:33:54 UTC (rev 11151)
+++ trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbProposal.java 2008-10-24 13:36:38 UTC (rev 11152)
@@ -23,10 +23,10 @@
}
public static final int R_NONE = 0;
- public static final int R_JSP_JSF_EL_VARIABLE_ATTRIBUTE_VALUE = 650;
- public static final int R_JSP_ATTRIBUTE_VALUE = 700;
- public static final int R_XML_ATTRIBUTE_VALUE = 800;
- public static final int R_XML_ATTRIBUTE_NAME = 900;
+ public static final int R_JSP_JSF_EL_VARIABLE_ATTRIBUTE_VALUE = 810;
+ public static final int R_JSP_ATTRIBUTE_VALUE = 830;
+ public static final int R_XML_ATTRIBUTE_VALUE = 850;
+ public static final int R_XML_ATTRIBUTE_NAME = 910;
private static final long serialVersionUID = 3257007635692926512L;
17 years, 2 months
JBoss Tools SVN: r11151 - branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-10-24 09:33:54 -0400 (Fri, 24 Oct 2008)
New Revision: 11151
Modified:
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2397 Make EL code completions beautifull and context relevant
Proposal relevance is fixed
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2008-10-24 13:32:01 UTC (rev 11150)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2008-10-24 13:33:54 UTC (rev 11151)
@@ -62,6 +62,7 @@
import org.jboss.tools.common.el.core.parser.LexicalToken;
import org.jboss.tools.common.el.core.resolver.ElVarSearcher;
import org.jboss.tools.common.el.core.resolver.Var;
+import org.jboss.tools.common.kb.KbProposal;
import org.jboss.tools.common.model.ui.texteditors.xmleditor.XMLTextEditor;
import org.jboss.tools.common.text.ext.IEditorWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
@@ -271,7 +272,7 @@
* Returns the relevance of the proposal
*/
public int getRelevance() {
- return XMLRelevanceConstants.R_XML_ATTRIBUTE_VALUE+10;
+ return KbProposal.R_JSP_JSF_EL_VARIABLE_ATTRIBUTE_VALUE+10;
}
}
17 years, 2 months
JBoss Tools SVN: r11150 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-10-24 09:32:01 -0400 (Fri, 24 Oct 2008)
New Revision: 11150
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2397 Make EL code completions beautifull and context relevant
Proposal relevance is fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2008-10-24 12:49:19 UTC (rev 11149)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2008-10-24 13:32:01 UTC (rev 11150)
@@ -62,6 +62,7 @@
import org.jboss.tools.common.el.core.parser.LexicalToken;
import org.jboss.tools.common.el.core.resolver.ElVarSearcher;
import org.jboss.tools.common.el.core.resolver.Var;
+import org.jboss.tools.common.kb.KbProposal;
import org.jboss.tools.common.model.ui.texteditors.xmleditor.XMLTextEditor;
import org.jboss.tools.common.text.ext.IEditorWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
@@ -271,7 +272,7 @@
* Returns the relevance of the proposal
*/
public int getRelevance() {
- return XMLRelevanceConstants.R_XML_ATTRIBUTE_VALUE+10;
+ return KbProposal.R_JSP_JSF_EL_VARIABLE_ATTRIBUTE_VALUE+10;
}
}
17 years, 2 months
JBoss Tools SVN: r11149 - branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-10-24 08:49:19 -0400 (Fri, 24 Oct 2008)
New Revision: 11149
Modified:
branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java
Log:
https://jira.jboss.org/jira/browse/JBDS-461
Modified: branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java 2008-10-24 12:45:55 UTC (rev 11148)
+++ branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java 2008-10-24 12:49:19 UTC (rev 11149)
@@ -109,22 +109,22 @@
while(true){
String jbossASLocation = null;
- position = str.indexOf("=",position);
+ position = str.indexOf("=",position+1);
if(position < 0) break;
// server name
- position = str.indexOf(",",position);
+ position = str.indexOf(",",position+1);
if(position < 0) break;
// server type
- position = str.indexOf(",",position);
+ position = str.indexOf(",",position+1);
if(position < 0) break;
// server location
- position = str.indexOf(",",position);
+ position = str.indexOf(",",position+1);
if(position < 0) break;
- int next = str.indexOf("server",position);
+ int next = str.indexOf("server",position+1);
if(next < 0)
jbossASLocation = str.substring(position+1,str.length()-1);
17 years, 2 months
JBoss Tools SVN: r11148 - trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-10-24 08:45:55 -0400 (Fri, 24 Oct 2008)
New Revision: 11148
Modified:
trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java
Log:
https://jira.jboss.org/jira/browse/JBDS-461
Modified: trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java 2008-10-24 12:44:22 UTC (rev 11147)
+++ trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java 2008-10-24 12:45:55 UTC (rev 11148)
@@ -109,22 +109,22 @@
while(true){
String jbossASLocation = null;
- position = str.indexOf("=",position);
+ position = str.indexOf("=",position+1);
if(position < 0) break;
// server name
- position = str.indexOf(",",position);
+ position = str.indexOf(",",position+1);
if(position < 0) break;
// server type
- position = str.indexOf(",",position);
+ position = str.indexOf(",",position+1);
if(position < 0) break;
// server location
- position = str.indexOf(",",position);
+ position = str.indexOf(",",position+1);
if(position < 0) break;
- int next = str.indexOf("server",position);
+ int next = str.indexOf("server",position+1);
if(next < 0)
jbossASLocation = str.substring(position+1,str.length()-1);
17 years, 2 months
JBoss Tools SVN: r11147 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test: src/org/jboss/tools/jsf/vpe/richfaces/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-10-24 08:44:22 -0400 (Fri, 24 Oct 2008)
New Revision: 11147
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/changeExpandListener.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/nodeSelectListener.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/recursiveTreeNodesAdaptor.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/recursiveTreeNodesAdaptor.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNodesAdaptor.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNodesAdaptor.xhtml.xml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2810, tests for rich:changeExpandListener, rich:nodeSelectListener, rich:recursiveTreeNodesAdaptor, rich:treeNodesAdaptor.
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/changeExpandListener.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/changeExpandListener.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/nodeSelectListener.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/nodeSelectListener.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/recursiveTreeNodesAdaptor.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/recursiveTreeNodesAdaptor.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/recursiveTreeNodesAdaptor.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/recursiveTreeNodesAdaptor.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/recursiveTreeNodesAdaptor.xhtml.xml 2008-10-24 12:44:22 UTC (rev 11147)
@@ -0,0 +1,97 @@
+<tests>
+ <test id="dir">
+ <DIV ID="treeNodesAdaptor" CLASS="dr-tree-h-ic-div">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ CLASS="dr-tree-full-width">
+ <TBODY>
+ <TR>
+ <TD
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources//tree/line.gif\); background-position: center; background-repeat: repeat-y;/">
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconClosedNodeWithLines.gif/"
+ RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/>
+ </TD>
+ <TD
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources//tree/leftLine.gif\); background-position: center; background-repeat: repeat-y;/">
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconNodeWithLines.gif/"
+ RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM"/>
+ </TD>
+ <TD CLASS="treeNodeNameStyle">
+ <A>Directory: #{dir.name}</A>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ <DIV ID="treeNodesAdaptor" CLASS="dr-tree-h-ic-div">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ CLASS="dr-tree-full-width">
+ <TBODY>
+ <TR>
+ <TD
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources//tree/line.gif\); background-position: center; background-repeat: repeat-y;/">
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconNotCollapsedWithAllLines.gif/"
+ RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/>
+ </TD>
+ <TD>
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconLeafWithLines.gif/"
+ RICHFACESTREENODEPARAM="iconLeaf"/>
+ </TD>
+ <TD CLASS="treeNodeNameStyle">
+ <A>File: #{file.name}</A>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </DIV>
+ <DIV ID="treeNodesAdaptor" CLASS="dr-tree-h-ic-div">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ CLASS="dr-tree-full-width">
+ <TBODY>
+ <TR>
+ <TD
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources//tree/line.gif\); background-position: center; background-repeat: repeat-y;/">
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconNotCollapsedWithAllLines.gif/"
+ RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/>
+ </TD>
+ <TD>
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconLeafWithLines.gif/"
+ RICHFACESTREENODEPARAM="iconLeaf"/>
+ </TD>
+ <TD CLASS="treeNodeNameStyle">
+ <A>File1: #{file.name}</A>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </DIV>
+ <DIV ID="treeNodesAdaptor" CLASS="dr-tree-h-ic-div">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ CLASS="dr-tree-full-width">
+ <TBODY>
+ <TR>
+ <TD
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources//tree/rightLine.gif\); background-position: center; background-repeat: repeat-y;/">
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconNotCollapsedWithLines.gif/"
+ RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/>
+ </TD>
+ <TD>
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconLeafWithLines.gif/"
+ RICHFACESTREENODEPARAM="iconLeaf"/>
+ </TD>
+ <TD CLASS="treeNodeNameStyle">
+ <A>Archive entry: #{archiveEntry.name}</A>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </DIV>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/recursiveTreeNodesAdaptor.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNodesAdaptor.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNodesAdaptor.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNodesAdaptor.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNodesAdaptor.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNodesAdaptor.xhtml.xml 2008-10-24 12:44:22 UTC (rev 11147)
@@ -0,0 +1,101 @@
+<tests>
+ <test id="project">
+
+ <DIV ID="treeNodesAdaptor">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ CLASS="dr-tree-full-width">
+ <TBODY>
+ <TR>
+ <TD
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources//tree/line.gif\); background-position: center; background-repeat: repeat-y;/">
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconClosedNodeWithLines.gif/"
+ RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/>
+ </TD>
+ <TD
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources//tree/leftLine.gif\); background-position: center; background-repeat: repeat-y;/">
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconNodeWithLines.gif/"
+ RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM"/>
+ </TD>
+ <TD CLASS="treeNodeNameStyle">
+ <A>Project: #{project.name}</A>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ <DIV ID="treeNodesAdaptor" CLASS="dr-tree-h-ic-div">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ CLASS="dr-tree-full-width">
+ <TBODY>
+ <TR>
+ <TD
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources//tree/line.gif\); background-position: center; background-repeat: repeat-y;/">
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconClosedNodeWithLines.gif/"
+ RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/>
+ </TD>
+ <TD
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources//tree/leftLine.gif\); background-position: center; background-repeat: repeat-y;/">
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconNodeWithLines.gif/"
+ RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM"/>
+ </TD>
+ <TD CLASS="treeNodeNameStyle">
+ <A>Source directory: #{srcDir.name}</A>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ <DIV ID="treeNodesAdaptor" CLASS="dr-tree-h-ic-div">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ CLASS="dr-tree-full-width">
+ <TBODY>
+ <TR>
+ <TD
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources//tree/line.gif\); background-position: center; background-repeat: repeat-y;/">
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconClosedNodeWithLines.gif/"
+ RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/>
+ </TD>
+ <TD
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources//tree/leftLine.gif\); background-position: center; background-repeat: repeat-y;/">
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconNodeWithLines.gif/"
+ RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM"/>
+ </TD>
+ <TD CLASS="treeNodeNameStyle">
+ <A>Package: #{pkg.name}</A>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ <DIV ID="treeNodesAdaptor" CLASS="dr-tree-h-ic-div">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ CLASS="dr-tree-full-width">
+ <TBODY>
+ <TR>
+ <TD
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources//tree/rightLine.gif\); background-position: center; background-repeat: repeat-y;/">
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconNotCollapsedWithLines.gif/"
+ RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/>
+ </TD>
+ <TD>
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconLeafWithLines.gif/"
+ RICHFACESTREENODEPARAM="iconLeaf"/>
+ </TD>
+ <TD CLASS="treeNodeNameStyle">
+ <A>Class: #{class.name}</A>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </DIV>
+ </DIV>
+ </DIV>
+ </DIV>
+
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNodesAdaptor.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-24 12:32:37 UTC (rev 11146)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-24 12:44:22 UTC (rev 11147)
@@ -308,19 +308,19 @@
}
public void testChangeExpandListener() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performInvisibleTagTest("components/changeExpandListener.xhtml", "changeExpandListener"); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testNodeSelectListener() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performInvisibleTagTest("components/nodeSelectListener.xhtml", "nodeSelectListener"); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testRecursiveTreeNodesAdaptor() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/recursiveTreeNodesAdaptor.xhtml");//$NON-NLS-1$
}
public void testTreeNodesAdaptor() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/treeNodesAdaptor.xhtml");//$NON-NLS-1$
}
protected String getTestProjectName() {
17 years, 2 months
JBoss Tools SVN: r11146 - branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-10-24 08:32:37 -0400 (Fri, 24 Oct 2008)
New Revision: 11146
Modified:
branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2397 Make EL code completions beautifull and context relevant
Sorting is fixed
Modified: branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java 2008-10-24 12:30:36 UTC (rev 11145)
+++ branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java 2008-10-24 12:32:37 UTC (rev 11146)
@@ -257,7 +257,7 @@
return str2.compareTo(str1) > 0;
}
- return (pr2 > pr1);
+ return (pr1 > pr2);
}
};
}
17 years, 2 months
JBoss Tools SVN: r11145 - trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-10-24 08:30:36 -0400 (Fri, 24 Oct 2008)
New Revision: 11145
Modified:
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2397 Make EL code completions beautifull and context relevant
Sorting is fixed
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java 2008-10-24 10:25:00 UTC (rev 11144)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java 2008-10-24 12:30:36 UTC (rev 11145)
@@ -257,7 +257,7 @@
return str2.compareTo(str1) > 0;
}
- return (pr2 > pr1);
+ return (pr1 > pr2);
}
};
}
17 years, 2 months
JBoss Tools SVN: r11144 - branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-10-24 06:25:00 -0400 (Fri, 24 Oct 2008)
New Revision: 11144
Modified:
branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2980 CA is broken with java.lang.NullPointerException.
fixed
Modified: branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2008-10-24 10:17:26 UTC (rev 11143)
+++ branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2008-10-24 10:25:00 UTC (rev 11144)
@@ -219,6 +219,9 @@
}
public List<TaglibData> getIncludeTaglibs() {
+ if (getEditPart() == null) {
+ return new ArrayList<TaglibData>();
+ }
IEditorInput input = getEditPart().getEditorInput();
IFile file = null;
if (input instanceof IFileEditorInput) {
17 years, 2 months
JBoss Tools SVN: r11143 - branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.ui/icons/wizards.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-10-24 06:17:26 -0400 (Fri, 24 Oct 2008)
New Revision: 11143
Added:
branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.ui/icons/wizards/esb.gif
Log:
JBIDE-2983: apply new icons to new esb project and file wizards
Added: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.ui/icons/wizards/esb.gif
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.ui/icons/wizards/esb.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
17 years, 2 months
JBoss Tools SVN: r11142 - in branches/jbosstools-3.0.0.Beta1/esb/plugins: org.jboss.tools.esb.project.ui/icons/obj16 and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-10-24 06:15:50 -0400 (Fri, 24 Oct 2008)
New Revision: 11142
Added:
branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.ui/icons/obj16/esb_module.gif
branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.ui/images/esb16.gif
Removed:
branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.ui/icons/wizards/esb.gif
branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.ui/images/esb16.png
Modified:
branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml
branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.ui/plugin.xml
Log:
JBIDE-2983: apply new icons to new esb project and file wizards
Added: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.ui/icons/obj16/esb_module.gif
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.ui/icons/obj16/esb_module.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.ui/icons/wizards/esb.gif
===================================================================
(Binary files differ)
Modified: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml
===================================================================
--- branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml 2008-10-24 09:59:27 UTC (rev 11141)
+++ branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml 2008-10-24 10:15:50 UTC (rev 11142)
@@ -34,7 +34,7 @@
<extension
point="org.eclipse.wst.server.ui.serverImages">
<image
- icon="icons/wizards/esb.gif"
+ icon="icons/obj16/esb_module.gif"
id="org.jboss.tools.esb.project.ui.image"
typeIds="jst.jboss.esb">
</image>
Added: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.ui/images/esb16.gif
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.ui/images/esb16.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.ui/images/esb16.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.ui/plugin.xml
===================================================================
--- branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.ui/plugin.xml 2008-10-24 09:59:27 UTC (rev 11141)
+++ branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.ui/plugin.xml 2008-10-24 10:15:50 UTC (rev 11142)
@@ -10,7 +10,7 @@
<wizard
category="org.jboss.tools.esb.ui"
class="org.jboss.tools.esb.ui.wizard.newfile.NewESBFileWizard"
- icon="images/esb16.png"
+ icon="images/esb16.gif"
id="org.jboss.tools.esb.ui.wizard.newfile.NewESBFileWizard"
name="ESB File"
project="false">
17 years, 2 months
JBoss Tools SVN: r11141 - in trunk/esb/plugins: org.jboss.tools.esb.project.ui/icons/obj16 and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-10-24 05:59:27 -0400 (Fri, 24 Oct 2008)
New Revision: 11141
Added:
trunk/esb/plugins/org.jboss.tools.esb.project.ui/icons/obj16/esb_module.gif
trunk/esb/plugins/org.jboss.tools.esb.ui/images/esb16.gif
Removed:
trunk/esb/plugins/org.jboss.tools.esb.ui/images/esb16.png
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.ui/icons/wizards/esb.gif
trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml
trunk/esb/plugins/org.jboss.tools.esb.ui/plugin.xml
Log:
JBIDE-2983: change icons of ESB new project and file wizard
Added: trunk/esb/plugins/org.jboss.tools.esb.project.ui/icons/obj16/esb_module.gif
===================================================================
(Binary files differ)
Property changes on: trunk/esb/plugins/org.jboss.tools.esb.project.ui/icons/obj16/esb_module.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/icons/wizards/esb.gif
===================================================================
(Binary files differ)
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml 2008-10-24 09:41:30 UTC (rev 11140)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml 2008-10-24 09:59:27 UTC (rev 11141)
@@ -34,7 +34,7 @@
<extension
point="org.eclipse.wst.server.ui.serverImages">
<image
- icon="icons/wizards/esb.gif"
+ icon="icons/obj16/esb_module.gif"
id="org.jboss.tools.esb.project.ui.image"
typeIds="jst.jboss.esb">
</image>
Added: trunk/esb/plugins/org.jboss.tools.esb.ui/images/esb16.gif
===================================================================
(Binary files differ)
Property changes on: trunk/esb/plugins/org.jboss.tools.esb.ui/images/esb16.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/esb/plugins/org.jboss.tools.esb.ui/images/esb16.png
===================================================================
(Binary files differ)
Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/plugin.xml 2008-10-24 09:41:30 UTC (rev 11140)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/plugin.xml 2008-10-24 09:59:27 UTC (rev 11141)
@@ -10,7 +10,7 @@
<wizard
category="org.jboss.tools.esb.ui"
class="org.jboss.tools.esb.ui.wizard.newfile.NewESBFileWizard"
- icon="images/esb16.png"
+ icon="images/esb16.gif"
id="org.jboss.tools.esb.ui.wizard.newfile.NewESBFileWizard"
name="ESB File"
project="false">
17 years, 2 months
JBoss Tools SVN: r11140 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test: src/org/jboss/tools/jsf/vpe/richfaces/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-10-24 05:41:30 -0400 (Fri, 24 Oct 2008)
New Revision: 11140
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBarGroup.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBarGroup.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolTip.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tree.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNode.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNode.xhtml.xml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tree.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2810, tests for rich:toolBar, rich:toolBarGroup, rich:toolTip, rich:tree, rich:treeNode. PickList test was updated.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml.xml 2008-10-24 08:42:29 UTC (rev 11139)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml.xml 2008-10-24 09:41:30 UTC (rev 11140)
@@ -13,9 +13,9 @@
<DIV CLASS="rich-picklist-list-content" STYLE="width: 140px; height: 140px;">
<TABLE CELLPADDING="0" CLASS="rich-picklist-internal-tab">
<TBODY>
- <OPTION> Option 1 </OPTION>
- <OPTION> Option 2 </OPTION>
- <OPTION> Option 3 </OPTION>
+ <OPTION> Option 1</OPTION>
+ <OPTION> Option 2</OPTION>
+ <OPTION> Option 3</OPTION>
</TBODY>
</TABLE>
</DIV>
@@ -29,31 +29,31 @@
<DIV CLASS="rich-picklist-controls">
<DIV CLASS="rich-picklist-control-button-class">
<DIV
- STYLE="background-image: url(file:///D:/Projects/jboss_trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/pickList/button.gif);"
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/pickList/button.gif\);/"
CLASS="rich-list-picklist-button">
<DIV CLASS="rich-list-picklist-button-content">
<IMG WIDTH="15" HEIGHT="15"
- SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/pickList/arrow_remove.gif/"/> Remove
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/pickList/arrow_copy.gif/"/> Copy
</DIV>
</DIV>
</DIV>
<DIV CLASS="rich-picklist-control-button-class">
<DIV
- STYLE="background-image: url(file:///D:/Projects/jboss_trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/pickList/button.gif);"
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/pickList/button.gif\);/"
CLASS="rich-list-picklist-button">
<DIV CLASS="rich-list-picklist-button-content">
<IMG WIDTH="15" HEIGHT="15"
- SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/pickList/arrow_copy_all.gif/"/> Copy all
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/pickList/arrow_remove.gif/"/> Remove
</DIV>
</DIV>
</DIV>
<DIV CLASS="rich-picklist-control-button-class">
<DIV
- STYLE="background-image: url(file:///D:/Projects/jboss_trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/pickList/button.gif);"
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/pickList/button.gif\);/"
CLASS="rich-list-picklist-button">
<DIV CLASS="rich-list-picklist-button-content">
<IMG WIDTH="15" HEIGHT="15"
- SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/pickList/arrow_copy.gif/"/> Copy
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/pickList/arrow_remove_all.gif/"/> Remove All
</DIV>
</DIV>
</DIV>
@@ -63,7 +63,7 @@
CLASS="rich-list-picklist-button">
<DIV CLASS="rich-list-picklist-button-content">
<IMG WIDTH="15" HEIGHT="15"
- SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/pickList/arrow_remove_all.gif/"/> Remove All
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/pickList/arrow_copy_all.gif/"/> Copy all
</DIV>
</DIV>
</DIV>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml 2008-10-24 08:42:29 UTC (rev 11139)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml 2008-10-24 09:41:30 UTC (rev 11140)
@@ -8,26 +8,23 @@
<head>
</head>
-
<body>
-<!-- Tool Bar component -->
- <rich:toolBar id="bar" height="30">
- <!-- Tool Bar Group component -->
- <rich:toolBarGroup>
- <h:outputText value="Group1.1" />
- <h:outputText value="Group1.2" />
- <h:outputText value="Group1.3" />
- </rich:toolBarGroup>
- <!-- Tool Bar Group component -->
- <rich:toolBarGroup>
- <h:outputText value="Group2.1" />
- <h:outputText value="Group2.2" />
- </rich:toolBarGroup>
- <!-- Tool Bar Group component -->
- <rich:toolBarGroup location="right">
- <h:outputText value="Group3.1" />
- <h:outputText value="Group3.2" />
- </rich:toolBarGroup>
- </rich:toolBar>
+<f:view>
+ <rich:toolBar id="toolBar" itemSeparator="line">
+ <rich:toolBarGroup>
+ <h:outputLabel value="Edit" for="edit" />
+ </rich:toolBarGroup>
+ <rich:toolBarGroup>
+ <h:outputLabel value="Find" for="find" />
+ </rich:toolBarGroup>
+ <rich:toolBarGroup>
+ <h:outputLabel value="Filter" for="filter" />
+ </rich:toolBarGroup>
+ <rich:toolBarGroup location="right">
+ <h:inputText styleClass="barsearch" />
+ <h:commandButton styleClass="barsearchbutton" value="Search" />
+ </rich:toolBarGroup>
+ </rich:toolBar>
+</f:view>
</body>
</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml 2008-10-24 09:41:30 UTC (rev 11140)
@@ -0,0 +1,82 @@
+<tests>
+ <test id="toolBar">
+ <TABLE WIDTH="100%" CLASS="dr-toolbar-ext rich-toolbar"
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/common/background.gif\);/">
+ <TBODY>
+ <TR VALIGN="middle">
+ <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE="padding: 0px;">
+ <TABLE
+ STYLE="border: 0px none ; margin: 0px; padding: 0px; width: 100%; height: 100%;">
+ <TBODY>
+ <TR VALIGN="middle">
+ <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE="">
+ <LABEL FOR="edit"> Edit </LABEL>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </TD>
+ <TD ALIGN="center">
+ <IMG
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/toolBar/separatorLine.gif/"/>
+ </TD>
+ <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE="padding: 0px;">
+ <TABLE
+ STYLE="border: 0px none ; margin: 0px; padding: 0px; width: 100%; height: 100%;">
+ <TBODY>
+ <TR VALIGN="middle">
+ <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE="">
+ <LABEL FOR="find"> Find </LABEL>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </TD>
+ <TD ALIGN="center">
+ <IMG
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/toolBar/separatorLine.gif/"/>
+ </TD>
+ <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE="padding: 0px;">
+ <TABLE
+ STYLE="border: 0px none ; margin: 0px; padding: 0px; width: 100%; height: 100%;">
+ <TBODY>
+ <TR VALIGN="middle">
+ <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE="">
+ <LABEL FOR="filter"> Filter </LABEL>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </TD>
+ <TD ALIGN="center">
+ <IMG
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/toolBar/separatorLine.gif/"/>
+ </TD>
+ <TD WIDTH="100%">
+ <BR _MOZ_DIRTY="" TYPE="_moz"/>
+ </TD>
+ <TD ALIGN="center">
+ <IMG
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/toolBar/separatorLine.gif/"/>
+ </TD>
+ <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE="padding: 0px;">
+ <TABLE
+ STYLE="border: 0px none ; margin: 0px; padding: 0px; width: 100%; height: 100%;">
+ <TBODY>
+ <TR VALIGN="middle">
+ <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE="">
+ <INPUT CLASS="barsearch" READONLY=""/>
+ </TD>
+ <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE="">
+ <INPUT TYPE="button" CLASS="barsearchbutton" VALUE="Search"
+ STYLE="-moz-user-modify: read-only;" READONLY=""/>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBarGroup.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBarGroup.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBarGroup.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBarGroup.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBarGroup.xhtml.xml 2008-10-24 09:41:30 UTC (rev 11140)
@@ -0,0 +1,14 @@
+<tests>
+ <test id="toolBarGroup">
+ <TABLE
+ STYLE="border: 0px none ; margin: 0px; padding: 0px; width: 100%; height: 100%;">
+ <TBODY>
+ <TR VALIGN="middle">
+ <TD CLASS="dr-toolbar-int rich-toolbar-item">
+ <LABEL FOR="edit"> Edit</LABEL>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBarGroup.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolTip.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolTip.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tree.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tree.xhtml 2008-10-24 08:42:29 UTC (rev 11139)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tree.xhtml 2008-10-24 09:41:30 UTC (rev 11140)
@@ -1,37 +1,28 @@
<!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:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://richfaces.org/rich">
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
<head>
</head>
<body>
-<!-- Tree component -->
-<rich:tree style="width:300px">
- <!-- Tree Nodes component -->
- <rich:treeNodesAdaptor>
- <!-- Tree Node component -->
- <rich:treeNode type="artist">
- <h:outputText value="Node1" />
- </rich:treeNode>
- <rich:treeNode type="album">
- <h:outputText value="Node2" />
- </rich:treeNode>
- </rich:treeNodesAdaptor>
- <!-- Recursive TreeNodes component -->
- <rich:recursiveTreeNodesAdaptor>
- <rich:treeNode type="song">
- <h:outputText value="Leaf1" />
- </rich:treeNode>
- <rich:treeNode type="song">
- <h:outputText value="Leaf2" />
- </rich:treeNode>
- </rich:recursiveTreeNodesAdaptor>
-
-</rich:tree>
+<f:view>
+ <rich:tree id="tree" switchType="client" style="width:300px"
+ value="#{library.data}" var="item" nodeFace="#{item.type}">
+ <rich:treeNode type="artist">
+ <h:outputText value="#{item.name}" />
+ </rich:treeNode>
+ <rich:treeNode type="album">
+ <h:outputText value="#{item.title}" />
+ </rich:treeNode>
+ <rich:treeNode type="song">
+ <h:outputText value="#{item.title}" />
+ </rich:treeNode>
+ </rich:tree>
+</f:view>
</body>
</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tree.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tree.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tree.xhtml.xml 2008-10-24 09:41:30 UTC (rev 11140)
@@ -0,0 +1,75 @@
+<tests>
+ <test id="tree">
+ <DIV STYLE="width: 300px;">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ CLASS="dr-tree-full-width">
+ <TBODY>
+ <TR>
+ <TD
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources//tree/rightLine.gif\); background-position: center; background-repeat: repeat-y;/">
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconCollapsedWithLines.gif/"
+ RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/>
+ </TD>
+ <TD
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources//tree/leftLine.gif\); background-position: center; background-repeat: repeat-y;/">
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconNodeWithLines.gif/"
+ RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM"/>
+ </TD>
+ <TD CLASS="treeNodeNameStyle">
+ <SPAN> #{item.name}</SPAN>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ <DIV CLASS="dr-tree-h-ic-div">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ CLASS="dr-tree-full-width">
+ <TBODY>
+ <TR>
+ <TD
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources//tree/rightLine.gif\); background-position: center; background-repeat: repeat-y;/">
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconCollapsedWithLines.gif/"
+ RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/>
+ </TD>
+ <TD
+ STYLE="background-image: url(file:///D:/Projects/jboss_trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources//tree/leftLine.gif); background-position: center; background-repeat: repeat-y;">
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconNodeWithLines.gif/"
+ RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM"/>
+ </TD>
+ <TD CLASS="treeNodeNameStyle">
+ <SPAN> #{item.title}</SPAN>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ <DIV CLASS="dr-tree-h-ic-div">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ CLASS="dr-tree-full-width">
+ <TBODY>
+ <TR>
+ <TD
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources//tree/rightLine.gif\); background-position: center; background-repeat: repeat-y;/">
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconNotCollapsedWithLines.gif/"
+ RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/>
+ </TD>
+ <TD>
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconLeafWithLines.gif/"
+ RICHFACESTREENODEPARAM="iconLeaf"/>
+ </TD>
+ <TD CLASS="treeNodeNameStyle">
+ <SPAN> #{item.title}</SPAN>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </DIV>
+ </DIV>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tree.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNode.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNode.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNode.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNode.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNode.xhtml.xml 2008-10-24 09:41:30 UTC (rev 11140)
@@ -0,0 +1,26 @@
+<tests>
+ <test id="treeNode">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ CLASS="dr-tree-full-width">
+ <TBODY>
+ <TR>
+ <TD
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources//tree/rightLine.gif\); background-position: center; background-repeat: repeat-y;/">
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconCollapsedWithLines.gif/"
+ RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/>
+ </TD>
+ <TD
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources//tree/leftLine.gif\); background-position: center; background-repeat: repeat-y;/">
+ <IMG CLASS="treePictureStyle"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/tree/iconNodeWithLines.gif/"
+ RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM"/>
+ </TD>
+ <TD CLASS="treeNodeNameStyle">
+ <SPAN> #{item.name}</SPAN>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNode.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-24 08:42:29 UTC (rev 11139)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-24 09:41:30 UTC (rev 11140)
@@ -288,23 +288,23 @@
}
public void testToolBar() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/toolBar.xhtml");//$NON-NLS-1$
}
public void testToolBarGroup() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/toolBarGroup.xhtml");//$NON-NLS-1$
}
public void testToolTip() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performInvisibleTagTest("components/toolTip.xhtml", "toolTip"); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testTree() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/tree.xhtml");//$NON-NLS-1$
}
public void testTreeNode() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/treeNode.xhtml");//$NON-NLS-1$
}
public void testChangeExpandListener() throws Throwable {
17 years, 2 months
JBoss Tools SVN: r11139 - in branches/jbosstools-3.0.0.Beta1/jbpm/docs: converter_ref and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-10-24 04:42:29 -0400 (Fri, 24 Oct 2008)
New Revision: 11139
Added:
branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/
branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/
branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/
branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_1.png
branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_2.png
branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_3.png
branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_4.png
branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_5.png
branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_6.png
branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_7.png
branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_8.png
branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/master.xml
branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/modules/
branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/modules/bpmn2jpdl.xml
branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/modules/overview.xml
branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/pom.xml
Log:
JBIDE-2982:add doc for bpmn ->jpdl
Added: branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_1.png
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_2.png
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_3.png
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_4.png
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_5.png
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_5.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_6.png
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_6.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_7.png
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_7.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_8.png
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_8.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/master.xml
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/master.xml (rev 0)
+++ branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/master.xml 2008-10-24 08:42:29 UTC (rev 11139)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3CR3/docbookx.dtd"
+
+[<!ENTITY overview SYSTEM "modules/overview.xml">
+<!ENTITY bpmn2jpdl SYSTEM "modules/bpmn2jpdl.xml">
+]>
+
+<book>
+
+ <bookinfo>
+ <title>BPMN Convert User Guide</title>
+ <author><firstname>Grid</firstname><surname>Qian</surname><email>fqian(a)redhat.com</email></author>
+ <pubdate>October 2008</pubdate>
+ <copyright>
+ <year>2008</year>
+ <holder>JBoss, a division of Red Hat Inc.</holder>
+ </copyright>
+ <releaseinfo>
+ Version: 3.0.0.beta1
+ </releaseinfo>
+<abstract>
+ <title/>
+ <para>
+ <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/bpmn_convert_guide/p...">PDF version</ulink>
+ </para>
+</abstract>
+
+
+ </bookinfo>
+
+ <toc/>
+ &overview;
+ &bpmn2jpdl;
+</book>
Added: branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/modules/bpmn2jpdl.xml
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/modules/bpmn2jpdl.xml (rev 0)
+++ branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/modules/bpmn2jpdl.xml 2008-10-24 08:42:29 UTC (rev 11139)
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<chapter id="bpmn2jpdl" >
+ <title>Translate a BPMN file to a JPDL file</title>
+ <para>In this chapter we provide you with the necessary steps to translate a BPMN file to a JPDL file.</para>
+
+ <section id="createproject">
+ <title>Creating a project</title>
+ <para>Before creating a bpmn file, you should have a Project created.</para>
+ <para>Create a project by
+ <emphasis><property>New > Project... > Project</property></emphasis>
+ . Enter the following information:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>Project Name: test</para>
+ </listitem>
+ </itemizedlist>
+ <figure>
+ <title>A Project</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_1.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Click on the <property>Finish</property> button.</para>
+ </section>
+
+ <section id="createbpmnfile">
+ <title>Creating a bpmn file by STP BPMN editor</title>
+ <para>Create a bpmn diagram file by
+ <emphasis><property>New > Others... > Bpmn Diagram</property></emphasis>
+ . Enter the following information:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>File Name: test</para>
+ </listitem>
+ </itemizedlist>
+ <figure>
+ <title>Create BPMN Diagram</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_2.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Click on the <property>Finish</property> button.</para>
+ <para>Open the test.bpmn_diagram file by double-click it.</para>
+ <para>Draw the bpmn diagram using STP BPMN editor. If you do not know how to use STP BPMN editor, please go to web site: www.eclipse.org/stp to get the information about STP BPMN editor.</para>
+ </section>
+
+ <section id="bpmntojpdl">
+ <title>Exporting a bpmn file to some jpdl files</title>
+ <para>A BPMN file may include more than one pool. Every pool can be mapped to a corresponding JPDL file.</para>
+ <itemizedlist>
+ <listitem>
+ <para>Select 'test.bpmn' file and right-click it. Open the export wizard by
+ <emphasis><property>Export... > BPMN Export > BPMN -> JPDL</property></emphasis>
+ .
+ </para>
+ <figure>
+ <title>BPMN Export</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_3.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Click on the <property>Next</property> button.</para>
+ </listitem>
+ <listitem>
+ <para>Select the BPMN file that you want to translate.
+ </para>
+ <figure>
+ <title>Choose a BPMN file</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_4.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Click on the <property>Next</property> button.</para>
+ </listitem>
+ <listitem>
+ <para>Select the Pools of BPMN that you want to translate.
+ </para>
+ <figure>
+ <title>Choose BPMN Pools</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_5.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Click on the <property>Next</property> button.</para>
+ </listitem>
+ <listitem>
+ <para>In this page, You may get error messages or warning messages that occured during the conversion. If no any messages, this page will be skipped.
+ </para>
+ <figure>
+ <title>Show Messages</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_6.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Click on the <property>Next</property> button.</para>
+ </listitem>
+ <listitem>
+ <para>Select the target location to save the generated JPDL files.
+ </para>
+ <figure>
+ <title>Target Location</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_7.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <itemizedlist>
+ <listitem>
+ <para>Overwrite existing resources: if you don't want to overwrite existing resources, please keep uncheck this checkbox.</para>
+ </listitem>
+ </itemizedlist>
+ <para>Click on the <property>Finish</property> button.</para>
+ <para>Then the JPDL files are generated to the target location.</para>
+ </listitem>
+ </itemizedlist>
+ <para>The generated files look like this: </para>
+ <figure>
+ <title>The Generated JPDL Files</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_8.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </section>
+
+
+</chapter>
\ No newline at end of file
Added: branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/modules/overview.xml
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/modules/overview.xml (rev 0)
+++ branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/en/modules/overview.xml 2008-10-24 08:42:29 UTC (rev 11139)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<chapter id="overview" revisionflag="overview">
+ <title>BPMN Convert Overview</title>
+
+ <para>JBoss BPMN Convert module is a tool. Users can use it to translate a BPMN file to something else.</para>
+ <para>The BPMN file may be written by hands or by some editors. In this guide, we use STP BPMN editor to draw a BPMN file.</para>
+ <para>As a part of JBoss tools, this module realizes BPMN -> JPDL translation. Users can get a basic JPDL file from a BPMN file by using this module.</para>
+
+</chapter>
\ No newline at end of file
Added: branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/pom.xml
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/pom.xml (rev 0)
+++ branches/jbosstools-3.0.0.Beta1/jbpm/docs/converter_ref/pom.xml 2008-10-24 08:42:29 UTC (rev 11139)
@@ -0,0 +1,102 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>converter-ref-guide${translation}</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+ <name>Converter_Reference_Guide</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.0-200803311251UTC-MPJDOCBOOK-8</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-docbook-xslt</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.0</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDocumentName>master.xml</sourceDocumentName>
+ <sourceDirectory>${pom.basedir}/en</sourceDirectory>
+ <imageResource>
+ <directory>${pom.basedir}/en</directory>
+ <includes>
+ <include>images/**/*</include>
+ </includes>
+ </imageResource>
+ <cssResource>
+ <directory>${pom.basedir}/${cssdir}</directory>
+ </cssResource>
+
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>file:${pom.basedir}/${stylesdir}/xslt/org/jboss/tools/pdf.xsl</stylesheetResource>
+ <finalName>${pom.name}.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>file:${pom.basedir}/${stylesdir}/xslt/org/jboss/tools/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>file:${pom.basedir}/${stylesdir}/xslt/org/jboss/tools/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>eclipse</formatName>
+ <stylesheetResource>file:${pom.basedir}/${stylesdir}/xslt/org/jboss/tools/eclipse.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
+ <!-- could also locate the docbook dependency and inspect its version... -->
+ <docbookVersion>1.72.0</docbookVersion>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <distributionManagement>
+ <repository>
+ <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
+ <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
+ <!-- todo : replace this with direct svn access once the svnkit providers are available -->
+ <id>repository.jboss.org</id>
+ <url>file://${maven.repository.root}</url>
+ </repository>
+ <snapshotRepository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>dav:https://snapshots.jboss.org/maven2</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <properties>
+ <stylesdir>../../../documentation/jbosstools-docbook-xslt/src/main/resources/</stylesdir>
+ <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/org/css/</cssdir>
+ <translation>en-US</translation>
+ </properties>
+
+</project>
17 years, 2 months
JBoss Tools SVN: r11138 - in trunk/jbpm/docs: converter_ref and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-10-24 04:41:43 -0400 (Fri, 24 Oct 2008)
New Revision: 11138
Added:
trunk/jbpm/docs/converter_ref/
trunk/jbpm/docs/converter_ref/en/
trunk/jbpm/docs/converter_ref/en/images/
trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_1.png
trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_2.png
trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_3.png
trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_4.png
trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_5.png
trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_6.png
trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_7.png
trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_8.png
trunk/jbpm/docs/converter_ref/en/master.xml
trunk/jbpm/docs/converter_ref/en/modules/
trunk/jbpm/docs/converter_ref/en/modules/bpmn2jpdl.xml
trunk/jbpm/docs/converter_ref/en/modules/overview.xml
trunk/jbpm/docs/converter_ref/pom.xml
Log:
JBIDE-2982:add doc for bpmn ->jpdl
Added: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_1.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_2.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_3.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_4.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_5.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_5.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_6.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_6.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_7.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_7.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_8.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_8.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/converter_ref/en/master.xml
===================================================================
--- trunk/jbpm/docs/converter_ref/en/master.xml (rev 0)
+++ trunk/jbpm/docs/converter_ref/en/master.xml 2008-10-24 08:41:43 UTC (rev 11138)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3CR3/docbookx.dtd"
+
+[<!ENTITY overview SYSTEM "modules/overview.xml">
+<!ENTITY bpmn2jpdl SYSTEM "modules/bpmn2jpdl.xml">
+]>
+
+<book>
+
+ <bookinfo>
+ <title>BPMN Convert User Guide</title>
+ <author><firstname>Grid</firstname><surname>Qian</surname><email>fqian(a)redhat.com</email></author>
+ <pubdate>October 2008</pubdate>
+ <copyright>
+ <year>2008</year>
+ <holder>JBoss, a division of Red Hat Inc.</holder>
+ </copyright>
+ <releaseinfo>
+ Version: 3.0.0.beta1
+ </releaseinfo>
+<abstract>
+ <title/>
+ <para>
+ <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/bpmn_convert_guide/p...">PDF version</ulink>
+ </para>
+</abstract>
+
+
+ </bookinfo>
+
+ <toc/>
+ &overview;
+ &bpmn2jpdl;
+</book>
Added: trunk/jbpm/docs/converter_ref/en/modules/bpmn2jpdl.xml
===================================================================
--- trunk/jbpm/docs/converter_ref/en/modules/bpmn2jpdl.xml (rev 0)
+++ trunk/jbpm/docs/converter_ref/en/modules/bpmn2jpdl.xml 2008-10-24 08:41:43 UTC (rev 11138)
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<chapter id="bpmn2jpdl" >
+ <title>Translate a BPMN file to a JPDL file</title>
+ <para>In this chapter we provide you with the necessary steps to translate a BPMN file to a JPDL file.</para>
+
+ <section id="createproject">
+ <title>Creating a project</title>
+ <para>Before creating a bpmn file, you should have a Project created.</para>
+ <para>Create a project by
+ <emphasis><property>New > Project... > Project</property></emphasis>
+ . Enter the following information:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>Project Name: test</para>
+ </listitem>
+ </itemizedlist>
+ <figure>
+ <title>A Project</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_1.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Click on the <property>Finish</property> button.</para>
+ </section>
+
+ <section id="createbpmnfile">
+ <title>Creating a bpmn file by STP BPMN editor</title>
+ <para>Create a bpmn diagram file by
+ <emphasis><property>New > Others... > Bpmn Diagram</property></emphasis>
+ . Enter the following information:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>File Name: test</para>
+ </listitem>
+ </itemizedlist>
+ <figure>
+ <title>Create BPMN Diagram</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_2.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Click on the <property>Finish</property> button.</para>
+ <para>Open the test.bpmn_diagram file by double-click it.</para>
+ <para>Draw the bpmn diagram using STP BPMN editor. If you do not know how to use STP BPMN editor, please go to web site: www.eclipse.org/stp to get the information about STP BPMN editor.</para>
+ </section>
+
+ <section id="bpmntojpdl">
+ <title>Exporting a bpmn file to some jpdl files</title>
+ <para>A BPMN file may include more than one pool. Every pool can be mapped to a corresponding JPDL file.</para>
+ <itemizedlist>
+ <listitem>
+ <para>Select 'test.bpmn' file and right-click it. Open the export wizard by
+ <emphasis><property>Export... > BPMN Export > BPMN -> JPDL</property></emphasis>
+ .
+ </para>
+ <figure>
+ <title>BPMN Export</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_3.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Click on the <property>Next</property> button.</para>
+ </listitem>
+ <listitem>
+ <para>Select the BPMN file that you want to translate.
+ </para>
+ <figure>
+ <title>Choose a BPMN file</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_4.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Click on the <property>Next</property> button.</para>
+ </listitem>
+ <listitem>
+ <para>Select the Pools of BPMN that you want to translate.
+ </para>
+ <figure>
+ <title>Choose BPMN Pools</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_5.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Click on the <property>Next</property> button.</para>
+ </listitem>
+ <listitem>
+ <para>In this page, You may get error messages or warning messages that occured during the conversion. If no any messages, this page will be skipped.
+ </para>
+ <figure>
+ <title>Show Messages</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_6.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Click on the <property>Next</property> button.</para>
+ </listitem>
+ <listitem>
+ <para>Select the target location to save the generated JPDL files.
+ </para>
+ <figure>
+ <title>Target Location</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_7.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <itemizedlist>
+ <listitem>
+ <para>Overwrite existing resources: if you don't want to overwrite existing resources, please keep uncheck this checkbox.</para>
+ </listitem>
+ </itemizedlist>
+ <para>Click on the <property>Finish</property> button.</para>
+ <para>Then the JPDL files are generated to the target location.</para>
+ </listitem>
+ </itemizedlist>
+ <para>The generated files look like this: </para>
+ <figure>
+ <title>The Generated JPDL Files</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_8.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </section>
+
+
+</chapter>
\ No newline at end of file
Added: trunk/jbpm/docs/converter_ref/en/modules/overview.xml
===================================================================
--- trunk/jbpm/docs/converter_ref/en/modules/overview.xml (rev 0)
+++ trunk/jbpm/docs/converter_ref/en/modules/overview.xml 2008-10-24 08:41:43 UTC (rev 11138)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<chapter id="overview" revisionflag="overview">
+ <title>BPMN Convert Overview</title>
+
+ <para>JBoss BPMN Convert module is a tool. Users can use it to translate a BPMN file to something else.</para>
+ <para>The BPMN file may be written by hands or by some editors. In this guide, we use STP BPMN editor to draw a BPMN file.</para>
+ <para>As a part of JBoss tools, this module realizes BPMN -> JPDL translation. Users can get a basic JPDL file from a BPMN file by using this module.</para>
+
+</chapter>
\ No newline at end of file
Added: trunk/jbpm/docs/converter_ref/pom.xml
===================================================================
--- trunk/jbpm/docs/converter_ref/pom.xml (rev 0)
+++ trunk/jbpm/docs/converter_ref/pom.xml 2008-10-24 08:41:43 UTC (rev 11138)
@@ -0,0 +1,102 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>converter-ref-guide${translation}</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+ <name>Converter_Reference_Guide</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.0-200803311251UTC-MPJDOCBOOK-8</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-docbook-xslt</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.0</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDocumentName>master.xml</sourceDocumentName>
+ <sourceDirectory>${pom.basedir}/en</sourceDirectory>
+ <imageResource>
+ <directory>${pom.basedir}/en</directory>
+ <includes>
+ <include>images/**/*</include>
+ </includes>
+ </imageResource>
+ <cssResource>
+ <directory>${pom.basedir}/${cssdir}</directory>
+ </cssResource>
+
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>file:${pom.basedir}/${stylesdir}/xslt/org/jboss/tools/pdf.xsl</stylesheetResource>
+ <finalName>${pom.name}.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>file:${pom.basedir}/${stylesdir}/xslt/org/jboss/tools/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>file:${pom.basedir}/${stylesdir}/xslt/org/jboss/tools/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>eclipse</formatName>
+ <stylesheetResource>file:${pom.basedir}/${stylesdir}/xslt/org/jboss/tools/eclipse.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
+ <!-- could also locate the docbook dependency and inspect its version... -->
+ <docbookVersion>1.72.0</docbookVersion>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <distributionManagement>
+ <repository>
+ <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
+ <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
+ <!-- todo : replace this with direct svn access once the svnkit providers are available -->
+ <id>repository.jboss.org</id>
+ <url>file://${maven.repository.root}</url>
+ </repository>
+ <snapshotRepository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>dav:https://snapshots.jboss.org/maven2</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <properties>
+ <stylesdir>../../../documentation/jbosstools-docbook-xslt/src/main/resources/</stylesdir>
+ <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/org/css/</cssdir>
+ <translation>en-US</translation>
+ </properties>
+
+</project>
17 years, 2 months
JBoss Tools SVN: r11137 - branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-10-24 04:09:11 -0400 (Fri, 24 Oct 2008)
New Revision: 11137
Modified:
branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnToWizard.java
branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/ErrorMessagesPage.java
Log:
JBIDE-2974:the Finish button should be disable after choose some bpmn pools in the wizard page
Modified: branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnToWizard.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnToWizard.java 2008-10-24 08:05:17 UTC (rev 11136)
+++ branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnToWizard.java 2008-10-24 08:09:11 UTC (rev 11137)
@@ -129,8 +129,10 @@
public IWizardPage getNextPage(IWizardPage page) {
if (page.getName()
- .equals(B2JMessages.Bpmn_Translate_Message_WizardPage_Name)) {
+ .equals(B2JMessages.Bpmn_Pool_Choose_WizardPage_Name)) {
errorList = translateBpmnToStrings();
+ errorPage.setPageComplete(true);
+
if (errorList.size() == 0) {
return locationPage;
}
Modified: branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/ErrorMessagesPage.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/ErrorMessagesPage.java 2008-10-24 08:05:17 UTC (rev 11136)
+++ branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/ErrorMessagesPage.java 2008-10-24 08:09:11 UTC (rev 11137)
@@ -31,6 +31,7 @@
private TableViewer listViewer;
+
protected ErrorMessagesPage(String pageName, String title, String description) {
super(pageName);
this.setDescription(description);
@@ -43,7 +44,7 @@
createListTitleArea(composite);
createListViewer(composite);
setControl(composite);
-
+ initializePage();
}
private Label createListTitleArea(Composite composite) {
@@ -78,11 +79,10 @@
composite.setLayoutData(new GridData(GridData.FILL_BOTH));
return composite;
}
-
- public boolean isPageComplete() {
- return true;
+
+ private void initializePage() {
+ this.setPageComplete(false);
}
-
public TableViewer getListViewer() {
return listViewer;
17 years, 2 months
JBoss Tools SVN: r11136 - trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-10-24 04:05:17 -0400 (Fri, 24 Oct 2008)
New Revision: 11136
Modified:
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnToWizard.java
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/ErrorMessagesPage.java
Log:
JBIDE-2974:the Finish button should be disable after choose some bpmn pools in the wizard page
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnToWizard.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnToWizard.java 2008-10-24 07:25:01 UTC (rev 11135)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnToWizard.java 2008-10-24 08:05:17 UTC (rev 11136)
@@ -129,8 +129,10 @@
public IWizardPage getNextPage(IWizardPage page) {
if (page.getName()
- .equals(B2JMessages.Bpmn_Translate_Message_WizardPage_Name)) {
+ .equals(B2JMessages.Bpmn_Pool_Choose_WizardPage_Name)) {
errorList = translateBpmnToStrings();
+ errorPage.setPageComplete(true);
+
if (errorList.size() == 0) {
return locationPage;
}
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/ErrorMessagesPage.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/ErrorMessagesPage.java 2008-10-24 07:25:01 UTC (rev 11135)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/ErrorMessagesPage.java 2008-10-24 08:05:17 UTC (rev 11136)
@@ -31,6 +31,7 @@
private TableViewer listViewer;
+
protected ErrorMessagesPage(String pageName, String title, String description) {
super(pageName);
this.setDescription(description);
@@ -43,7 +44,7 @@
createListTitleArea(composite);
createListViewer(composite);
setControl(composite);
-
+ initializePage();
}
private Label createListTitleArea(Composite composite) {
@@ -78,11 +79,10 @@
composite.setLayoutData(new GridData(GridData.FILL_BOTH));
return composite;
}
-
- public boolean isPageComplete() {
- return true;
+
+ private void initializePage() {
+ this.setPageComplete(false);
}
-
public TableViewer getListViewer() {
return listViewer;
17 years, 2 months
JBoss Tools SVN: r11135 - in branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert: b2j/wizard and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-10-24 03:25:01 -0400 (Fri, 24 Oct 2008)
New Revision: 11135
Modified:
branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/TranslateHelper.java
branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/wizard/B2JExportWizard.java
branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/util/BPMNToUtil.java
branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java
Log:
JBIDE-2973:the checkbox for overwrite existing resources has not effort on the result
Modified: branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/TranslateHelper.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/TranslateHelper.java 2008-10-24 07:19:54 UTC (rev 11134)
+++ branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/TranslateHelper.java 2008-10-24 07:25:01 UTC (rev 11135)
@@ -65,16 +65,16 @@
File jpdlFolder = BPMNToUtil.createFile(parentFolder,
B2JMessages.Jpdl_Suffix, null, isOverWrite);
File diagramFolder = BPMNToUtil.createFile(
- jpdlFolder.getAbsolutePath(), bpmnFileName, null, isOverWrite);
+ jpdlFolder.getAbsolutePath(), bpmnFileName, null, false);
File[] files = new File[strsForGenerate.length];
File processFolder = null;
int i = 0;
for (String str : strsForGenerate) {
processFolder = BPMNToUtil.createFile(diagramFolder
- .getAbsolutePath(), fileFolders[i], null, isOverWrite);
+ .getAbsolutePath(), fileFolders[i], null, false);
files[i] = BPMNToUtil.createFile(processFolder.getAbsolutePath(),
- fileName, str, isOverWrite);
+ fileName, str, false);
i++;
}
return files;
Modified: branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/wizard/B2JExportWizard.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/wizard/B2JExportWizard.java 2008-10-24 07:19:54 UTC (rev 11134)
+++ branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/wizard/B2JExportWizard.java 2008-10-24 07:25:01 UTC (rev 11135)
@@ -38,6 +38,9 @@
private List<String> generatedGpdFoldersList = new ArrayList<String>();
public void createGeneratedFile(boolean isOverWrite) {
+ if(!isOverWrite){
+ return;
+ }
String[] jpdlFolderNames = new String[this.generatedFoldersList.size()];
String location = super.getContainerPath((IContainer) super
@@ -81,7 +84,7 @@
}
try {
TranslateHelper.createFiles(location, bpmnFileName, strs,
- jpdlFolderNames, B2JMessages.Gpd_Definition_Name, isOverWrite);
+ jpdlFolderNames, B2JMessages.Gpd_Definition_Name, false);
} catch (Exception e) {
BpmnToPlugin.getDefault().logError(e.getMessage());
}
Modified: branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/util/BPMNToUtil.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/util/BPMNToUtil.java 2008-10-24 07:19:54 UTC (rev 11134)
+++ branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/util/BPMNToUtil.java 2008-10-24 07:25:01 UTC (rev 11135)
@@ -53,12 +53,15 @@
public static File createFile(String parentFolder, String fileName,
String inputStr, boolean isOverWrite) throws IOException {
File child = new File(parentFolder, fileName);
+ if(isOverWrite){
+ deleteAll(child);
+ }
if (inputStr == null) {
- if (!child.exists() || isOverWrite) {
+ if (!child.exists()) {
child.mkdir();
}
} else {
- if (!child.exists() || isOverWrite) {
+ if (!child.exists()) {
child.createNewFile();
}
FileWriter childWriter = new FileWriter(child);
@@ -71,6 +74,20 @@
return child;
}
+ public static void deleteAll(File path) {
+ if (!path.exists())
+ return;
+ if (path.isFile()) {
+ path.delete();
+ return;
+ }
+ File[] files = path.listFiles();
+ for (int i = 0; i < files.length; i++) {
+ deleteAll(files[i]);
+ }
+ path.delete();
+ }
+
/*
* get a sax input source
*/
Modified: branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java 2008-10-24 07:19:54 UTC (rev 11134)
+++ branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java 2008-10-24 07:25:01 UTC (rev 11135)
@@ -50,7 +50,7 @@
private ISelection currentSelection;
private Button button;
private IWizard wizard;
- private boolean isOverWrite;
+ private boolean isOverWrite = true;
protected GeneratedFileLocationPage(String pageName, String title,
17 years, 2 months
JBoss Tools SVN: r11134 - in trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert: b2j/wizard and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-10-24 03:19:54 -0400 (Fri, 24 Oct 2008)
New Revision: 11134
Modified:
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/TranslateHelper.java
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/wizard/B2JExportWizard.java
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/util/BPMNToUtil.java
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java
Log:
JBIDE-2973:the checkbox for overwrite existing resources has not effort on the result
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/TranslateHelper.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/TranslateHelper.java 2008-10-24 07:17:20 UTC (rev 11133)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/TranslateHelper.java 2008-10-24 07:19:54 UTC (rev 11134)
@@ -65,16 +65,16 @@
File jpdlFolder = BPMNToUtil.createFile(parentFolder,
B2JMessages.Jpdl_Suffix, null, isOverWrite);
File diagramFolder = BPMNToUtil.createFile(
- jpdlFolder.getAbsolutePath(), bpmnFileName, null, isOverWrite);
+ jpdlFolder.getAbsolutePath(), bpmnFileName, null, false);
File[] files = new File[strsForGenerate.length];
File processFolder = null;
int i = 0;
for (String str : strsForGenerate) {
processFolder = BPMNToUtil.createFile(diagramFolder
- .getAbsolutePath(), fileFolders[i], null, isOverWrite);
+ .getAbsolutePath(), fileFolders[i], null, false);
files[i] = BPMNToUtil.createFile(processFolder.getAbsolutePath(),
- fileName, str, isOverWrite);
+ fileName, str, false);
i++;
}
return files;
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/wizard/B2JExportWizard.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/wizard/B2JExportWizard.java 2008-10-24 07:17:20 UTC (rev 11133)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/wizard/B2JExportWizard.java 2008-10-24 07:19:54 UTC (rev 11134)
@@ -38,6 +38,9 @@
private List<String> generatedGpdFoldersList = new ArrayList<String>();
public void createGeneratedFile(boolean isOverWrite) {
+ if(!isOverWrite){
+ return;
+ }
String[] jpdlFolderNames = new String[this.generatedFoldersList.size()];
String location = super.getContainerPath((IContainer) super
@@ -81,7 +84,7 @@
}
try {
TranslateHelper.createFiles(location, bpmnFileName, strs,
- jpdlFolderNames, B2JMessages.Gpd_Definition_Name, isOverWrite);
+ jpdlFolderNames, B2JMessages.Gpd_Definition_Name, false);
} catch (Exception e) {
BpmnToPlugin.getDefault().logError(e.getMessage());
}
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/util/BPMNToUtil.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/util/BPMNToUtil.java 2008-10-24 07:17:20 UTC (rev 11133)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/util/BPMNToUtil.java 2008-10-24 07:19:54 UTC (rev 11134)
@@ -53,12 +53,15 @@
public static File createFile(String parentFolder, String fileName,
String inputStr, boolean isOverWrite) throws IOException {
File child = new File(parentFolder, fileName);
+ if(isOverWrite){
+ deleteAll(child);
+ }
if (inputStr == null) {
- if (!child.exists() || isOverWrite) {
+ if (!child.exists()) {
child.mkdir();
}
} else {
- if (!child.exists() || isOverWrite) {
+ if (!child.exists()) {
child.createNewFile();
}
FileWriter childWriter = new FileWriter(child);
@@ -71,6 +74,20 @@
return child;
}
+ public static void deleteAll(File path) {
+ if (!path.exists())
+ return;
+ if (path.isFile()) {
+ path.delete();
+ return;
+ }
+ File[] files = path.listFiles();
+ for (int i = 0; i < files.length; i++) {
+ deleteAll(files[i]);
+ }
+ path.delete();
+ }
+
/*
* get a sax input source
*/
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java 2008-10-24 07:17:20 UTC (rev 11133)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java 2008-10-24 07:19:54 UTC (rev 11134)
@@ -50,7 +50,7 @@
private ISelection currentSelection;
private Button button;
private IWizard wizard;
- private boolean isOverWrite;
+ private boolean isOverWrite = true;
protected GeneratedFileLocationPage(String pageName, String title,
17 years, 2 months
JBoss Tools SVN: r11133 - in branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: java2xml/analyzer and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-10-24 03:17:20 -0400 (Fri, 24 Oct 2008)
New Revision: 11133
Modified:
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/IMappingAnalyzer.java
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/XML2XMLAnalyzer.java
Log:
JBIDE-2867
Change the display composite to sashform
Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/IMappingAnalyzer.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/IMappingAnalyzer.java 2008-10-23 23:27:05 UTC (rev 11132)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/IMappingAnalyzer.java 2008-10-24 07:17:20 UTC (rev 11133)
@@ -26,6 +26,6 @@
public MappingResourceConfigList analyzeMappingSmooksModel(
SmooksResourceListType listType,Object sourceObject,Object targetObject);
- public DesignTimeAnalyzeResult analyzeGraphModel(SmooksConfigurationFileGenerateContext context);
+ public DesignTimeAnalyzeResult[] analyzeGraphModel(SmooksConfigurationFileGenerateContext context);
}
Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java 2008-10-23 23:27:05 UTC (rev 11132)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java 2008-10-24 07:17:20 UTC (rev 11133)
@@ -174,7 +174,7 @@
return "${" + name + "}";
}
- public DesignTimeAnalyzeResult analyzeGraphModel(
+ public DesignTimeAnalyzeResult[] analyzeGraphModel(
SmooksConfigurationFileGenerateContext context) {
// TODO Auto-generated method stub
return null;
Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-10-23 23:27:05 UTC (rev 11132)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-10-24 07:17:20 UTC (rev 11133)
@@ -366,12 +366,12 @@
}
- private DesignTimeAnalyzeResult checkOtherNodeConnected(
+ private DesignTimeAnalyzeResult[] checkOtherNodeConnected(
SmooksConfigurationFileGenerateContext context) {
GraphRootModel root = context.getGraphicalRootModel();
List sourceList = root.loadSourceModelList();
List targetList = root.loadTargetModelList();
- StringBuffer buffer = new StringBuffer();
+ List<DesignTimeAnalyzeResult> arList = new ArrayList<DesignTimeAnalyzeResult>();
for (Iterator iterator = targetList.iterator(); iterator.hasNext();) {
AbstractStructuredDataModel targetm = (AbstractStructuredDataModel) iterator
.next();
@@ -390,24 +390,21 @@
if (pgm != null && pgm instanceof IConnectableModel) {
if (((IConnectableModel) pgm)
.getModelTargetConnections().isEmpty()) {
- buffer
- .append("The parent of Java node \""
- + javaModel.getName()
- + "\" : \""
- + parent.getName()
- + "\" doesn't be connected by any source node!\n");
+ String errorMessage = "The parent of Java node \""
+ + javaModel.getName()
+ + "\" : \""
+ + parent.getName()
+ + "\" doesn't be connected by any source node";
+ DesignTimeAnalyzeResult dr = new DesignTimeAnalyzeResult();
+ dr.setErrorMessage(errorMessage);
+
+ arList.add(dr);
}
}
}
}
}
- String result = buffer.toString();
- if ("".equals(result)) {
- return null;
- }
- DesignTimeAnalyzeResult dr = new DesignTimeAnalyzeResult();
- dr.setErrorMessage(result);
- return dr;
+ return arList.toArray(new DesignTimeAnalyzeResult[0]);
}
/**
@@ -1044,7 +1041,7 @@
return null;
}
- public DesignTimeAnalyzeResult analyzeGraphModel(
+ public DesignTimeAnalyzeResult[] analyzeGraphModel(
SmooksConfigurationFileGenerateContext context) {
checkRootNodeConnected(context);
return checkOtherNodeConnected(context);
Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-10-23 23:27:05 UTC (rev 11132)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-10-24 07:17:20 UTC (rev 11133)
@@ -61,6 +61,8 @@
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.custom.ScrolledComposite;
import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.DragSourceAdapter;
import org.eclipse.swt.dnd.DragSourceEvent;
@@ -92,6 +94,7 @@
import org.eclipse.ui.forms.events.IHyperlinkListener;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.Hyperlink;
+import org.eclipse.ui.forms.widgets.ImageHyperlink;
import org.eclipse.ui.forms.widgets.ScrolledForm;
import org.eclipse.ui.forms.widgets.Section;
import org.jboss.tools.smooks.analyzer.AnalyzerFactory;
@@ -141,6 +144,9 @@
public class SmooksGraphicalFormPage extends FormPage implements
ISelectionChangedListener, ISelectionProvider,
org.eclipse.emf.common.command.CommandStackListener {
+
+ private List<DesignTimeAnalyzeResult> analyzeResultList = new ArrayList<DesignTimeAnalyzeResult>();
+
private static final String REFERENCE_MODEL = "__reference_model";
protected SmooksConfigurationFileGenerateContext smooksConfigurationFileGenerateContext;
protected IViewerInitor sourceViewerInitor;
@@ -168,10 +174,10 @@
private ISelection selection;
protected MappingResourceConfigList mappingResourceConfigList;
protected AdapterFactoryEditingDomain editingDomain;
- private Label notifyLabel;
private boolean canSaveFile = true;
- private Label imageLabel;
+ private Composite designTimeAnalyzeResultRegion;
+
public ISelection getSelection() {
return selection;
}
@@ -268,37 +274,38 @@
Section.TITLE_BAR | Section.DESCRIPTION,
"Mapping Graph Edit Panel",
"Edit the source and target assosiation");
- Composite mappingMainComposite = toolkit.createComposite(section);
- GridLayout gly = new GridLayout();
- gly.numColumns = 3;
- gly.horizontalSpacing = 0;
- mappingMainComposite.setLayout(gly);
- section.setClient(mappingMainComposite);
- Composite notifyComposite = toolkit
- .createComposite(mappingMainComposite);
- GridData ngd = new GridData(GridData.FILL_HORIZONTAL);
- ngd.horizontalSpan = 3;
+ Composite mainComposite = toolkit.createComposite(section);
+ section.setClient(mainComposite);
+
+ GridLayout mainLayout = new GridLayout();
+ mainComposite.setLayout(mainLayout);
+
+ SashForm sashForm = new SashForm(mainComposite, SWT.VERTICAL);
+ GridData sashFormLd = new GridData(GridData.FILL_BOTH);
+ sashForm.setLayoutData(sashFormLd);
+
+ sashForm.setSashWidth(1);
+
+ designTimeAnalyzeResultRegion = toolkit.createComposite(sashForm);
GridLayout ngl = new GridLayout();
ngl.numColumns = 2;
- notifyComposite.setLayout(ngl);
- notifyComposite.setLayoutData(ngd);
- imageLabel = toolkit.createLabel(notifyComposite, "");
- imageLabel.setImage(SmooksUIActivator.getDefault().getImageRegistry()
- .get(SmooksGraphConstants.IMAGE_EMPTY));
- notifyLabel = toolkit.createLabel(notifyComposite, "" );
- GridData nlgd = new GridData(GridData.FILL_HORIZONTAL);
- notifyLabel.setLayoutData(nlgd);
+ ngl.marginWidth = 0;
+ designTimeAnalyzeResultRegion.setLayout(ngl);
+
+ SashForm mappingMainComposite = new SashForm(sashForm, SWT.NONE);
+ mappingMainComposite.setSashWidth(1);
GridData sgd = new GridData(GridData.FILL_BOTH);
section.setLayoutData(sgd);
{
Composite composite1 = toolkit
.createComposite(mappingMainComposite);
GridLayout layout = new GridLayout();
+ layout.marginWidth = 1;
layout.marginHeight = 1;
- layout.marginWidth = 1;
+ composite1.setLayout(layout);
+
GridData gd = new GridData(GridData.FILL_BOTH);
- composite1.setLayout(layout);
sourceViewer = this.createSourceTreeViewer(composite1);
sourceViewer.getTree().setLayoutData(gd);
sourceViewer.addDragSupport(DND.DROP_MOVE | DND.DROP_COPY
@@ -320,26 +327,16 @@
composite1.setLayoutData(gd);
composite1.setBackground(GraphicsConstants.groupBorderColor);
}
+
{
Composite composite2 = toolkit
.createComposite(mappingMainComposite);
- GridData composite2LData = new GridData();
- composite2LData.grabExcessHorizontalSpace = true;
- composite2LData.grabExcessVerticalSpace = true;
- composite2LData.horizontalAlignment = GridData.FILL;
- composite2LData.verticalAlignment = GridData.FILL;
- composite2.setLayoutData(composite2LData);
composite2.setLayout(new FillLayout());
this.setGraphicalViewer(createGraphicalViewer(composite2));
}
{
Composite composite3 = toolkit
.createComposite(mappingMainComposite);
- GridData composite3LData = new GridData();
- composite3LData.grabExcessHorizontalSpace = true;
- composite3LData.verticalAlignment = GridData.FILL;
- composite3LData.grabExcessVerticalSpace = true;
- composite3LData.horizontalAlignment = GridData.FILL;
GridLayout layout = new GridLayout();
layout.marginWidth = 1;
layout.marginHeight = 1;
@@ -362,8 +359,7 @@
}
{
- Composite underToolPanel = toolkit
- .createComposite(mappingMainComposite);
+ Composite underToolPanel = toolkit.createComposite(mainComposite);
GridData sgd1 = new GridData(GridData.FILL_HORIZONTAL);
GridLayout underLayout = new GridLayout();
underLayout.numColumns = 3;
@@ -416,8 +412,8 @@
// section1.setLayoutData(sgd1);
toolkit.paintBordersFor(rootMainControl);
-
form.pack();
+ sashForm.setWeights(new int[] { 8, 100 });
if (initSourceTreeViewerProviders()) {
initSourceTreeViewer();
expandSourceConnectionModel();
@@ -665,7 +661,9 @@
/*
* (non-Javadoc)
*
- * @see org.eclipse.ui.forms.editor.FormPage#doSave(org.eclipse.core.runtime.IProgressMonitor)
+ * @see
+ * org.eclipse.ui.forms.editor.FormPage#doSave(org.eclipse.core.runtime.
+ * IProgressMonitor)
*/
@Override
public void doSave(IProgressMonitor monitor) {
@@ -674,8 +672,8 @@
.openQuestion(
getSite().getShell(),
"Clean all the errors please",
- "There occurs some errors on the graphical design , please clean all errors .\n" +
- "Click \"Yes\" to return . If you don't care that , click \"No\" to save file.");
+ "There occurs some errors on the graphical design , please clean all errors .\n"
+ + "Click \"Yes\" to return . If you don't care that , click \"No\" to save file.");
if (cleanError)
return;
}
@@ -913,7 +911,7 @@
protected void initTransformViewerModel(IEditorSite site, IEditorInput input)
throws Throwable {
graphicalInformationSaver = new GraphicalInformationSaver(input);
-
+
GraphInformations graph = null;
try {
graph = graphicalInformationSaver.doLoad();
@@ -975,8 +973,9 @@
/*
* (non-Javadoc)
*
- * @see org.eclipse.ui.forms.editor.FormPage#init(org.eclipse.ui.IEditorSite,
- * org.eclipse.ui.IEditorInput)
+ * @see
+ * org.eclipse.ui.forms.editor.FormPage#init(org.eclipse.ui.IEditorSite,
+ * org.eclipse.ui.IEditorInput)
*/
public void init(IEditorSite site, IEditorInput input) {
super.init(site, input);
@@ -1096,7 +1095,9 @@
/*
* (non-Javadoc)
*
- * @see org.eclipse.ui.forms.events.IHyperlinkListener#linkActivated(org.eclipse.ui.forms.events.HyperlinkEvent)
+ * @see
+ * org.eclipse.ui.forms.events.IHyperlinkListener#linkActivated(org.
+ * eclipse.ui.forms.events.HyperlinkEvent)
*/
public void linkActivated(HyperlinkEvent e) {
showCreationWizard(viewer);
@@ -1105,7 +1106,9 @@
/*
* (non-Javadoc)
*
- * @see org.eclipse.ui.forms.events.IHyperlinkListener#linkEntered(org.eclipse.ui.forms.events.HyperlinkEvent)
+ * @see
+ * org.eclipse.ui.forms.events.IHyperlinkListener#linkEntered(org.eclipse
+ * .ui.forms.events.HyperlinkEvent)
*/
public void linkEntered(HyperlinkEvent e) {
@@ -1114,7 +1117,9 @@
/*
* (non-Javadoc)
*
- * @see org.eclipse.ui.forms.events.IHyperlinkListener#linkExited(org.eclipse.ui.forms.events.HyperlinkEvent)
+ * @see
+ * org.eclipse.ui.forms.events.IHyperlinkListener#linkExited(org.eclipse
+ * .ui.forms.events.HyperlinkEvent)
*/
public void linkExited(HyperlinkEvent e) {
@@ -1146,7 +1151,9 @@
/*
* (non-Javadoc)
*
- * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
+ * @see
+ * org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets
+ * .Event)
*/
public void handleEvent(Event event) {
TreeItem item = (TreeItem) event.item;
@@ -1179,7 +1186,9 @@
/*
* (non-Javadoc)
*
- * @see org.eclipse.swt.events.PaintListener#paintControl(org.eclipse.swt.events.PaintEvent)
+ * @see
+ * org.eclipse.swt.events.PaintListener#paintControl(org.eclipse.swt
+ * .events.PaintEvent)
*/
public void paintControl(PaintEvent e) {
Tree tree = (Tree) e.getSource();
@@ -1253,27 +1262,32 @@
getManagedForm().dirtyStateChanged();
}
- protected void setErrorMessage(String errorMessage) {
- imageLabel.setImage(SmooksUIActivator.getDefault().getImageRegistry().get(SmooksGraphConstants.IMAGE_EMPTY));
- notifyLabel.setText("");
- canSaveFile = true;
- if (errorMessage != null) {
- imageLabel.setImage(SmooksUIActivator.getDefault()
- .getImageRegistry().get(SmooksGraphConstants.IMAGE_ERROR));
- notifyLabel.setText(errorMessage);
- canSaveFile = false;
+ protected void updateErrorMessage() {
+ for (Iterator<DesignTimeAnalyzeResult> iterator = this.analyzeResultList
+ .iterator(); iterator.hasNext();) {
+ DesignTimeAnalyzeResult result = (DesignTimeAnalyzeResult) iterator
+ .next();
+ if (result.getErrorMessage() != null) {
+ if(canSaveFile) canSaveFile = false;
+ Label imageLabel = new Label(designTimeAnalyzeResultRegion,
+ SWT.NONE);
+ GridData gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
+ imageLabel.setLayoutData(gd);
+ imageLabel.setImage(SmooksUIActivator.getDefault()
+ .getImageRegistry().get(
+ SmooksGraphConstants.IMAGE_ERROR));
+ Label notifyLabel = new Label(designTimeAnalyzeResultRegion,
+ SWT.NONE);
+ GridData nlgd = new GridData(GridData.FILL_HORIZONTAL);
+ notifyLabel.setLayoutData(nlgd);
+ notifyLabel.setText(result.getErrorMessage());
+
+ }
}
}
- protected void setWarningMessage(String warningMessage) {
- imageLabel.setImage(SmooksUIActivator.getDefault().getImageRegistry().get(SmooksGraphConstants.IMAGE_EMPTY));
- notifyLabel.setText("");
- if (warningMessage != null) {
- imageLabel
- .setImage(SmooksUIActivator.getDefault().getImageRegistry()
- .get(SmooksGraphConstants.IMAGE_WARNING));
- notifyLabel.setText(warningMessage);
- }
+ protected void updateWarningMessage() {
+
}
protected void analyzeDesignGraph() {
@@ -1283,28 +1297,33 @@
SmooksConfigurationFileGenerateContext context = this
.createContext();
this.initSmooksConfigurationFileGenerateContext(context);
- DesignTimeAnalyzeResult result = analyzer
+ DesignTimeAnalyzeResult[] results = analyzer
.analyzeGraphModel(context);
- if (result != null) {
- String errorMessage = result.getErrorMessage();
- String warningMessage = result.getWarningMessage();
-
- if (errorMessage != null) {
- setErrorMessage(errorMessage);
- return;
- }
-
- if (warningMessage != null) {
- setWarningMessage(warningMessage);
- return;
- }
+ analyzeResultList.clear();
+ for (int i = 0; i < results.length; i++) {
+ analyzeResultList.add(results[i]);
}
+ updateNotifyMessage();
} catch (CoreException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
+ protected void updateNotifyMessage() {
+ canSaveFile = true;
+ Control[] children = designTimeAnalyzeResultRegion.getChildren();
+ for (int i = 0; i < children.length; i++) {
+ Control c = children[i];
+ c.setVisible(false);
+ c.dispose();
+ c = null;
+ }
+ updateErrorMessage();
+ updateWarningMessage();
+ designTimeAnalyzeResultRegion.layout(true);
+ }
+
/**
* @return the editingDomain
*/
Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-10-23 23:27:05 UTC (rev 11132)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-10-24 07:17:20 UTC (rev 11133)
@@ -393,7 +393,7 @@
return null;
}
- public DesignTimeAnalyzeResult analyzeGraphModel(
+ public DesignTimeAnalyzeResult[] analyzeGraphModel(
SmooksConfigurationFileGenerateContext context) {
// TODO Auto-generated method stub
return null;
Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/XML2XMLAnalyzer.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/XML2XMLAnalyzer.java 2008-10-23 23:27:05 UTC (rev 11132)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/XML2XMLAnalyzer.java 2008-10-24 07:17:20 UTC (rev 11133)
@@ -46,7 +46,7 @@
return null;
}
- public DesignTimeAnalyzeResult analyzeGraphModel(
+ public DesignTimeAnalyzeResult[] analyzeGraphModel(
SmooksConfigurationFileGenerateContext context) {
// TODO Auto-generated method stub
return null;
17 years, 2 months
JBoss Tools SVN: r11132 - branches/jbosstools-3.0.0.Beta1/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-23 19:27:05 -0400 (Thu, 23 Oct 2008)
New Revision: 11132
Modified:
branches/jbosstools-3.0.0.Beta1/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamBigProjectTest.java
Log:
fix tests hanging
Modified: branches/jbosstools-3.0.0.Beta1/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamBigProjectTest.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamBigProjectTest.java 2008-10-23 22:13:10 UTC (rev 11131)
+++ branches/jbosstools-3.0.0.Beta1/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamBigProjectTest.java 2008-10-23 23:27:05 UTC (rev 11132)
@@ -155,17 +155,17 @@
sb.append(s.substring(j));
IFile file = webContent.getFile("long.xhtml");
try {
- boolean save = ResourcesUtils.setBuildAutomatically(false);
+// boolean save = ResourcesUtils.setBuildAutomatically(false);
file.create(new ByteArrayInputStream(sb.toString().getBytes()), true, new NullProgressMonitor());
long time = System.currentTimeMillis();
- project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
-
+// project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
+ JobUtils.waitForIdle();
long dt = System.currentTimeMillis() - time;
System.out.println("validated in " + dt);
- ResourcesUtils.setBuildAutomatically(save);
+// ResourcesUtils.setBuildAutomatically(save);
- assertTrue("Validator takes more than 5s (" + (dt/1000d) + ") for validating generated long.xhtml", dt < 5000);
+ assertTrue("Validator takes more than 5s (" + ((dt-500d)/1000d) + ") for validating generated long.xhtml", dt < 5000);
} catch (CoreException e) {
JUnitUtils.fail("", e);
}
17 years, 2 months
JBoss Tools SVN: r11131 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-10-23 18:13:10 -0400 (Thu, 23 Oct 2008)
New Revision: 11131
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
Log:
Fixing errors in the org.jboss.tools.jsf.vpe.jsf.test tests
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java 2008-10-23 22:13:05 UTC (rev 11130)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java 2008-10-23 22:13:10 UTC (rev 11131)
@@ -75,7 +75,7 @@
job.setPriority(Job.SHORT);
job.schedule(0L);
job.join();
- TestUtil.waitForIdle();
+ TestUtil.waitForIdle(15*1000*60);
TestUtil.delay(1000L);
closeEditors();
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-10-23 22:13:05 UTC (rev 11130)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-10-23 22:13:10 UTC (rev 11131)
@@ -259,55 +259,59 @@
assertNotNull("Editor input is null", input); //$NON-NLS-1$
// open and get editor
- JSPMultiPageEditor part = openEditor(input);
-
- int position = TestUtil.getLinePositionOffcet(part.getSourceEditor().getTextViewer(), lineIndex, linePosition);
+ ICompletionProposal[] results;
+ try {
+ JSPMultiPageEditor part = openEditor(input);
+
+ int position = TestUtil.getLinePositionOffcet(part.getSourceEditor().getTextViewer(), lineIndex, linePosition);
- // insert string
- part.getSourceEditor().getTextViewer().getTextWidget()
- .replaceTextRange(position, 0, partOfString);
+ // insert string
+ part.getSourceEditor().getTextViewer().getTextWidget()
+ .replaceTextRange(position, 0, partOfString);
- int newPosition = position + partOfString.length();
+ int newPosition = position + partOfString.length();
- // sets cursor position
- part.getSourceEditor().getTextViewer().getTextWidget().setCaretOffset(
- newPosition);
-
- TestUtil.waitForJobs();
- TestUtil.delay(1000);
- SourceViewerConfiguration sourceViewerConfiguration = ((JSPTextEditor) part
- .getSourceEditor()).getSourceViewerConfigurationForTest();
- // errase errors which can be on start of editor(for example xuklunner
- // not found)
- setException(null);
- StructuredTextViewerConfiguration stvc = (StructuredTextViewerConfiguration) sourceViewerConfiguration;
- IContentAssistant iContentAssistant = stvc
- .getContentAssistant((ISourceViewer) part.getSourceEditor()
- .getAdapter(ISourceViewer.class));
- assertNotNull(iContentAssistant);
- IContentAssistProcessor iContentAssistProcessor = iContentAssistant
- .getContentAssistProcessor(caName);
- assertNotNull(iContentAssistProcessor);
- ICompletionProposal[] results = iContentAssistProcessor
- .computeCompletionProposals(part.getSourceEditor()
- .getTextViewer(), newPosition);
+ // sets cursor position
+ part.getSourceEditor().getTextViewer().getTextWidget().setCaretOffset(
+ newPosition);
+
+ TestUtil.waitForJobs();
+ TestUtil.delay(1000);
+ SourceViewerConfiguration sourceViewerConfiguration = ((JSPTextEditor) part
+ .getSourceEditor()).getSourceViewerConfigurationForTest();
+ // errase errors which can be on start of editor(for example xuklunner
+ // not found)
+ setException(null);
+ StructuredTextViewerConfiguration stvc = (StructuredTextViewerConfiguration) sourceViewerConfiguration;
+ IContentAssistant iContentAssistant = stvc
+ .getContentAssistant((ISourceViewer) part.getSourceEditor()
+ .getAdapter(ISourceViewer.class));
+ assertNotNull(iContentAssistant);
+ IContentAssistProcessor iContentAssistProcessor = iContentAssistant
+ .getContentAssistProcessor(caName);
+ assertNotNull(iContentAssistProcessor);
+ results = iContentAssistProcessor
+ .computeCompletionProposals(part.getSourceEditor()
+ .getTextViewer(), newPosition);
- // remove inserted string
- part.getSourceEditor().getTextViewer().getTextWidget()
- .replaceTextRange(position, partOfString.length(), ""); //$NON-NLS-1$
- assertNotNull(results);
- assertTrue("Number of ca proposals shouldn't be a null",results.length>0); //$NON-NLS-1$
- if (isCheck) {
- for (int i = 0; i < results.length; i++) {
+ // remove inserted string
+ part.getSourceEditor().getTextViewer().getTextWidget()
+ .replaceTextRange(position, partOfString.length(), ""); //$NON-NLS-1$
+ assertNotNull(results);
+ assertTrue("Number of ca proposals shouldn't be a null",results.length>0); //$NON-NLS-1$
+ if (isCheck) {
+ for (int i = 0; i < results.length; i++) {
- String displayString = ((ICompletionProposal) results[i]).getDisplayString();
- assertNotNull(displayString);
- assertEquals(true, displayString.startsWith(partOfString));
- }
- }
+ String displayString = ((ICompletionProposal) results[i]).getDisplayString();
+ assertNotNull(displayString);
+ assertEquals(true, displayString.startsWith(partOfString));
+ }
+ }
+ } finally {
+ closeEditors();
+ TestUtil.delay(1000L);
+ }
- closeEditors();
- TestUtil.delay(1000L);
return results;
}
}
17 years, 2 months
JBoss Tools SVN: r11130 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-10-23 18:13:05 -0400 (Thu, 23 Oct 2008)
New Revision: 11130
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java
Log:
Fixing errors in the org.jboss.tools.jsf.vpe.jsf.test tests
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java 2008-10-23 22:12:59 UTC (rev 11129)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java 2008-10-23 22:13:05 UTC (rev 11130)
@@ -71,6 +71,7 @@
clearAll();
setConnector(null);
setReferenceNode(null);
+ setPageContext(null);
}
/**
17 years, 2 months
JBoss Tools SVN: r11129 - trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-10-23 18:12:59 -0400 (Thu, 23 Oct 2008)
New Revision: 11129
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java
Log:
Fixing errors in the org.jboss.tools.jsf.vpe.jsf.test tests
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java 2008-10-23 22:06:47 UTC (rev 11128)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java 2008-10-23 22:12:59 UTC (rev 11129)
@@ -1,346 +1,350 @@
-/*******************************************************************************
- * 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.vpe.ui.test;
-
-import java.io.File;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
-import org.jboss.tools.vpe.VpeDebug;
-import org.jboss.tools.vpe.editor.VpeController;
-import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping;
-import org.jboss.tools.vpe.xulrunner.browser.util.DOMTreeDumper;
-import org.mozilla.interfaces.nsIDOMElement;
-import org.mozilla.interfaces.nsIDOMNode;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @author Sergey Dzmitrovich
- *
- */
-public abstract class ComponentContentTest extends VpeTest {
-
- public static final String XML_FILE_EXTENSION = ".xml"; //$NON-NLS-1$
-
- public ComponentContentTest(String name) {
- super(name);
- }
-
- /**
- *
- * there are several conditions:
- *
- * 1) xml file which contain tests must be named 'name of test page' +
- * '.xml'
- *
- * Example: test.jsp and test.jsp.xml
- *
- * 2) a tag <test> in xml file and required element in test page must have
- * the same attribute "id"
- *
- * Example: <tests>... <test id="testId" > ...<tests> - in xml file and
- * <html>... <x:testElement id="testId" > ... </html> - in test page
- *
- * @param elementPagePath
- * - path to test page
- * @throws Throwable
- */
- protected void performContentTest(String elementPagePath) throws Throwable {
- setException(null);
-
- IFile elementPageFile = (IFile) TestUtil.getComponentPath(
- elementPagePath, getTestProjectName());
-
- IEditorInput input = new FileEditorInput(elementPageFile);
-
- TestUtil.waitForJobs();
-
- IEditorPart editor = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage().openEditor(input,
- EDITOR_ID, true);
-
- assertNotNull(editor);
-
- TestUtil.waitForJobs();
-
- TestUtil.delay(2000);
- VpeController controller = getVpeController((JSPMultiPageEditor) editor);
-
- // get xml test file
- File xmlTestFile = TestUtil.getComponentPath(
- elementPagePath + XML_FILE_EXTENSION, getTestProjectName())
- .getLocation().toFile();
-
- // get document
- Document xmlTestDocument = TestDomUtil.getDocument(xmlTestFile);
- assertNotNull(xmlTestDocument);
-
- List<String> ids = TestDomUtil.getTestIds(xmlTestDocument);
-
- for (String id : ids) {
-
- compareElements(controller, xmlTestDocument, id, id);
- }
-
- if (getException() != null) {
- throw getException();
- }
-
- }
-
- /**
- *
- * @param controller
- * @param xmlTestDocument
- * @param elementId
- * @param xmlTestId
- * @return
- * @throws ComparisonException
- */
- protected void compareElements(VpeController controller,
- Document xmlTestDocument, String elementId, String xmlTestId)
- throws ComparisonException {
-
- // get element by id
- nsIDOMElement vpeElement = findElementById(controller, elementId);
- assertNotNull(vpeElement);
-
- DOMTreeDumper dumper = new DOMTreeDumper(
- VpeDebug.VISUAL_DUMP_PRINT_HASH);
- dumper.dumpToStream(System.out, vpeElement);
-
- // get test element by id - get <test id="..." > element and get his
- // first child
- Element xmlModelElement = TestDomUtil.getFirstChildElement(TestDomUtil
- .getElemenById(xmlTestDocument, xmlTestId));
-
- assertNotNull(xmlModelElement);
-
- // compare DOMs
- TestDomUtil.compareNodes(vpeElement, xmlModelElement);
-
- }
-
- /**
- * test for invisible tags
- *
- * @param elementPagePath
- * - path to test page
- * @param elementId
- * - id of element on page
- * @throws Throwable
- */
- protected void performInvisibleTagTest(String elementPagePath,
- String elementId) throws Throwable {
- setException(null);
-
- IFile elementPageFile = (IFile) TestUtil.getComponentPath(
- elementPagePath, getTestProjectName());
-
- IEditorInput input = new FileEditorInput(elementPageFile);
-
- TestUtil.waitForJobs();
-
- IEditorPart editor = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage().openEditor(input,
- EDITOR_ID, true);
-
- assertNotNull(editor);
-
- TestUtil.waitForJobs();
-
- VpeController controller = getVpeController((JSPMultiPageEditor) editor);
-
- // find source element and check if it is not null
- Element sourceELement = findSourceElementById(controller, elementId);
- assertNotNull(sourceELement);
-
- // find visual element and check if it is null
- nsIDOMElement visualElement = findElementById(controller, elementId);
- assertNull(visualElement);
-
- // set show invisible tag's flag to true
- controller.getVisualBuilder().setShowInvisibleTags(true);
- controller.visualRefresh();
-
- TestUtil.waitForIdle();
-
- // find visual element and check if it is not null
- visualElement = findElementById(controller, elementId);
- assertNotNull(visualElement);
-
- // generate text for invisible tag
- String modelInvisibleTagText = generateInvisibleTagText(sourceELement
- .getNodeName());
-
- // generate dom document and get root element
- Element modelElement = TestDomUtil.getDocument(modelInvisibleTagText)
- .getDocumentElement();
- assertNotNull(modelElement);
-
- TestDomUtil.compareNodes(visualElement, modelElement);
-
- if (getException() != null) {
- throw getException();
- }
-
- }
-
- /**
- * test for invisible tags which can have visible children
- *
- * @param elementPagePath
- * - path to test page
- * @param elementId
- * - id of element on page
- * @throws Throwable
- */
- protected void performInvisibleWrapperTagTest(String elementPagePath,
- String elementId) throws Throwable {
- setException(null);
-
- IFile elementPageFile = (IFile) TestUtil.getComponentPath(
- elementPagePath, getTestProjectName());
-
- IEditorInput input = new FileEditorInput(elementPageFile);
-
- TestUtil.waitForJobs();
-
- IEditorPart editor = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage().openEditor(input,
- EDITOR_ID, true);
-
- assertNotNull(editor);
-
- TestUtil.waitForJobs();
-
- VpeController controller = getVpeController((JSPMultiPageEditor) editor);
-
- // find source element and check if it is not null
- Element sourceELement = findSourceElementById(controller, elementId);
- assertNotNull(sourceELement);
-
- // find visual element and check if it is null
- nsIDOMElement visualElement = findElementById(controller, elementId);
- assertNull(visualElement);
-
- // check children of non-visual
- NodeList children = sourceELement.getChildNodes();
- for (int i = 0; i < children.getLength(); i++) {
- Node child = children.item(i);
- assertNotNull(findNode(controller, child));
- }
-
- // set show invisible tag's flag to true
- controller.getVisualBuilder().setShowInvisibleTags(true);
- controller.visualRefresh();
-
- TestUtil.waitForIdle();
-
- // find visual element and check if it is not null
- visualElement = findElementById(controller, elementId);
- assertNotNull(visualElement);
-
- // generate text for invisible tag
- String modelInvisibleTagText = generateInvisibleTagText(sourceELement
- .getNodeName());
-
- // generate dom document and get root element
- Element modelElement = TestDomUtil.getDocument(modelInvisibleTagText)
- .getDocumentElement();
- assertNotNull(modelElement);
-
- // compare elements
- TestDomUtil.compareNodes(visualElement, modelElement);
-
- if (getException() != null) {
- throw getException();
- }
-
- }
-
- /**
- *
- * @param tagName
- * @return
- */
- private String generateInvisibleTagText(String tagName) {
- return "<span style=\"border: 1px dashed GREY; color: GREY; font-size: 12px;\" >" //$NON-NLS-1$
- + tagName + "</span>"; //$NON-NLS-1$
- }
-
- /**
- * find visual element by "id" entered in source part of vpe
- *
- * @param controller
- * @param elementId
- * @return
- */
- protected nsIDOMElement findElementById(VpeController controller,
- String elementId) {
-
- Element sourceElement = findSourceElementById(controller, elementId);
-
- VpeNodeMapping nodeMapping = controller.getDomMapping().getNodeMapping(
- sourceElement);
-
- if (nodeMapping == null)
- return null;
-
- return (nsIDOMElement) nodeMapping.getVisualNode();
- }
-
- /**
- * find visual element by "id" entered in source part of vpe
- *
- * @param controller
- * @param elementId
- * @return
- */
- protected nsIDOMNode findNode(VpeController controller, Node node) {
-
- VpeNodeMapping nodeMapping = controller.getDomMapping().getNodeMapping(
- node);
-
- if (nodeMapping == null)
- return null;
-
- return nodeMapping.getVisualNode();
- }
-
- /**
- * find source element by "id"
- *
- * @param controller
- * @param elementId
- * @return
- */
- protected Element findSourceElementById(VpeController controller,
- String elementId) {
-
- return getSourceDocument(controller).getElementById(elementId);
- }
-
- /**
- *
- * @return
- */
- abstract protected String getTestProjectName();
-
-}
+/*******************************************************************************
+ * 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.vpe.ui.test;
+
+import java.io.File;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.VpeDebug;
+import org.jboss.tools.vpe.editor.VpeController;
+import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping;
+import org.jboss.tools.vpe.xulrunner.browser.util.DOMTreeDumper;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMNode;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * @author Sergey Dzmitrovich
+ *
+ */
+public abstract class ComponentContentTest extends VpeTest {
+
+ public static final String XML_FILE_EXTENSION = ".xml"; //$NON-NLS-1$
+
+ public ComponentContentTest(String name) {
+ super(name);
+ }
+
+ /**
+ *
+ * there are several conditions:
+ *
+ * 1) xml file which contain tests must be named 'name of test page' +
+ * '.xml'
+ *
+ * Example: test.jsp and test.jsp.xml
+ *
+ * 2) a tag <test> in xml file and required element in test page must have
+ * the same attribute "id"
+ *
+ * Example: <tests>... <test id="testId" > ...<tests> - in xml file and
+ * <html>... <x:testElement id="testId" > ... </html> - in test page
+ *
+ * @param elementPagePath
+ * - path to test page
+ * @throws Throwable
+ */
+ protected void performContentTest(String elementPagePath) throws Throwable {
+ setException(null);
+
+ IFile elementPageFile = (IFile) TestUtil.getComponentPath(
+ elementPagePath, getTestProjectName());
+
+ IEditorInput input = new FileEditorInput(elementPageFile);
+
+ TestUtil.waitForJobs();
+
+ IEditorPart editor = PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage().openEditor(input,
+ EDITOR_ID, true);
+
+ assertNotNull(editor);
+
+ TestUtil.waitForJobs();
+
+ TestUtil.delay(2000);
+ VpeController controller = getVpeController((JSPMultiPageEditor) editor);
+
+ // get xml test file
+ File xmlTestFile = TestUtil.getComponentPath(
+ elementPagePath + XML_FILE_EXTENSION, getTestProjectName())
+ .getLocation().toFile();
+
+ // get document
+ Document xmlTestDocument = TestDomUtil.getDocument(xmlTestFile);
+ assertNotNull(xmlTestDocument);
+
+ List<String> ids = TestDomUtil.getTestIds(xmlTestDocument);
+
+ for (String id : ids) {
+
+ compareElements(controller, xmlTestDocument, id, id);
+ }
+
+ if (getException() != null) {
+ throw getException();
+ }
+
+ }
+
+ /**
+ *
+ * @param controller
+ * @param xmlTestDocument
+ * @param elementId
+ * @param xmlTestId
+ * @return
+ * @throws ComparisonException
+ */
+ protected void compareElements(VpeController controller,
+ Document xmlTestDocument, String elementId, String xmlTestId)
+ throws ComparisonException {
+
+ // get element by id
+ nsIDOMElement vpeElement = findElementById(controller, elementId);
+ assertNotNull(vpeElement);
+
+ DOMTreeDumper dumper = new DOMTreeDumper(
+ VpeDebug.VISUAL_DUMP_PRINT_HASH);
+ dumper.dumpToStream(System.out, vpeElement);
+
+ // get test element by id - get <test id="..." > element and get his
+ // first child
+ Element xmlModelElement = TestDomUtil.getFirstChildElement(TestDomUtil
+ .getElemenById(xmlTestDocument, xmlTestId));
+
+ assertNotNull(xmlModelElement);
+
+ // compare DOMs
+ try {
+ TestDomUtil.compareNodes(vpeElement, xmlModelElement);
+ } catch (ComparisonException e) {
+ fail(e.getMessage());
+ }
+
+ }
+
+ /**
+ * test for invisible tags
+ *
+ * @param elementPagePath
+ * - path to test page
+ * @param elementId
+ * - id of element on page
+ * @throws Throwable
+ */
+ protected void performInvisibleTagTest(String elementPagePath,
+ String elementId) throws Throwable {
+ setException(null);
+
+ IFile elementPageFile = (IFile) TestUtil.getComponentPath(
+ elementPagePath, getTestProjectName());
+
+ IEditorInput input = new FileEditorInput(elementPageFile);
+
+ TestUtil.waitForJobs();
+
+ IEditorPart editor = PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage().openEditor(input,
+ EDITOR_ID, true);
+
+ assertNotNull(editor);
+
+ TestUtil.waitForJobs();
+
+ VpeController controller = getVpeController((JSPMultiPageEditor) editor);
+
+ // find source element and check if it is not null
+ Element sourceELement = findSourceElementById(controller, elementId);
+ assertNotNull(sourceELement);
+
+ // find visual element and check if it is null
+ nsIDOMElement visualElement = findElementById(controller, elementId);
+ assertNull(visualElement);
+
+ // set show invisible tag's flag to true
+ controller.getVisualBuilder().setShowInvisibleTags(true);
+ controller.visualRefresh();
+
+ TestUtil.waitForIdle();
+
+ // find visual element and check if it is not null
+ visualElement = findElementById(controller, elementId);
+ assertNotNull(visualElement);
+
+ // generate text for invisible tag
+ String modelInvisibleTagText = generateInvisibleTagText(sourceELement
+ .getNodeName());
+
+ // generate dom document and get root element
+ Element modelElement = TestDomUtil.getDocument(modelInvisibleTagText)
+ .getDocumentElement();
+ assertNotNull(modelElement);
+
+ TestDomUtil.compareNodes(visualElement, modelElement);
+
+ if (getException() != null) {
+ throw getException();
+ }
+
+ }
+
+ /**
+ * test for invisible tags which can have visible children
+ *
+ * @param elementPagePath
+ * - path to test page
+ * @param elementId
+ * - id of element on page
+ * @throws Throwable
+ */
+ protected void performInvisibleWrapperTagTest(String elementPagePath,
+ String elementId) throws Throwable {
+ setException(null);
+
+ IFile elementPageFile = (IFile) TestUtil.getComponentPath(
+ elementPagePath, getTestProjectName());
+
+ IEditorInput input = new FileEditorInput(elementPageFile);
+
+ TestUtil.waitForJobs();
+
+ IEditorPart editor = PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage().openEditor(input,
+ EDITOR_ID, true);
+
+ assertNotNull(editor);
+
+ TestUtil.waitForJobs();
+
+ VpeController controller = getVpeController((JSPMultiPageEditor) editor);
+
+ // find source element and check if it is not null
+ Element sourceELement = findSourceElementById(controller, elementId);
+ assertNotNull(sourceELement);
+
+ // find visual element and check if it is null
+ nsIDOMElement visualElement = findElementById(controller, elementId);
+ assertNull(visualElement);
+
+ // check children of non-visual
+ NodeList children = sourceELement.getChildNodes();
+ for (int i = 0; i < children.getLength(); i++) {
+ Node child = children.item(i);
+ assertNotNull(findNode(controller, child));
+ }
+
+ // set show invisible tag's flag to true
+ controller.getVisualBuilder().setShowInvisibleTags(true);
+ controller.visualRefresh();
+
+ TestUtil.waitForIdle();
+
+ // find visual element and check if it is not null
+ visualElement = findElementById(controller, elementId);
+ assertNotNull(visualElement);
+
+ // generate text for invisible tag
+ String modelInvisibleTagText = generateInvisibleTagText(sourceELement
+ .getNodeName());
+
+ // generate dom document and get root element
+ Element modelElement = TestDomUtil.getDocument(modelInvisibleTagText)
+ .getDocumentElement();
+ assertNotNull(modelElement);
+
+ // compare elements
+ TestDomUtil.compareNodes(visualElement, modelElement);
+
+ if (getException() != null) {
+ throw getException();
+ }
+
+ }
+
+ /**
+ *
+ * @param tagName
+ * @return
+ */
+ private String generateInvisibleTagText(String tagName) {
+ return "<span style=\"border: 1px dashed GREY; color: GREY; font-size: 12px;\" >" //$NON-NLS-1$
+ + tagName + "</span>"; //$NON-NLS-1$
+ }
+
+ /**
+ * find visual element by "id" entered in source part of vpe
+ *
+ * @param controller
+ * @param elementId
+ * @return
+ */
+ protected nsIDOMElement findElementById(VpeController controller,
+ String elementId) {
+
+ Element sourceElement = findSourceElementById(controller, elementId);
+
+ VpeNodeMapping nodeMapping = controller.getDomMapping().getNodeMapping(
+ sourceElement);
+
+ if (nodeMapping == null)
+ return null;
+
+ return (nsIDOMElement) nodeMapping.getVisualNode();
+ }
+
+ /**
+ * find visual element by "id" entered in source part of vpe
+ *
+ * @param controller
+ * @param elementId
+ * @return
+ */
+ protected nsIDOMNode findNode(VpeController controller, Node node) {
+
+ VpeNodeMapping nodeMapping = controller.getDomMapping().getNodeMapping(
+ node);
+
+ if (nodeMapping == null)
+ return null;
+
+ return nodeMapping.getVisualNode();
+ }
+
+ /**
+ * find source element by "id"
+ *
+ * @param controller
+ * @param elementId
+ * @return
+ */
+ protected Element findSourceElementById(VpeController controller,
+ String elementId) {
+
+ return getSourceDocument(controller).getElementById(elementId);
+ }
+
+ /**
+ *
+ * @return
+ */
+ abstract protected String getTestProjectName();
+
+}
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 2008-10-23 22:06:47 UTC (rev 11128)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java 2008-10-23 22:12:59 UTC (rev 11129)
@@ -193,14 +193,18 @@
/**
* Wait for idle.
*/
- public static void waitForIdle() {
+ public static void waitForIdle(long maxIdle) {
long start = System.currentTimeMillis();
while (!Job.getJobManager().isIdle()) {
delay(500);
- if ( (System.currentTimeMillis()-start) > MAX_IDLE )
+ if ( (System.currentTimeMillis()-start) > maxIdle )
throw new RuntimeException("A long running task detected"); //$NON-NLS-1$
}
}
+
+ public static void waitForIdle() {
+ waitForIdle(MAX_IDLE);
+ }
/**
* find elements by name.
17 years, 2 months
JBoss Tools SVN: r11128 - branches/jbosstools-3.0.0.Beta1/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-10-23 18:06:47 -0400 (Thu, 23 Oct 2008)
New Revision: 11128
Modified:
branches/jbosstools-3.0.0.Beta1/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java
branches/jbosstools-3.0.0.Beta1/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java
Log:
Fixing errors in the org.jboss.tools.jsf.vpe.jsf.test tests
Modified: branches/jbosstools-3.0.0.Beta1/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java 2008-10-23 22:06:42 UTC (rev 11127)
+++ branches/jbosstools-3.0.0.Beta1/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java 2008-10-23 22:06:47 UTC (rev 11128)
@@ -133,7 +133,11 @@
assertNotNull(xmlModelElement);
// compare DOMs
- TestDomUtil.compareNodes(vpeElement, xmlModelElement);
+ try {
+ TestDomUtil.compareNodes(vpeElement, xmlModelElement);
+ } catch (ComparisonException e) {
+ fail(e.getMessage());
+ }
}
Modified: branches/jbosstools-3.0.0.Beta1/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java 2008-10-23 22:06:42 UTC (rev 11127)
+++ branches/jbosstools-3.0.0.Beta1/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java 2008-10-23 22:06:47 UTC (rev 11128)
@@ -193,14 +193,18 @@
/**
* Wait for idle.
*/
- public static void waitForIdle() {
+ public static void waitForIdle(long maxIdle) {
long start = System.currentTimeMillis();
while (!Job.getJobManager().isIdle()) {
delay(500);
- if ( (System.currentTimeMillis()-start) > MAX_IDLE )
+ if ( (System.currentTimeMillis()-start) > maxIdle )
throw new RuntimeException("A long running task detected"); //$NON-NLS-1$
}
}
+
+ public static void waitForIdle() {
+ waitForIdle(MAX_IDLE);
+ }
/**
* find elements by name.
17 years, 2 months
JBoss Tools SVN: r11127 - branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-10-23 18:06:42 -0400 (Thu, 23 Oct 2008)
New Revision: 11127
Modified:
branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java
branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
Log:
Fixing errors in the org.jboss.tools.jsf.vpe.jsf.test tests
Modified: branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java 2008-10-23 22:06:37 UTC (rev 11126)
+++ branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java 2008-10-23 22:06:42 UTC (rev 11127)
@@ -75,7 +75,7 @@
job.setPriority(Job.SHORT);
job.schedule(0L);
job.join();
- TestUtil.waitForIdle();
+ TestUtil.waitForIdle(15*1000*60);
TestUtil.delay(1000L);
closeEditors();
Modified: branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-10-23 22:06:37 UTC (rev 11126)
+++ branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-10-23 22:06:42 UTC (rev 11127)
@@ -259,55 +259,59 @@
assertNotNull("Editor input is null", input); //$NON-NLS-1$
// open and get editor
- JSPMultiPageEditor part = openEditor(input);
-
- int position = TestUtil.getLinePositionOffcet(part.getSourceEditor().getTextViewer(), lineIndex, linePosition);
+ ICompletionProposal[] results;
+ try {
+ JSPMultiPageEditor part = openEditor(input);
+
+ int position = TestUtil.getLinePositionOffcet(part.getSourceEditor().getTextViewer(), lineIndex, linePosition);
- // insert string
- part.getSourceEditor().getTextViewer().getTextWidget()
- .replaceTextRange(position, 0, partOfString);
+ // insert string
+ part.getSourceEditor().getTextViewer().getTextWidget()
+ .replaceTextRange(position, 0, partOfString);
- int newPosition = position + partOfString.length();
+ int newPosition = position + partOfString.length();
- // sets cursor position
- part.getSourceEditor().getTextViewer().getTextWidget().setCaretOffset(
- newPosition);
-
- TestUtil.waitForJobs();
- TestUtil.delay(1000);
- SourceViewerConfiguration sourceViewerConfiguration = ((JSPTextEditor) part
- .getSourceEditor()).getSourceViewerConfigurationForTest();
- // errase errors which can be on start of editor(for example xuklunner
- // not found)
- setException(null);
- StructuredTextViewerConfiguration stvc = (StructuredTextViewerConfiguration) sourceViewerConfiguration;
- IContentAssistant iContentAssistant = stvc
- .getContentAssistant((ISourceViewer) part.getSourceEditor()
- .getAdapter(ISourceViewer.class));
- assertNotNull(iContentAssistant);
- IContentAssistProcessor iContentAssistProcessor = iContentAssistant
- .getContentAssistProcessor(caName);
- assertNotNull(iContentAssistProcessor);
- ICompletionProposal[] results = iContentAssistProcessor
- .computeCompletionProposals(part.getSourceEditor()
- .getTextViewer(), newPosition);
+ // sets cursor position
+ part.getSourceEditor().getTextViewer().getTextWidget().setCaretOffset(
+ newPosition);
+
+ TestUtil.waitForJobs();
+ TestUtil.delay(1000);
+ SourceViewerConfiguration sourceViewerConfiguration = ((JSPTextEditor) part
+ .getSourceEditor()).getSourceViewerConfigurationForTest();
+ // errase errors which can be on start of editor(for example xuklunner
+ // not found)
+ setException(null);
+ StructuredTextViewerConfiguration stvc = (StructuredTextViewerConfiguration) sourceViewerConfiguration;
+ IContentAssistant iContentAssistant = stvc
+ .getContentAssistant((ISourceViewer) part.getSourceEditor()
+ .getAdapter(ISourceViewer.class));
+ assertNotNull(iContentAssistant);
+ IContentAssistProcessor iContentAssistProcessor = iContentAssistant
+ .getContentAssistProcessor(caName);
+ assertNotNull(iContentAssistProcessor);
+ results = iContentAssistProcessor
+ .computeCompletionProposals(part.getSourceEditor()
+ .getTextViewer(), newPosition);
- // remove inserted string
- part.getSourceEditor().getTextViewer().getTextWidget()
- .replaceTextRange(position, partOfString.length(), ""); //$NON-NLS-1$
- assertNotNull(results);
- assertTrue("Number of ca proposals shouldn't be a null",results.length>0); //$NON-NLS-1$
- if (isCheck) {
- for (int i = 0; i < results.length; i++) {
+ // remove inserted string
+ part.getSourceEditor().getTextViewer().getTextWidget()
+ .replaceTextRange(position, partOfString.length(), ""); //$NON-NLS-1$
+ assertNotNull(results);
+ assertTrue("Number of ca proposals shouldn't be a null",results.length>0); //$NON-NLS-1$
+ if (isCheck) {
+ for (int i = 0; i < results.length; i++) {
- String displayString = ((ICompletionProposal) results[i]).getDisplayString();
- assertNotNull(displayString);
- assertEquals(true, displayString.startsWith(partOfString));
- }
- }
+ String displayString = ((ICompletionProposal) results[i]).getDisplayString();
+ assertNotNull(displayString);
+ assertEquals(true, displayString.startsWith(partOfString));
+ }
+ }
+ } finally {
+ closeEditors();
+ TestUtil.delay(1000L);
+ }
- closeEditors();
- TestUtil.delay(1000L);
return results;
}
}
17 years, 2 months
JBoss Tools SVN: r11126 - branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-10-23 18:06:37 -0400 (Thu, 23 Oct 2008)
New Revision: 11126
Modified:
branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java
Log:
Fixing errors in the org.jboss.tools.jsf.vpe.jsf.test tests
Modified: branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java 2008-10-23 20:11:13 UTC (rev 11125)
+++ branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java 2008-10-23 22:06:37 UTC (rev 11126)
@@ -71,6 +71,7 @@
clearAll();
setConnector(null);
setReferenceNode(null);
+ setPageContext(null);
}
/**
17 years, 2 months
JBoss Tools SVN: r11125 - in branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-23 16:11:13 -0400 (Thu, 23 Oct 2008)
New Revision: 11125
Modified:
branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF
branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml
Log:
fix plugin ide and path to icon
Modified: branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF 2008-10-23 20:09:27 UTC (rev 11124)
+++ branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF 2008-10-23 20:11:13 UTC (rev 11125)
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.jboss.tools.jbpm.convert.bpmnto;singleton:=true
+Bundle-SymbolicName: org.jboss.tools.jbpm.convert;singleton:=true
Bundle-Version: 1.0.0
Bundle-Localization: plugin
Bundle-Activator: org.jboss.tools.jbpm.convert.bpmnto.BpmnToPlugin
Modified: branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml 2008-10-23 20:09:27 UTC (rev 11124)
+++ branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml 2008-10-23 20:11:13 UTC (rev 11125)
@@ -5,7 +5,7 @@
<category name="%category.name"
id="org.jboss.tools.jbpm.convert.export.category"/>
<wizard name="%wizard.name"
- icon="icons/sample.gif"
+ icon="$nl$/icons/sample.gif"
category="org.jboss.tools.jbpm.convert.export.category"
class="org.jboss.tools.jbpm.convert.b2j.wizard.B2JExportWizard"
id="org.jboss.tools.jbpm.convert.export.b2jexportwizard">
17 years, 2 months
JBoss Tools SVN: r11124 - branches/jbosstools-3.0.0.Beta1/jbpm/features.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-23 16:09:27 -0400 (Thu, 23 Oct 2008)
New Revision: 11124
Added:
branches/jbosstools-3.0.0.Beta1/jbpm/features/org.jboss.tools.jbpm.convert.feature/
Log:
branch for ibpm-convert feature
Copied: branches/jbosstools-3.0.0.Beta1/jbpm/features/org.jboss.tools.jbpm.convert.feature (from rev 11123, trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature)
17 years, 2 months
JBoss Tools SVN: r11122 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-10-23 15:55:56 -0400 (Thu, 23 Oct 2008)
New Revision: 11122
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2980 CA is broken with java.lang.NullPointerException.
fixed
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2008-10-23 19:51:17 UTC (rev 11121)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2008-10-23 19:55:56 UTC (rev 11122)
@@ -219,6 +219,9 @@
}
public List<TaglibData> getIncludeTaglibs() {
+ if (getEditPart() == null) {
+ return new ArrayList<TaglibData>();
+ }
IEditorInput input = getEditPart().getEditorInput();
IFile file = null;
if (input instanceof IFileEditorInput) {
17 years, 2 months
JBoss Tools SVN: r11121 - branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-10-23 15:51:17 -0400 (Thu, 23 Oct 2008)
New Revision: 11121
Modified:
branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
Log:
change some view IDs so they do not conflict with actual eclipse id's.
Modified: branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2008-10-23 19:22:34 UTC (rev 11120)
+++ branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2008-10-23 19:51:17 UTC (rev 11121)
@@ -67,7 +67,7 @@
if( !prefs.getBoolean(IPreferenceKeys.ENABLED_DECORATORS)) {
IDecoratorManager manager = WorkbenchPlugin.getDefault().getDecoratorManager();
- manager.setEnabled("org.eclipse.wst.server.ui.navigatorDecorator", true);
+ manager.setEnabled("org.jboss.tools.wst.server.ui.navigatorDecorator", true);
manager.setEnabled("org.jboss.ide.eclipse.as.ui.extensions.xml.decorator", true);
prefs.setValue(IPreferenceKeys.ENABLED_DECORATORS, true);
savePluginPreferences();
17 years, 2 months
JBoss Tools SVN: r11120 - trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-23 15:22:34 -0400 (Thu, 23 Oct 2008)
New Revision: 11120
Modified:
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF
Log:
version removed frorm dependency to common plugin
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF 2008-10-23 18:50:05 UTC (rev 11119)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF 2008-10-23 19:22:34 UTC (rev 11120)
@@ -7,7 +7,7 @@
Bundle-Activator: org.jboss.tools.jbpm.convert.bpmnto.BpmnToPlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.jboss.tools.common;bundle-version="2.0.0"
+ org.jboss.tools.common
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .,
17 years, 2 months
JBoss Tools SVN: r11119 - in trunk/jbpm/plugins/org.jboss.tools.jbpm.convert: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-23 14:50:05 -0400 (Thu, 23 Oct 2008)
New Revision: 11119
Modified:
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/build.properties
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-2947. Plugin ID has been changed to be the same as project and folder name
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF 2008-10-23 18:48:43 UTC (rev 11118)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF 2008-10-23 18:50:05 UTC (rev 11119)
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.jboss.tools.jbpm.convert.bpmnto;singleton:=true
+Bundle-SymbolicName: org.jboss.tools.jbpm.convert;singleton:=true
Bundle-Version: 1.0.0
Bundle-Localization: plugin
Bundle-Activator: org.jboss.tools.jbpm.convert.bpmnto.BpmnToPlugin
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/build.properties
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/build.properties 2008-10-23 18:48:43 UTC (rev 11118)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/build.properties 2008-10-23 18:50:05 UTC (rev 11119)
@@ -4,4 +4,5 @@
.,\
plugin.xml,\
plugin.properties,\
- lib/dom4j-1.6.1.jar
+ lib/dom4j-1.6.1.jar,\
+ icons/
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml 2008-10-23 18:48:43 UTC (rev 11118)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml 2008-10-23 18:50:05 UTC (rev 11119)
@@ -5,7 +5,7 @@
<category name="%category.name"
id="org.jboss.tools.jbpm.convert.export.category"/>
<wizard name="%wizard.name"
- icon="icons/sample.gif"
+ icon="$nl$/icons/sample.gif"
category="org.jboss.tools.jbpm.convert.export.category"
class="org.jboss.tools.jbpm.convert.b2j.wizard.B2JExportWizard"
id="org.jboss.tools.jbpm.convert.export.b2jexportwizard">
17 years, 2 months
JBoss Tools SVN: r11118 - trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-23 14:48:43 -0400 (Thu, 23 Oct 2008)
New Revision: 11118
Added:
trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/.project
trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/about.html
trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/build.properties
trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/epl-v10.html
trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/feature.xml
Log:
Share project "org.jboss.tools.jbpm.convert.feature" into "https://svn.jboss.org/repos/jbosstools"
Added: trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/.project
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/.project (rev 0)
+++ trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/.project 2008-10-23 18:48:43 UTC (rev 11118)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.jbpm.convert.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/about.html
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/about.html (rev 0)
+++ trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/about.html 2008-10-23 18:48:43 UTC (rev 11118)
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<HTML>
+
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+
+<BODY lang="EN-US">
+
+<H3>About This Content</H3>
+
+<P>©2007 Red Hat, Inc. All rights reserved</P>
+
+<H3>License</H3>
+
+<P>Red Hat Inc., through its JBoss division, makes available all content in this plug-in
+("Content"). Unless otherwise indicated below, the Content is provided to you
+under the terms and conditions of the Eclipse Public License Version 1.0
+("EPL"). A copy of the EPL is available at
+<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
+For purposes of the EPL, "Program" will mean the Content.</P>
+
+<P>If you did not receive this Content directly from Red Hat Inc., the
+Content is being redistributed by another party ("Redistributor") and different
+terms and conditions may apply to your use of any object code in the Content.
+Check the Redistributor's license that was provided with the Content. If no such
+license exists, contact the Redistributor. Unless otherwise indicated below, the
+terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at
+ <A href="http://www.jboss.org/tools">http://www.jboss.org/tools</A>.</P>
+
+</BODY>
+</HTML>
\ No newline at end of file
Property changes on: trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/about.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/build.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/build.properties (rev 0)
+++ trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/build.properties 2008-10-23 18:48:43 UTC (rev 11118)
@@ -0,0 +1 @@
+bin.includes = feature.xml
Property changes on: trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/epl-v10.html
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/epl-v10.html (rev 0)
+++ trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/epl-v10.html 2008-10-23 18:48:43 UTC (rev 11118)
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!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">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+ body {
+ size: 8.5in 11.0in;
+ margin: 0.25in 0.5in 0.25in 0.5in;
+ tab-interval: 0.5in;
+ }
+ p {
+ margin-left: auto;
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+ }
+ p.list {
+ margin-left: 0.5in;
+ margin-top: 0.05em;
+ margin-bottom: 0.05em;
+ }
+ </style>
+
+</head>
+
+<body lang="EN-US">
+
+<p align=center><b>Eclipse Public License - v 1.0</b></p>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>"Contribution" means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>"Contributor" means any person or entity that distributes
+the Program.</p>
+
+<p>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>"Program" means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
Property changes on: trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/epl-v10.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/feature.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/feature.xml (rev 0)
+++ trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/feature.xml 2008-10-23 18:48:43 UTC (rev 11118)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.jbpm.convert.feature"
+ label="jBPM Conbvert Feature"
+ version="1.0.0"
+ provider-name="JBoss, a division of Red Hat">
+
+ <description url="http://www.example.com/description">
+ [Enter Feature Description here.]
+ </description>
+
+ <copyright url="http://www.example.com/copyright">
+ [Enter Copyright Description here.]
+ </copyright>
+
+ <license url="http://www.example.com/license">
+ [Enter License Description here.]
+ </license>
+
+ <plugin
+ id="org.jboss.tools.jbpm.convert"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
Property changes on: trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/feature.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 2 months
JBoss Tools SVN: r11116 - branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-10-23 14:11:46 -0400 (Thu, 23 Oct 2008)
New Revision: 11116
Modified:
branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
change some view IDs so they do not conflict with actual eclipse id's.
Modified: branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2008-10-23 18:00:18 UTC (rev 11115)
+++ branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2008-10-23 18:11:46 UTC (rev 11116)
@@ -329,7 +329,7 @@
<extension point="org.eclipse.ui.views">
<view
- id="org.eclipse.wst.server.ui.ServersViewProvisional"
+ id="org.jboss.tools.wst.server.ui.ServersViewProvisional"
name="JBoss Servers View 2 (beta)"
category="org.eclipse.wst.server.ui"
class="org.eclipse.wst.server.ui.internal.view.servers.provisional.ServersView"
@@ -340,7 +340,7 @@
<decorator
class="org.eclipse.wst.server.ui.internal.view.servers.provisional.ServerDecorator"
icon="icons/obj16/server.gif"
- id="org.eclipse.wst.server.ui.navigatorDecorator"
+ id="org.jboss.tools.wst.server.ui.navigatorDecorator"
label="Server State Decorator"
lightweight="true"
location="BOTTOM_RIGHT">
@@ -363,7 +363,7 @@
activeByDefault="true"
contentProvider="org.eclipse.wst.server.ui.internal.view.servers.provisional.ServerContentProvider"
icon="icons/cview16/servers_view.gif"
- id="org.eclipse.wst.server.ui.ServersView.content.root"
+ id="org.jboss.tools.wst.server.ui.ServersView.content.root"
labelProvider="org.eclipse.wst.server.ui.internal.view.servers.provisional.ServerLabelProvider"
name="Servers View Default Content"
priority="highest">
@@ -383,19 +383,35 @@
</or></possibleChildren>
<actionProvider
class="org.eclipse.wst.server.ui.internal.view.servers.provisional.ServerActionProvider"
- id="org.eclipse.wst.server.ui.internal.view.servers.provisional.ServerActionProvider"
+ id="org.jboss.tools.wst.server.ui.internal.view.servers.provisional.ServerActionProvider"
priority="highest">
+ <enablement>
+ <or>
+ <instanceof
+ value="org.eclipse.wst.server.core.IServer">
+ </instanceof>
+ <instanceof
+ value="org.eclipse.wst.server.ui.internal.view.servers.ModuleServer">
+ </instanceof>
+ <adapt
+ type="java.util.Collection">
+ <count
+ value="0">
+ </count>
+ </adapt>
+ </or>
+ </enablement>
</actionProvider>
</navigatorContent>
</extension>
<extension
point="org.eclipse.ui.navigator.viewer">
<viewerContentBinding
- viewerId="org.eclipse.wst.server.ui.ServersViewProvisional">
+ viewerId="org.jboss.tools.wst.server.ui.ServersViewProvisional">
<includes>
<contentExtension
isRoot="true"
- pattern="org.eclipse.wst.server.ui.ServersView.content.root">
+ pattern="org.jboss.tools.wst.server.ui.ServersView.content.root">
</contentExtension>
</includes>
</viewerContentBinding>
@@ -479,7 +495,7 @@
<extension
point="org.eclipse.ui.navigator.viewer">
<viewerContentBinding
- viewerId="org.eclipse.wst.server.ui.ServersViewProvisional">
+ viewerId="org.jboss.tools.wst.server.ui.ServersViewProvisional">
<includes>
<contentExtension
isRoot="false"
17 years, 2 months
JBoss Tools SVN: r11115 - trunk/jbpm.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-23 14:00:18 -0400 (Thu, 23 Oct 2008)
New Revision: 11115
Added:
trunk/jbpm/features/
Log:
17 years, 2 months
JBoss Tools SVN: r11114 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2008-10-23 13:50:00 -0400 (Thu, 23 Oct 2008)
New Revision: 11114
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnGroupTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java
Log:
Bug fix: https://jira.jboss.org/jira/browse/JBIDE-2884 .
- Attributes "styleClass", "columnClasses", "rowClasses" work now.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnGroupTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnGroupTemplate.java 2008-10-23 17:04:02 UTC (rev 11113)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnGroupTemplate.java 2008-10-23 17:50:00 UTC (rev 11114)
@@ -7,40 +7,98 @@
*
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.jsf.vpe.richfaces.template;
import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
+import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces;
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
public class RichFacesColumnGroupTemplate extends RichFacesSubTableTemplate {
public static RichFacesColumnGroupTemplate DEFAULT_INSTANCE = new RichFacesColumnGroupTemplate();
+ private static String styleClass;
public RichFacesColumnGroupTemplate() {
super();
}
+
+ /** @see RichFacesSubTableTemplate#encode(VpePageContext, VpeCreationData, Element, nsIDOMDocument, nsIDOMElement) */
+ @Override
+ public VpeCreationData encode(VpePageContext pageContext,
+ VpeCreationData creationData, Element sourceElement,
+ nsIDOMDocument visualDocument, nsIDOMElement parentVisualNode) {
+ styleClass = sourceElement.getAttribute(RichFaces.ATTR_STYLE_CLASS);
+
+ return super.encode(pageContext, creationData, sourceElement, visualDocument,
+ parentVisualNode);
+ }
+
+
+ @Override
protected String getHeaderClass() {
return "dr-table-header rich-table-header";
}
+ @Override
protected String getHeaderContinueClass() {
return "dr-table-header-continue rich-table-header-continue";
}
+ @Override
protected String getFooterClass() {
return "dr-table-footer rich-table-footer";
}
+ @Override
protected String getFooterContinueClass() {
return "dr-table-footer-continue rich-table-footer-continue";
}
- protected String getCellClass() {
- return "dr-table-cell rich-table-cell";
- }
-
+ @Override
protected String getHeaderBackgoundImgStyle() {
return ComponentUtil.getHeaderBackgoundImgStyle();
}
-}
\ No newline at end of file
+
+ /** @see RichFacesSubTableTemplate#encodeFooter(VpePageContext, VpeCreationData, Element, nsIDOMDocument, nsIDOMElement)*/
+ @Override
+ protected void encodeFooter(final VpePageContext pageContext,
+ final VpeCreationData creationData, final Element sourceElement,
+ final nsIDOMDocument visualDocument, final nsIDOMElement parentVisualNode) {
+ // do nothing, because the tag do not support footers
+ }
+
+ /** @see RichFacesSubTableTemplate#encodeHeader(VpePageContext, VpeCreationData, Element, nsIDOMDocument, nsIDOMElement) */
+ @Override
+ protected void encodeHeader(final VpePageContext pageContext,
+ final VpeCreationData creationData, final Element sourceElement,
+ final nsIDOMDocument visualDocument, final nsIDOMElement parentVisualNode) {
+ // do nothing, because the tag do not support headers
+ }
+
+ /** @see RichFacesSubTableTemplate#encodeHeaderOrFooter(VpePageContext, VpeCreationData, Element, nsIDOMDocument, nsIDOMElement, String, String, String) */
+ @Override
+ protected void encodeHeaderOrFooter(final VpePageContext pageContext,
+ final VpeCreationData creationData, final Element sourceElement,
+ final nsIDOMDocument visualDocument, final nsIDOMElement parentVisualNode,
+ final String facetName, final String trClass, final String tdClass) {
+ // do nothing, because the tag do not support headers and footers
+ }
+
+ /** @see RichFacesSubTableTemplate#getRowClass(int) */
+ @Override
+ protected String getRowClass(int row) {
+ String rowClass = super.getRowClass(row);
+ if (styleClass != null) {
+ rowClass += ' ' + styleClass;
+ }
+ return rowClass;
+ }
+
+}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java 2008-10-23 17:04:02 UTC (rev 11113)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java 2008-10-23 17:50:00 UTC (rev 11114)
@@ -366,7 +366,9 @@
List<Node> children = ComponentUtil.getChildren(sourceElement);
if (children != null) {
for (Node child : children) {
- if (child.getNodeName().endsWith(RichFaces.TAG_SUB_TABLE)) {
+ if (child.getNodeName().endsWith(RichFaces.TAG_COLUMN_GROUP)) {
+ RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.validate(pageContext, child, visualDocument, data);
+ } else if (child.getNodeName().endsWith(RichFaces.TAG_SUB_TABLE)) {
RichFacesSubTableTemplate.DEFAULT_INSTANCE.validate(pageContext, child, visualDocument, data);
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java 2008-10-23 17:04:02 UTC (rev 11113)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java 2008-10-23 17:50:00 UTC (rev 11114)
@@ -242,7 +242,7 @@
return "dr-subtable-footer-continue rich-subtable-footer-continue";
}
- private String getRowClass(final int row) {
+ protected String getRowClass(final int row) {
StringBuffer rowClass = new StringBuffer(DEAFAULT_CELL_CLASS);
if (rowClasses != null) {
17 years, 2 months
JBoss Tools SVN: r11113 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-23 13:04:02 -0400 (Thu, 23 Oct 2008)
New Revision: 11113
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java
Log:
JBIDE-2494
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java 2008-10-23 17:03:19 UTC (rev 11112)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java 2008-10-23 17:04:02 UTC (rev 11113)
@@ -191,6 +191,8 @@
}
int length = 0;
BufferedInputStream bs = null;
+ String encoding = null;
+ boolean first = true;
try {
InputStream is = jar.getInputStream(jar.getEntry(path));
bs = new BufferedInputStream(is);
@@ -200,7 +202,15 @@
length = bs.read(b, 0, length);
if (length < 0)
break;
- sb.append(new String(b, 0, length));
+ if(first) {
+ first = false;
+ encoding = FileUtil.getEncoding(b);
+ }
+ if(encoding != null) {
+ sb.append(new String(b, 0, length, encoding));
+ } else {
+ sb.append(new String(b, 0, length));
+ }
}
return sb.toString();
} catch (IOException e) {
17 years, 2 months
JBoss Tools SVN: r11112 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-23 13:03:19 -0400 (Thu, 23 Oct 2008)
New Revision: 11112
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/ModelObjectStorageEditorInput.java
Log:
JBIDE-2494
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/ModelObjectStorageEditorInput.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/ModelObjectStorageEditorInput.java 2008-10-23 15:25:16 UTC (rev 11111)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/ModelObjectStorageEditorInput.java 2008-10-23 17:03:19 UTC (rev 11112)
@@ -21,6 +21,7 @@
import org.jboss.tools.common.model.*;
import org.jboss.tools.common.model.filesystems.impl.*;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.util.FileUtil;
public class ModelObjectStorageEditorInput extends ModelObjectEditorInput implements IStorageEditorInput {
@@ -40,7 +41,19 @@
ByteArrayInputStream b = null;
if(object instanceof FileAnyImpl) {
FileAnyImpl f = (FileAnyImpl)object;
- b = new ByteArrayInputStream(f.getAsText().getBytes());
+ String s = f.getAsText();
+ String encoding = FileUtil.getEncoding(s);
+ byte[] bs = null;
+ if(encoding == null) {
+ bs = s.getBytes();
+ } else {
+ try {
+ bs = s.getBytes(encoding);
+ } catch (UnsupportedEncodingException e) {
+ bs = s.getBytes();
+ }
+ }
+ b = new ByteArrayInputStream(bs);
} else {
b = new ByteArrayInputStream(new byte[0]);
}
17 years, 2 months
JBoss Tools SVN: r11111 - branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: dsakovich
Date: 2008-10-23 11:25:16 -0400 (Thu, 23 Oct 2008)
New Revision: 11111
Modified:
branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java
branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2894
Modified: branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java 2008-10-23 13:54:44 UTC (rev 11110)
+++ branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java 2008-10-23 15:25:16 UTC (rev 11111)
@@ -24,4 +24,5 @@
public static final String PIXEL = "px"; //$NON-NLS-1$
public static final String PERCENT = "%"; //$NON-NLS-1$
public static final String COMMA = ","; //$NON-NLS-1$
+ public static final String FILE_PREFIX = "file://"; //$NON-NLS-1$
}
Modified: branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java 2008-10-23 13:54:44 UTC (rev 11110)
+++ branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java 2008-10-23 15:25:16 UTC (rev 11111)
@@ -12,6 +12,8 @@
package org.jboss.tools.vpe.editor.util;
import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
@@ -336,13 +338,18 @@
Attr attr = element.getAttributeNode(attributeName);
- File file = new File(attr.getValue());
- if (!file.exists()) {
- // corrected path
- attr.setValue(initFile.getParent()
- + File.separator + attr.getValue());
+ try {
+ URI uri = new URI(attr.getValue());
+ if (!uri.isAbsolute()) {
+ // corrected path
+ attr.setValue(Constants.FILE_PREFIX + initFile.getParent()
+ + File.separator + attr.getValue());
+ }
+ } catch (URISyntaxException e) {
+ VpePlugin.getPluginLog().logError(e.getMessage());
}
+
}
}
17 years, 2 months
JBoss Tools SVN: r11110 - branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-10-23 09:54:44 -0400 (Thu, 23 Oct 2008)
New Revision: 11110
Modified:
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2951 Fixed in trunk (cr1) and brunch (beta1)
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2008-10-23 13:51:49 UTC (rev 11109)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2008-10-23 13:54:44 UTC (rev 11110)
@@ -121,6 +121,7 @@
Control control = findGroupByText(getShell(), SeamUIMessages.SEAM_PROJECT_WIZARD_EAR_MEMBERSHIP);
if (control != null)
control.setVisible(false);
+ firstPage.isPageComplete();
}
private void synchSeamActionModels() {
@@ -286,21 +287,26 @@
*/
@Override
public boolean isPageComplete() {
- if(super.isPageComplete()) {
- IProjectFacet pFacet = ProjectFacetsManager.getProjectFacet(ISeamFacetDataModelProperties.SEAM_FACET_ID);
- IFacetedProjectWorkingCopy fProject = getFacetedProjectWorkingCopy();
- if(fProject!=null) {
- IProjectFacetVersion seamFacet = fProject.getProjectFacetVersion(pFacet);
- if(seamFacet==null) {
+ boolean pageComplete = super.isPageComplete();
+
+ IProjectFacet pFacet = ProjectFacetsManager.getProjectFacet(ISeamFacetDataModelProperties.SEAM_FACET_ID);
+ IFacetedProjectWorkingCopy fProject = getFacetedProjectWorkingCopy();
+ if(fProject!=null) {
+ IProjectFacetVersion seamFacet = fProject.getProjectFacetVersion(pFacet);
+ if(seamFacet==null) {
+ if(pageComplete) {
this.setErrorMessage(SeamUIMessages.SEAM_PROJECT_WIZARD_PAGE1_SEAM_FACET_MUST_BE_SPECIFIED);
return false;
- } else {
- this.setErrorMessage(null);
- }
+ }
+ } else {
+ if(pageComplete) {
+ this.setErrorMessage(null);
+ } else if(SeamUIMessages.SEAM_PROJECT_WIZARD_PAGE1_SEAM_FACET_MUST_BE_SPECIFIED.equals(getErrorMessage())) {
+ this.setErrorMessage(null);
+ }
}
- return true;
- }
- return false;
+ }
+ return pageComplete;
}
public boolean launchNewServerWizard(Shell shell, IDataModel model, String serverTypeID) {
17 years, 2 months
JBoss Tools SVN: r11109 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-10-23 09:51:49 -0400 (Thu, 23 Oct 2008)
New Revision: 11109
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2951 Fixed in trunk (cr1) and brunch (beta1)
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2008-10-23 13:38:58 UTC (rev 11108)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2008-10-23 13:51:49 UTC (rev 11109)
@@ -121,6 +121,7 @@
Control control = findGroupByText(getShell(), SeamUIMessages.SEAM_PROJECT_WIZARD_EAR_MEMBERSHIP);
if (control != null)
control.setVisible(false);
+ firstPage.isPageComplete();
}
private void synchSeamActionModels() {
@@ -286,21 +287,26 @@
*/
@Override
public boolean isPageComplete() {
- if(super.isPageComplete()) {
- IProjectFacet pFacet = ProjectFacetsManager.getProjectFacet(ISeamFacetDataModelProperties.SEAM_FACET_ID);
- IFacetedProjectWorkingCopy fProject = getFacetedProjectWorkingCopy();
- if(fProject!=null) {
- IProjectFacetVersion seamFacet = fProject.getProjectFacetVersion(pFacet);
- if(seamFacet==null) {
+ boolean pageComplete = super.isPageComplete();
+
+ IProjectFacet pFacet = ProjectFacetsManager.getProjectFacet(ISeamFacetDataModelProperties.SEAM_FACET_ID);
+ IFacetedProjectWorkingCopy fProject = getFacetedProjectWorkingCopy();
+ if(fProject!=null) {
+ IProjectFacetVersion seamFacet = fProject.getProjectFacetVersion(pFacet);
+ if(seamFacet==null) {
+ if(pageComplete) {
this.setErrorMessage(SeamUIMessages.SEAM_PROJECT_WIZARD_PAGE1_SEAM_FACET_MUST_BE_SPECIFIED);
return false;
- } else {
- this.setErrorMessage(null);
- }
+ }
+ } else {
+ if(pageComplete) {
+ this.setErrorMessage(null);
+ } else if(SeamUIMessages.SEAM_PROJECT_WIZARD_PAGE1_SEAM_FACET_MUST_BE_SPECIFIED.equals(getErrorMessage())) {
+ this.setErrorMessage(null);
+ }
}
- return true;
- }
- return false;
+ }
+ return pageComplete;
}
public boolean launchNewServerWizard(Shell shell, IDataModel model, String serverTypeID) {
17 years, 2 months
JBoss Tools SVN: r11108 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test: src/org/jboss/tools/jsf/vpe/richfaces/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-10-23 09:38:58 -0400 (Thu, 23 Oct 2008)
New Revision: 11108
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tab.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tab.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tabPanel.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml.xml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSlider.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tabPanel.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2810, tests for rich:tabPanel, rich:tab, rich:togglePanel, rich:toggleControl. Other tests were updated.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSlider.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSlider.xhtml 2008-10-23 13:27:19 UTC (rev 11107)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSlider.xhtml 2008-10-23 13:38:58 UTC (rev 11108)
@@ -9,7 +9,9 @@
<head>
</head>
<body>
+<f:view>
<rich:inputNumberSlider id="inputNumberSlider" value="50">
</rich:inputNumberSlider>
+</f:view>
</body>
</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml 2008-10-23 13:27:19 UTC (rev 11107)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml 2008-10-23 13:38:58 UTC (rev 11108)
@@ -9,7 +9,9 @@
<head>
</head>
<body>
+<f:view>
<rich:inputNumberSpinner id="inputNumberSpinner" value="50">
</rich:inputNumberSpinner>
+</f:view>
</body>
</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml 2008-10-23 13:27:19 UTC (rev 11107)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml 2008-10-23 13:38:58 UTC (rev 11108)
@@ -12,17 +12,7 @@
<body>
<f:view>
<rich:simpleTogglePanel id="simpleTogglePanel" switchType="client"
- label="Add AJAX capability to existing JSF applications">
- The framework is implemented by using a component library. The library
- set Ajax functionality into existing pages, so there is no need to write
- any JavaScript code or to replace existing components with new Ajax one.
- Ajax4jsf enables page-wide Ajax support instead of the traditional
- component-wide support and it gives the opportunity to define the event
- on the page. An event invokes an Ajax request and areas of the page
- which are synchronized with the JSF Component Tree after changing the
- data on the server by Ajax request in accordance with events fired on
- the client.
- </rich:simpleTogglePanel>
+ label="Add AJAX capability to existing JSF applications">The framework is implemented by using a component library.</rich:simpleTogglePanel>
</f:view>
</body>
</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml.xml 2008-10-23 13:27:19 UTC (rev 11107)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml.xml 2008-10-23 13:38:58 UTC (rev 11108)
@@ -6,22 +6,13 @@
VPE-USER-TOGGLE-ID="false">
Add AJAX capability to existing JSF applications
<DIV STYLE="position: absolute; top: 0px; right: 5px;"
- VPE-USER-TOGGLE-ID="false" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> «</DIV>
+ VPE-USER-TOGGLE-ID="false" VPE-USER-TOGGLE-LOOKUP-PARENT="true">«</DIV>
</DIV>
<DIV STYLE="overflow: hidden; width: 100%;">
<TABLE CELLPADDING="0" STYLE="width: 100%;">
<TR>
<TD CLASS="dr-stglpnl-b rich-stglpanel-body">
- <SPAN> The framework is implemented by using a component library.
- The library set Ajax functionality into existing pages, so there
- is no need to write any JavaScript code or to replace existing
- components with new Ajax one. Ajax4jsf enables page-wide Ajax
- support instead of the traditional component-wide support and it
- gives the opportunity to define the event on the page. An event
- invokes an Ajax request and areas of the page which are
- synchronized with the JSF Component Tree after changing the data
- on the server by Ajax request in accordance with events fired on
- the client.</SPAN>
+ <SPAN> The framework is implemented by using a component library.</SPAN>
</TD>
</TR>
</TABLE>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml 2008-10-23 13:27:19 UTC (rev 11107)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml 2008-10-23 13:38:58 UTC (rev 11108)
@@ -12,7 +12,7 @@
<body>
<f:view>
line1
- <rich:spacer width="1" height="5" title="Here is a spacer..." />
+ <rich:spacer id="spacer" width="1" height="5" title="Here is a spacer..." />
line2
</f:view>
</body>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tab.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tab.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tab.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tab.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tab.xhtml.xml 2008-10-23 13:38:58 UTC (rev 11108)
@@ -0,0 +1,6 @@
+<tests>
+ <test id="tab">
+ <!-- rich:tab is rendered inside RichFacesTabPanelTempalte -->
+ <!-- so it can't be found on its own account -->
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tab.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tabPanel.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tabPanel.xhtml 2008-10-23 13:27:19 UTC (rev 11107)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tabPanel.xhtml 2008-10-23 13:38:58 UTC (rev 11108)
@@ -1,27 +1,26 @@
<!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:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://richfaces.org/rich">
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
<head>
</head>
-
<body>
-<!-- Tab panel component -->
-<rich:tabPanel>
- <!-- Tab component -->
- <rich:tab label="First">
+<f:view>
+ <rich:tabPanel id="tabPanel" switchType="ajax">
+ <rich:tab label="First">
Here is tab #1
</rich:tab>
- <rich:tab label="Second">
+ <rich:tab label="Second" disabled="true">
Here is tab #2
</rich:tab>
- <rich:tab label="Third">
+ <rich:tab label="Third">
Here is tab #3
</rich:tab>
-</rich:tabPanel>
+ </rich:tabPanel>
+</f:view>
</body>
</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tabPanel.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tabPanel.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tabPanel.xhtml.xml 2008-10-23 13:38:58 UTC (rev 11108)
@@ -0,0 +1,167 @@
+<tests>
+ <test id="tabPanel">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" CLASS="rich-tabpanel"
+ STYLE="width: 100%;">
+ <TBODY>
+ <TR>
+ <TD ALIGN="left" CLASS="">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0">
+ <TR>
+ <TD>
+ <IMG WIDTH="2" HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"/>
+ </TD>
+ <TD>
+ <IMG HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"
+ STYLE="width: 1px;"/>
+ </TD>
+ <TD STYLE="height: 100%; vertical-align: bottom;" CLASS="rich-tabhdr-cell-active"
+ VPE-USER-TOGGLE-ID="0">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ STYLE="height: 100%; position: relative; z-index: 2;"
+ VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TR VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border"
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/border.gif\);/"
+ VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <IMG WIDTH="1" HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"
+ VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true"/>
+ </TD>
+ <TD VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ STYLE="height: 100%; width: 100%;" VPE-USER-TOGGLE-ID="0"
+ VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TR VPE-USER-TOGGLE-ID="0"
+ VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TD
+ CLASS="rich-tab-header rich-tab-label rich-tab-active rich-tabhdr-cell-active"
+ VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ First </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border"
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/border.gif\);/"
+ VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <IMG WIDTH="1" HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"
+ VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true"/>
+ </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ <TD>
+ <IMG HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"
+ STYLE="width: 1px;"/>
+ </TD>
+ <TD STYLE="height: 100%; vertical-align: bottom;" CLASS="rich-tabhdr-cell-disabled rich-tab-disabled"
+ VPE-USER-TOGGLE-ID="1">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ STYLE="height: 100%; position: relative; z-index: 2;"
+ VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TR VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border"
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/border.gif\);/"
+ VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <IMG WIDTH="1" HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"
+ VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true"/>
+ </TD>
+ <TD VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ STYLE="height: 100%; width: 100%;" VPE-USER-TOGGLE-ID="1"
+ VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TR VPE-USER-TOGGLE-ID="1"
+ VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TD
+ CLASS="rich-tab-header rich-tab-label rich-tab-disabled rich-tabhdr-cell-disabled"
+ VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ Second </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border"
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/border.gif\);/"
+ VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <IMG WIDTH="1" HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"
+ VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true"/>
+ </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ <TD>
+ <IMG HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"
+ STYLE="width: 1px;"/>
+ </TD>
+ <TD STYLE="height: 100%; vertical-align: bottom;" CLASS="rich-tabhdr-cell-inactive"
+ VPE-USER-TOGGLE-ID="2">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ STYLE="height: 100%; position: relative; z-index: 2;"
+ VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TR VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border"
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/border.gif\);/"
+ VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <IMG WIDTH="1" HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"
+ VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true"/>
+ </TD>
+ <TD VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ STYLE="height: 100%; width: 100%;" VPE-USER-TOGGLE-ID="2"
+ VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TR VPE-USER-TOGGLE-ID="2"
+ VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TD
+ CLASS="rich-tab-header rich-tab-label rich-tab-inactive rich-tabhdr-cell-inactive"
+ VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ Third </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border"
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/border.gif\);/"
+ VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <IMG WIDTH="1" HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"
+ VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true"/>
+ </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ <TD>
+ <IMG HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"
+ STYLE="width: 1px;"/>
+ </TD>
+ <TD>
+ <IMG WIDTH="1" HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"/>
+ </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ </TR>
+ <TR>
+ <TD HEIGHT="100%">
+ <TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="10" BORDER="0"
+ CLASS="rich-tabpanel-content-position" STYLE="position: relative; z-index: 1;">
+ <TR>
+ <TD
+ CLASS="rich-tabpanel rich-tabpanel-content rich-tabpanel-content-position"
+ STYLE="">
+ <SPAN> Here is tab #1 </SPAN>
+ </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tabPanel.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml.xml 2008-10-23 13:38:58 UTC (rev 11108)
@@ -0,0 +1,8 @@
+<tests>
+ <test id="toggleControl">
+ <SPAN STYLE="color: blue; text-decoration: underline;"
+ VPE-USER-TOGGLE-ID="">
+ <SPAN> CLOSED </SPAN>
+ </SPAN>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml 2008-10-23 13:27:19 UTC (rev 11107)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml 2008-10-23 13:38:58 UTC (rev 11108)
@@ -1,58 +1,38 @@
<!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:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://richfaces.org/rich">
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
<head>
</head>
-
<body>
-<!-- Toggle Panel component -->
-<rich:togglePanel value="#{toggleBean.skinChooserState1}"
- switchType="client" stateOrder="closed,tip1, tip2,tip3">
-
- <f:facet name="closed">
- <!-- Toggle Control component-->
- <rich:toggleControl>
- <h:graphicImage id="pic" style="border-width:0"
- value="/pictures/clickme.gif" />
- </rich:toggleControl>
- </f:facet>
-
- <f:facet name="tip1">
- <ui:include src="/templetes/tipBlock.xhtml">
- <ui:param name="tip"
- value="rich:toggleControl might bre located inside of outside
- of the rich:toogleControl it works for. In case of outside location, the control
- attribute 'for' should refer to the toggle panel id." />
- <ui:param name="next" value="tip2" />
- </ui:include>
- </f:facet>
-
- <f:facet name="tip2">
- <ui:include src="/templetes/tipBlock.xhtml">
- <ui:param name="tip"
- value="Attribute initialState defines the first state appear
- when the page is loaded. If this attribute is not specified, the first state
- mentioned in the attribute stateOrder will be the first" />
- <ui:param name="previous" value="tip1" />
- <ui:param name="next" value="tip3" />
- </ui:include>
- </f:facet>
-
- <f:facet name="tip3">
- <ui:include src="/templetes/tipBlock.xhtml">
- <ui:param name="tip"
- value="Note that rich:toggleControl similar to
- h:commandLink for 'server' mode and smilar to a4j:commandLink for 'ajax' mode.
- Set immediate attribute to true if jsf form has other input field that might
- cause the validation error. Otherwize, the state switched will not perform" />
- <ui:param name="previous" value="tip2" />
- </ui:include>
- </f:facet>
-</rich:togglePanel>
+<f:view>
+ <rich:togglePanel id="togglePanel" value="togglePanelValue" switchType="client"
+ stateOrder="closed,tip1,tip2">
+ <f:facet name="closed">
+ <rich:toggleControl>
+ <h:outputText value="CLOSED" />
+ </rich:toggleControl>
+ </f:facet>
+ <f:facet name="tip1">
+ <h:outputText value="TIP 1" />
+ <h:panelGrid columns="2">
+ <rich:toggleControl switchToState="closed" value="x Close" />
+ <rich:toggleControl switchToState="tip2" value="Next >>" />
+ </h:panelGrid>
+ </f:facet>
+ <f:facet name="tip2">
+ <h:outputText value="TIP 2" />
+ <h:panelGrid columns="2">
+ <rich:toggleControl switchToState="closed" value="x Close" />
+ <rich:toggleControl switchToState="tip1" value="« Previous" />
+ <rich:toggleControl switchToState="tip2" value="Next >>" />
+ </h:panelGrid>
+ </f:facet>
+ </rich:togglePanel>
+</f:view>
</body>
</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml.xml 2008-10-23 13:38:58 UTC (rev 11108)
@@ -0,0 +1,10 @@
+<tests>
+ <test id="togglePanel">
+ <DIV>
+ <SPAN STYLE="color: blue; text-decoration: underline;"
+ VPE-USER-TOGGLE-ID="">
+ <SPAN> CLOSED </SPAN>
+ </SPAN>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-23 13:27:19 UTC (rev 11107)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-23 13:38:58 UTC (rev 11108)
@@ -272,19 +272,19 @@
}
public void testTabPanel() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/tabPanel.xhtml");//$NON-NLS-1$
}
public void testTab() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/tab.xhtml");//$NON-NLS-1$
}
public void testTogglePanel() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/togglePanel.xhtml");//$NON-NLS-1$
}
public void testToggleControl() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/toggleControl.xhtml");//$NON-NLS-1$
}
public void testToolBar() throws Throwable {
17 years, 2 months
JBoss Tools SVN: r11107 - in branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui: internal/project/facet and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-10-23 09:27:19 -0400 (Thu, 23 Oct 2008)
New Revision: 11107
Modified:
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2959 Fixed in trunk (cr1) and brunch (beta1)
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2008-10-23 13:22:32 UTC (rev 11106)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2008-10-23 13:27:19 UTC (rev 11107)
@@ -113,6 +113,8 @@
public static String SEAM_FORM_WIZARD_PAGE1_JAVA_INTERFACE_SLSB_AND_KEY_SEAMEJB3_ANNOTATIONS_WILL_BE_CREATED;
+ public static String SEAM_INSTALL_WIZARD_PROJECT_NAME_WITH_UPPERCASE;
+
public static String SEAM_FORM_WIZARD_PAGE1_SEAM_FORM;
public static String SEAM_FORM_WIZARD_PAGE1_SELECT_THE_NAME_OF_THE_NEW_SEAM_FORM;
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java 2008-10-23 13:22:32 UTC (rev 11106)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java 2008-10-23 13:27:19 UTC (rev 11107)
@@ -15,6 +15,8 @@
import java.util.List;
import java.util.Map;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.DialogPage;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.widgets.Display;
import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
@@ -84,25 +86,40 @@
*
*/
public void validateUntillError() {
- page.setErrorMessage(getFirstValidationError());
+ IStatus message = getFirstValidationError();
+ if(message == null) {
+ page.setMessage(null);
+ page.setErrorMessage(null);
+ } else {
+ if(message.getSeverity()==IStatus.ERROR) {
+ page.setErrorMessage(message.getMessage());
+ } else {
+ page.setErrorMessage(null);
+ page.setMessage(message.getMessage(), DialogPage.WARNING);
+ }
+ }
page.setPageComplete(page.getErrorMessage()==null);
- if(page.getErrorMessage()==null) page.setMessage(null);
}
/**
*
* @return
*/
- public String getFirstValidationError() {
+ public IStatus getFirstValidationError() {
+ IStatus firstWarning = null;
for (String validatorName : validationOrder) {
- Map<String,String> errors = getValidator(validatorName).validate(
+ Map<String,IStatus> errors = getValidator(validatorName).validate(
model.getProperty(validatorName),model);
- String message = errors.get(validatorName);
+ IStatus message = errors.get(validatorName);
if(message!=null) {
- return message;
+ if(message.getSeverity()==IStatus.ERROR) {
+ return message;
+ } else if(message.getSeverity()==IStatus.WARNING && firstWarning==null) {
+ firstWarning = message;
+ }
}
}
- return null;
+ return firstWarning;
}
/**
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java 2008-10-23 13:22:32 UTC (rev 11106)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java 2008-10-23 13:27:19 UTC (rev 11107)
@@ -12,6 +12,8 @@
import java.util.Map;
+import org.eclipse.core.runtime.IStatus;
+
/**
* Simple validator interface
* @author eskimo
@@ -27,5 +29,5 @@
* @param context - a contextual data that can be used during validation
* @return map from editor name to error text
*/
- Map<String,String> validate(Object value, Object context);
+ Map<String, IStatus> validate(Object value, Object context);
}
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-10-23 13:22:32 UTC (rev 11106)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-10-23 13:27:19 UTC (rev 11107)
@@ -20,11 +20,13 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.datatools.connectivity.IConnectionProfile;
import org.eclipse.datatools.connectivity.ProfileManager;
import org.eclipse.jdt.core.JavaConventions;
import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.DialogPage;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.wizard.IWizard;
@@ -98,7 +100,7 @@
// Database group
private IFieldEditor connProfileSelEditor = SeamWizardFactory.createConnectionProfileSelectionFieldEditor(getConnectionProfileDefaultValue(), new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
SeamInstallWizardPage.this.validate();
return ValidatorFactory.NO_ERRORS;
}
@@ -379,6 +381,12 @@
validatorDelegate.addValidatorForProperty(
ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,
getDeploymentTypeValidator(getWizard()));
+ validatorDelegate.addValidatorForProperty(
+ IFacetDataModelProperties.FACET_PROJECT_NAME,
+ new ProjectNamesDuplicationValidator(
+ IFacetDataModelProperties.FACET_PROJECT_NAME));
+ validatorDelegate.addValidatorForProperty(IFacetDataModelProperties.FACET_PROJECT_NAME,
+ new ProjectNameValidator(IFacetDataModelProperties.FACET_PROJECT_NAME));
}
jBossHibernateDbTypeEditor
@@ -479,11 +487,24 @@
}
private void validate() {
- final String message = validatorDelegate.getFirstValidationError();
+ final IStatus message = validatorDelegate.getFirstValidationError();
Display.getDefault().syncExec(new Runnable() {
public void run() {
- setPageComplete(message == null);
- setErrorMessage(message);
+ if(message==null) {
+ setMessage(null);
+ setErrorMessage(null);
+ setPageComplete(true);
+ return;
+ }
+ if(message.getSeverity()==IStatus.ERROR) {
+ setErrorMessage(message.getMessage());
+ setPageComplete(false);
+ return;
+ }
+ setErrorMessage(null);
+ setMessage(message.getMessage(), DialogPage.WARNING);
+ setPageComplete(true);
+ return;
}
});
}
@@ -505,18 +526,45 @@
/**
* @see IValidator#validate(Object, Object)
*/
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
IStatus status = JavaConventions.validatePackageName(value
.toString(), CompilerOptions.VERSION_1_5,
CompilerOptions.VERSION_1_5);
- if (!status.isOK()) {
+ if (status.getSeverity()==IStatus.ERROR) {
return ValidatorFactory.createErrormessage(fieldName,
- SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR + targetName + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID);
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR + targetName + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID));
+ } else if (status.getSeverity()==IStatus.WARNING) {
+ return ValidatorFactory.createErrormessage(fieldName,
+ new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR + targetName + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID));
}
return ValidatorFactory.NO_ERRORS;
}
}
+ class ProjectNameValidator implements IValidator {
+ String propertyName;
+
+ public ProjectNameValidator(String propertyName) {
+ this.propertyName = propertyName;
+ }
+
+ public Map<String, IStatus> validate(Object value, Object context) {
+ if(value==null) {
+ return ValidatorFactory.NO_ERRORS;
+ }
+ final String projectName = (String)value;
+ if(projectName.length()==0) {
+ return ValidatorFactory.NO_ERRORS;
+ }
+ char firstLetter = projectName.charAt(0);
+ if(Character.isUpperCase(firstLetter)) {
+ return ValidatorFactory.createErrormessage(propertyName,
+ new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.SEAM_INSTALL_WIZARD_PROJECT_NAME_WITH_UPPERCASE));
+ }
+ return ValidatorFactory.NO_ERRORS;
+ }
+ }
+
class ProjectNamesDuplicationValidator implements IValidator {
String propertyName;
@@ -529,35 +577,52 @@
/**
* @see IValidator#validate(Object, Object)
*/
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
final String projectName = (String)value;
final String deployAs = model.getStringProperty(
ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS);
final String testProjectName = projectName + "-test"; //$NON-NLS-1$
IStatus status = ProjectCreationDataModelProviderNew.validateName(testProjectName);
- if (!status.isOK())
+ if (status.getSeverity()==IStatus.ERROR) {
return ValidatorFactory.createErrormessage(propertyName,
- SeamUIMessages.VALIDATOR_FACTORY_TEST_PROJECT +
- testProjectName +
- SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS);
-
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_TEST_PROJECT +
+ testProjectName +
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ } else if (status.getSeverity()==IStatus.WARNING) {
+ return ValidatorFactory.createErrormessage(propertyName,
+ new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_TEST_PROJECT +
+ testProjectName +
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ }
if (ISeamFacetDataModelProperties.DEPLOY_AS_EAR.equals(deployAs)) {
final String earProjectName = projectName + "-ear"; //$NON-NLS-1$
status = ProjectCreationDataModelProviderNew.validateName(earProjectName);
- if (!status.isOK())
+ if (status.getSeverity()==IStatus.ERROR) {
return ValidatorFactory.createErrormessage(propertyName,
- SeamUIMessages.VALIDATOR_FACTORY_EAR_PROJECT +
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_EAR_PROJECT +
earProjectName +
- SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS);
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ } else if (status.getSeverity()==IStatus.WARNING) {
+ return ValidatorFactory.createErrormessage(propertyName,
+ new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_EAR_PROJECT +
+ earProjectName +
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ }
final String ejbProjectName = projectName + "-ejb"; //$NON-NLS-1$
status = ProjectCreationDataModelProviderNew.validateName(ejbProjectName);
- if (!status.isOK())
+ if (status.getSeverity()==IStatus.ERROR) {
return ValidatorFactory.createErrormessage(propertyName,
- SeamUIMessages.VALIDATOR_FACTORY_EJB_PROJECT +
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_EJB_PROJECT +
ejbProjectName +
- SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS);
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ } else if (status.getSeverity()==IStatus.WARNING) {
+ return ValidatorFactory.createErrormessage(propertyName,
+ new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_EJB_PROJECT +
+ ejbProjectName +
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ }
}
return ValidatorFactory.NO_ERRORS;
}
@@ -569,7 +634,7 @@
}
// return new DeploymentTypeValidator(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, model);
return new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
return ValidatorFactory.NO_ERRORS;
}
};
@@ -599,7 +664,7 @@
/**
* @see IValidator#validate(Object, Object)
*/
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
final String deploymentType = value.toString();
if(!ISeamFacetDataModelProperties.DEPLOY_AS_WAR.equals(deploymentType)) {
Object runtimeName = model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
@@ -608,7 +673,7 @@
if(!rt.supports(EJB_30) || !rt.supports(EAR_50)) {
return ValidatorFactory.createErrormessage(
propertyName,
- NLS.bind(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_CANNOT_USE_SELECTED_DEPLOYMENT6 , new String[]{deploymentType.toUpperCase(),runtimeName.toString()}));
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS.bind(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_CANNOT_USE_SELECTED_DEPLOYMENT6 , new String[]{deploymentType.toUpperCase(),runtimeName.toString()})));
}
}
}
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2008-10-23 13:22:32 UTC (rev 11106)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2008-10-23 13:27:19 UTC (rev 11107)
@@ -21,6 +21,7 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.datatools.connectivity.IConnectionProfile;
import org.eclipse.datatools.connectivity.ProfileManager;
import org.eclipse.jdt.core.IJavaProject;
@@ -56,14 +57,14 @@
/**
*
*/
- static public final Map<String, String> NO_ERRORS = Collections
- .unmodifiableMap(new HashMap<String, String>());
+ static public final Map<String, IStatus> NO_ERRORS = Collections
+ .unmodifiableMap(new HashMap<String, IStatus>());
/**
*
*/
static public IValidator NO_ERRORS_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
return NO_ERRORS;
}
};
@@ -82,8 +83,8 @@
*
* @return
*/
- public static Map<String, String> createErrorMap() {
- return new HashMap<String, String>();
+ public static Map<String, IStatus> createErrorMap() {
+ return new HashMap<String, IStatus>();
}
/**
@@ -91,9 +92,9 @@
* @param text
* @return
*/
- public static Map<String, String> createErrormessage(String text) {
- Map<String, String> map = createErrorMap();
- map.put(IValidator.DEFAULT_ERROR, text);
+ public static Map<String, IStatus> createErrormessage(IStatus message) {
+ Map<String, IStatus> map = createErrorMap();
+ map.put(IValidator.DEFAULT_ERROR, message);
return map;
}
@@ -102,10 +103,10 @@
* @param text
* @return
*/
- public static Map<String, String> createErrormessage(String propertyName,
- String text) {
- Map<String, String> map = createErrorMap();
- map.put(propertyName, text);
+ public static Map<String, IStatus> createErrormessage(String propertyName,
+ IStatus message) {
+ Map<String, IStatus> map = createErrorMap();
+ map.put(propertyName, message);
return map;
}
@@ -114,7 +115,7 @@
*/
public static final IValidator FILE_SYSTEM_FOLDER_EXISTS = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (value == null)
throw new IllegalArgumentException(
SeamUIMessages.VALIDATOR_FACTORY_PATH_TO_A_FOLDER_CANNOT_BE_NULL);
@@ -122,13 +123,13 @@
File folder = new File(folderPath);
if (!folder.exists())
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_FOLDER
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_FOLDER
+ folderPath
- + SeamUIMessages.VALIDATOR_FACTORY_DOES_NOT_EXISTS);
+ + SeamUIMessages.VALIDATOR_FACTORY_DOES_NOT_EXISTS));
if (!folder.isDirectory())
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_PATH
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_PATH
+ folderPath
- + SeamUIMessages.VALIDATOR_FACTORY_POINTS_TO_FILE);
+ + SeamUIMessages.VALIDATOR_FACTORY_POINTS_TO_FILE));
return NO_ERRORS;
}
};
@@ -137,15 +138,13 @@
*
*/
public static final IValidator JBOSS_SEAM_HOME_FOLDER_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
- Map<String, String> errors = FILE_SYSTEM_FOLDER_EXISTS.validate(
+ public Map<String, IStatus> validate(Object value, Object context) {
+ Map<String, IStatus> errors = FILE_SYSTEM_FOLDER_EXISTS.validate(
value, context);
if (errors.size() > 0) {
errors = createErrorMap();
- errors
- .put(
- ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
- SeamUIMessages.VALIDATOR_FACTORY_SEAM_HOME_FOLDER_DOES_NOT_EXISTS);
+ errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME, new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
+ SeamUIMessages.VALIDATOR_FACTORY_SEAM_HOME_FOLDER_DOES_NOT_EXISTS));
return errors;
}
String version = (String) context;
@@ -155,21 +154,19 @@
"lib/jboss-seam.jar"); //$NON-NLS-1$
if (!seamJarFile.isFile()) {
errors = createErrorMap();
- errors
- .put(
- ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
+ errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
SeamUIMessages.VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO
- + SeamUIMessages.VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER);
+ + SeamUIMessages.VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER));
}
} else {
File seamJarFile = new File(value.toString(), "jboss-seam.jar"); //$NON-NLS-1$
if (!seamJarFile.isFile()) {
errors = createErrorMap();
- errors
- .put(
- ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
+ errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
SeamUIMessages.VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO
- + SeamUIMessages.VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER);
+ + SeamUIMessages.VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER));
}
}
@@ -181,23 +178,21 @@
*
*/
public static final IValidator JBOSS_AS_HOME_FOLDER_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
- Map<String, String> errors = FILE_SYSTEM_FOLDER_EXISTS.validate(
+ public Map<String, IStatus> validate(Object value, Object context) {
+ Map<String, IStatus> errors = FILE_SYSTEM_FOLDER_EXISTS.validate(
value, context);
if (errors.size() > 0) {
errors = createErrorMap();
- errors
- .put(
- ISeamFacetDataModelProperties.JBOSS_AS_HOME,
- SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_DOES_NOT_EXIST);
+ errors.put(ISeamFacetDataModelProperties.JBOSS_AS_HOME,
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
+ SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_DOES_NOT_EXIST));
return errors;
}
if (!new File(value.toString(), "bin/twiddle.jar").isFile()) { //$NON-NLS-1$
- errors
- .put(
- ISeamFacetDataModelProperties.JBOSS_AS_HOME,
- SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT
- + SeamUIMessages.VALIDATOR_FACTORY_LOOK_LIKE_JBOSS_AS_HOME_FOLDER);
+ errors.put(ISeamFacetDataModelProperties.JBOSS_AS_HOME,
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
+ SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT
+ + SeamUIMessages.VALIDATOR_FACTORY_LOOK_LIKE_JBOSS_AS_HOME_FOLDER));
}
return errors;
}
@@ -207,34 +202,29 @@
*
*/
public static final IValidator CLASS_QNAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
String classDecl = "class " + value.toString() + " {}"; //$NON-NLS-1$ //$NON-NLS-2$
ASTParser parser = ASTParser.newParser(AST.JLS3);
parser.setSource(classDecl.toCharArray());
parser.setProject((IJavaProject) context);
- CompilationUnit compilationUnit = (CompilationUnit) parser
- .createAST(null);
+ CompilationUnit compilationUnit = (CompilationUnit)parser.createAST(null);
IProblem[] problems = compilationUnit.getProblems();
if (problems.length > 0) {
- return createErrormessage(Messages
- .format(
- SeamUIMessages.VALIDATOR_FACTORY_COMPONENT_NAME_IS_NOT_VALID,
- problems[0].getMessage()));
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
+ Messages.format(SeamUIMessages.VALIDATOR_FACTORY_COMPONENT_NAME_IS_NOT_VALID,
+ problems[0].getMessage())));
}
return ValidatorFactory.NO_ERRORS;
}
};
public static final IValidator PACKAGE_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
IStatus status = JavaConventions.validatePackageName(value
.toString(), CompilerOptions.VERSION_1_5,
CompilerOptions.VERSION_1_5);
if (status.getSeverity() == IStatus.ERROR) {
- return createErrormessage((Messages
- .format(
- NewWizardMessages.NewTypeWizardPage_error_InvalidPackageName,
- status.getMessage())));
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, Messages.format(NewWizardMessages.NewTypeWizardPage_error_InvalidPackageName, status.getMessage())));
}
return ValidatorFactory.NO_ERRORS;
@@ -245,7 +235,7 @@
*
*/
public static final IValidator FILESYSTEM_FILE_EXISTS_VALIDATOR = new IValidator() {
- public java.util.Map<String, String> validate(Object value,
+ public java.util.Map<String, IStatus> validate(Object value,
Object context) {
return ValidatorFactory.NO_ERRORS;
};
@@ -258,14 +248,14 @@
*/
public static final IValidator SEAM_COMPONENT_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
IStatus status = JavaConventions.validateClassFileName(value
.toString()
+ ".class", "5.0", "5.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
if (status.isOK()) {
return NO_ERRORS;
} else {
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID);
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID));
}
}
};
@@ -277,7 +267,7 @@
*/
public static final IValidator SEAM_JAVA_INTEFACE_NAME_CONVENTION_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (!(context instanceof Object[])) {
throw new IllegalArgumentException(
"Context parameter should be instance of Object[]"); //$NON-NLS-1$
@@ -295,8 +285,8 @@
IStatus status = JavaConventions.validateJavaTypeName(value
.toString(), sourceLevel, compliance);
if (status.getSeverity() == IStatus.WARNING) {
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_LOCAL_INTERFACE_NAME_IS_NOT_VALID
- + status.getMessage());
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_LOCAL_INTERFACE_NAME_IS_NOT_VALID
+ + status.getMessage()));
}
return NO_ERRORS;
}
@@ -304,7 +294,7 @@
public static final IValidator SEAM_METHOD_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (!(context instanceof Object[])) {
throw new IllegalArgumentException(
"Context parameter should be instance of Object[]"); //$NON-NLS-1$
@@ -321,8 +311,8 @@
IProblem[] problems = compilationUnit.getProblems();
if (problems.length > 0) {
- return createErrormessage(targetName
- + SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID2);
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, targetName
+ + SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID2));
}
return NO_ERRORS;
@@ -331,7 +321,7 @@
public static final IValidator FILE_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (!(context instanceof Object[])) {
throw new IllegalArgumentException(
"Context parameter should be instance of Object[]"); //$NON-NLS-1$
@@ -343,27 +333,27 @@
if ("".equals(value) //$NON-NLS-1$
|| !project.getLocation().isValidSegment(value.toString()))
- return createErrormessage(targetName
- + SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID2);
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, targetName
+ + SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID2));
return NO_ERRORS;
}
};
public static final IValidator SEAM_PROJECT_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (value == null || "".equals(value)) { //$NON-NLS-1$
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_PRJ_NOT_SELECTED);
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_PRJ_NOT_SELECTED));
}
IResource project = ResourcesPlugin.getWorkspace().getRoot()
.findMember(value.toString());
if (project == null || !(project instanceof IProject)
|| !project.exists()) {
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_PROJECT
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_PROJECT
+ value
- + SeamUIMessages.VALIDATOR_FACTORY_DOES_NOT_EXIST);
+ + SeamUIMessages.VALIDATOR_FACTORY_DOES_NOT_EXIST));
} else {
IProject selection = (IProject) project;
try {
@@ -376,19 +366,19 @@
// .class)).hasProjectFacet(ProjectFacetsManager
// .getProjectFacet("jst.web"))
|| "" .equals(SeamCorePlugin.getSeamPreferences(selection).get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, ""))) { //$NON-NLS-1$
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_SELECTED_PROJECT
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_SELECTED_PROJECT
+ project.getName()
- + SeamUIMessages.VALIDATOR_FACTORY_IS_NOT_A_SEAM_WEB_PROJECT);
+ + SeamUIMessages.VALIDATOR_FACTORY_IS_NOT_A_SEAM_WEB_PROJECT));
} else {
// TODO validate project(s) structure
}
} catch (CoreException e) {
// it might happen only if project is closed and project
// name typed by hand
- return createErrormessage(NLS
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SELECTED_PRJ_IS_CLOSED,
- project.getName()));
+ project.getName())));
}
}
return NO_ERRORS;
@@ -403,11 +393,11 @@
this.allowEmptyConnection = allowEmptyConnection;
}
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (!allowEmptyConnection && (value == null || "".equals(value.toString().trim()))) { //$NON-NLS-1$
return createErrormessage(
ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE,
- SeamUIMessages.VALIDATOR_FACTORY_CONNECTION_PROFILE_IS_NOT_SELECTED);
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_CONNECTION_PROFILE_IS_NOT_SELECTED));
} else {
IConnectionProfile connProfile = ProfileManager.getInstance()
.getProfileByName(value.toString());
@@ -418,9 +408,9 @@
if (driverClass == null || "".equals(driverClass)) { //$NON-NLS-1$
return createErrormessage(
ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE,
- SeamUIMessages.VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED
+ value
- + SeamUIMessages.VALIDATOR_FACTORY_CONNECTION_PROFILE);
+ + SeamUIMessages.VALIDATOR_FACTORY_CONNECTION_PROFILE));
}
}
return NO_ERRORS;
@@ -432,58 +422,58 @@
public static final IValidator CONNECTION_DRIVER_VALIDATOR = new ConnectionProfileValidator(true);
public static final IValidator SEAM_RUNTIME_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
- Map<String, String> errors = NO_ERRORS;
+ Map<String, IStatus> errors = NO_ERRORS;
if (value == null || "".equals(value.toString().trim())) { //$NON-NLS-1$
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- SeamUIMessages.VALIDATOR_FACTORY_SEAM_RUNTIME_IS_NOT_SELECTED);
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_SEAM_RUNTIME_IS_NOT_SELECTED));
} else {
SeamRuntime rt = SeamRuntimeManager.getInstance()
.findRuntimeByName(value.toString());
if (rt == null) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_CANNOT_FIND_SEAM_RUNTIME,
- value));
+ value)));
} else if (!new File(rt.getHomeDir()).exists()) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_IS_MISSING,
- value));
+ value)));
} else if (!new File(rt.getSeamGenDir()).exists()) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_IS_MISSING,
- value));
+ value)));
} else if (!new File(rt.getSrcTemplatesDir()).exists()) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_SRC_DIR_IS_MISSING,
- value));
+ value)));
} else if (!new File(rt.getViewTemplatesDir()).exists()) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_VIEW_DIR_IS_MISSING,
- value));
+ value)));
} else if (!new File(rt.getResourceTemplatesDir()).exists()) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_RESOURCES_DIR_IS_MISSING,
- value));
+ value)));
}
}
return errors;
@@ -491,41 +481,41 @@
};
public static final IValidator SEAM_RUNTIME_VALIDATOR = new IValidator() {
- public java.util.Map<String, String> validate(Object value,
+ public java.util.Map<String, IStatus> validate(Object value,
Object context) {
- Map<String, String> errors = NO_ERRORS;
+ Map<String, IStatus> errors = NO_ERRORS;
String rtName = value.toString();
if (value == null || "".equals(value)) { //$NON-NLS-1$
- errors = createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_NOT_CONFIGURED);
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_NOT_CONFIGURED));
} else {
SeamRuntime rt = SeamRuntimeManager.getInstance()
.findRuntimeByName(value.toString());
if (rt == null) {
- errors = createErrormessage(NLS
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_CANNOT_BE_FOUND,
- value));
+ value)));
} else if (!new File(rt.getHomeDir()).exists()) {
- errors = createErrormessage(NLS
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_DOES_NOT_EXIST,
- value));
+ value)));
} else if (!new File(rt.getSeamGenDir()).exists()) {
- errors = createErrormessage(NLS
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_DOES_NOT_EXIST,
- value));
+ value)));
} else if (!new File(rt.getSrcTemplatesDir()).exists()) {
- errors = createErrormessage(NLS
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_SOURCE_TEMPLATES_DIR_DOES_NOT_EXIST,
- value));
+ value)));
} else if (!new File(rt.getViewTemplatesDir()).exists()) {
- errors = createErrormessage(NLS
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_VIE_TEMPLATE_DIR_DOES_NOT_EXIST,
- value));
+ value)));
// } else if(!new
// File(rt.getResourceTemplatesDir()).exists()) {
// errors = createErrormessage(NLS.bind(
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2008-10-23 13:22:32 UTC (rev 11106)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2008-10-23 13:27:19 UTC (rev 11107)
@@ -107,6 +107,7 @@
SEAM_WIZARD_FACTORY_METHOD_NAME=Method name:
SEAM_INSTALL_WIZARD_PAGE_NEW=New...
SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR=Package name for
+SEAM_INSTALL_WIZARD_PROJECT_NAME_WITH_UPPERCASE=Project names which start with a capital letter may break Seam/JSF applications; use lower case.
SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID=\ is not valid
SEAM_BASE_WIZARD_PAGE_POJO_CLASS_NAME=POJO class name:
SEAM_BASE_WIZARD_PAGE_SEAM_COMPONENTS=Seam component
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java 2008-10-23 13:22:32 UTC (rev 11106)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java 2008-10-23 13:27:19 UTC (rev 11107)
@@ -14,12 +14,12 @@
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jface.wizard.IWizardPage;
@@ -67,10 +67,15 @@
projectEditor = SeamWizardFactory.createSeamProjectSelectionFieldEditor(projectName);
projectEditor.addPropertyChangeListener(this);
if(projectName!=null && projectName.length()>0) {
- Map<String, String> errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(projectEditor.getValue(), null);
+ Map<String, IStatus> errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(projectEditor.getValue(), null);
if(errors.size()>0) {
- setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).toString());
- setPageComplete(false);
+ IStatus message = errors.get(IValidator.DEFAULT_ERROR);
+ if(message.getSeverity()==IStatus.ERROR) {
+ setErrorMessage(message.getMessage());
+ setPageComplete(false);
+ } else {
+ setMessage(message.getMessage());
+ }
} else {
setMessage(null);
}
@@ -202,15 +207,20 @@
}
private void validate() {
- Map<String, String> errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(projectEditor.getValue(), null);
+ Map<String, IStatus> errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(projectEditor.getValue(), null);
if(errors.size()>0 || !isProjectSettingsOk()) {
- Object errorMessage = errors.get(IValidator.DEFAULT_ERROR);
+ IStatus errorMessage = errors.get(IValidator.DEFAULT_ERROR);
if(errorMessage==null) {
- errorMessage = SeamUIMessages.VALIDATOR_INVALID_SETTINGS;
+ setErrorMessage(SeamUIMessages.VALIDATOR_INVALID_SETTINGS);
}
- setErrorMessage(errorMessage.toString());
- setPageComplete(false);
+ if(errorMessage.getSeverity()==IStatus.ERROR) {
+ setErrorMessage(errorMessage.getMessage());
+ setPageComplete(false);
+ } else {
+ setMessage(errorMessage.getMessage());
+ }
+
return;
}
String config = (String)configEditor.getValue();
17 years, 2 months
JBoss Tools SVN: r11106 - branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2008-10-23 09:22:32 -0400 (Thu, 23 Oct 2008)
New Revision: 11106
Modified:
branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java
Log:
JBIDE-2956
Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2008-10-23 13:21:42 UTC (rev 11105)
+++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2008-10-23 13:22:32 UTC (rev 11106)
@@ -29,6 +29,7 @@
import org.eclipse.jdt.core.dom.AST;
import org.eclipse.jdt.core.dom.ASTParser;
import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
import org.eclipse.jdt.internal.core.JavaElement;
import org.eclipse.jdt.internal.core.JavaElementInfo;
import org.eclipse.jdt.internal.core.JavaProject;
@@ -182,6 +183,10 @@
if (tmp instanceof AbstractTypeDeclaration) {
fullyQualifiedName += ((AbstractTypeDeclaration)tmp).getName();
}
+ if (!(tmp instanceof TypeDeclaration)) {
+ // ignore EnumDeclaration & AnnotationTypeDeclaration
+ fullyQualifiedName = ""; //$NON-NLS-1$
+ }
}
} catch (IllegalArgumentException e) {
HibernateConsolePlugin.getDefault().logErrorMessage("IllegalArgumentException: ", e); //$NON-NLS-1$
17 years, 2 months
JBoss Tools SVN: r11105 - trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2008-10-23 09:21:42 -0400 (Thu, 23 Oct 2008)
New Revision: 11105
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java
Log:
JBIDE-2956
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2008-10-23 13:20:58 UTC (rev 11104)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2008-10-23 13:21:42 UTC (rev 11105)
@@ -29,6 +29,7 @@
import org.eclipse.jdt.core.dom.AST;
import org.eclipse.jdt.core.dom.ASTParser;
import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
import org.eclipse.jdt.internal.core.JavaElement;
import org.eclipse.jdt.internal.core.JavaElementInfo;
import org.eclipse.jdt.internal.core.JavaProject;
@@ -182,6 +183,10 @@
if (tmp instanceof AbstractTypeDeclaration) {
fullyQualifiedName += ((AbstractTypeDeclaration)tmp).getName();
}
+ if (!(tmp instanceof TypeDeclaration)) {
+ // ignore EnumDeclaration & AnnotationTypeDeclaration
+ fullyQualifiedName = ""; //$NON-NLS-1$
+ }
}
} catch (IllegalArgumentException e) {
HibernateConsolePlugin.getDefault().logErrorMessage("IllegalArgumentException: ", e); //$NON-NLS-1$
17 years, 2 months
JBoss Tools SVN: r11104 - in trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui: internal/project/facet and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-10-23 09:20:58 -0400 (Thu, 23 Oct 2008)
New Revision: 11104
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2959 Fixed in trunk (cr1) and brunch (beta1)
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2008-10-23 12:22:25 UTC (rev 11103)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2008-10-23 13:20:58 UTC (rev 11104)
@@ -113,6 +113,8 @@
public static String SEAM_FORM_WIZARD_PAGE1_JAVA_INTERFACE_SLSB_AND_KEY_SEAMEJB3_ANNOTATIONS_WILL_BE_CREATED;
+ public static String SEAM_INSTALL_WIZARD_PROJECT_NAME_WITH_UPPERCASE;
+
public static String SEAM_FORM_WIZARD_PAGE1_SEAM_FORM;
public static String SEAM_FORM_WIZARD_PAGE1_SELECT_THE_NAME_OF_THE_NEW_SEAM_FORM;
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java 2008-10-23 12:22:25 UTC (rev 11103)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java 2008-10-23 13:20:58 UTC (rev 11104)
@@ -15,6 +15,8 @@
import java.util.List;
import java.util.Map;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.DialogPage;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.widgets.Display;
import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
@@ -84,25 +86,40 @@
*
*/
public void validateUntillError() {
- page.setErrorMessage(getFirstValidationError());
+ IStatus message = getFirstValidationError();
+ if(message == null) {
+ page.setMessage(null);
+ page.setErrorMessage(null);
+ } else {
+ if(message.getSeverity()==IStatus.ERROR) {
+ page.setErrorMessage(message.getMessage());
+ } else {
+ page.setErrorMessage(null);
+ page.setMessage(message.getMessage(), DialogPage.WARNING);
+ }
+ }
page.setPageComplete(page.getErrorMessage()==null);
- if(page.getErrorMessage()==null) page.setMessage(null);
}
/**
*
* @return
*/
- public String getFirstValidationError() {
+ public IStatus getFirstValidationError() {
+ IStatus firstWarning = null;
for (String validatorName : validationOrder) {
- Map<String,String> errors = getValidator(validatorName).validate(
+ Map<String,IStatus> errors = getValidator(validatorName).validate(
model.getProperty(validatorName),model);
- String message = errors.get(validatorName);
+ IStatus message = errors.get(validatorName);
if(message!=null) {
- return message;
+ if(message.getSeverity()==IStatus.ERROR) {
+ return message;
+ } else if(message.getSeverity()==IStatus.WARNING && firstWarning==null) {
+ firstWarning = message;
+ }
}
}
- return null;
+ return firstWarning;
}
/**
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java 2008-10-23 12:22:25 UTC (rev 11103)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java 2008-10-23 13:20:58 UTC (rev 11104)
@@ -12,6 +12,8 @@
import java.util.Map;
+import org.eclipse.core.runtime.IStatus;
+
/**
* Simple validator interface
* @author eskimo
@@ -27,5 +29,5 @@
* @param context - a contextual data that can be used during validation
* @return map from editor name to error text
*/
- Map<String,String> validate(Object value, Object context);
+ Map<String, IStatus> validate(Object value, Object context);
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-10-23 12:22:25 UTC (rev 11103)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-10-23 13:20:58 UTC (rev 11104)
@@ -20,11 +20,13 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.datatools.connectivity.IConnectionProfile;
import org.eclipse.datatools.connectivity.ProfileManager;
import org.eclipse.jdt.core.JavaConventions;
import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.DialogPage;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.wizard.IWizard;
@@ -98,7 +100,7 @@
// Database group
private IFieldEditor connProfileSelEditor = SeamWizardFactory.createConnectionProfileSelectionFieldEditor(getConnectionProfileDefaultValue(), new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
SeamInstallWizardPage.this.validate();
return ValidatorFactory.NO_ERRORS;
}
@@ -379,6 +381,12 @@
validatorDelegate.addValidatorForProperty(
ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,
getDeploymentTypeValidator(getWizard()));
+ validatorDelegate.addValidatorForProperty(
+ IFacetDataModelProperties.FACET_PROJECT_NAME,
+ new ProjectNamesDuplicationValidator(
+ IFacetDataModelProperties.FACET_PROJECT_NAME));
+ validatorDelegate.addValidatorForProperty(IFacetDataModelProperties.FACET_PROJECT_NAME,
+ new ProjectNameValidator(IFacetDataModelProperties.FACET_PROJECT_NAME));
}
jBossHibernateDbTypeEditor
@@ -479,11 +487,24 @@
}
private void validate() {
- final String message = validatorDelegate.getFirstValidationError();
+ final IStatus message = validatorDelegate.getFirstValidationError();
Display.getDefault().syncExec(new Runnable() {
public void run() {
- setPageComplete(message == null);
- setErrorMessage(message);
+ if(message==null) {
+ setMessage(null);
+ setErrorMessage(null);
+ setPageComplete(true);
+ return;
+ }
+ if(message.getSeverity()==IStatus.ERROR) {
+ setErrorMessage(message.getMessage());
+ setPageComplete(false);
+ return;
+ }
+ setErrorMessage(null);
+ setMessage(message.getMessage(), DialogPage.WARNING);
+ setPageComplete(true);
+ return;
}
});
}
@@ -505,18 +526,45 @@
/**
* @see IValidator#validate(Object, Object)
*/
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
IStatus status = JavaConventions.validatePackageName(value
.toString(), CompilerOptions.VERSION_1_5,
CompilerOptions.VERSION_1_5);
- if (!status.isOK()) {
+ if (status.getSeverity()==IStatus.ERROR) {
return ValidatorFactory.createErrormessage(fieldName,
- SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR + targetName + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID);
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR + targetName + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID));
+ } else if (status.getSeverity()==IStatus.WARNING) {
+ return ValidatorFactory.createErrormessage(fieldName,
+ new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR + targetName + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID));
}
return ValidatorFactory.NO_ERRORS;
}
}
+ class ProjectNameValidator implements IValidator {
+ String propertyName;
+
+ public ProjectNameValidator(String propertyName) {
+ this.propertyName = propertyName;
+ }
+
+ public Map<String, IStatus> validate(Object value, Object context) {
+ if(value==null) {
+ return ValidatorFactory.NO_ERRORS;
+ }
+ final String projectName = (String)value;
+ if(projectName.length()==0) {
+ return ValidatorFactory.NO_ERRORS;
+ }
+ char firstLetter = projectName.charAt(0);
+ if(Character.isUpperCase(firstLetter)) {
+ return ValidatorFactory.createErrormessage(propertyName,
+ new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.SEAM_INSTALL_WIZARD_PROJECT_NAME_WITH_UPPERCASE));
+ }
+ return ValidatorFactory.NO_ERRORS;
+ }
+ }
+
class ProjectNamesDuplicationValidator implements IValidator {
String propertyName;
@@ -529,35 +577,52 @@
/**
* @see IValidator#validate(Object, Object)
*/
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
final String projectName = (String)value;
final String deployAs = model.getStringProperty(
ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS);
final String testProjectName = projectName + "-test"; //$NON-NLS-1$
IStatus status = ProjectCreationDataModelProviderNew.validateName(testProjectName);
- if (!status.isOK())
+ if (status.getSeverity()==IStatus.ERROR) {
return ValidatorFactory.createErrormessage(propertyName,
- SeamUIMessages.VALIDATOR_FACTORY_TEST_PROJECT +
- testProjectName +
- SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS);
-
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_TEST_PROJECT +
+ testProjectName +
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ } else if (status.getSeverity()==IStatus.WARNING) {
+ return ValidatorFactory.createErrormessage(propertyName,
+ new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_TEST_PROJECT +
+ testProjectName +
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ }
if (ISeamFacetDataModelProperties.DEPLOY_AS_EAR.equals(deployAs)) {
final String earProjectName = projectName + "-ear"; //$NON-NLS-1$
status = ProjectCreationDataModelProviderNew.validateName(earProjectName);
- if (!status.isOK())
+ if (status.getSeverity()==IStatus.ERROR) {
return ValidatorFactory.createErrormessage(propertyName,
- SeamUIMessages.VALIDATOR_FACTORY_EAR_PROJECT +
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_EAR_PROJECT +
earProjectName +
- SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS);
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ } else if (status.getSeverity()==IStatus.WARNING) {
+ return ValidatorFactory.createErrormessage(propertyName,
+ new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_EAR_PROJECT +
+ earProjectName +
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ }
final String ejbProjectName = projectName + "-ejb"; //$NON-NLS-1$
status = ProjectCreationDataModelProviderNew.validateName(ejbProjectName);
- if (!status.isOK())
+ if (status.getSeverity()==IStatus.ERROR) {
return ValidatorFactory.createErrormessage(propertyName,
- SeamUIMessages.VALIDATOR_FACTORY_EJB_PROJECT +
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_EJB_PROJECT +
ejbProjectName +
- SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS);
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ } else if (status.getSeverity()==IStatus.WARNING) {
+ return ValidatorFactory.createErrormessage(propertyName,
+ new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_EJB_PROJECT +
+ ejbProjectName +
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ }
}
return ValidatorFactory.NO_ERRORS;
}
@@ -569,7 +634,7 @@
}
// return new DeploymentTypeValidator(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, model);
return new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
return ValidatorFactory.NO_ERRORS;
}
};
@@ -599,7 +664,7 @@
/**
* @see IValidator#validate(Object, Object)
*/
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
final String deploymentType = value.toString();
if(!ISeamFacetDataModelProperties.DEPLOY_AS_WAR.equals(deploymentType)) {
Object runtimeName = model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
@@ -608,7 +673,7 @@
if(!rt.supports(EJB_30) || !rt.supports(EAR_50)) {
return ValidatorFactory.createErrormessage(
propertyName,
- NLS.bind(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_CANNOT_USE_SELECTED_DEPLOYMENT6 , new String[]{deploymentType.toUpperCase(),runtimeName.toString()}));
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS.bind(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_CANNOT_USE_SELECTED_DEPLOYMENT6 , new String[]{deploymentType.toUpperCase(),runtimeName.toString()})));
}
}
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2008-10-23 12:22:25 UTC (rev 11103)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2008-10-23 13:20:58 UTC (rev 11104)
@@ -21,6 +21,7 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.datatools.connectivity.IConnectionProfile;
import org.eclipse.datatools.connectivity.ProfileManager;
import org.eclipse.jdt.core.IJavaProject;
@@ -56,14 +57,14 @@
/**
*
*/
- static public final Map<String, String> NO_ERRORS = Collections
- .unmodifiableMap(new HashMap<String, String>());
+ static public final Map<String, IStatus> NO_ERRORS = Collections
+ .unmodifiableMap(new HashMap<String, IStatus>());
/**
*
*/
static public IValidator NO_ERRORS_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
return NO_ERRORS;
}
};
@@ -82,8 +83,8 @@
*
* @return
*/
- public static Map<String, String> createErrorMap() {
- return new HashMap<String, String>();
+ public static Map<String, IStatus> createErrorMap() {
+ return new HashMap<String, IStatus>();
}
/**
@@ -91,9 +92,9 @@
* @param text
* @return
*/
- public static Map<String, String> createErrormessage(String text) {
- Map<String, String> map = createErrorMap();
- map.put(IValidator.DEFAULT_ERROR, text);
+ public static Map<String, IStatus> createErrormessage(IStatus message) {
+ Map<String, IStatus> map = createErrorMap();
+ map.put(IValidator.DEFAULT_ERROR, message);
return map;
}
@@ -102,10 +103,10 @@
* @param text
* @return
*/
- public static Map<String, String> createErrormessage(String propertyName,
- String text) {
- Map<String, String> map = createErrorMap();
- map.put(propertyName, text);
+ public static Map<String, IStatus> createErrormessage(String propertyName,
+ IStatus message) {
+ Map<String, IStatus> map = createErrorMap();
+ map.put(propertyName, message);
return map;
}
@@ -114,7 +115,7 @@
*/
public static final IValidator FILE_SYSTEM_FOLDER_EXISTS = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (value == null)
throw new IllegalArgumentException(
SeamUIMessages.VALIDATOR_FACTORY_PATH_TO_A_FOLDER_CANNOT_BE_NULL);
@@ -122,13 +123,13 @@
File folder = new File(folderPath);
if (!folder.exists())
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_FOLDER
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_FOLDER
+ folderPath
- + SeamUIMessages.VALIDATOR_FACTORY_DOES_NOT_EXISTS);
+ + SeamUIMessages.VALIDATOR_FACTORY_DOES_NOT_EXISTS));
if (!folder.isDirectory())
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_PATH
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_PATH
+ folderPath
- + SeamUIMessages.VALIDATOR_FACTORY_POINTS_TO_FILE);
+ + SeamUIMessages.VALIDATOR_FACTORY_POINTS_TO_FILE));
return NO_ERRORS;
}
};
@@ -137,15 +138,13 @@
*
*/
public static final IValidator JBOSS_SEAM_HOME_FOLDER_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
- Map<String, String> errors = FILE_SYSTEM_FOLDER_EXISTS.validate(
+ public Map<String, IStatus> validate(Object value, Object context) {
+ Map<String, IStatus> errors = FILE_SYSTEM_FOLDER_EXISTS.validate(
value, context);
if (errors.size() > 0) {
errors = createErrorMap();
- errors
- .put(
- ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
- SeamUIMessages.VALIDATOR_FACTORY_SEAM_HOME_FOLDER_DOES_NOT_EXISTS);
+ errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME, new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
+ SeamUIMessages.VALIDATOR_FACTORY_SEAM_HOME_FOLDER_DOES_NOT_EXISTS));
return errors;
}
String version = (String) context;
@@ -155,21 +154,19 @@
"lib/jboss-seam.jar"); //$NON-NLS-1$
if (!seamJarFile.isFile()) {
errors = createErrorMap();
- errors
- .put(
- ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
+ errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
SeamUIMessages.VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO
- + SeamUIMessages.VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER);
+ + SeamUIMessages.VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER));
}
} else {
File seamJarFile = new File(value.toString(), "jboss-seam.jar"); //$NON-NLS-1$
if (!seamJarFile.isFile()) {
errors = createErrorMap();
- errors
- .put(
- ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
+ errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
SeamUIMessages.VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO
- + SeamUIMessages.VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER);
+ + SeamUIMessages.VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER));
}
}
@@ -181,23 +178,21 @@
*
*/
public static final IValidator JBOSS_AS_HOME_FOLDER_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
- Map<String, String> errors = FILE_SYSTEM_FOLDER_EXISTS.validate(
+ public Map<String, IStatus> validate(Object value, Object context) {
+ Map<String, IStatus> errors = FILE_SYSTEM_FOLDER_EXISTS.validate(
value, context);
if (errors.size() > 0) {
errors = createErrorMap();
- errors
- .put(
- ISeamFacetDataModelProperties.JBOSS_AS_HOME,
- SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_DOES_NOT_EXIST);
+ errors.put(ISeamFacetDataModelProperties.JBOSS_AS_HOME,
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
+ SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_DOES_NOT_EXIST));
return errors;
}
if (!new File(value.toString(), "bin/twiddle.jar").isFile()) { //$NON-NLS-1$
- errors
- .put(
- ISeamFacetDataModelProperties.JBOSS_AS_HOME,
- SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT
- + SeamUIMessages.VALIDATOR_FACTORY_LOOK_LIKE_JBOSS_AS_HOME_FOLDER);
+ errors.put(ISeamFacetDataModelProperties.JBOSS_AS_HOME,
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
+ SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT
+ + SeamUIMessages.VALIDATOR_FACTORY_LOOK_LIKE_JBOSS_AS_HOME_FOLDER));
}
return errors;
}
@@ -207,34 +202,29 @@
*
*/
public static final IValidator CLASS_QNAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
String classDecl = "class " + value.toString() + " {}"; //$NON-NLS-1$ //$NON-NLS-2$
ASTParser parser = ASTParser.newParser(AST.JLS3);
parser.setSource(classDecl.toCharArray());
parser.setProject((IJavaProject) context);
- CompilationUnit compilationUnit = (CompilationUnit) parser
- .createAST(null);
+ CompilationUnit compilationUnit = (CompilationUnit)parser.createAST(null);
IProblem[] problems = compilationUnit.getProblems();
if (problems.length > 0) {
- return createErrormessage(Messages
- .format(
- SeamUIMessages.VALIDATOR_FACTORY_COMPONENT_NAME_IS_NOT_VALID,
- problems[0].getMessage()));
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
+ Messages.format(SeamUIMessages.VALIDATOR_FACTORY_COMPONENT_NAME_IS_NOT_VALID,
+ problems[0].getMessage())));
}
return ValidatorFactory.NO_ERRORS;
}
};
public static final IValidator PACKAGE_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
IStatus status = JavaConventions.validatePackageName(value
.toString(), CompilerOptions.VERSION_1_5,
CompilerOptions.VERSION_1_5);
if (status.getSeverity() == IStatus.ERROR) {
- return createErrormessage((Messages
- .format(
- NewWizardMessages.NewTypeWizardPage_error_InvalidPackageName,
- status.getMessage())));
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, Messages.format(NewWizardMessages.NewTypeWizardPage_error_InvalidPackageName, status.getMessage())));
}
return ValidatorFactory.NO_ERRORS;
@@ -245,7 +235,7 @@
*
*/
public static final IValidator FILESYSTEM_FILE_EXISTS_VALIDATOR = new IValidator() {
- public java.util.Map<String, String> validate(Object value,
+ public java.util.Map<String, IStatus> validate(Object value,
Object context) {
return ValidatorFactory.NO_ERRORS;
};
@@ -258,14 +248,14 @@
*/
public static final IValidator SEAM_COMPONENT_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
IStatus status = JavaConventions.validateClassFileName(value
.toString()
+ ".class", "5.0", "5.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
if (status.isOK()) {
return NO_ERRORS;
} else {
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID);
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID));
}
}
};
@@ -277,7 +267,7 @@
*/
public static final IValidator SEAM_JAVA_INTEFACE_NAME_CONVENTION_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (!(context instanceof Object[])) {
throw new IllegalArgumentException(
"Context parameter should be instance of Object[]"); //$NON-NLS-1$
@@ -295,8 +285,8 @@
IStatus status = JavaConventions.validateJavaTypeName(value
.toString(), sourceLevel, compliance);
if (status.getSeverity() == IStatus.WARNING) {
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_LOCAL_INTERFACE_NAME_IS_NOT_VALID
- + status.getMessage());
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_LOCAL_INTERFACE_NAME_IS_NOT_VALID
+ + status.getMessage()));
}
return NO_ERRORS;
}
@@ -304,7 +294,7 @@
public static final IValidator SEAM_METHOD_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (!(context instanceof Object[])) {
throw new IllegalArgumentException(
"Context parameter should be instance of Object[]"); //$NON-NLS-1$
@@ -321,8 +311,8 @@
IProblem[] problems = compilationUnit.getProblems();
if (problems.length > 0) {
- return createErrormessage(targetName
- + SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID2);
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, targetName
+ + SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID2));
}
return NO_ERRORS;
@@ -331,7 +321,7 @@
public static final IValidator FILE_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (!(context instanceof Object[])) {
throw new IllegalArgumentException(
"Context parameter should be instance of Object[]"); //$NON-NLS-1$
@@ -343,27 +333,27 @@
if ("".equals(value) //$NON-NLS-1$
|| !project.getLocation().isValidSegment(value.toString()))
- return createErrormessage(targetName
- + SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID2);
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, targetName
+ + SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID2));
return NO_ERRORS;
}
};
public static final IValidator SEAM_PROJECT_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (value == null || "".equals(value)) { //$NON-NLS-1$
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_PRJ_NOT_SELECTED);
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_PRJ_NOT_SELECTED));
}
IResource project = ResourcesPlugin.getWorkspace().getRoot()
.findMember(value.toString());
if (project == null || !(project instanceof IProject)
|| !project.exists()) {
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_PROJECT
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_PROJECT
+ value
- + SeamUIMessages.VALIDATOR_FACTORY_DOES_NOT_EXIST);
+ + SeamUIMessages.VALIDATOR_FACTORY_DOES_NOT_EXIST));
} else {
IProject selection = (IProject) project;
try {
@@ -376,19 +366,19 @@
// .class)).hasProjectFacet(ProjectFacetsManager
// .getProjectFacet("jst.web"))
|| "" .equals(SeamCorePlugin.getSeamPreferences(selection).get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, ""))) { //$NON-NLS-1$
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_SELECTED_PROJECT
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_SELECTED_PROJECT
+ project.getName()
- + SeamUIMessages.VALIDATOR_FACTORY_IS_NOT_A_SEAM_WEB_PROJECT);
+ + SeamUIMessages.VALIDATOR_FACTORY_IS_NOT_A_SEAM_WEB_PROJECT));
} else {
// TODO validate project(s) structure
}
} catch (CoreException e) {
// it might happen only if project is closed and project
// name typed by hand
- return createErrormessage(NLS
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SELECTED_PRJ_IS_CLOSED,
- project.getName()));
+ project.getName())));
}
}
return NO_ERRORS;
@@ -403,11 +393,11 @@
this.allowEmptyConnection = allowEmptyConnection;
}
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (!allowEmptyConnection && (value == null || "".equals(value.toString().trim()))) { //$NON-NLS-1$
return createErrormessage(
ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE,
- SeamUIMessages.VALIDATOR_FACTORY_CONNECTION_PROFILE_IS_NOT_SELECTED);
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_CONNECTION_PROFILE_IS_NOT_SELECTED));
} else {
IConnectionProfile connProfile = ProfileManager.getInstance()
.getProfileByName(value.toString());
@@ -418,9 +408,9 @@
if (driverClass == null || "".equals(driverClass)) { //$NON-NLS-1$
return createErrormessage(
ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE,
- SeamUIMessages.VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED
+ value
- + SeamUIMessages.VALIDATOR_FACTORY_CONNECTION_PROFILE);
+ + SeamUIMessages.VALIDATOR_FACTORY_CONNECTION_PROFILE));
}
}
return NO_ERRORS;
@@ -432,58 +422,58 @@
public static final IValidator CONNECTION_DRIVER_VALIDATOR = new ConnectionProfileValidator(true);
public static final IValidator SEAM_RUNTIME_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
- Map<String, String> errors = NO_ERRORS;
+ Map<String, IStatus> errors = NO_ERRORS;
if (value == null || "".equals(value.toString().trim())) { //$NON-NLS-1$
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- SeamUIMessages.VALIDATOR_FACTORY_SEAM_RUNTIME_IS_NOT_SELECTED);
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_SEAM_RUNTIME_IS_NOT_SELECTED));
} else {
SeamRuntime rt = SeamRuntimeManager.getInstance()
.findRuntimeByName(value.toString());
if (rt == null) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_CANNOT_FIND_SEAM_RUNTIME,
- value));
+ value)));
} else if (!new File(rt.getHomeDir()).exists()) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_IS_MISSING,
- value));
+ value)));
} else if (!new File(rt.getSeamGenDir()).exists()) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_IS_MISSING,
- value));
+ value)));
} else if (!new File(rt.getSrcTemplatesDir()).exists()) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_SRC_DIR_IS_MISSING,
- value));
+ value)));
} else if (!new File(rt.getViewTemplatesDir()).exists()) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_VIEW_DIR_IS_MISSING,
- value));
+ value)));
} else if (!new File(rt.getResourceTemplatesDir()).exists()) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_RESOURCES_DIR_IS_MISSING,
- value));
+ value)));
}
}
return errors;
@@ -491,41 +481,41 @@
};
public static final IValidator SEAM_RUNTIME_VALIDATOR = new IValidator() {
- public java.util.Map<String, String> validate(Object value,
+ public java.util.Map<String, IStatus> validate(Object value,
Object context) {
- Map<String, String> errors = NO_ERRORS;
+ Map<String, IStatus> errors = NO_ERRORS;
String rtName = value.toString();
if (value == null || "".equals(value)) { //$NON-NLS-1$
- errors = createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_NOT_CONFIGURED);
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_NOT_CONFIGURED));
} else {
SeamRuntime rt = SeamRuntimeManager.getInstance()
.findRuntimeByName(value.toString());
if (rt == null) {
- errors = createErrormessage(NLS
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_CANNOT_BE_FOUND,
- value));
+ value)));
} else if (!new File(rt.getHomeDir()).exists()) {
- errors = createErrormessage(NLS
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_DOES_NOT_EXIST,
- value));
+ value)));
} else if (!new File(rt.getSeamGenDir()).exists()) {
- errors = createErrormessage(NLS
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_DOES_NOT_EXIST,
- value));
+ value)));
} else if (!new File(rt.getSrcTemplatesDir()).exists()) {
- errors = createErrormessage(NLS
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_SOURCE_TEMPLATES_DIR_DOES_NOT_EXIST,
- value));
+ value)));
} else if (!new File(rt.getViewTemplatesDir()).exists()) {
- errors = createErrormessage(NLS
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_VIE_TEMPLATE_DIR_DOES_NOT_EXIST,
- value));
+ value)));
// } else if(!new
// File(rt.getResourceTemplatesDir()).exists()) {
// errors = createErrormessage(NLS.bind(
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2008-10-23 12:22:25 UTC (rev 11103)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2008-10-23 13:20:58 UTC (rev 11104)
@@ -107,6 +107,7 @@
SEAM_WIZARD_FACTORY_METHOD_NAME=Method name:
SEAM_INSTALL_WIZARD_PAGE_NEW=New...
SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR=Package name for
+SEAM_INSTALL_WIZARD_PROJECT_NAME_WITH_UPPERCASE=Project names which start with a capital letter may break Seam/JSF applications; use lower case.
SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID=\ is not valid
SEAM_BASE_WIZARD_PAGE_POJO_CLASS_NAME=POJO class name:
SEAM_BASE_WIZARD_PAGE_SEAM_COMPONENTS=Seam component
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java 2008-10-23 12:22:25 UTC (rev 11103)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java 2008-10-23 13:20:58 UTC (rev 11104)
@@ -14,12 +14,12 @@
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jface.wizard.IWizardPage;
@@ -67,10 +67,15 @@
projectEditor = SeamWizardFactory.createSeamProjectSelectionFieldEditor(projectName);
projectEditor.addPropertyChangeListener(this);
if(projectName!=null && projectName.length()>0) {
- Map<String, String> errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(projectEditor.getValue(), null);
+ Map<String, IStatus> errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(projectEditor.getValue(), null);
if(errors.size()>0) {
- setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).toString());
- setPageComplete(false);
+ IStatus message = errors.get(IValidator.DEFAULT_ERROR);
+ if(message.getSeverity()==IStatus.ERROR) {
+ setErrorMessage(message.getMessage());
+ setPageComplete(false);
+ } else {
+ setMessage(message.getMessage());
+ }
} else {
setMessage(null);
}
@@ -202,15 +207,20 @@
}
private void validate() {
- Map<String, String> errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(projectEditor.getValue(), null);
+ Map<String, IStatus> errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(projectEditor.getValue(), null);
if(errors.size()>0 || !isProjectSettingsOk()) {
- Object errorMessage = errors.get(IValidator.DEFAULT_ERROR);
+ IStatus errorMessage = errors.get(IValidator.DEFAULT_ERROR);
if(errorMessage==null) {
- errorMessage = SeamUIMessages.VALIDATOR_INVALID_SETTINGS;
+ setErrorMessage(SeamUIMessages.VALIDATOR_INVALID_SETTINGS);
}
- setErrorMessage(errorMessage.toString());
- setPageComplete(false);
+ if(errorMessage.getSeverity()==IStatus.ERROR) {
+ setErrorMessage(errorMessage.getMessage());
+ setPageComplete(false);
+ } else {
+ setMessage(errorMessage.getMessage());
+ }
+
return;
}
String config = (String)configEditor.getValue();
17 years, 2 months
JBoss Tools SVN: r11103 - trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-23 08:22:25 -0400 (Thu, 23 Oct 2008)
New Revision: 11103
Modified:
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties
Log:
Keys to new seam components added.
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties 2008-10-23 12:10:42 UTC (rev 11102)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties 2008-10-23 12:22:25 UTC (rev 11103)
@@ -185,7 +185,7 @@
SeamCoreActor_Properties.Title=Seam Core Actor
SeamCoreBundleNames_AddEntry.WindowTitle=Add Entry
-SeamCoreBundleNames_AddEntry.Title=Entry
+SeamCoreBundleNames_AddEntry.Title=Seam Bundle Name
SeamCoreBundleNames_Properties.Title=Seam Core Bundle Names
@@ -198,7 +198,7 @@
SeamCoreFilter_Properties.Title=Seam Core Filter
SeamCoreFilters_AddEntry.WindowTitle=Add Entry
-SeamCoreFilters_AddEntry.Title=Entry
+SeamCoreFilters_AddEntry.Title=Seam Core Filter
SeamCoreFilters_Properties.Title=Seam Core Filters
@@ -215,151 +215,151 @@
SeamCoreMicrocontainer_Properties.Title=Seam Core Microcontainer
SeamCorePageflowDefinitions_AddEntry.WindowTitle=Add Entry
-SeamCorePageflowDefinitions_AddEntry.Title=Entry
+SeamCorePageflowDefinitions_AddEntry.Title=Seam Pageflow Definition
SeamCorePageflowDefinitions_Properties.Title=Seam Core Pageflow Definitions
SeamCorePages_Properties.Title=Seam Core Pages
SeamCoreParameters_AddEntry.WindowTitle=Add Entry
-SeamCoreParameters_AddEntry.Title=Entry
+SeamCoreParameters_AddEntry.Title=Seam Map Entry
SeamCoreParameters_Properties.Title=Seam Core Parameters
SeamCorePersistenceUnitProperties_AddEntry.WindowTitle=Add Entry
-SeamCorePersistenceUnitProperties_AddEntry.Title=Entry
+SeamCorePersistenceUnitProperties_AddEntry.Title=Seam Map Entry
-SeamCorePersistenceUnitProperties_Properties.Title=Seam Core Persistence Unit
+SeamCorePersistenceUnitProperties_Properties.Title=Seam Core Persistence Unit Properties
SeamCorePojoCache_Properties.Title=Seam Core POJO Cache
SeamCoreProcessDefinitions_AddEntry.WindowTitle=Add Entry
-SeamCoreProcessDefinitions_AddEntry.Title=Entry
+SeamCoreProcessDefinitions_AddEntry.Title=Seam Process Definition
SeamCoreProcessDefinitions_Properties.Title=Seam Core Process Definitions
SeamCoreResourceBundle_Properties.Title=Seam Core Resource Bundle
-SeamCoreTimeZoneSelector_Properties.Title=Seam Core TimeZone Selector
+SeamCoreTimeZoneSelector_Properties.Title=Seam Core Time Zone Selector
SeamCoreTransactionListener_Properties.Title=Seam Core Transaction Listener
FileSeamComponents12_AddActor.WindowTitle=Add Actor
-FileSeamComponents12_AddActor.Title=Actor
+FileSeamComponents12_AddActor.Title=Seam Core Actor
FileSeamComponents12_AddDispatcher.WindowTitle=Add Dispatcher
-FileSeamComponents12_AddDispatcher.Title=Dispatcher
+FileSeamComponents12_AddDispatcher.Title=Seam Core Dispatcher
FileSeamComponents12_AddTransactionListener.WindowTitle=Add Transaction Listener
-FileSeamComponents12_AddTransactionListener.Title=Transaction Listener
+FileSeamComponents12_AddTransactionListener.Title=Seam Core Transaction Listener
FileSeamComponents12_AddEJB.WindowTitle=Add EJB
-FileSeamComponents12_AddEJB.Title=EJB
+FileSeamComponents12_AddEJB.Title=Seam Core EJB
FileSeamComponents12_AddInit.WindowTitle=Add Init
-FileSeamComponents12_AddInit.Title=Init
+FileSeamComponents12_AddInit.Title=Seam Core Init
FileSeamComponents12_AddJBPM.WindowTitle=Add JBPM
-FileSeamComponents12_AddJBPM.Title=JBPM
+FileSeamComponents12_AddJBPM.Title=Seam Core JBPM
FileSeamComponents12_AddLocaleSelector.WindowTitle=Add Locale Selector
-FileSeamComponents12_AddLocaleSelector.Title=Locale Selector
+FileSeamComponents12_AddLocaleSelector.Title=Seam Core Locale Selector
FileSeamComponents12_AddManager.WindowTitle=Add Manager
-FileSeamComponents12_AddManager.Title=Manager
+FileSeamComponents12_AddManager.Title=Seam Core Manager
FileSeamComponents12_AddMicrocontainer.WindowTitle=Add Microcontainer
-FileSeamComponents12_AddMicrocontainer.Title=Microcontainer
+FileSeamComponents12_AddMicrocontainer.Title=Seam Core Microcontainer
FileSeamComponents12_AddPages.WindowTitle=Add Pages
-FileSeamComponents12_AddPages.Title=Pages
+FileSeamComponents12_AddPages.Title=Seam Core Pages
FileSeamComponents12_AddPojoCache.WindowTitle=Add POJO Cache
-FileSeamComponents12_AddPojoCache.Title=POJO Cache
+FileSeamComponents12_AddPojoCache.Title=Seam Core POJO Cache
FileSeamComponents12_AddResourceBundle.WindowTitle=Add Resource Bundle
-FileSeamComponents12_AddResourceBundle.Title=Resource Bundle
+FileSeamComponents12_AddResourceBundle.Title=Seam Core Resource Bundle
FileSeamComponents12_AddTimeZoneSelector.WindowTitle=Add Time Zone Selector
-FileSeamComponents12_AddTimeZoneSelector.Title=Time Zone Selector
+FileSeamComponents12_AddTimeZoneSelector.Title=Seam Core Time Zone Selector
FileSeamComponents12_AddManagedPersistenceContext.WindowTitle=Add Managed Persistence Context
-FileSeamComponents12_AddManagedPersistenceContext.Title=Managed Persistence Context
+FileSeamComponents12_AddManagedPersistenceContext.Title=Seam Core Managed Persistence Context
FileSeamComponents12_AddEntityManagerFactory.WindowTitle=Add Entity Manager Factory
-FileSeamComponents12_AddEntityManagerFactory.Title=Entity Manager Factory
+FileSeamComponents12_AddEntityManagerFactory.Title=Seam Core Entity Manager Factory
FileSeamComponents12_AddFilter.WindowTitle=Add Filter
-FileSeamComponents12_AddFilter.Title=Filter
+FileSeamComponents12_AddFilter.Title=Seam Core Filter
FileSeamComponents12_EditorActionList_AddActor.WindowTitle=Add Actor
-FileSeamComponents12_EditorActionList_AddActor.Title=Actor
+FileSeamComponents12_EditorActionList_AddActor.Title=Seam Core Actor
FileSeamComponents12_EditorActionList_AddDispatcher.WindowTitle=Add Dispatcher
-FileSeamComponents12_EditorActionList_AddDispatcher.Title=Dispatcher
+FileSeamComponents12_EditorActionList_AddDispatcher.Title=Seam Core Dispatcher
FileSeamComponents12_EditorActionList_AddTransactionListener.WindowTitle=Add Transaction Listener
-FileSeamComponents12_EditorActionList_AddTransactionListener.Title=Transaction Listener
+FileSeamComponents12_EditorActionList_AddTransactionListener.Title=Seam Core Transaction Listener
FileSeamComponents12_EditorActionList_AddEJB.WindowTitle=Add EJB
-FileSeamComponents12_EditorActionList_AddEJB.Title=EJB
+FileSeamComponents12_EditorActionList_AddEJB.Title=Seam Core EJB
FileSeamComponents12_EditorActionList_AddInit.WindowTitle=Add Init
-FileSeamComponents12_EditorActionList_AddInit.Title=Init
+FileSeamComponents12_EditorActionList_AddInit.Title=Seam Core Init
FileSeamComponents12_EditorActionList_AddJBPM.WindowTitle=Add JBPM
-FileSeamComponents12_EditorActionList_AddJBPM.Title=JBPM
+FileSeamComponents12_EditorActionList_AddJBPM.Title=Seam Core JBPM
FileSeamComponents12_EditorActionList_AddLocaleSelector.WindowTitle=Add Locale Selector
-FileSeamComponents12_EditorActionList_AddLocaleSelector.Title=Locale Selector
+FileSeamComponents12_EditorActionList_AddLocaleSelector.Title=Seam Core Locale Selector
FileSeamComponents12_EditorActionList_AddManager.WindowTitle=Add Manager
-FileSeamComponents12_EditorActionList_AddManager.Title=Manager
+FileSeamComponents12_EditorActionList_AddManager.Title=Seam Core Manager
FileSeamComponents12_EditorActionList_AddMicrocontainer.WindowTitle=Add Microcontainer
-FileSeamComponents12_EditorActionList_AddMicrocontainer.Title=Microcontainer
+FileSeamComponents12_EditorActionList_AddMicrocontainer.Title=Seam Core Microcontainer
FileSeamComponents12_EditorActionList_AddPages.WindowTitle=Add Pages
-FileSeamComponents12_EditorActionList_AddPages.Title=Pages
+FileSeamComponents12_EditorActionList_AddPages.Title=Seam Core Pages
FileSeamComponents12_EditorActionList_AddPojoCache.WindowTitle=Add POJO Cache
-FileSeamComponents12_EditorActionList_AddPojoCache.Title=POJO Cache
+FileSeamComponents12_EditorActionList_AddPojoCache.Title=Seam Core POJO Cache
FileSeamComponents12_EditorActionList_AddResourceBundle.WindowTitle=Add Resource Bundle
-FileSeamComponents12_EditorActionList_AddResourceBundle.Title=Resource Bundle
+FileSeamComponents12_EditorActionList_AddResourceBundle.Title=Seam Core Resource Bundle
FileSeamComponents12_EditorActionList_AddTimeZoneSelector.WindowTitle=Add Time Zone Selector
-FileSeamComponents12_EditorActionList_AddTimeZoneSelector.Title=Time Zone Selector
+FileSeamComponents12_EditorActionList_AddTimeZoneSelector.Title=Seam Core Time Zone Selector
FileSeamComponents12_EditorActionList_AddManagedPersistenceContext.WindowTitle=Add Managed Persistence Context
-FileSeamComponents12_EditorActionList_AddManagedPersistenceContext.Title=Managed Persistence Context
+FileSeamComponents12_EditorActionList_AddManagedPersistenceContext.Title=Seam Core Managed Persistence Context
FileSeamComponents12_EditorActionList_AddEntityManagerFactory.WindowTitle=Add Entity Manager Factory
-FileSeamComponents12_EditorActionList_AddEntityManagerFactory.Title=Entity Manager Factory
+FileSeamComponents12_EditorActionList_AddEntityManagerFactory.Title=Seam Core Entity Manager Factory
FileSeamComponents12_EditorActionList_AddFilter.WindowTitle=Add Filter
-FileSeamComponents12_EditorActionList_AddFilter.Title=Filter
+FileSeamComponents12_EditorActionList_AddFilter.Title=Seam Core Filter
SeamDroolsManagedWorkingMemory_Properties.Title=Seam Drools Managed Working Memory
SeamDroolsRuleBase_Properties.Title=Seam Drools Rule Base
SeamDroolsRuleFiles_AddEntry.WindowTitle=Add Entry
-SeamDroolsRuleFiles_AddEntry.Title=Entry
+SeamDroolsRuleFiles_AddEntry.Title=Seam Drools Rule File
SeamDroolsRuleFiles_Properties.Title=Seam Drools Rule Files
FileSeamComponents12_AddManagedWorkingMemory.WindowTitle=Add Managed Working Memory
-FileSeamComponents12_AddManagedWorkingMemory.Title=Managed Working Memory
+FileSeamComponents12_AddManagedWorkingMemory.Title=Seam Drools Managed Working Memory
FileSeamComponents12_AddRuleBase.WindowTitle=Add Rule Base
-FileSeamComponents12_AddRuleBase.Title=Rule Base
+FileSeamComponents12_AddRuleBase.Title=Seam Drools Rule Base
FileSeamComponents12_EditorActionList_AddManagedWorkingMemory.WindowTitle=Add Managed Working Memory
-FileSeamComponents12_EditorActionList_AddManagedWorkingMemory.Title=Managed Working Memory
+FileSeamComponents12_EditorActionList_AddManagedWorkingMemory.Title=Seam Drools Managed Working Memory
FileSeamComponents12_EditorActionList_AddRuleBase.WindowTitle=Add Rule Base
-FileSeamComponents12_EditorActionList_AddRuleBase.Title=Rule Base
+FileSeamComponents12_EditorActionList_AddRuleBase.Title=Seam Drools Rule Base
SeamFrameworkEntityHome_Properties.WindowTitle=Seam Framework Entity Home
@@ -370,136 +370,136 @@
SeamFrameworkHibernateEntityQuery_Properties.WindowTitle=Seam Framework Hibernate Entity Query
SeamFrameworkHints_AddEntry.WindowTitle=Add Entry
-SeamFrameworkHints_AddEntry.Title=Entry
+SeamFrameworkHints_AddEntry.Title=Seam Framework Hint
SeamFrameworkHints_Properties.Title=Seam Framework Hints
SeamFrameworkRestrictions_AddEntry.WindowTitle=Add Entry
-SeamFrameworkRestrictions_AddEntry.Title=Entry
+SeamFrameworkRestrictions_AddEntry.Title=Seam Framework Restriction
SeamFrameworkRestrictions_Properties.Title=Seam Framework Restrictions
FileSeamComponents12_AddEntityQuery.WindowTitle=Add Entity Query
-FileSeamComponents12_AddEntityQuery.Title=Entity Query
+FileSeamComponents12_AddEntityQuery.Title=Seam Framework Entity Query
FileSeamComponents12_AddHibernateEntityQuery.WindowTitle=Add Hibernate Entity Query
-FileSeamComponents12_AddHibernateEntityQuery.Title=Hibernate Entity Query
+FileSeamComponents12_AddHibernateEntityQuery.Title=Seam Framework Hibernate Entity Query
FileSeamComponents12_AddEntityHome.WindowTitle=Add Entity Home
-FileSeamComponents12_AddEntityHome.Title=Entity Home
+FileSeamComponents12_AddEntityHome.Title=Seam Framework Entity Home
FileSeamComponents12_AddHibernateEntityHome.WindowTitle=Add Hibernate Entity Home
-FileSeamComponents12_AddHibernateEntityHome.Title=Hibernate Entity Home
+FileSeamComponents12_AddHibernateEntityHome.Title=Seam Framework Hibernate Entity Home
FileSeamComponents12_EditorActionList_AddEntityQuery.WindowTitle=Add Entity Query
-FileSeamComponents12_EditorActionList_AddEntityQuery.Title=Entity Query
+FileSeamComponents12_EditorActionList_AddEntityQuery.Title=Seam Framework Entity Query
FileSeamComponents12_EditorActionList_AddHibernateEntityQuery.WindowTitle=Add Hibernate Entity Query
-FileSeamComponents12_EditorActionList_AddHibernateEntityQuery.Title=Hibernate Entity Query
+FileSeamComponents12_EditorActionList_AddHibernateEntityQuery.Title=Seam Framework Hibernate Entity Query
FileSeamComponents12_EditorActionList_AddEntityHome.WindowTitle=Add Entity Home
-FileSeamComponents12_EditorActionList_AddEntityHome.Title=Entity Home
+FileSeamComponents12_EditorActionList_AddEntityHome.Title=Seam Framework Entity Home
FileSeamComponents12_EditorActionList_AddHibernateEntityHome.WindowTitle=Add Hibernate Entity Home
-FileSeamComponents12_EditorActionList_AddHibernateEntityHome.Title=Hibernate Entity Home
+FileSeamComponents12_EditorActionList_AddHibernateEntityHome.Title=Seam Framework Hibernate Entity Home
-SeamJmsQueueConnection_Properties.Title=Seam JMS Queue Connection
+SeamJmsQueueConnection_Properties.Title=Seam Jms Queue Connection
-SeamJmsQueueSender_Properties.Title=Seam JMS Queue Sender
+SeamJmsQueueSender_Properties.Title=Seam Jms Queue Sender
-SeamJmsTopicConnection_Properties.Title=Seam JMS Topic Connection
+SeamJmsTopicConnection_Properties.Title=Seam Jms Topic Connection
-SeamJmsTopicPublisher_Properties.Title=Seam JMS Topic Publisher
+SeamJmsTopicPublisher_Properties.Title=Seam Jms Topic Publisher
FileSeamComponents12_AddQueueConnection.WindowTitle=Add Queue Connection
-FileSeamComponents12_AddQueueConnection.Title=Queue Connection
+FileSeamComponents12_AddQueueConnection.Title=Seam Jms Queue Connection
FileSeamComponents12_AddTopicConnection.WindowTitle=Add Topic Connection
-FileSeamComponents12_AddTopicConnection.Title=Topic Connection
+FileSeamComponents12_AddTopicConnection.Title=Seam Jms Topic Connection
FileSeamComponents12_AddTopicPublisher.WindowTitle=Add Managed Topic Publisher
-FileSeamComponents12_AddTopicPublisher.Title=Managed Topic Publisher
+FileSeamComponents12_AddTopicPublisher.Title=Seam Jms Topic Publisher
FileSeamComponents12_AddQueueSender.WindowTitle=Add Managed Queue Sender
-FileSeamComponents12_AddQueueSender.Title=Managed Queue Sender
+FileSeamComponents12_AddQueueSender.Title=Seam Jms Queue Sender
FileSeamComponents12_EditorActionList_AddQueueConnection.WindowTitle=Add Queue Connection
-FileSeamComponents12_EditorActionList_AddQueueConnection.Title=Queue Connection
+FileSeamComponents12_EditorActionList_AddQueueConnection.Title=Seam Jms Queue Connection
FileSeamComponents12_EditorActionList_AddTopicConnection.WindowTitle=Add Topic Connection
-FileSeamComponents12_EditorActionList_AddTopicConnection.Title=Topic Connection
+FileSeamComponents12_EditorActionList_AddTopicConnection.Title=Seam Jms Topic Connection
FileSeamComponents12_EditorActionList_AddTopicPublisher.WindowTitle=Add Managed Topic Publisher
-FileSeamComponents12_EditorActionList_AddTopicPublisher.Title=Managed Topic Publisher
+FileSeamComponents12_EditorActionList_AddTopicPublisher.Title=Seam Jms Topic Publisher
FileSeamComponents12_EditorActionList_AddQueueSender.WindowTitle=Add Managed Queue Sender
-FileSeamComponents12_EditorActionList_AddQueueSender.Title=Managed Queue Sender
+FileSeamComponents12_EditorActionList_AddQueueSender.Title=Seam Jms Queue Sender
SeamMailSession_Properties.Title=Seam Mail Session
FileSeamComponents12_AddMailSession.WindowTitle=Add Mail Session
-FileSeamComponents12_AddMailSession.Title=Mail Session
+FileSeamComponents12_AddMailSession.Title=Seam Mail Session
FileSeamComponents12_EditorActionList_AddMailSession.WindowTitle=Add Mail Session
-FileSeamComponents12_EditorActionList_AddMailSession.Title=Mail Session
+FileSeamComponents12_EditorActionList_AddMailSession.Title=Seam Mail Session
SeamPdfDocumentStore_Properties.Title=Seam PDF Document Store
SeamPdfKeyStoreConfig_Properties.Title=Seam PDF Key Store Config
FileSeamComponents12_AddDocumentStore.WindowTitle=Add Document Store
-FileSeamComponents12_AddDocumentStore.Title=Document Store
+FileSeamComponents12_AddDocumentStore.Title=Seam PDF Document Store
FileSeamComponents12_AddKeyStoreConfig.WindowTitle=Add Key Store Config
-FileSeamComponents12_AddKeyStoreConfig.Title=Key Store Config
+FileSeamComponents12_AddKeyStoreConfig.Title=Seam PDF Key Store Config
FileSeamComponents12_EditorActionList_AddDocumentStore.WindowTitle=Add Document Store
-FileSeamComponents12_EditorActionList_AddDocumentStore.Title=Document Store
+FileSeamComponents12_EditorActionList_AddDocumentStore.Title=Seam PDF Document Store
FileSeamComponents12_EditorActionList_AddKeyStoreConfig.WindowTitle=Add Key Store Config
-FileSeamComponents12_EditorActionList_AddKeyStoreConfig.Title=Key Store Config
+FileSeamComponents12_EditorActionList_AddKeyStoreConfig.Title=Seam PDF Key Store Config
SeamRemotingConfig_Properties.Title=Seam Remoting Config
-FileSeamComponents12_AddRemotingConfig.WindowTitle=Add Remoting Config
-FileSeamComponents12_AddRemotingConfig.Title=Remoting Config
+FileSeamComponents12_AddRemotingConfig.WindowTitle=Add Config
+FileSeamComponents12_AddRemotingConfig.Title=Seam Remoting Config
-FileSeamComponents12_EditorActionList_AddRemotingConfig.WindowTitle=Add Remoting Config
-FileSeamComponents12_EditorActionList_AddRemotingConfig.Title=Remoting Config
+FileSeamComponents12_EditorActionList_AddRemotingConfig.WindowTitle=Add Config
+FileSeamComponents12_EditorActionList_AddRemotingConfig.Title=Seam Remoting Config
SeamSecurityIdentity_Properties.Title=Seam Security Identity
FileSeamComponents12_AddIdentity.WindowTitle=Add Identity
-FileSeamComponents12_AddIdentity.Title=Identity
+FileSeamComponents12_AddIdentity.Title=Seam Security Identity
FileSeamComponents12_EditorActionList_AddIdentity.WindowTitle=Add Identity
-FileSeamComponents12_EditorActionList_AddIdentity.Title=Identity
+FileSeamComponents12_EditorActionList_AddIdentity.Title=Seam Security Identity
SeamSpringConfigLocations_AddEntry.WindowTitle=Add Entry
-SeamSpringConfigLocations_AddEntry.Title=Entry
+SeamSpringConfigLocations_AddEntry.Title=Seam Spring Config Location
SeamSpringConfigLocations_Properties.Title=Seam Spring Config Locations
SeamSpringContextLoader_Properties.Title=Seam Spring Context Loader
FileSeamComponents12_AddContextLoader.WindowTitle=Add Context Loader
-FileSeamComponents12_AddContextLoader.Title=Context Loader
+FileSeamComponents12_AddContextLoader.Title=Seam Spring Context Loader
FileSeamComponents12_EditorActionList_AddContextLoader.WindowTitle=Add Context Loader
-FileSeamComponents12_EditorActionList_AddContextLoader.Title=Context Loader
+FileSeamComponents12_EditorActionList_AddContextLoader.Title=Seam Spring Context Loader
SeamThemeAvailableThemes_AddEntry.WindowTitle=Add Entry
-SeamThemeAvailableThemes_AddEntry.Title=Entry
+SeamThemeAvailableThemes_AddEntry.Title=Available Theme
SeamThemeAvailableThemes_Properties.Title=Seam Available Themes
-SeamThemeSelector_Properties.Title=Theme Selector
+SeamThemeSelector_Properties.Title=Seam Theme Selector
FileSeamComponents12_AddThemeSelector.WindowTitle=Add Theme Selector
-FileSeamComponents12_AddThemeSelector.Title=Theme Selector
+FileSeamComponents12_AddThemeSelector.Title=Seam Theme Selector
FileSeamComponents12_EditorActionList_AddThemeSelector.WindowTitle=Add Theme Selector
-FileSeamComponents12_EditorActionList_AddThemeSelector.Title=Theme Selector
+FileSeamComponents12_EditorActionList_AddThemeSelector.Title=Seam Theme Selector
SeamWebContextFilter_Properties.Title=Seam Web Context Filter
@@ -510,28 +510,28 @@
SeamWebRedirectFilter_Properties.Title=Seam Web Redirect Filter
FileSeamComponents12_AddContextFilter.WindowTitle=Add Context Filter
-FileSeamComponents12_AddContextFilter.Title=Context Filter
+FileSeamComponents12_AddContextFilter.Title=Seam Web Context Filter
FileSeamComponents12_AddExceptionFilter.WindowTitle=Add Exception Filter
-FileSeamComponents12_AddExceptionFilter.Title=Exception Filter
+FileSeamComponents12_AddExceptionFilter.Title=Seam Web Exception Filter
FileSeamComponents12_AddMultipartFilter.WindowTitle=Add Multipart Filter
-FileSeamComponents12_AddMultipartFilter.Title=Multipart Filter
+FileSeamComponents12_AddMultipartFilter.Title=Seam Web Multipart Filter
FileSeamComponents12_AddRedirectFilter.WindowTitle=Add Redirect Filter
-FileSeamComponents12_AddRedirectFilter.Title=Redirect Filter
+FileSeamComponents12_AddRedirectFilter.Title=Seam Web Redirect Filter
FileSeamComponents12_EditorActionList_AddContextFilter.WindowTitle=Add Context Filter
-FileSeamComponents12_EditorActionList_AddContextFilter.Title=Context Filter
+FileSeamComponents12_EditorActionList_AddContextFilter.Title=Seam Web Context Filter
FileSeamComponents12_EditorActionList_AddExceptionFilter.WindowTitle=Add Exception Filter
-FileSeamComponents12_EditorActionList_AddExceptionFilter.Title=Exception Filter
+FileSeamComponents12_EditorActionList_AddExceptionFilter.Title=Seam Web Exception Filter
FileSeamComponents12_EditorActionList_AddMultipartFilter.WindowTitle=Add Multipart Filter
-FileSeamComponents12_EditorActionList_AddMultipartFilter.Title=Multipart Filter
+FileSeamComponents12_EditorActionList_AddMultipartFilter.Title=Seam Web Multipart Filter
FileSeamComponents12_EditorActionList_AddRedirectFilter.WindowTitle=Add Redirect Filter
-FileSeamComponents12_EditorActionList_AddRedirectFilter.Title=Redirect Filter
+FileSeamComponents12_EditorActionList_AddRedirectFilter.Title=Seam Web Redirect Filter
SeamBPMActor20_Properties.Title=Seam BPM Actor
@@ -547,166 +547,8 @@
SeamBPMProcessDefinitions20_Properties.Title=Seam Process Definitions
-SeamCoreActor_Properties.Title=Seam Core Actor
-
-SeamCoreBundleNames_AddEntry.WindowTitle=Add Entry
-SeamCoreBundleNames_AddEntry.Title=Seam Bundle Name
-
-SeamCoreBundleNames_Properties.Title=Seam Core Bundle Names
-
-SeamCoreDispatcher_Properties.Title=Seam Core Dispatcher
-
-SeamCoreEJB_Properties.Title=Seam Core EJB
-
-SeamCoreEntityManagerFactory_Properties.Title=Seam Core Entity Manager Factory
-
-SeamCoreFilter_Properties.Title=Seam Core Filter
-
-SeamCoreFilters_AddEntry.WindowTitle=Add Entry
-SeamCoreFilters_AddEntry.Title=Seam Core Filter
-
-SeamCoreFilters_Properties.Title=Seam Core Filters
-
-SeamCoreInit_Properties.Title=Seam Core Init
-
-SeamCoreJBPM_Properties.Title=Seam Core JBPM
-
-SeamCoreLocaleSelector_Properties.Title=Seam Core Locale Selector
-
-SeamCoreManagedPersistenceContext_Properties.Title=Seam Core Managed Persistence Context
-
-SeamCoreManager_Properties.Title=Seam Core Manager
-
-SeamCoreMicrocontainer_Properties.Title=Seam Core Microcontainer
-
-SeamCorePageflowDefinitions_AddEntry.WindowTitle=Add Entry
-SeamCorePageflowDefinitions_AddEntry.Title=Seam Pageflow Definition
-
-SeamCorePageflowDefinitions_Properties.Title=Seam Core Pageflow Definitions
-
-SeamCorePages_Properties.Title=Seam Core Pages
-
-SeamCoreParameters_AddEntry.WindowTitle=Add Entry
-SeamCoreParameters_AddEntry.Title=Seam Map Entry
-
-SeamCoreParameters_Properties.Title=Seam Core Parameters
-
-SeamCorePersistenceUnitProperties_AddEntry.WindowTitle=Add Entry
-SeamCorePersistenceUnitProperties_AddEntry.Title=Seam Map Entry
-
-SeamCorePersistenceUnitProperties_Properties.Title=Seam Core Persistence Unit Properties
-
-SeamCorePojoCache_Properties.Title=Seam Core POJO Cache
-
-SeamCoreProcessDefinitions_AddEntry.WindowTitle=Add Entry
-SeamCoreProcessDefinitions_AddEntry.Title=Seam Process Definition
-
-SeamCoreProcessDefinitions_Properties.Title=Seam Core Process Definitions
-
-SeamCoreResourceBundle_Properties.Title=Seam Core Resource Bundle
-
SeamCoreResourceLoader20_Properties.Title=Seam Core Resource Loader
-SeamCoreTimeZoneSelector_Properties.Title=Seam Core Time Zone Selector
-
-SeamCoreTransactionListener_Properties.Title=Seam Core Transaction Listener
-
-FileSeamComponents12_AddActor.WindowTitle=Add Actor
-FileSeamComponents12_AddActor.Title=Seam Core Actor
-
-FileSeamComponents12_AddDispatcher.WindowTitle=Add Dispatcher
-FileSeamComponents12_AddDispatcher.Title=Seam Core Dispatcher
-
-FileSeamComponents12_AddTransactionListener.WindowTitle=Add Transaction Listener
-FileSeamComponents12_AddTransactionListener.Title=Seam Core Transaction Listener
-
-FileSeamComponents12_AddEJB.WindowTitle=Add EJB
-FileSeamComponents12_AddEJB.Title=Seam Core EJB
-
-FileSeamComponents12_AddInit.WindowTitle=Add Init
-FileSeamComponents12_AddInit.Title=Seam Core Init
-
-FileSeamComponents12_AddJBPM.WindowTitle=Add JBPM
-FileSeamComponents12_AddJBPM.Title=Seam Core JBPM
-
-FileSeamComponents12_AddLocaleSelector.WindowTitle=Add Locale Selector
-FileSeamComponents12_AddLocaleSelector.Title=Seam Core Locale Selector
-
-FileSeamComponents12_AddManager.WindowTitle=Add Manager
-FileSeamComponents12_AddManager.Title=Seam Core Manager
-
-FileSeamComponents12_AddMicrocontainer.WindowTitle=Add Microcontainer
-FileSeamComponents12_AddMicrocontainer.Title=Seam Core Microcontainer
-
-FileSeamComponents12_AddPages.WindowTitle=Add Pages
-FileSeamComponents12_AddPages.Title=Seam Core Pages
-
-FileSeamComponents12_AddPojoCache.WindowTitle=Add POJO Cache
-FileSeamComponents12_AddPojoCache.Title=Seam Core POJO Cache
-
-FileSeamComponents12_AddResourceBundle.WindowTitle=Add Resource Bundle
-FileSeamComponents12_AddResourceBundle.Title=Seam Core Resource Bundle
-
-FileSeamComponents12_AddTimeZoneSelector.WindowTitle=Add Time Zone Selector
-FileSeamComponents12_AddTimeZoneSelector.Title=Seam Core Time Zone Selector
-
-FileSeamComponents12_AddManagedPersistenceContext.WindowTitle=Add Managed Persistence Context
-FileSeamComponents12_AddManagedPersistenceContext.Title=Seam Core Managed Persistence Context
-
-FileSeamComponents12_AddEntityManagerFactory.WindowTitle=Add Entity Manager Factory
-FileSeamComponents12_AddEntityManagerFactory.Title=Seam Core Entity Manager Factory
-
-FileSeamComponents12_AddFilter.WindowTitle=Add Filter
-FileSeamComponents12_AddFilter.Title=Seam Core Filter
-
-FileSeamComponents12_EditorActionList_AddActor.WindowTitle=Add Actor
-FileSeamComponents12_EditorActionList_AddActor.Title=Seam Core Actor
-
-FileSeamComponents12_EditorActionList_AddDispatcher.WindowTitle=Add Dispatcher
-FileSeamComponents12_EditorActionList_AddDispatcher.Title=Seam Core Dispatcher
-
-FileSeamComponents12_EditorActionList_AddTransactionListener.WindowTitle=Add Transaction Listener
-FileSeamComponents12_EditorActionList_AddTransactionListener.Title=Seam Core Transaction Listener
-
-FileSeamComponents12_EditorActionList_AddEJB.WindowTitle=Add EJB
-FileSeamComponents12_EditorActionList_AddEJB.Title=Seam Core EJB
-
-FileSeamComponents12_EditorActionList_AddInit.WindowTitle=Add Init
-FileSeamComponents12_EditorActionList_AddInit.Title=Seam Core Init
-
-FileSeamComponents12_EditorActionList_AddJBPM.WindowTitle=Add JBPM
-FileSeamComponents12_EditorActionList_AddJBPM.Title=Seam Core JBPM
-
-FileSeamComponents12_EditorActionList_AddLocaleSelector.WindowTitle=Add Locale Selector
-FileSeamComponents12_EditorActionList_AddLocaleSelector.Title=Seam Core Locale Selector
-
-FileSeamComponents12_EditorActionList_AddManager.WindowTitle=Add Manager
-FileSeamComponents12_EditorActionList_AddManager.Title=Seam Core Manager
-
-FileSeamComponents12_EditorActionList_AddMicrocontainer.WindowTitle=Add Microcontainer
-FileSeamComponents12_EditorActionList_AddMicrocontainer.Title=Seam Core Microcontainer
-
-FileSeamComponents12_EditorActionList_AddPages.WindowTitle=Add Pages
-FileSeamComponents12_EditorActionList_AddPages.Title=Seam Core Pages
-
-FileSeamComponents12_EditorActionList_AddPojoCache.WindowTitle=Add POJO Cache
-FileSeamComponents12_EditorActionList_AddPojoCache.Title=Seam Core POJO Cache
-
-FileSeamComponents12_EditorActionList_AddResourceBundle.WindowTitle=Add Resource Bundle
-FileSeamComponents12_EditorActionList_AddResourceBundle.Title=Seam Core Resource Bundle
-
-FileSeamComponents12_EditorActionList_AddTimeZoneSelector.WindowTitle=Add Time Zone Selector
-FileSeamComponents12_EditorActionList_AddTimeZoneSelector.Title=Seam Core Time Zone Selector
-
-FileSeamComponents12_EditorActionList_AddManagedPersistenceContext.WindowTitle=Add Managed Persistence Context
-FileSeamComponents12_EditorActionList_AddManagedPersistenceContext.Title=Seam Core Managed Persistence Context
-
-FileSeamComponents12_EditorActionList_AddEntityManagerFactory.WindowTitle=Add Entity Manager Factory
-FileSeamComponents12_EditorActionList_AddEntityManagerFactory.Title=Seam Core Entity Manager Factory
-
-FileSeamComponents12_EditorActionList_AddFilter.WindowTitle=Add Filter
-FileSeamComponents12_EditorActionList_AddFilter.Title=Seam Core Filter
-
FileSeamComponents20_AddInit.WindowTitle=Add Init
FileSeamComponents20_AddInit.Title=Seam Core Init
@@ -743,28 +585,8 @@
FileSeamComponents20_EditorActionList_AddJBPM.WindowTitle=Add JBPM
FileSeamComponents20_EditorActionList_AddJBPM.Title=Seam BPMJBPM
-SeamDroolsManagedWorkingMemory_Properties.Title=Seam Drools Managed Working Memory
-
SeamDroolsRuleAgent_Properties.Title=Seam Drools Rule Agent
-SeamDroolsRuleBase_Properties.Title=Seam Drools Rule Base
-
-SeamDroolsRuleFiles_AddEntry.Title=Seam Drools Rule File
-
-SeamDroolsRuleFiles_Properties.Title=Seam Drools Rule Files
-
-FileSeamComponents12_AddManagedWorkingMemory.WindowTitle=Add Managed Working Memory
-FileSeamComponents12_AddManagedWorkingMemory.Title=Seam Drools Managed Working Memory
-
-FileSeamComponents12_AddRuleBase.WindowTitle=Add Rule Base
-FileSeamComponents12_AddRuleBase.Title=Seam Drools Rule Base
-
-FileSeamComponents12_EditorActionList_AddManagedWorkingMemory.WindowTitle=Add Managed Working Memory
-FileSeamComponents12_EditorActionList_AddManagedWorkingMemory.Title=Seam Drools Managed Working Memory
-
-FileSeamComponents12_EditorActionList_AddRuleBase.WindowTitle=Add Rule Base
-FileSeamComponents12_EditorActionList_AddRuleBase.Title=Seam Drools Rule Base
-
FileSeamComponents20_AddManagedWorkingMemory.WindowTitle=Add Managed Working Memory
FileSeamComponents20_AddManagedWorkingMemory.Title=Seam Drools Managed Working Memory
@@ -791,72 +613,6 @@
SeamFrameworkHibernateEntityQuery_Properties.Title=Seam Framework Hibernate Entity Query
-SeamFrameworkHints_AddEntry.WindowTitle=Add Entry
-SeamFrameworkHints_AddEntry.Title=Seam Framework Hint
-
-SeamFrameworkHints_Properties.Title=Seam Framework Hints
-
-SeamFrameworkRestrictions_AddEntry.WindowTitle=Add Entry
-SeamFrameworkRestrictions_AddEntry.Title=Seam Framework Restriction
-
-SeamFrameworkRestrictions_Properties.Title=Seam Framework Restrictions
-
-FileSeamComponents12_AddEntityQuery.WindowTitle=Add Entity Query
-FileSeamComponents12_AddEntityQuery.Title=Seam Framework Entity Query
-
-FileSeamComponents12_AddHibernateEntityQuery.WindowTitle=Add Hibernate Entity Query
-FileSeamComponents12_AddHibernateEntityQuery.Title=Seam Framework Hibernate Entity Query
-
-FileSeamComponents12_AddEntityHome.WindowTitle=Add Entity Home
-FileSeamComponents12_AddEntityHome.Title=Seam Framework Entity Home
-
-FileSeamComponents12_AddHibernateEntityHome.WindowTitle=Add Hibernate Entity Home
-FileSeamComponents12_AddHibernateEntityHome.Title=Seam Framework Hibernate Entity Home
-
-FileSeamComponents12_EditorActionList_AddEntityQuery.WindowTitle=Add Entity Query
-FileSeamComponents12_EditorActionList_AddEntityQuery.Title=Seam Framework Entity Query
-
-FileSeamComponents12_EditorActionList_AddHibernateEntityQuery.WindowTitle=Add Hibernate Entity Query
-FileSeamComponents12_EditorActionList_AddHibernateEntityQuery.Title=Seam Framework Hibernate Entity Query
-
-FileSeamComponents12_EditorActionList_AddEntityHome.WindowTitle=Add Entity Home
-FileSeamComponents12_EditorActionList_AddEntityHome.Title=Seam Framework Entity Home
-
-FileSeamComponents12_EditorActionList_AddHibernateEntityHome.WindowTitle=Add Hibernate Entity Home
-FileSeamComponents12_EditorActionList_AddHibernateEntityHome.Title=Seam Framework Hibernate Entity Home
-
-SeamJmsQueueConnection_Properties.Title=Seam Jms Queue Connection
-
-SeamJmsQueueSender_Properties.Title=Seam Jms Queue Sender
-
-SeamJmsTopicConnection_Properties.Title=Seam Jms Topic Connection
-
-SeamJmsTopicPublisher_Properties.Title=Seam Jms Topic Publisher
-
-FileSeamComponents12_AddQueueConnection.WindowTitle=Add Queue Connection
-FileSeamComponents12_AddQueueConnection.Title=Seam Jms Queue Connection
-
-FileSeamComponents12_AddTopicConnection.WindowTitle=Add Topic Connection
-FileSeamComponents12_AddTopicConnection.Title=Seam Jms Topic Connection
-
-FileSeamComponents12_AddTopicPublisher.WindowTitle=Add Managed Topic Publisher
-FileSeamComponents12_AddTopicPublisher.Title=Seam Jms Topic Publisher
-
-FileSeamComponents12_AddQueueSender.WindowTitle=Add Managed Queue Sender
-FileSeamComponents12_AddQueueSender.Title=Seam Jms Queue Sender
-
-FileSeamComponents12_EditorActionList_AddQueueConnection.WindowTitle=Add Queue Connection
-FileSeamComponents12_EditorActionList_AddQueueConnection.Title=Seam Jms Queue Connection
-
-FileSeamComponents12_EditorActionList_AddTopicConnection.WindowTitle=Add Topic Connection
-FileSeamComponents12_EditorActionList_AddTopicConnection.Title=Seam Jms Topic Connection
-
-FileSeamComponents12_EditorActionList_AddTopicPublisher.WindowTitle=Add Managed Topic Publisher
-FileSeamComponents12_EditorActionList_AddTopicPublisher.Title=Seam Jms Topic Publisher
-
-FileSeamComponents12_EditorActionList_AddQueueSender.WindowTitle=Add Managed Queue Sender
-FileSeamComponents12_EditorActionList_AddQueueSender.Title=Seam Jms Queue Sender
-
SeamMailAliases_AddEntry.WindowTitle=Add Entry
SeamMailAliases_AddEntry.Title=Seam List Entry
@@ -866,19 +622,11 @@
SeamMailMeldwareUser_Properties.Title=Seam Mail Meldware User
-SeamMailSession_Properties.Title=Seam Mail Session
-
SeamMailUsers_AddEntry.WindowTitle=Add Entry
SeamMailUsers_AddEntry.Title=Seam Mail User
SeamMailUsers_Properties.Title=Seam Mail Users
-FileSeamComponents12_AddMailSession.WindowTitle=Add Mail Session
-FileSeamComponents12_AddMailSession.Title=Seam Mail Session
-
-FileSeamComponents12_EditorActionList_AddMailSession.WindowTitle=Add Mail Session
-FileSeamComponents12_EditorActionList_AddMailSession.Title=Seam Mail Session
-
FileSeamComponents20_AddMailSession.WindowTitle=Add Mail Session
FileSeamComponents20_AddMailSession.Title=Seam Mail Session
@@ -897,55 +645,10 @@
FileSeamComponents20_EditorActionList_AddMeldwareUser.WindowTitle=Add Meldware User
FileSeamComponents20_EditorActionList_AddMeldwareUser.Title=Seam Mail Meldware User
-SeamPdfDocumentStore_Properties.Title=Seam PDF Document Store
-
-SeamPdfKeyStoreConfig_Properties.Title=Seam PDF Key Store Config
-
-FileSeamComponents12_AddDocumentStore.WindowTitle=Add Document Store
-FileSeamComponents12_AddDocumentStore.Title=Seam PDF Document Store
-
-FileSeamComponents12_AddKeyStoreConfig.WindowTitle=Add Key Store Config
-FileSeamComponents12_AddKeyStoreConfig.Title=Seam PDF Key Store Config
-
-FileSeamComponents12_EditorActionList_AddDocumentStore.WindowTitle=Add Document Store
-FileSeamComponents12_EditorActionList_AddDocumentStore.Title=Seam PDF Document Store
-
-FileSeamComponents12_EditorActionList_AddKeyStoreConfig.WindowTitle=Add Key Store Config
-FileSeamComponents12_EditorActionList_AddKeyStoreConfig.Title=Seam PDF Key Store Config
-
-SeamRemotingConfig_Properties.Title=Seam Remoting Config
-
-FileSeamComponents12_AddRemotingConfig.WindowTitle=Add Config
-FileSeamComponents12_AddRemotingConfig.Title=Seam Remoting Config
-
-FileSeamComponents12_EditorActionList_AddRemotingConfig.WindowTitle=Add Config
-FileSeamComponents12_EditorActionList_AddRemotingConfig.Title=Seam Remoting Config
-
-SeamSecurityIdentity_Properties.Title=Seam Security Identity
-
-FileSeamComponents12_AddIdentity.WindowTitle=Add Identity
-FileSeamComponents12_AddIdentity.Title=Seam Security Identity
-
-FileSeamComponents12_EditorActionList_AddIdentity.WindowTitle=Add Identity
-FileSeamComponents12_EditorActionList_AddIdentity.Title=Seam Security Identity
-
-SeamSpringConfigLocations_AddEntry.WindowTitle=Add Entry
-SeamSpringConfigLocations_AddEntry.Title=Seam Spring Config Location
-
-SeamSpringConfigLocations_Properties.Title=Seam Spring Config Locations
-
-SeamSpringContextLoader_Properties.Title=Seam Spring Context Loader
-
SeamSpringTaskDispatcher20_Properties.Title=Seam Spring Task Dispatcher
SeamSpringTransaction20_Properties.Title=Seam Spring Transaction
-FileSeamComponents12_AddContextLoader.WindowTitle=Add Context Loader
-FileSeamComponents12_AddContextLoader.Title=Seam Spring Context Loader
-
-FileSeamComponents12_EditorActionList_AddContextLoader.WindowTitle=Add Context Loader
-FileSeamComponents12_EditorActionList_AddContextLoader.Title=Seam Spring Context Loader
-
FileSeamComponents20_AddContextLoader.WindowTitle=Add Context Loader
FileSeamComponents20_AddContextLoader.Title=Seam Spring Context Loader
@@ -964,20 +667,6 @@
FileSeamComponents20_EditorActionList_AddTransaction.WindowTitle=Add Transaction
FileSeamComponents20_EditorActionList_AddTransaction.Title=Seam Spring Transaction
-
-SeamThemeAvailableThemes_AddEntry.WindowTitle=Add Entry
-SeamThemeAvailableThemes_AddEntry.Title=Available Theme
-
-SeamThemeAvailableThemes_Properties.Title=Seam Available Themes
-
-SeamThemeSelector_Properties.Title=Seam Theme Selector
-
-FileSeamComponents12_AddThemeSelector.WindowTitle=Add Theme Selector
-FileSeamComponents12_AddThemeSelector.Title=Seam Theme Selector
-
-FileSeamComponents12_EditorActionList_AddThemeSelector.WindowTitle=Add Theme Selector
-FileSeamComponents12_EditorActionList_AddThemeSelector.Title=Seam Theme Selector
-
SeamNoTransaction_Properties.Title=Seam No Transaction
SeamTransactionEjb_Properties.Title=Seam Transaction EJB
@@ -1016,42 +705,10 @@
SeamWebCharacterFilter20_Properties.Title=Seam Web Character Filter
-SeamWebContextFilter_Properties.Title=Seam Web Context Filter
-
-SeamWebExceptionFilter_Properties.Title=Seam Web Exception Filter
-
SeamWebLoggingFilter20_Properties.Title=Seam Web Logging Filter
-SeamWebMultipartFilter_Properties.Title=Seam Web Multipart Filter
-
-SeamWebRedirectFilter_Properties.Title=Seam Web Redirect Filter
-
SeamWebServletSession20_Properties.Title=Seam Web Servlet Session
-FileSeamComponents12_AddContextFilter.WindowTitle=Add Context Filter
-FileSeamComponents12_AddContextFilter.Title=Seam Web Context Filter
-
-FileSeamComponents12_AddExceptionFilter.WindowTitle=Add Exception Filter
-FileSeamComponents12_AddExceptionFilter.Title=Seam Web Exception Filter
-
-FileSeamComponents12_AddMultipartFilter.WindowTitle=Add Multipart Filter
-FileSeamComponents12_AddMultipartFilter.Title=Seam Web Multipart Filter
-
-FileSeamComponents12_AddRedirectFilter.WindowTitle=Add Redirect Filter
-FileSeamComponents12_AddRedirectFilter.Title=Seam Web Redirect Filter
-
-FileSeamComponents12_EditorActionList_AddContextFilter.WindowTitle=Add Context Filter
-FileSeamComponents12_EditorActionList_AddContextFilter.Title=Seam Web Context Filter
-
-FileSeamComponents12_EditorActionList_AddExceptionFilter.WindowTitle=Add Exception Filter
-FileSeamComponents12_EditorActionList_AddExceptionFilter.Title=Seam Web Exception Filter
-
-FileSeamComponents12_EditorActionList_AddMultipartFilter.WindowTitle=Add Multipart Filter
-FileSeamComponents12_EditorActionList_AddMultipartFilter.Title=Seam Web Multipart Filter
-
-FileSeamComponents12_EditorActionList_AddRedirectFilter.WindowTitle=Add Redirect Filter
-FileSeamComponents12_EditorActionList_AddRedirectFilter.Title=Seam Web Redirect Filter
-
FileSeamComponents20_AddContextFilter.WindowTitle=Add Context Filter
FileSeamComponents20_AddContextFilter.Title=Seam Web Context Filter
@@ -1106,9 +763,6 @@
FileSeamComponents20_EditorActionList_AddServletSession.WindowTitle=Add Servlet Session
FileSeamComponents20_EditorActionList_AddServletSession.Title=Seam Web Servlet Session
-FileSeamComponents20_EditorActionList_AddServletSession.WindowTitle=Add Servlet Session
-FileSeamComponents20_EditorActionList_AddServletSession.Title=Seam Web Servlet Session
-
SeamAsyncPool_Properties.Title=Seam Async Pool
SeamAsyncQuartz_Properties.Title=Seam Async Quartz
@@ -1319,3 +973,266 @@
FileSeamComponents20_EditorActionList_AddThemeSelector.WindowTitle=Add Theme Selector
FileSeamComponents20_EditorActionList_AddThemeSelector.Title=Seam Theme Selector
+
+FileSeamComponents21_AddTimer.WindowTitle=Add Timer Service Dispatcher
+FileSeamComponents21_AddTimer.Title=Seam Async Timer
+
+FileSeamComponents21_AddQuartz.WindowTitle=Add Quartz Dispatcher
+FileSeamComponents21_AddQuartz.Title=Seam Async Quartz
+
+FileSeamComponents21_AddPool.WindowTitle=Add Thread Pool Dispatcher
+FileSeamComponents21_AddPool.Title=Seam Async Pool
+
+FileSeamComponent12_AddAnyProperty.WindowTitle=Add Property
+FileSeamComponent12_AddAnyProperty.Title=Property
+
+FileSeamComponent12_EditorActionList_AddAnyProperty.WindowTitle=Add Property
+FileSeamComponent12_EditorActionList_AddAnyProperty.Title=Property
+
+FileSeamComponent12_EditorActionList_Properties.Title=File Seam Component_ Editor Action List
+FileSeamComponent20_Rename.Message=
+
+FileSeamComponent20_AddAnyProperty.WindowTitle=Add Property
+FileSeamComponent20_AddAnyProperty.Title=Property
+
+FileSeamComponents11_Rename.Message=
+
+FileSeamComponents11_EditorActionList_Properties.Title=File Seam Components_ Editor Action List
+FileSeamComponents12_Rename.Message=
+
+FileSeamComponents12_Properties.Title=File Seam Components
+FileSeamComponents12_EditorActionList_Properties.Title=File Seam Components_ Editor Action List
+
+FileSeamComponents20_Rename.Message=
+FileSeamComponents21_AddComponent.WindowTitle=Add Component
+
+FileSeamComponents21_AddComponent.Title=Seam Component
+FileSeamComponents21_AddFactory.WindowTitle=Add Factory
+
+FileSeamComponents21_AddFactory.Title=Seam Factory
+FileSeamComponents21_AddEvent.WindowTitle=Add Event
+
+FileSeamComponents21_AddEvent.Title=Seam Event
+FileSeamComponents21_AddImport.WindowTitle=Add Import
+
+FileSeamComponents21_AddImport.Title=Seam Import
+SeamComponent_AddAnyProperty.WindowTitle=Add Property
+
+SeamComponent_AddAnyProperty.Title=Property
+SeamComponent20_AddProperty.WindowTitle=Add Simple Property
+
+SeamComponent20_AddProperty.Title=Seam Property
+SeamComponent20_AddListProperty.WindowTitle=Add List Property
+
+SeamComponent20_AddListProperty.Title=Seam Property List
+SeamComponent20_AddMapProperty.WindowTitle=Add Map Property
+
+SeamComponent20_AddMapProperty.Title=Seam Property Map
+SeamComponent20_AddAnyProperty.WindowTitle=Add Property
+
+SeamComponent20_AddAnyProperty.Title=Property
+SeamComponent21_AddProperty.WindowTitle=Add Simple Property
+
+SeamComponent21_AddProperty.Title=Seam Property
+SeamComponent21_AddListProperty.WindowTitle=Add List Property
+
+SeamComponent21_AddListProperty.Title=Seam Property List
+SeamComponent21_AddMapProperty.WindowTitle=Add Map Property
+
+SeamComponent21_AddMapProperty.Title=Seam Property Map
+SeamComponent21_AddAnyProperty.WindowTitle=Add Property
+
+SeamComponent21_AddAnyProperty.Title=Property
+FileFolder_CreateFileSeamComponentsV.WindowTitle=Add Seam Components File
+
+FileFolder_CreateFileSeamComponentsV.Title=Seam Components File
+FileSystemFolder_CreateFileSeamComponentsV.WindowTitle=Add Seam Components File
+
+FileSystemFolder_CreateFileSeamComponentsV.Title=Seam Components File
+SeamCoreInit20_Properties.Title=Seam Core Init
+
+FileSeamComponents21_AddInit.WindowTitle=Add Init
+FileSeamComponents21_AddInit.Title=Seam Core Init
+
+FileSeamComponents21_AddManager.WindowTitle=Add Manager
+FileSeamComponents21_AddManager.Title=Seam Core Manager
+
+FileSeamComponents21_AddPojoCache.WindowTitle=Add Pojo Cache
+FileSeamComponents21_AddPojoCache.Title=Seam Core Pojo Cache
+
+FileSeamComponents21_AddResourceLoader.WindowTitle=Add Resource Loader
+FileSeamComponents21_AddResourceLoader.Title=Seam Core Resource Loader
+
+FileSeamComponents21_AddActor.WindowTitle=Add Actor
+FileSeamComponents21_AddActor.Title=Seam BPM Actor
+
+FileSeamComponents21_AddJBPM.WindowTitle=Add JBPM
+FileSeamComponents21_AddJBPM.Title=Seam JBPM
+
+FileSeamComponents21_AddManagedWorkingMemory.WindowTitle=Add Managed Working Memory
+FileSeamComponents21_AddManagedWorkingMemory.Title=Seam Drools Managed Working Memory
+
+FileSeamComponents21_AddRuleBase.WindowTitle=Add Rule Base
+FileSeamComponents21_AddRuleBase.Title=Seam Drools Rule Base
+
+FileSeamComponents21_AddRuleAgent.WindowTitle=Add Rule Agent
+FileSeamComponents21_AddRuleAgent.Title=Seam Drools Rule Agent
+
+FileSeamComponents21_AddEntityQuery.WindowTitle=Add Entity Query
+FileSeamComponents21_AddEntityQuery.Title=Seam Framework Entity Query
+
+FileSeamComponents21_AddHibernateEntityQuery.WindowTitle=Add Hibernate Entity Query
+FileSeamComponents21_AddHibernateEntityQuery.Title=Seam Framework Hibernate Entity Query
+
+FileSeamComponents21_AddEntityHome.WindowTitle=Add Entity Home
+FileSeamComponents21_AddEntityHome.Title=Seam Framework Entity Home
+
+FileSeamComponents21_AddHibernateEntityHome.WindowTitle=Add Hibernate Entity Home
+FileSeamComponents21_AddHibernateEntityHome.Title=Seam Framework Hibernate Entity Home
+
+FileSeamComponents21_AddLocaleSelector.WindowTitle=Add Locale Selector
+FileSeamComponents21_AddLocaleSelector.Title=Seam Core Locale Selector
+
+FileSeamComponents21_AddTimeZoneSelector.WindowTitle=Add Time Zone Selector
+FileSeamComponents21_AddTimeZoneSelector.Title=Seam Core Time Zone Selector
+
+FileSeamComponents21_AddLocaleConfig.WindowTitle=Add Locale Config
+FileSeamComponents21_AddLocaleConfig.Title=Seam International Locale Config
+
+FileSeamComponents21_AddQueueConnection.WindowTitle=Add Queue Connection
+FileSeamComponents21_AddQueueConnection.Title=Seam Jms Queue Connection
+
+FileSeamComponents21_AddTopicConnection.WindowTitle=Add Topic Connection
+FileSeamComponents21_AddTopicConnection.Title=Seam Jms Topic Connection
+
+FileSeamComponents21_AddTopicPublisher.WindowTitle=Add Managed Topic Publisher
+FileSeamComponents21_AddTopicPublisher.Title=Seam Jms Topic Publisher
+
+FileSeamComponents21_AddQueueSender.WindowTitle=Add Managed Queue Sender
+FileSeamComponents21_AddQueueSender.Title=Seam Jms Queue Sender
+
+FileSeamComponents21_AddMailSession.WindowTitle=Add Mail Session
+FileSeamComponents21_AddMailSession.Title=Seam Mail Session
+
+FileSeamComponents21_AddMeldware.WindowTitle=Add Meldware
+FileSeamComponents21_AddMeldware.Title=Seam Mail Meldware
+
+FileSeamComponents21_AddMeldwareUser.WindowTitle=Add Meldware User
+FileSeamComponents21_AddMeldwareUser.Title=Seam Mail Meldware User
+
+FileSeamComponents21_AddDocumentStore.WindowTitle=Add Document Store
+FileSeamComponents21_AddDocumentStore.Title=Seam Pdf Document Store
+
+FileSeamComponents21_AddKeyStoreConfig.WindowTitle=Add Key Store Config
+FileSeamComponents21_AddKeyStoreConfig.Title=Seam Pdf Key Store Config
+
+FileSeamComponents21_AddManagedPersistenceContext.WindowTitle=Add Managed Persistence Context
+FileSeamComponents21_AddManagedPersistenceContext.Title=Seam Persistence Managed Context
+
+FileSeamComponents21_AddEntityManagerFactory.WindowTitle=Add Entity Manager Factory
+FileSeamComponents21_AddEntityManagerFactory.Title=Seam Persistence Entity Manager Factory
+
+FileSeamComponents21_AddFilter.WindowTitle=Add Filter
+FileSeamComponents21_AddFilter.Title=Seam Persistence Filter
+
+FileSeamComponents21_AddManagedHibernateSession.WindowTitle=Add Managed Hibernate Session
+FileSeamComponents21_AddManagedHibernateSession.Title=Seam Persistence Managed Hibernate Session
+
+FileSeamComponents21_AddHibernateSessionFactory.WindowTitle=Add Hibernate Session Factory
+FileSeamComponents21_AddHibernateSessionFactory.Title=Seam Persistence Hibernate Session Factory
+
+SeamRemotingConfig20_Properties.Title=Seam Remoting Config
+FileSeamComponents21_AddRemotingConfig.WindowTitle=Add Config
+
+FileSeamComponents21_AddRemotingConfig.Title=Seam Remoting
+SeamFacesSecurityEvents20_Properties.Title=Seam Faces Security Events
+
+FileSeamComponents20_AddFacesSecurityEvents.WindowTitle=Add Faces Security Events
+FileSeamComponents20_AddFacesSecurityEvents.Title=Seam Faces Security Events
+
+FileSeamComponents21_AddIdentity.WindowTitle=Add Identity
+FileSeamComponents21_AddIdentity.Title=Seam Security Identity
+
+FileSeamComponents21_AddFacesSecurityEvents.WindowTitle=Add Faces Security Events
+FileSeamComponents21_AddFacesSecurityEvents.Title=Seam Faces Security Events
+
+FileSeamComponents21_AddIdentityManager.WindowTitle=Add Identity Manager
+FileSeamComponents21_AddIdentityManager.Title=Seam Security Identity Manager
+
+FileSeamComponents21_AddJPAIdentityStore.WindowTitle=Add JPA Identity Store
+FileSeamComponents21_AddJPAIdentityStore.Title=Seam Security JPAIdentity Store
+
+FileSeamComponents21_AddLDAPIdentityStore.WindowTitle=Add LDAP Identity Store
+FileSeamComponents21_AddLDAPIdentityStore.Title=Seam Security LDAPIdentity Store
+
+FileSeamComponents21_AddPermissionManager.WindowTitle=Add Permission Manager
+FileSeamComponents21_AddPermissionManager.Title=Seam Security Permission Manager
+
+FileSeamComponents21_AddJPAPermissionStore.WindowTitle=Add JPA Permission Store
+FileSeamComponents21_AddJPAPermissionStore.Title=Seam Security JPAPermission Store
+
+FileSeamComponents21_AddRuleBasedPermissionResolver.WindowTitle=Add Rule Based Permission Resolver
+FileSeamComponents21_AddRuleBasedPermissionResolver.Title=Seam Security Rule Based Permission Resolver
+
+FileSeamComponents21_AddPersistentPermissionResolver.WindowTitle=Add Persistent Permission Resolver
+FileSeamComponents21_AddPersistentPermissionResolver.Title=Seam Security Persistent Permission Resolver
+
+FileSeamComponents21_AddThemeSelector.WindowTitle=Add Theme Selector
+FileSeamComponents21_AddThemeSelector.Title=Seam Theme Selector
+
+FileSeamComponents21_AddEjb.WindowTitle=Add Ejb
+FileSeamComponents21_AddEjb.Title=Seam Transaction Ejb
+
+FileSeamComponents21_AddEntity.WindowTitle=Add Entity
+FileSeamComponents21_AddEntity.Title=Seam Transaction Entity
+
+FileSeamComponents21_AddHibernate.WindowTitle=Add Hibernate
+FileSeamComponents21_AddHibernate.Title=Seam Transaction Hibernate
+
+FileSeamComponents21_AddNo.WindowTitle=Add No Transaction
+FileSeamComponents21_AddNo.Title=Seam No Transaction
+
+FileSeamComponents21_AddJPAEntityLoader.WindowTitle=Add JPA Entity Loader
+FileSeamComponents21_AddJPAEntityLoader.Title=Seam UIJPA
+
+FileSeamComponents21_AddHibernateEntityLoader.WindowTitle=Add Hibernate Entity Loader
+FileSeamComponents21_AddHibernateEntityLoader.Title=Seam UIHibernate
+
+FileSeamComponents21_AddEntityConverter.WindowTitle=Add Entity Converter
+FileSeamComponents21_AddEntityConverter.Title=Seam UIEntity Converter
+
+FileSeamComponents21_AddContextFilter.WindowTitle=Add Context Filter
+FileSeamComponents21_AddContextFilter.Title=Seam Web Context Filter
+
+FileSeamComponents21_AddExceptionFilter.WindowTitle=Add Exception Filter
+FileSeamComponents21_AddExceptionFilter.Title=Seam Web Exception Filter
+
+FileSeamComponents21_AddMultipartFilter.WindowTitle=Add Multipart Filter
+FileSeamComponents21_AddMultipartFilter.Title=Seam Web Multipart Filter
+
+FileSeamComponents21_AddRedirectFilter.WindowTitle=Add Redirect Filter
+FileSeamComponents21_AddRedirectFilter.Title=Seam Web Redirect Filter
+
+FileSeamComponents21_AddAuthenticationFilter.WindowTitle=Add Authentication Filter
+FileSeamComponents21_AddAuthenticationFilter.Title=Seam Web Authentication Filter
+
+FileSeamComponents21_AddCharacterFilter.WindowTitle=Add Character Encoding Filter
+FileSeamComponents21_AddCharacterFilter.Title=Seam Web Character Filter
+
+FileSeamComponents21_AddAjaxFilter.WindowTitle=Add Ajax For JSF Filter
+FileSeamComponents21_AddAjaxFilter.Title=Seam Web Ajax Filter
+
+FileSeamComponents21_AddLoggingFilter.WindowTitle=Add Logging Filter
+FileSeamComponents21_AddLoggingFilter.Title=Seam Web Logging Filter
+
+FileSeamComponents21_AddSession.WindowTitle=Add Session
+FileSeamComponents21_AddSession.Title=Seam Web Session
+
+FileSeamComponents21_AddIdentityFilter.WindowTitle=Add Identity Filter
+FileSeamComponents21_AddIdentityFilter.Title=Seam Web Identity Filter
+
+FileSeamComponents21_AddWicketFilter.WindowTitle=Add Wicket Filter
+FileSeamComponents21_AddWicketFilter.Title=Seam Web Wicket Filter
+
+FileSeamComponents21_AddWebApplication.WindowTitle=Add Web Application
+FileSeamComponents21_AddWebApplication.Title=Seam Wicket Web App
17 years, 2 months
JBoss Tools SVN: r11102 - in workspace: mareshkau and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-10-23 08:10:42 -0400 (Thu, 23 Oct 2008)
New Revision: 11102
Added:
workspace/mareshkau/xulrunner_1.9.0.3/
Removed:
workspace/xulrunner_1.9.0.3/
Log:
Move XulRunner 1.9.0.3 to mareshkau workspace
Copied: workspace/mareshkau/xulrunner_1.9.0.3 (from rev 11101, workspace/xulrunner_1.9.0.3)
17 years, 2 months
JBoss Tools SVN: r11101 - workspace.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-10-23 08:03:28 -0400 (Thu, 23 Oct 2008)
New Revision: 11101
Added:
workspace/mareshkau/
Log:
Mareshkau workspace
17 years, 2 months
JBoss Tools SVN: r11099 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test: src/org/jboss/tools/jsf/vpe/richfaces/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-10-23 07:37:29 -0400 (Thu, 23 Oct 2008)
New Revision: 11099
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/separator.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml.xml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/separator.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/suggestionbox.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2810, tests for rich:separator, rich:spacer, rich:simpleTogglePanel, rich:suggestionbox.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/separator.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/separator.xhtml 2008-10-23 10:32:10 UTC (rev 11098)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/separator.xhtml 2008-10-23 11:37:29 UTC (rev 11099)
@@ -10,7 +10,8 @@
</head>
<body>
-<!-- Separator component -->
- <rich:separator height="20"/>
+<f:view>
+ <rich:separator id="separator" height="4" lineType="double" />
+</f:view>
</body>
</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/separator.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/separator.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/separator.xhtml.xml 2008-10-23 11:37:29 UTC (rev 11099)
@@ -0,0 +1,9 @@
+<tests>
+ <test id="separator">
+ <DIV ALIGN="left" CLASS="td-parentdiv">
+ <DIV CLASS="separator-color"
+ STYLE="border-style: double; width: 100%;">
+ </DIV>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/separator.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml 2008-10-23 10:32:10 UTC (rev 11098)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml 2008-10-23 11:37:29 UTC (rev 11099)
@@ -10,10 +10,19 @@
</head>
<body>
-<!-- Simple Toggle Panel component -->
-<rich:simpleTogglePanel switchType="client"
- label="Test simple toggle panel">
- This is simple toggle panel
+<f:view>
+ <rich:simpleTogglePanel id="simpleTogglePanel" switchType="client"
+ label="Add AJAX capability to existing JSF applications">
+ The framework is implemented by using a component library. The library
+ set Ajax functionality into existing pages, so there is no need to write
+ any JavaScript code or to replace existing components with new Ajax one.
+ Ajax4jsf enables page-wide Ajax support instead of the traditional
+ component-wide support and it gives the opportunity to define the event
+ on the page. An event invokes an Ajax request and areas of the page
+ which are synchronized with the JSF Component Tree after changing the
+ data on the server by Ajax request in accordance with events fired on
+ the client.
</rich:simpleTogglePanel>
+</f:view>
</body>
</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml.xml 2008-10-23 11:37:29 UTC (rev 11099)
@@ -0,0 +1,31 @@
+<tests>
+ <test id="simpleTogglePanel">
+ <DIV CLASS="dr-stglpnl rich-stglpanel" STYLE="">
+ <DIV CLASS="dr-stglpnl-h rich-stglpanel-header"
+ STYLE="/position: relative; background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/common/background.gif\);/"
+ VPE-USER-TOGGLE-ID="false">
+ Add AJAX capability to existing JSF applications
+ <DIV STYLE="position: absolute; top: 0px; right: 5px;"
+ VPE-USER-TOGGLE-ID="false" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> «</DIV>
+ </DIV>
+ <DIV STYLE="overflow: hidden; width: 100%;">
+ <TABLE CELLPADDING="0" STYLE="width: 100%;">
+ <TR>
+ <TD CLASS="dr-stglpnl-b rich-stglpanel-body">
+ <SPAN> The framework is implemented by using a component library.
+ The library set Ajax functionality into existing pages, so there
+ is no need to write any JavaScript code or to replace existing
+ components with new Ajax one. Ajax4jsf enables page-wide Ajax
+ support instead of the traditional component-wide support and it
+ gives the opportunity to define the event on the page. An event
+ invokes an Ajax request and areas of the page which are
+ synchronized with the JSF Component Tree after changing the data
+ on the server by Ajax request in accordance with events fired on
+ the client.</SPAN>
+ </TD>
+ </TR>
+ </TABLE>
+ </DIV>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml 2008-10-23 10:32:10 UTC (rev 11098)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml 2008-10-23 11:37:29 UTC (rev 11099)
@@ -1,16 +1,19 @@
<!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:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://richfaces.org/rich">
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
<head>
</head>
<body>
-<!-- Spacer component -->
-<rich:spacer width="720" height="50" />
+<f:view>
+ line1
+ <rich:spacer width="1" height="5" title="Here is a spacer..." />
+ line2
+</f:view>
</body>
</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml.xml 2008-10-23 11:37:29 UTC (rev 11099)
@@ -0,0 +1,6 @@
+<tests>
+ <test id="spacer">
+ <IMG WIDTH="1" HEIGHT="5"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/spacer/spacer.gif/" />
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/suggestionbox.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/suggestionbox.xhtml 2008-10-23 10:32:10 UTC (rev 11098)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/suggestionbox.xhtml 2008-10-23 11:37:29 UTC (rev 11099)
@@ -10,21 +10,28 @@
</head>
<body>
-<!-- Suggestion Box component -->
-<h:inputText value="#{suggestionBox.property}" id="text" />
-<rich:suggestionbox id="suggestionBoxId" for="text" tokens=",["
+<rich:suggestionbox id="suggestionBox" for="text" tokens=",[]"
rules="#{suggestionBox.rules}"
- suggestionAction="#{suggestionBox.autocomplete}" var="result"
- fetchValue="#{result.text}" rows="#{suggestionBox.intRows}"
- first="#{suggestionBox.intFirst}" minChars="#{suggestionBox.minchars}"
+ suggestionAction="#{capitalsBean.autocomplete}" var="result"
+ fetchValue="#{result.name}" first="#{suggestionBox.intFirst}"
+ minChars="#{suggestionBox.minchars}"
shadowOpacity="#{suggestionBox.shadowOpacity}"
border="#{suggestionBox.border}" width="#{suggestionBox.width}"
height="#{suggestionBox.height}"
shadowDepth="#{suggestionBox.shadowDepth}"
- cellpadding="#{suggestionBox.cellpadding}">
+ cellpadding="#{suggestionBox.cellpadding}"
+ nothingLabel="No capitals found" usingSuggestObjects="true"
+ onobjectchange="processObjectsChange(suggestion)">
+
<h:column>
- <h:outputText value="#{result.text}" />
+ <h:graphicImage value="#{result.stateFlag}" />
</h:column>
+ <h:column>
+ <h:outputText value="#{result.name}" />
+ </h:column>
+ <h:column>
+ <h:outputText value="#{result.state}" style="font-style:italic" />
+ </h:column>
</rich:suggestionbox>
</body>
</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-23 10:32:10 UTC (rev 11098)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-23 11:37:29 UTC (rev 11099)
@@ -256,19 +256,19 @@
}
public void testSeparator() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/separator.xhtml");//$NON-NLS-1$
}
public void testSimpleTogglePanel() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/simpleTogglePanel.xhtml");//$NON-NLS-1$
}
public void testSpacer() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/spacer.xhtml");//$NON-NLS-1$
}
public void testSuggestionbox() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performInvisibleTagTest("components/suggestionbox.xhtml", "suggestionBox"); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testTabPanel() throws Throwable {
17 years, 2 months
JBoss Tools SVN: r11098 - in branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core: src/org/jboss/tools/hibernate/jpt/core/internal/context and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-10-23 06:32:10 -0400 (Thu, 23 Oct 2008)
New Revision: 11098
Added:
branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java
branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/messages.properties
Modified:
branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF
branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2976
Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2008-10-23 10:27:41 UTC (rev 11097)
+++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2008-10-23 10:32:10 UTC (rev 11098)
@@ -7,7 +7,8 @@
org.eclipse.core.runtime,
org.eclipse.jpt.core,
org.eclipse.wst.validation,
- org.eclipse.jpt.utility;bundle-version="1.2.0"
+ org.eclipse.jpt.utility;bundle-version="1.2.0",
+ org.eclipse.core.resources;bundle-version="3.4.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Hibernate Team
Export-Package: org.jboss.tools.hibernate.jpt.core.internal,
Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2008-10-23 10:27:41 UTC (rev 11097)
+++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2008-10-23 10:32:10 UTC (rev 11098)
@@ -10,16 +10,27 @@
******************************************************************************/
package org.jboss.tools.hibernate.jpt.core.internal.context;
+import java.io.File;
+import java.util.List;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jpt.core.context.persistence.Persistence;
+import org.eclipse.jpt.core.context.persistence.Property;
import org.eclipse.jpt.core.internal.context.persistence.GenericPersistenceUnit;
import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
+import org.eclipse.wst.validation.internal.core.Message;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
import org.jboss.tools.hibernate.jpt.core.internal.context.basic.BasicHibernateProperties;
/**
* @author Dmitry Geraskov
*
*/
-public class HibernatePersistenceUnit extends GenericPersistenceUnit {
+public class HibernatePersistenceUnit extends GenericPersistenceUnit
+ implements Messages{
private HibernateProperties hibernateProperties;
@@ -42,4 +53,53 @@
return this.hibernateProperties.getBasicHibernate();
}
+ // ********** Validation ***********************************************
+ @Override
+ public void addToMessages(List<IMessage> messages) {
+ super.addToMessages(messages);
+ addFileNotExistsMessages(messages);
+ }
+
+ protected void addFileNotExistsMessages(List<IMessage> messages) {
+ String configFile = getBasicProperties().getConfigurationFile();
+ if (configFile != null && configFile.length() > 0){
+ IPath path = new Path(configFile);
+
+ if (new File(path.toOSString()).exists()) return;
+
+
+ IResource res= ResourcesPlugin.getWorkspace().getRoot().findMember(path);
+ if (res != null) {
+ int resType= res.getType();
+ if (resType != IResource.FILE) {
+ Property prop = getProperty(BasicHibernateProperties.HIBERNATE_CONFIG_FILE);
+ IMessage message = new HibernateMessage(IMessage.HIGH_SEVERITY,
+ NOT_A_FILE, new String[]{configFile}, getResource());
+ message.setLineNo(prop.getValidationTextRange().getLineNumber());
+ messages.add(message);
+ }
+ } else {
+ Property prop = getProperty(BasicHibernateProperties.HIBERNATE_CONFIG_FILE);
+ IMessage message = new HibernateMessage(IMessage.HIGH_SEVERITY,
+ FILE_NOT_FOUND, new String[]{configFile}, getResource());
+ message.setLineNo(prop.getValidationTextRange().getLineNumber());
+ messages.add(message);
+ }
+ }
+ }
}
+
+/*Fixes the problem with class loader*/
+class HibernateMessage extends Message {
+
+ /**
+ * @param aSeverity
+ * @param anId
+ * @param aParams
+ * @param aTargetObject
+ */
+ public HibernateMessage(int aSeverity, String anId, String[] aParams, Object aTargetObject) {
+ super(Messages.class.getName(), aSeverity, anId, aParams, aTargetObject);
+ }
+
+}
Added: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java (rev 0)
+++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java 2008-10-23 10:32:10 UTC (rev 11098)
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2008 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.hibernate.jpt.core.internal.context;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public interface Messages {
+
+ String NOT_A_FILE = "not_a_file";
+
+ String FILE_NOT_FOUND = "file_not_found";
+
+}
Property changes on: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/messages.properties
===================================================================
--- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/messages.properties (rev 0)
+++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/messages.properties 2008-10-23 10:32:10 UTC (rev 11098)
@@ -0,0 +1,2 @@
+not_a_file= Resource \"{0}\" is not a file.
+file_not_found = File \"{0}\" not found.
\ No newline at end of file
Property changes on: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/messages.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
17 years, 2 months
JBoss Tools SVN: r11097 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core: src/org/jboss/tools/hibernate/jpt/core/internal/context and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-10-23 06:27:41 -0400 (Thu, 23 Oct 2008)
New Revision: 11097
Added:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/messages.properties
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2976
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2008-10-23 09:24:48 UTC (rev 11096)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2008-10-23 10:27:41 UTC (rev 11097)
@@ -7,7 +7,8 @@
org.eclipse.core.runtime,
org.eclipse.jpt.core,
org.eclipse.wst.validation,
- org.eclipse.jpt.utility;bundle-version="1.2.0"
+ org.eclipse.jpt.utility;bundle-version="1.2.0",
+ org.eclipse.core.resources;bundle-version="3.4.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Hibernate Team
Export-Package: org.jboss.tools.hibernate.jpt.core.internal,
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2008-10-23 09:24:48 UTC (rev 11096)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2008-10-23 10:27:41 UTC (rev 11097)
@@ -10,16 +10,27 @@
******************************************************************************/
package org.jboss.tools.hibernate.jpt.core.internal.context;
+import java.io.File;
+import java.util.List;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jpt.core.context.persistence.Persistence;
+import org.eclipse.jpt.core.context.persistence.Property;
import org.eclipse.jpt.core.internal.context.persistence.GenericPersistenceUnit;
import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
+import org.eclipse.wst.validation.internal.core.Message;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
import org.jboss.tools.hibernate.jpt.core.internal.context.basic.BasicHibernateProperties;
/**
* @author Dmitry Geraskov
*
*/
-public class HibernatePersistenceUnit extends GenericPersistenceUnit {
+public class HibernatePersistenceUnit extends GenericPersistenceUnit
+ implements Messages{
private HibernateProperties hibernateProperties;
@@ -42,4 +53,53 @@
return this.hibernateProperties.getBasicHibernate();
}
+ // ********** Validation ***********************************************
+ @Override
+ public void addToMessages(List<IMessage> messages) {
+ super.addToMessages(messages);
+ addFileNotExistsMessages(messages);
+ }
+
+ protected void addFileNotExistsMessages(List<IMessage> messages) {
+ String configFile = getBasicProperties().getConfigurationFile();
+ if (configFile != null && configFile.length() > 0){
+ IPath path = new Path(configFile);
+
+ if (new File(path.toOSString()).exists()) return;
+
+
+ IResource res= ResourcesPlugin.getWorkspace().getRoot().findMember(path);
+ if (res != null) {
+ int resType= res.getType();
+ if (resType != IResource.FILE) {
+ Property prop = getProperty(BasicHibernateProperties.HIBERNATE_CONFIG_FILE);
+ IMessage message = new HibernateMessage(IMessage.HIGH_SEVERITY,
+ NOT_A_FILE, new String[]{configFile}, getResource());
+ message.setLineNo(prop.getValidationTextRange().getLineNumber());
+ messages.add(message);
+ }
+ } else {
+ Property prop = getProperty(BasicHibernateProperties.HIBERNATE_CONFIG_FILE);
+ IMessage message = new HibernateMessage(IMessage.HIGH_SEVERITY,
+ FILE_NOT_FOUND, new String[]{configFile}, getResource());
+ message.setLineNo(prop.getValidationTextRange().getLineNumber());
+ messages.add(message);
+ }
+ }
+ }
}
+
+/*Fixes the problem with class loader*/
+class HibernateMessage extends Message {
+
+ /**
+ * @param aSeverity
+ * @param anId
+ * @param aParams
+ * @param aTargetObject
+ */
+ public HibernateMessage(int aSeverity, String anId, String[] aParams, Object aTargetObject) {
+ super(Messages.class.getName(), aSeverity, anId, aParams, aTargetObject);
+ }
+
+}
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java 2008-10-23 10:27:41 UTC (rev 11097)
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2008 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.hibernate.jpt.core.internal.context;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public interface Messages {
+
+ String NOT_A_FILE = "not_a_file";
+
+ String FILE_NOT_FOUND = "file_not_found";
+
+}
Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/messages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/messages.properties (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/messages.properties 2008-10-23 10:27:41 UTC (rev 11097)
@@ -0,0 +1,2 @@
+not_a_file= Resource \"{0}\" is not a file.
+file_not_found = File \"{0}\" not found.
\ No newline at end of file
Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/messages.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
17 years, 2 months
JBoss Tools SVN: r11096 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test: src/org/jboss/tools/jsf/vpe/richfaces/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-10-23 05:24:48 -0400 (Thu, 23 Oct 2008)
New Revision: 11096
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/progressBar.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/progressBar.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2810, tests for rich:pickList, rich:progressBar, rich:scrollableDataTable.
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml.xml 2008-10-23 09:24:48 UTC (rev 11096)
@@ -0,0 +1,89 @@
+<tests>
+ <test id="pickList">
+ <TABLE CLASS="rich-list-picklist" STYLE="">
+ <TBODY>
+ <TR>
+ <TD>
+ <DIV CLASS="rich-picklist-source-items" STYLE="width: 140px; height: 140px;">
+ <TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="0"
+ CLASS="rich-picklist-body">
+ <TR>
+ <TD STYLE="border: 0px none ; padding: 0px;">
+ <DIV CLASS="rich-picklist-list">
+ <DIV CLASS="rich-picklist-list-content" STYLE="width: 140px; height: 140px;">
+ <TABLE CELLPADDING="0" CLASS="rich-picklist-internal-tab">
+ <TBODY>
+ <OPTION> Option 1 </OPTION>
+ <OPTION> Option 2 </OPTION>
+ <OPTION> Option 3 </OPTION>
+ </TBODY>
+ </TABLE>
+ </DIV>
+ </DIV>
+ </TD>
+ </TR>
+ </TABLE>
+ </DIV>
+ </TD>
+ <TD STYLE="vertical-align: middle;">
+ <DIV CLASS="rich-picklist-controls">
+ <DIV CLASS="rich-picklist-control-button-class">
+ <DIV
+ STYLE="background-image: url(file:///D:/Projects/jboss_trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/pickList/button.gif);"
+ CLASS="rich-list-picklist-button">
+ <DIV CLASS="rich-list-picklist-button-content">
+ <IMG WIDTH="15" HEIGHT="15"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/pickList/arrow_remove.gif/"/> Remove
+ </DIV>
+ </DIV>
+ </DIV>
+ <DIV CLASS="rich-picklist-control-button-class">
+ <DIV
+ STYLE="background-image: url(file:///D:/Projects/jboss_trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/pickList/button.gif);"
+ CLASS="rich-list-picklist-button">
+ <DIV CLASS="rich-list-picklist-button-content">
+ <IMG WIDTH="15" HEIGHT="15"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/pickList/arrow_copy_all.gif/"/> Copy all
+ </DIV>
+ </DIV>
+ </DIV>
+ <DIV CLASS="rich-picklist-control-button-class">
+ <DIV
+ STYLE="background-image: url(file:///D:/Projects/jboss_trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/pickList/button.gif);"
+ CLASS="rich-list-picklist-button">
+ <DIV CLASS="rich-list-picklist-button-content">
+ <IMG WIDTH="15" HEIGHT="15"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/pickList/arrow_copy.gif/"/> Copy
+ </DIV>
+ </DIV>
+ </DIV>
+ <DIV CLASS="rich-picklist-control-button-class">
+ <DIV
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/pickList/button.gif\);/"
+ CLASS="rich-list-picklist-button">
+ <DIV CLASS="rich-list-picklist-button-content">
+ <IMG WIDTH="15" HEIGHT="15"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/pickList/arrow_remove_all.gif/"/> Remove All
+ </DIV>
+ </DIV>
+ </DIV>
+ </DIV>
+ </TD>
+ <TD>
+ <DIV CLASS="rich-picklist-target-items" STYLE="width: 140px; height: 140px;">
+ <TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="0"
+ CLASS="rich-picklist-body">
+ <TR>
+ <TD STYLE="border: 0px none ; padding: 0px;">
+ <BR _MOZ_DIRTY="" TYPE="_moz"/>
+ </TD>
+ </TR>
+ </TABLE>
+ </DIV>
+ <BR _MOZ_DIRTY="" TYPE="_moz"/>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/progressBar.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/progressBar.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/progressBar.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/progressBar.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/progressBar.xhtml.xml 2008-10-23 09:24:48 UTC (rev 11096)
@@ -0,0 +1,20 @@
+<tests>
+ <test id="progressBar">
+ <DIV
+ CLASS="rich-progress-bar-block rich-progress-bar-width rich-progress-bar-shell"
+ STYLE="height: 13px; text-align: left;">
+ <DIV CLASS="rich-progress-bar-height rich-progress-bar-uploaded null"
+ STYLE="height: 13px; width: 60%;">
+ <DIV
+ STYLE="height: 13px; font-weight: bold; position: relative; text-align: center;"> #{progressBarBean.currentValue} %
+ </DIV>
+ </DIV>
+ <DIV><BR STYLE="-moz-user-modify: read-write;"/>
+
+ </DIV>
+ <DIV><BR STYLE="-moz-user-modify: read-write;"/>
+
+ </DIV>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/progressBar.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml 2008-10-23 08:21:25 UTC (rev 11095)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml 2008-10-23 09:24:48 UTC (rev 11096)
@@ -1,31 +1,61 @@
<!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:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://richfaces.org/rich">
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
<head>
</head>
<body>
-<!-- Scrollable Data Table component -->
- <rich:scrollableDataTable rowKeyVar="rkv" frozenColCount="1"
- height="150px" width="700px" rows="5" columnClasses="col"
- sortMode="single">
- <rich:column>
- <f:facet name="header">
- <h:outputText styleClass="headerText" value="Car" />
- </f:facet>
- <h:outputText value="Car1" />
- </rich:column>
- <rich:column>
- <f:facet name="header">
- <h:outputText styleClass="headerText" value="Model" />
- </f:facet>
- <h:outputText value="Model1" />
- </rich:column>
- </rich:scrollableDataTable>
+<f:view>
+<rich:scrollableDataTable id="scrollableDataTable" rowKeyVar="rkv" frozenColCount="1"
+ height="400px" width="700px" id="carList" rows="40"
+ columnClasses="col" value="#{dataTableScrollerBean.allCars}"
+ var="category" sortMode="single"
+ binding="#{dataTableScrollerBean.table}"
+ sortOrder="#{dataTableScrollerBean.order}"
+ selection="#{dataTableScrollerBean.selection}">
+
+ <rich:column id="make">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="Make" />
+ </f:facet>
+ <h:outputText value="#{category.make}" />
+ </rich:column>
+ <rich:column id="model">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="Model" />
+ </f:facet>
+ <h:outputText value="#{category.model}" />
+ </rich:column>
+ <rich:column id="price">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="Price" />
+ </f:facet>
+ <h:outputText value="#{category.price}" />
+ </rich:column>
+ <rich:column id="mileage">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="Mileage" />
+ </f:facet>
+ <h:outputText value="#{category.mileage}" />
+ </rich:column>
+ <rich:column width="200px" id="vin">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="VIN" />
+ </f:facet>
+ <h:outputText value="#{category.vin}" />
+ </rich:column>
+ <rich:column id="stock">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="Stock" />
+ </f:facet>
+ <h:outputText value="#{category.stock}" />
+ </rich:column>
+ </rich:scrollableDataTable>
+</f:view>
</body>
</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml 2008-10-23 09:24:48 UTC (rev 11096)
@@ -0,0 +1,160 @@
+<tests>
+ <test id="scrollableDataTable">
+ <TABLE>
+ <TR>
+ <TD>
+ <DIV CLASS="dr-table-hidden" STYLE="width: 700px; height: 400px;">
+ <TABLE WIDTH="700" ROWKEYVAR="rkv" FROZENCOLCOUNT="1" ID="carList"
+ ROWS="40" COLUMNCLASSES="col" VALUE="#{dataTableScrollerBean.allCars}"
+ VAR="category" SORTMODE="single" BINDING="#{dataTableScrollerBean.table}"
+ SORTORDER="#{dataTableScrollerBean.order}" SELECTION="#{dataTableScrollerBean.selection}"
+ CLASS="dr-table rich-table">
+ <COLGROUP SPAN="6">
+ </COLGROUP>
+ <THEAD>
+ <TR CLASS="dr-table-subheader rich-table-subheader">
+ <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
+ SCOP="col">
+ <SPAN CLASS="headerText"> Make </SPAN>
+ </TD>
+ <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
+ SCOP="col">
+ <SPAN CLASS="headerText"> Model </SPAN>
+ </TD>
+ <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
+ SCOP="col">
+ <SPAN CLASS="headerText"> Price </SPAN>
+ </TD>
+ <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
+ SCOP="col">
+ <SPAN CLASS="headerText"> Mileage </SPAN>
+ </TD>
+ <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
+ SCOP="col">
+ <SPAN CLASS="headerText"> VIN </SPAN>
+ </TD>
+ <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
+ SCOP="col">
+ <SPAN CLASS="headerText"> Stock </SPAN>
+ </TD>
+ </TR>
+ </THEAD>
+ <TBODY>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD CLASS="dr-table-cell rich-table-cell" ID="make">
+ <SPAN> #{category.make} </SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" ID="model">
+ <SPAN> #{category.model} </SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" ID="price">
+ <SPAN> #{category.price} </SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" ID="mileage">
+ <SPAN> #{category.mileage} </SPAN>
+ </TD>
+ <TD WIDTH="200" CLASS="dr-table-cell rich-table-cell" ID="vin">
+ <SPAN> #{category.vin} </SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" ID="stock">
+ <SPAN> #{category.stock} </SPAN>
+ </TD>
+ </TR>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD CLASS="dr-table-cell rich-table-cell" ID="make">
+ <SPAN> #{category.make} </SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" ID="model">
+ <SPAN> #{category.model} </SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" ID="price">
+ <SPAN> #{category.price} </SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" ID="mileage">
+ <SPAN> #{category.mileage} </SPAN>
+ </TD>
+ <TD WIDTH="200" CLASS="dr-table-cell rich-table-cell" ID="vin">
+ <SPAN> #{category.vin} </SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" ID="stock">
+ <SPAN> #{category.stock} </SPAN>
+ </TD>
+ </TR>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD CLASS="dr-table-cell rich-table-cell" ID="make">
+ <SPAN> #{category.make} </SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" ID="model">
+ <SPAN> #{category.model} </SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" ID="price">
+ <SPAN> #{category.price} </SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" ID="mileage">
+ <SPAN> #{category.mileage} </SPAN>
+ </TD>
+ <TD WIDTH="200" CLASS="dr-table-cell rich-table-cell" ID="vin">
+ <SPAN> #{category.vin} </SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" ID="stock">
+ <SPAN> #{category.stock} </SPAN>
+ </TD>
+ </TR>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD CLASS="dr-table-cell rich-table-cell" ID="make">
+ <SPAN> #{category.make} </SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" ID="model">
+ <SPAN> #{category.model} </SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" ID="price">
+ <SPAN> #{category.price} </SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" ID="mileage">
+ <SPAN> #{category.mileage} </SPAN>
+ </TD>
+ <TD WIDTH="200" CLASS="dr-table-cell rich-table-cell" ID="vin">
+ <SPAN> #{category.vin} </SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" ID="stock">
+ <SPAN> #{category.stock} </SPAN>
+ </TD>
+ </TR>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD CLASS="dr-table-cell rich-table-cell" ID="make">
+ <SPAN> #{category.make} </SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" ID="model">
+ <SPAN> #{category.model} </SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" ID="price">
+ <SPAN> #{category.price} </SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" ID="mileage">
+ <SPAN> #{category.mileage} </SPAN>
+ </TD>
+ <TD WIDTH="200" CLASS="dr-table-cell rich-table-cell" ID="vin">
+ <SPAN> #{category.vin} </SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" ID="stock">
+ <SPAN> #{category.stock} </SPAN>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </DIV>
+ </TD>
+ <TD>
+ <DIV STYLE="overflow: scroll; width: 17px; height: 100%;">
+ </DIV>
+ </TD>
+ </TR>
+ <TR>
+ <TD>
+ <DIV STYLE="overflow: scroll; width: 100%; height: 17px;">
+ </DIV>
+ </TD>
+ </TR>
+ </TABLE>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-23 08:21:25 UTC (rev 11095)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-23 09:24:48 UTC (rev 11096)
@@ -244,15 +244,15 @@
}
public void testPickList() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/pickList.xhtml");//$NON-NLS-1$
}
public void testProgressBar() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/progressBar.xhtml");//$NON-NLS-1$
}
public void testScrollableDataTable() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/scrollableDataTable.xhtml");//$NON-NLS-1$
}
public void testSeparator() throws Throwable {
17 years, 2 months
JBoss Tools SVN: r11095 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test: src/org/jboss/tools/jsf/vpe/richfaces/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-10-23 04:21:25 -0400 (Thu, 23 Oct 2008)
New Revision: 11095
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenu.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenuGroup.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenuGroup.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenuItem.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenuItem.xhtml.xml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/paint2D.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenu.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2810, tests for rich:panelMenu, rich:panelMenuGroup, rich:panelMenuItem.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/paint2D.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/paint2D.xhtml 2008-10-22 23:44:58 UTC (rev 11094)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/paint2D.xhtml 2008-10-23 08:21:25 UTC (rev 11095)
@@ -10,7 +10,9 @@
</head>
<body>
+<f:view>
<rich:paint2D id="paint2D" width="300" height="120" data="#{paintData}"
format="png" paint="#{paintBean.paint}" />
+</f:view>
</body>
</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenu.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenu.xhtml 2008-10-22 23:44:58 UTC (rev 11094)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenu.xhtml 2008-10-23 08:21:25 UTC (rev 11095)
@@ -10,75 +10,62 @@
</head>
<body>
-<!-- Panel Menu component -->
-<h:panelGrid columns="2" columnClasses="cols" width="100%">
- <rich:panelMenu style="width:200px" mode="ajax"
+<f:view>
+ <rich:panelMenu id="panelMenu" style="width:200px" mode="ajax"
iconExpandedGroup="disc" iconCollapsedGroup="disc"
iconExpandedTopGroup="chevronUp" iconGroupTopPosition="right"
- iconCollapsedTopGroup="chevronDown" iconCollapsedTopPosition="right">
- <!-- Panel Menu Group component -->
+ iconCollapsedTopGroup="chevronDown">
+ <rich:panelMenuItem label="Item 1">
+ <f:param name="current" value="Item 1"/>
+ </rich:panelMenuItem>
<rich:panelMenuGroup label="Group 1">
- <rich:panelMenuItem label="Item 1.1"
- action="#{panelMenu.updateCurrent}">
+ <rich:panelMenuItem label="Item 1.1">
<f:param name="current" value="Item 1.1" />
</rich:panelMenuItem>
- <!-- Panel Menu Item component -->
- <rich:panelMenuItem label="Item 1.2"
- action="#{panelMenu.updateCurrent}">
+ <rich:panelMenuItem label="Item 1.2">
<f:param name="current" value="Item 1.2" />
</rich:panelMenuItem>
- <rich:panelMenuItem label="Item 1.3"
- action="#{panelMenu.updateCurrent}">
+ <rich:panelMenuItem label="Item 1.3">
<f:param name="current" value="Item 1.3" />
</rich:panelMenuItem>
</rich:panelMenuGroup>
<rich:panelMenuGroup label="Group 2">
- <rich:panelMenuItem label="Item 2.1"
- action="#{panelMenu.updateCurrent}">
+ <rich:panelMenuItem label="Item 2.1">
<f:param name="current" value="Item 2.1" />
</rich:panelMenuItem>
- <rich:panelMenuItem label="Item 2.2"
- action="#{panelMenu.updateCurrent}">
+ <rich:panelMenuItem label="Item 2.2">
<f:param name="current" value="Item 2.2" />
</rich:panelMenuItem>
- <rich:panelMenuItem label="Item 2.3"
- action="#{panelMenu.updateCurrent}">
+ <rich:panelMenuItem label="Item 2.3">
<f:param name="current" value="Item 2.3" />
</rich:panelMenuItem>
<rich:panelMenuGroup label="Group 2.4">
- <rich:panelMenuItem label="Item 2.4.1"
- action="#{panelMenu.updateCurrent}">
+ <rich:panelMenuItem label="Item 2.4.1">
<f:param name="current" value="Item 2.4.1" />
</rich:panelMenuItem>
- <rich:panelMenuItem label="Item 2.4.2"
- action="#{panelMenu.updateCurrent}">
+ <rich:panelMenuItem label="Item 2.4.2">
<f:param name="current" value="Item 2.4.2" />
</rich:panelMenuItem>
- <rich:panelMenuItem label="Item 2.4.3"
- action="#{panelMenu.updateCurrent}">
+ <rich:panelMenuItem label="Item 2.4.3">
<f:param name="current" value="Item 2.4.3" />
</rich:panelMenuItem>
</rich:panelMenuGroup>
- <rich:panelMenuItem label="Item 2.5"
- action="#{panelMenu.updateCurrent}">
+ <rich:panelMenuItem label="Item 2.5">
<f:param name="current" value="Item 2.5" />
</rich:panelMenuItem>
</rich:panelMenuGroup>
<rich:panelMenuGroup label="Group 3">
- <rich:panelMenuItem label="Item 3.1"
- action="#{panelMenu.updateCurrent}">
+ <rich:panelMenuItem label="Item 3.1">
<f:param name="current" value="Item 3.1" />
</rich:panelMenuItem>
- <rich:panelMenuItem label="Item 3.2"
- action="#{panelMenu.updateCurrent}">
+ <rich:panelMenuItem label="Item 3.2">
<f:param name="current" value="Item 3.2" />
</rich:panelMenuItem>
- <rich:panelMenuItem label="Item 3.3"
- action="#{panelMenu.updateCurrent}">
+ <rich:panelMenuItem label="Item 3.3">
<f:param name="current" value="Item 3.3" />
</rich:panelMenuItem>
</rich:panelMenuGroup>
</rich:panelMenu>
-</h:panelGrid>
+</f:view>
</body>
</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenu.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenu.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenu.xhtml.xml 2008-10-23 08:21:25 UTC (rev 11095)
@@ -0,0 +1,89 @@
+<tests>
+ <test id="panelMenu">
+ <DIV BORDER="0" STYLE="margin-top: 3px; width: 200px;">
+ <DIV CLASS="dr-pmenu-top-self-div" BORDER="0" STYLE="margin-top: 3px;"
+ VPESUPPORT="panelMenuItem">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ STYLE="margin-top: 3px;" CLASS="rich-pmenu-item rich-pmenu-top-item">
+ <TR CLASS="">
+ <TD STYLE="" CLASS="dr-pmenu-nowrap">
+ <IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuItem/spacer.gif/" />
+ <IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuItem/points.gif/"
+ CLASS="rich-pmenu-item-icon rich-pmenu-top-item-icon" />
+ </TD>
+ <TD STYLE="width: 100%;" CLASS="rich-pmenu-item-label rich-pmenu-top-item-label"> Item 1</TD>
+ <TD STYLE="" CLASS="dr-pmenu-nowrap">
+ <IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuItem/spacer.gif/" />
+ </TD>
+ </TR>
+ </TABLE>
+ </DIV>
+ <DIV>
+ <DIV VPESUPPORT="panelMenuGroup" VPE-USER-TOGGLE-ID="1"
+ CLASS="dr-pmenu-group-div dr-pmenu-top-group-div">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ CLASS="dr-pmenu-top-group rich-pmenu-group" STYLE="margin-top: 3px;">
+ <TR>
+ <TD VPE-USER-TOGGLE-ID="1" CLASS="rich-pmenu-top-group-self-icon">
+ <IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuGroup/spacer.gif/" />
+ </TD>
+ <TD STYLE="width: 100%;" VPE-USER-TOGGLE-ID="1"
+ CLASS="rich-pmenu-top-group-self-label"> Group 1</TD>
+ <TD VPE-USER-TOGGLE-ID="1"
+ CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
+ <IMG
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuGroup/chevronDown.gif/" />
+ </TD>
+ </TR>
+ </TABLE>
+ </DIV>
+ </DIV>
+ <DIV>
+ <DIV VPESUPPORT="panelMenuGroup" VPE-USER-TOGGLE-ID="2"
+ CLASS="dr-pmenu-group-div dr-pmenu-top-group-div">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ CLASS="dr-pmenu-top-group rich-pmenu-group" STYLE="margin-top: 3px;">
+ <TR>
+ <TD VPE-USER-TOGGLE-ID="2" CLASS="rich-pmenu-top-group-self-icon">
+ <IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuGroup/spacer.gif/" />
+ </TD>
+ <TD STYLE="width: 100%;" VPE-USER-TOGGLE-ID="2"
+ CLASS="rich-pmenu-top-group-self-label"> Group 2</TD>
+ <TD VPE-USER-TOGGLE-ID="2"
+ CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
+ <IMG
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuGroup/chevronDown.gif/" />
+ </TD>
+ </TR>
+ </TABLE>
+ </DIV>
+ </DIV>
+ <DIV>
+ <DIV VPESUPPORT="panelMenuGroup" VPE-USER-TOGGLE-ID="3"
+ CLASS="dr-pmenu-group-div dr-pmenu-top-group-div">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ CLASS="dr-pmenu-top-group rich-pmenu-group" STYLE="margin-top: 3px;">
+ <TR>
+ <TD VPE-USER-TOGGLE-ID="3" CLASS="rich-pmenu-top-group-self-icon">
+ <IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuGroup/spacer.gif/" />
+ </TD>
+ <TD STYLE="width: 100%;" VPE-USER-TOGGLE-ID="3"
+ CLASS="rich-pmenu-top-group-self-label"> Group 3</TD>
+ <TD VPE-USER-TOGGLE-ID="3"
+ CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
+ <IMG
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuGroup/chevronDown.gif/" />
+ </TD>
+ </TR>
+ </TABLE>
+ </DIV>
+ </DIV>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenu.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenuGroup.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenuGroup.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenuGroup.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenuGroup.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenuGroup.xhtml.xml 2008-10-23 08:21:25 UTC (rev 11095)
@@ -0,0 +1,25 @@
+<tests>
+ <test id="panelMenuGroup">
+ <DIV>
+ <DIV VPESUPPORT="panelMenuGroup" VPE-USER-TOGGLE-ID="1"
+ CLASS="dr-pmenu-group-div dr-pmenu-top-group-div">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ CLASS="dr-pmenu-top-group rich-pmenu-group" STYLE="margin-top: 3px;">
+ <TR>
+ <TD VPE-USER-TOGGLE-ID="1" CLASS="rich-pmenu-top-group-self-icon">
+ <IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuGroup/spacer.gif/"/>
+ </TD>
+ <TD STYLE="width: 100%;" VPE-USER-TOGGLE-ID="1"
+ CLASS="rich-pmenu-top-group-self-label"> Group 1</TD>
+ <TD VPE-USER-TOGGLE-ID="1"
+ CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
+ <IMG
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuGroup/chevronDown.gif/"/>
+ </TD>
+ </TR>
+ </TABLE>
+ </DIV>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenuGroup.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenuItem.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenuItem.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenuItem.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenuItem.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenuItem.xhtml.xml 2008-10-23 08:21:25 UTC (rev 11095)
@@ -0,0 +1,24 @@
+<tests>
+ <test id="panelMenuItem">
+ <DIV CLASS="dr-pmenu-top-self-div" BORDER="0" STYLE="margin-top: 3px;"
+ VPESUPPORT="panelMenuItem">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ STYLE="margin-top: 3px;" CLASS="rich-pmenu-item rich-pmenu-top-item">
+ <TR CLASS="">
+ <TD STYLE="" CLASS="dr-pmenu-nowrap">
+ <IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuItem/spacer.gif/"/>
+ <IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuItem/points.gif/"
+ CLASS="rich-pmenu-item-icon rich-pmenu-top-item-icon"/>
+ </TD>
+ <TD STYLE="width: 100%;" CLASS="rich-pmenu-item-label rich-pmenu-top-item-label"> Item 1 </TD>
+ <TD STYLE="" CLASS="dr-pmenu-nowrap">
+ <IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuItem/spacer.gif/"/>
+ </TD>
+ </TR>
+ </TABLE>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenuItem.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-22 23:44:58 UTC (rev 11094)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-23 08:21:25 UTC (rev 11095)
@@ -232,15 +232,15 @@
}
public void testPanelMenu() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/panelMenu.xhtml");//$NON-NLS-1$
}
public void testPanelMenuGroup() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/panelMenuGroup.xhtml");//$NON-NLS-1$
}
public void testPanelMenuItem() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/panelMenuItem.xhtml");//$NON-NLS-1$
}
public void testPickList() throws Throwable {
17 years, 2 months
JBoss Tools SVN: r11091 - branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-22 19:23:37 -0400 (Wed, 22 Oct 2008)
New Revision: 11091
Removed:
branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IDeployableServer.java
branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IJBossServerConstants.java
branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IJBossServerPublisher.java
branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IJBossServerRuntime.java
branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IPollerFailureHandler.java
branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IServerStatePoller.java
branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/UnitedServerListener.java
branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/UnitedServerListenerManager.java
Log:
fix jboss tools compilation errors in as component
Deleted: branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IDeployableServer.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IDeployableServer.java 2008-10-22 23:22:51 UTC (rev 11090)
+++ branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IDeployableServer.java 2008-10-22 23:23:37 UTC (rev 11091)
@@ -1,39 +0,0 @@
-/**
- * JBoss, a Division of Red Hat
- * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
-* This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ide.eclipse.as.core.server;
-
-import org.eclipse.wst.server.core.IServer;
-import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
-
-/**
- *
- * @author rob.stryker(a)jboss.com
- */
-public interface IDeployableServer {
- public static final String DEPLOY_DIRECTORY = "org.jboss.ide.eclipse.as.core.server.deployDirectory";
- public static final String TEMP_DEPLOY_DIRECTORY = "org.jboss.ide.eclipse.as.core.server.tempDeployDirectory";
-
- public String getDeployDirectory();
- public String getConfigDirectory();
- public ServerAttributeHelper getAttributeHelper();
- public IServer getServer();
-}
Deleted: branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IJBossServerConstants.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IJBossServerConstants.java 2008-10-22 23:22:51 UTC (rev 11090)
+++ branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IJBossServerConstants.java 2008-10-22 23:23:37 UTC (rev 11091)
@@ -1,66 +0,0 @@
-/**
- * JBoss, a Division of Red Hat
- * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
-* This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ide.eclipse.as.core.server;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-/**
- *
- * @author Rob Stryker
- *
- */
-public interface IJBossServerConstants {
-
- // Launch configuration constants
- public static final String JBOSS_SERVER_HOME_DIR = "jboss.server.home.dir";
- public static final String JBOSS_SERVER_BASE_DIR = "jboss.server.base.dir";
- public static final String JBOSS_SERVER_NAME = "jboss.server.name";
- public static final String JBOSS_HOME_DIR = "jboss.home.dir";
-
- // Folder constants
- public static final String DEFAULT_SERVER_NAME = "default";
- public static final String DEPLOY = "deploy";
- public static final String SERVER = "server";
-
- // Property keys stored in the server object
- public static final String SERVER_USERNAME = "org.jboss.ide.eclipse.as.core.server.userName";
- public static final String SERVER_PASSWORD = "org.jboss.ide.eclipse.as.core.server.password";
- public static final String JNDI_PORT = "org.jboss.ide.eclipse.as.core.server.jndiPort";
- public static final String WEB_PORT = "org.jboss.ide.eclipse.as.core.server.webPort";
- public static final String JNDI_PORT_DETECT = "org.jboss.ide.eclipse.as.core.server.jndiPortAutoDetect";
- public static final String WEB_PORT_DETECT= "org.jboss.ide.eclipse.as.core.server.webPortAutoDetect";
- public static final String JNDI_PORT_DETECT_XPATH = "org.jboss.ide.eclipse.as.core.server.jndiPortAutoDetect.XPath";
- public static final String WEB_PORT_DETECT_XPATH = "org.jboss.ide.eclipse.as.core.server.webPortAutoDetect.XPath";
- public static final String JNDI_PORT_DEFAULT_XPATH = "Ports" + Path.SEPARATOR + "JNDI";
- public static final String WEB_PORT_DEFAULT_XPATH = "Ports" + Path.SEPARATOR + "JBoss Web";
- public static final int JNDI_DEFAULT_PORT = 1099;
- public static final int JBOSS_WEB_DEFAULT_PORT = 8080;
-
-
- // Poller constants
- public static final String STARTUP_POLLER_KEY = "org.jboss.ide.eclipse.as.core.server.attributes.startupPollerKey";
- public static final String SHUTDOWN_POLLER_KEY = "org.jboss.ide.eclipse.as.core.server.attributes.shutdownPollerKey";
- public static final String DEFAULT_STARTUP_POLLER = "org.jboss.ide.eclipse.as.core.runtime.server.JMXPoller";
- public static final String DEFAULT_SHUTDOWN_POLLER = "org.jboss.ide.eclipse.as.core.runtime.server.processTerminatedPoller";
-
-}
Deleted: branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IJBossServerPublisher.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IJBossServerPublisher.java 2008-10-22 23:22:51 UTC (rev 11090)
+++ branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IJBossServerPublisher.java 2008-10-22 23:23:37 UTC (rev 11091)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ide.eclipse.as.core.server;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.model.IModuleResourceDelta;
-import org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel.EventLogTreeItem;
-
-/**
- *
- * @author Rob Stryker
- *
- */
-public interface IJBossServerPublisher {
- public static final int NO_PUBLISH = 0;
- public static final int INCREMENTAL_PUBLISH = 1;
- public static final int FULL_PUBLISH = 2;
- public static final int REMOVE_PUBLISH = 3;
-
- // pre-publish
- public boolean accepts(IServer server, IModule[] module);
-
-
- public IStatus publishModule(IServer server, IModule[] module,
- int publishType, IModuleResourceDelta[] delta,
- EventLogTreeItem log, IProgressMonitor monitor) throws CoreException;
-
- // post publish
- public int getPublishState();
-}
Deleted: branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IJBossServerRuntime.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IJBossServerRuntime.java 2008-10-22 23:22:51 UTC (rev 11090)
+++ branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IJBossServerRuntime.java 2008-10-22 23:23:37 UTC (rev 11091)
@@ -1,49 +0,0 @@
-/**
- * JBoss, a Division of Red Hat
- * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
-* This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ide.eclipse.as.core.server;
-
-import java.util.HashMap;
-
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.wst.server.core.IRuntime;
-
-/**
- *
- * @author Rob Stryker
- */
-public interface IJBossServerRuntime {
- public static String PROPERTY_VM_ID = "PROPERTY_VM_ID";
- public static String PROPERTY_VM_TYPE_ID = "PROPERTY_VM_TYPE_ID";
-
- public static String PROPERTY_CONFIGURATION_NAME = "org.jboss.ide.eclipse.as.core.runtime.configurationName";
-
- public IRuntime getRuntime();
- public IVMInstall getVM();
- public void setVM(IVMInstall install);
- public String getJBossConfiguration();
- public void setJBossConfiguration(String config);
-
- // for startup
- public String getDefaultRunArgs();
- public String getDefaultRunVMArgs();
- public HashMap<String, String> getDefaultRunEnvVars();
-}
Deleted: branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IPollerFailureHandler.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IPollerFailureHandler.java 2008-10-22 23:22:51 UTC (rev 11090)
+++ branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IPollerFailureHandler.java 2008-10-22 23:23:37 UTC (rev 11091)
@@ -1,33 +0,0 @@
-/**
- * JBoss, a Division of Red Hat
- * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
-* This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ide.eclipse.as.core.server;
-
-import java.util.List;
-
-/**
- * @author rob.stryker <rob.stryker(a)redhat.com>
- *
- */
-public interface IPollerFailureHandler {
- public boolean accepts(IServerStatePoller poller, String action, List<String> requiredProperties);
- public void handle(IServerStatePoller poller, String action, List<String> requiredProperties);
-}
Deleted: branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IServerStatePoller.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IServerStatePoller.java 2008-10-22 23:22:51 UTC (rev 11090)
+++ branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/IServerStatePoller.java 2008-10-22 23:23:37 UTC (rev 11091)
@@ -1,95 +0,0 @@
-/**
- * JBoss, a Division of Red Hat
- * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
-* This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ide.eclipse.as.core.server;
-
-import java.util.List;
-import java.util.Properties;
-
-import org.eclipse.wst.server.core.IServer;
-import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
-import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
-
-/**
- * A server state poller will
- * @author Rob Stryker
- *
- */
-public interface IServerStatePoller {
-
- public static final boolean SERVER_UP = true;
- public static final boolean SERVER_DOWN = false;
-
- public static final int CANCEL = 0;
- public static final int TIMEOUT_REACHED = 1;
- public static final int SUCCESS = 2;
- public static final int FAILED = 3;
-
- /**
- * Force a successful state change if we timeout
- */
- public static final int TIMEOUT_BEHAVIOR_SUCCEED = 0;
-
- /**
- * Ignore the timeout and let the wst tools handle the timeout
- */
- public static final int TIMEOUT_BEHAVIOR_IGNORE = 1;
-
- /**
- * Force a failure upon timeout
- */
- public static final int TIMEOUT_BEHAVIOR_FAIL = 2;
-
- public ServerStatePollerType getPollerType();
- public void setPollerType(ServerStatePollerType type);
- public void beginPolling(IServer server, boolean expectedState, PollThread pt); // expected to launch own thread
- public IServer getServer();
- public boolean isComplete() throws PollingException, RequiresInfoException;
- public boolean getState() throws PollingException, RequiresInfoException;
- public void cleanup(); // clean up any resources / processes. Will ALWAYS be called
- public List<String> getRequiredProperties();
- public void failureHandled(Properties properties);
-
- /**
- * Cancel the polling.
- * @param type CANCEL or TIMEOUT_REACHED
- */
- public void cancel(int type);
-
- /**
- * Returns a TIMEOUT_BEHAVIOR_XXX constant
- * @return
- */
- public int getTimeoutBehavior();
-
- public class PollingException extends Exception {
- private static final long serialVersionUID = -7830978018908940551L;
- public PollingException(String message) {super(message);}
- }
-
- public class RequiresInfoException extends Exception {
- private static final long serialVersionUID = 5050044329807740335L;
- private boolean checked = false;
- public RequiresInfoException(String msg) {super(msg);}
- public void setChecked() { this.checked = true; }
- public boolean getChecked() { return this.checked; }
- }
-}
Deleted: branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/UnitedServerListener.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/UnitedServerListener.java 2008-10-22 23:22:51 UTC (rev 11090)
+++ branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/UnitedServerListener.java 2008-10-22 23:23:37 UTC (rev 11091)
@@ -1,45 +0,0 @@
-/**
- * JBoss, a Division of Red Hat
- * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
-* This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ide.eclipse.as.core.server;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerEvent;
-
-/**
- * This is a stub superclass which can be used
- * to override only those methods you care about.
- *
- * @author Rob Stryker
- *
- */
-public class UnitedServerListener {
-
- public void init(IServer server) {}
- public void serverAdded(IServer server) {}
- public void serverChanged(IServer server) {}
- public void serverRemoved(IServer server) {}
- public void serverChanged(ServerEvent event) {}
- public void publishStarted(IServer server){}
- public void publishFinished(IServer server, IStatus status){}
- public void cleanUp(IServer server) {}
-}
Deleted: branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/UnitedServerListenerManager.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/UnitedServerListenerManager.java 2008-10-22 23:22:51 UTC (rev 11090)
+++ branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/server/UnitedServerListenerManager.java 2008-10-22 23:23:37 UTC (rev 11091)
@@ -1,117 +0,0 @@
-/**
- * JBoss, a Division of Red Hat
- * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
-* This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ide.eclipse.as.core.server;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.server.core.IPublishListener;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerLifecycleListener;
-import org.eclipse.wst.server.core.IServerListener;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerEvent;
-
-/**
- * The UnitedServerListenerManager keeps an array of
- * UnitedServerListeners. The manager registers itself as
- * a listener for all server operations and passes
- * all requests to every UnitedServerListener that's been
- * added to the model.
- *
- * @author Rob Stryker
- *
- */
-public class UnitedServerListenerManager implements
- IServerLifecycleListener, IServerListener, IPublishListener {
- protected static UnitedServerListenerManager instance;
- public static UnitedServerListenerManager getDefault() {
- if( instance == null )
- instance = new UnitedServerListenerManager();
- return instance;
- }
-
- protected ArrayList<UnitedServerListener> list;
- protected UnitedServerListenerManager() {
- list = new ArrayList<UnitedServerListener>();
- ServerCore.addServerLifecycleListener(this);
- IServer[] allServers = ServerCore.getServers();
- for( int i = 0; i < allServers.length; i++ ) {
- allServers[i].addServerListener(this);
- allServers[i].addPublishListener(this);
- }
- }
-
-
- public void addListener(UnitedServerListener listener) {
- if( !list.contains(listener)) {
- list.add(listener);
- IServer[] allServers = ServerCore.getServers();
- for( int i = 0; i < allServers.length; i++ )
- listener.init(allServers[i]);
- }
- }
- public void removeListener(UnitedServerListener listener) {
- list.remove(listener);
- IServer[] allServers = ServerCore.getServers();
- for( int i = 0; i < allServers.length; i++ )
- listener.cleanUp(allServers[i]);
- }
-
- public void serverAdded(IServer server) {
- server.addServerListener(this);
- server.addPublishListener(this);
- for( Iterator<UnitedServerListener> i = list.iterator(); i.hasNext(); ) {
- i.next().serverAdded(server);
- }
- }
- public void serverChanged(IServer server) {
- for( Iterator<UnitedServerListener> i = list.iterator(); i.hasNext(); ) {
- i.next().serverChanged(server);
- }
- }
- public void serverRemoved(IServer server) {
- server.removeServerListener(this);
- server.removePublishListener(this);
- for( Iterator<UnitedServerListener> i = list.iterator(); i.hasNext(); ) {
- i.next().serverRemoved(server);
- }
- }
-
- public void serverChanged(ServerEvent event) {
- for( Iterator<UnitedServerListener> i = list.iterator(); i.hasNext(); ) {
- i.next().serverChanged(event);
- }
- }
-
- public void publishStarted(IServer server) {
- for( Iterator<UnitedServerListener> i = list.iterator(); i.hasNext(); )
- i.next().publishStarted(server);
- }
-
- public void publishFinished(IServer server, IStatus status) {
- for( Iterator<UnitedServerListener> i = list.iterator(); i.hasNext(); )
- i.next().publishFinished(server, status);
- }
-
-}
17 years, 2 months
JBoss Tools SVN: r11087 - in trunk: jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/column and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2008-10-22 15:43:46 -0400 (Wed, 22 Oct 2008)
New Revision: 11087
Added:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/column/
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/column/sortable.gif
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataGridTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesExtendedDataTableTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SourceDomUtil.java
Log:
Method getClasses extracted from VpePanelGridCreator and placed into new class VpeClassUtil.
Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/column/sortable.gif
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/column/sortable.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnTemplate.java 2008-10-22 16:30:12 UTC (rev 11086)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnTemplate.java 2008-10-22 19:43:46 UTC (rev 11087)
@@ -10,15 +10,20 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.richfaces.template;
+import java.util.ArrayList;
import java.util.List;
import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces;
import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.mapping.VpeDomMapping;
+import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.editor.util.SourceDomUtil;
+import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMNode;
@@ -26,30 +31,52 @@
import org.w3c.dom.Node;
public class RichFacesColumnTemplate extends VpeAbstractTemplate {
+ private static final String HEADER_ICON_STYLE = "vertical-align:middle;";
+ private static final String SORTABLE_PATH = "column/sortable.gif"; //$NON-NLS-1$
public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) {
Element sourceElement = (Element)sourceNode;
+ VpeCreationData creationData;
+ boolean visible = !RichFaces.VAL_FALSE.equals(sourceElement.getAttribute(RichFaces.ATTR_VISIBLE));
+
+ if (visible) {
+ nsIDOMElement td = visualDocument.createElement(HTML.TAG_TD);
+ String columnClass = getColumnClass(sourceElement);
+ ComponentUtil.copyAttributes(sourceNode, td);
+ td.setAttribute(HTML.ATTR_CLASS, columnClass);
+ creationData = new VpeCreationData(td);
+
+ // Create mapping to Encode body
+ VpeChildrenInfo tdInfo = new VpeChildrenInfo(td);
+ List<Node> children = ComponentUtil.getChildren(sourceElement,true);
+ for (Node child : children) {
+ tdInfo.addSourceChild(child);
+ }
+ creationData.addChildrenInfo(tdInfo);
+
+ } else {
+ creationData = new VpeCreationData(null);
+ creationData.setChildrenInfoList(new ArrayList<VpeChildrenInfo>(0));
+ }
- nsIDOMElement td = visualDocument.createElement(HTML.TAG_TD);
+ return creationData;
+ }
+
+ private String getColumnClass(Element sourceElement) {
+ String columnClass;
if(isHeader(sourceElement)) {
- td.setAttribute(HTML.ATTR_CLASS, "dr-table-headercell rich-table-headercell"); //$NON-NLS-1$
+ columnClass = "dr-table-headercell rich-table-headercell"; //$NON-NLS-1$
} else if(isFooter(sourceElement)) {
- td.setAttribute(HTML.ATTR_CLASS, "dr-table-footercell rich-table-footercell"); //$NON-NLS-1$
+ columnClass = "dr-table-footercell rich-table-footercell"; //$NON-NLS-1$
} else {
- td.setAttribute(HTML.ATTR_CLASS, "dr-table-cell rich-table-cell"); //$NON-NLS-1$
+ columnClass = "dr-table-cell rich-table-cell"; //$NON-NLS-1$
}
- ComponentUtil.copyAttributes(sourceNode, td);
- VpeCreationData creationData = new VpeCreationData(td);
-
- // Create mapping to Encode body
- VpeChildrenInfo tdInfo = new VpeChildrenInfo(td);
- List<Node> children = ComponentUtil.getChildren(sourceElement,true);
- for (Node child : children) {
- tdInfo.addSourceChild(child);
+
+ String styleClass = sourceElement.getAttribute(RichFaces.ATTR_STYLE_CLASS);
+ if (styleClass != null) {
+ columnClass += " " + styleClass; //$NON-NLS-1$
}
- creationData.addChildrenInfo(tdInfo);
-
- return creationData;
+ return columnClass;
}
private boolean isHeader(Element sourceElement) {
@@ -73,14 +100,56 @@
}
@Override
- public void removeAttribute(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMNode visualNode, Object data, String name) {
- nsIDOMElement visualElement = (nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
- visualElement.removeAttribute(name);
+ public boolean isRecreateAtAttrChange(VpePageContext pageContext,
+ Element sourceElement, nsIDOMDocument visualDocument,
+ nsIDOMElement visualNode, Object data, String name, String value) {
+ return true;
}
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#getNodeForUptate(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMNode, java.lang.Object)
+ */
@Override
- public void setAttribute(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMNode visualNode, Object data, String name, String value) {
- nsIDOMElement visualElement = (nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
- visualElement.setAttribute(name, value);
+ public Node getNodeForUptate(VpePageContext pageContext, Node sourceNode,
+ nsIDOMNode visualNode, Object data) {
+ /* XXX: The implementation is a little tricky, it returns first n-th parent
+ * that has a nodeMapping. */
+
+ final VpeDomMapping domMapping = pageContext.getDomMapping();
+ SourceDomUtil.getParentHavingDomMapping(sourceNode, domMapping);
+ final Node parent = SourceDomUtil.getParentHavingDomMapping(sourceNode, domMapping);
+
+ if (parent != null) {
+ return parent;
+ } else {
+ return sourceNode;
+ }
}
+
+ /** Creates <code>IMG</code> tag if it is specified by <code><rich:column></code>
+ * attributes.
+ * @param pageContext
+ *
+ * @param column source <code><rich:column></code> element
+ * @param visualDocument Mozilla's Visual Document
+ * @return <code>IMG</code> tag if it is necessary, <code>null</code> otherwise */
+ public static nsIDOMElement getHeaderIcon(VpePageContext pageContext, Element column, nsIDOMDocument visualDocument) {
+ String sortable = ComponentUtil.getAttribute(column, RichFaces.ATTR_SORTABLE);
+ String sortBy = column.getAttribute(RichFaces.ATTR_SORT_BY);
+ if (RichFaces.VAL_TRUE.equals(sortable) || sortBy != null) {
+ nsIDOMElement img = visualDocument.createElement(HTML.TAG_IMG);
+ String sortIcon = column.getAttribute(RichFaces.ATTR_SORT_ICON);
+ if (sortIcon != null) {
+ sortIcon = VpeStyleUtil.addFullPathToImgSrc(sortIcon, pageContext, true);
+ sortIcon = sortIcon.replace('\\', '/');
+ img.setAttribute(HTML.ATTR_SRC, sortIcon);
+ } else {
+ ComponentUtil.setImg(img, SORTABLE_PATH);
+ }
+ img.setAttribute(HTML.ATTR_STYLE, HEADER_ICON_STYLE);
+ return img;
+ } else {
+ return null;
+ }
+ }
}
\ No newline at end of file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataGridTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataGridTemplate.java 2008-10-22 16:30:12 UTC (rev 11086)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataGridTemplate.java 2008-10-22 19:43:46 UTC (rev 11087)
@@ -63,7 +63,7 @@
nsIDOMElement thead = visualDocument.createElement(HTML.TAG_THEAD);
table.appendChild(thead);
String headerClass = (String) sourceElement.getAttribute(RichFaces.ATTR_HEADER_CLASS);
- encodeTableHeaderOrFooterFacet(creationData, thead, columnsLength, visualDocument, header,
+ encodeTableHeaderOrFooterFacet(pageContext, creationData, thead, columnsLength, visualDocument, header,
"dr-table-header rich-table-header", //$NON-NLS-1$
"dr-table-header-continue rich-table-header-continue", //$NON-NLS-1$
"dr-table-headercell rich-table-headercell", //$NON-NLS-1$
@@ -76,7 +76,7 @@
nsIDOMElement tfoot = visualDocument.createElement(HTML.TAG_TFOOT);
table.appendChild(tfoot);
String footerClass = (String) sourceElement.getAttribute(RichFaces.ATTR_FOOTER_CLASS);
- encodeTableHeaderOrFooterFacet(creationData, tfoot, columnsLength, visualDocument, footer,
+ encodeTableHeaderOrFooterFacet(pageContext, creationData, tfoot, columnsLength, visualDocument, footer,
"dr-table-footer rich-table-footer", //$NON-NLS-1$
"dr-table-footer-continue rich-table-footer-continue", //$NON-NLS-1$
"dr-table-footercell rich-table-footercell", //$NON-NLS-1$
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java 2008-10-22 16:30:12 UTC (rev 11086)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java 2008-10-22 19:43:46 UTC (rev 11087)
@@ -73,7 +73,7 @@
table.appendChild(thead);
String headerClass = (String) sourceElement.getAttribute(RichFaces.ATTR_HEADER_CLASS);
if(header != null) {
- encodeTableHeaderOrFooterFacet(creationData, thead, columnsLength, visualDocument, header,
+ encodeTableHeaderOrFooterFacet(pageContext, creationData, thead, columnsLength, visualDocument, header,
"dr-table-header rich-table-header", //$NON-NLS-1$
"dr-table-header-continue rich-table-header-continue", //$NON-NLS-1$
"dr-table-headercell rich-table-headercell", //$NON-NLS-1$
@@ -86,7 +86,7 @@
if(styleClass!=null) {
tr.setAttribute(HTML.ATTR_CLASS, styleClass);
}
- encodeHeaderOrFooterFacets(creationData, tr, visualDocument, columnsHeaders,
+ encodeHeaderOrFooterFacets(pageContext, creationData, tr, visualDocument, columnsHeaders,
"dr-table-subheadercell rich-table-subheadercell", //$NON-NLS-1$
headerClass, RichFaces.NAME_FACET_HEADER, HTML.TAG_TD);
}
@@ -106,12 +106,12 @@
if(styleClass!=null) {
tr.setAttribute(HTML.ATTR_CLASS, styleClass);
}
- encodeHeaderOrFooterFacets(creationData, tr, visualDocument, columnsFooters,
+ encodeHeaderOrFooterFacets(pageContext, creationData, tr, visualDocument, columnsFooters,
"dr-table-subfootercell rich-table-subfootercell", //$NON-NLS-1$
footerClass, RichFaces.NAME_FACET_FOOTER, HTML.TAG_TD);
}
if (footer != null) {
- encodeTableHeaderOrFooterFacet(creationData, tfoot, columnsLength, visualDocument, footer,
+ encodeTableHeaderOrFooterFacet(pageContext, creationData, tfoot, columnsLength, visualDocument, footer,
"dr-table-footer rich-table-footer", //$NON-NLS-1$
"dr-table-footer-continue rich-table-footer-continue", //$NON-NLS-1$
"dr-table-footercell rich-table-footercell", //$NON-NLS-1$
@@ -148,10 +148,10 @@
trInfo.addSourceChild(child);
} else if(child.getNodeName().endsWith(RichFaces.TAG_COLUMN_GROUP)) {
- RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(creationData, (Element)child, visualDocument, tbody);
+ RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(pageContext, creationData, (Element)child, visualDocument, tbody);
tr = null;
} else if(child.getNodeName().endsWith(RichFaces.TAG_SUB_TABLE)) {
- RichFacesSubTableTemplate.DEFAULT_INSTANCE.encode(creationData, (Element)child, visualDocument, tbody);
+ RichFacesSubTableTemplate.DEFAULT_INSTANCE.encode(pageContext, creationData, (Element)child, visualDocument, tbody);
tr = null;
} else {
VpeChildrenInfo childInfo = new VpeChildrenInfo(tbody);
@@ -190,9 +190,12 @@
}
- public static void encodeHeaderOrFooterFacets(VpeCreationData creationData, nsIDOMElement parentTr, nsIDOMDocument visualDocument, ArrayList<Element> headersOrFooters, String skinCellClass, String headerClass, String facetName, String element) {
+ public static void encodeHeaderOrFooterFacets(VpePageContext pageContext, VpeCreationData creationData,
+ nsIDOMElement parentTr, nsIDOMDocument visualDocument, ArrayList<Element> headersOrFooters,
+ String skinCellClass, String headerClass, String facetName, String element) {
for (Element column : headersOrFooters) {
String classAttribute = facetName + "Class"; //$NON-NLS-1$
+
String columnHeaderClass = column.getAttribute(classAttribute);
nsIDOMElement td = visualDocument.createElement(element);
parentTr.appendChild(td);
@@ -205,19 +208,28 @@
}
Node facetBody = ComponentUtil.getFacet(column, facetName,true);
- VpeChildrenInfo child = new VpeChildrenInfo(td);
- child.addSourceChild(facetBody);
- creationData.addChildrenInfo(child);
+ nsIDOMElement span = visualDocument.createElement(HTML.TAG_SPAN);
+ td.appendChild(span);
+ if (RichFaces.NAME_FACET_HEADER.equals(facetName)) {
+ nsIDOMElement icon = RichFacesColumnTemplate.getHeaderIcon(pageContext, column, visualDocument);
+ if (icon != null) {
+ td.appendChild(icon);
+ }
+ }
+
+ VpeChildrenInfo childrenInfo = new VpeChildrenInfo(span);
+ childrenInfo.addSourceChild(facetBody);
+ creationData.addChildrenInfo(childrenInfo);
}
}
- protected void encodeTableHeaderOrFooterFacet(VpeCreationData creationData, nsIDOMElement parentTheadOrTfood, int columns, nsIDOMDocument visualDocument, Node facetBody, String skinFirstRowClass, String skinRowClass, String skinCellClass, String facetBodyClass, String element) {
+ protected void encodeTableHeaderOrFooterFacet(final VpePageContext pageContext, VpeCreationData creationData, nsIDOMElement parentTheadOrTfood, int columns, nsIDOMDocument visualDocument, Node facetBody, String skinFirstRowClass, String skinRowClass, String skinCellClass, String facetBodyClass, String element) {
boolean isColumnGroup = facetBody.getNodeName().endsWith(RichFaces.TAG_COLUMN_GROUP);
boolean isSubTable = facetBody.getNodeName().endsWith(RichFaces.TAG_SUB_TABLE);
if(isColumnGroup) {
- RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(creationData, (Element)facetBody, visualDocument, parentTheadOrTfood);
+ RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(pageContext, creationData, (Element)facetBody, visualDocument, parentTheadOrTfood);
} else if(isSubTable) {
- RichFacesSubTableTemplate.DEFAULT_INSTANCE.encode(creationData, (Element)facetBody, visualDocument, parentTheadOrTfood);
+ RichFacesSubTableTemplate.DEFAULT_INSTANCE.encode(pageContext, creationData, (Element)facetBody, visualDocument, parentTheadOrTfood);
} else {
nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR);
parentTheadOrTfood.appendChild(tr);
@@ -359,7 +371,7 @@
}
}
}
-
+
super.validate(pageContext, sourceNode, visualDocument, data);
}
@@ -374,4 +386,4 @@
nsIDOMElement visualElement = (nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
visualElement.setAttribute(name, value);
}
-}
\ No newline at end of file
+}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesExtendedDataTableTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesExtendedDataTableTemplate.java 2008-10-22 16:30:12 UTC (rev 11086)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesExtendedDataTableTemplate.java 2008-10-22 19:43:46 UTC (rev 11087)
@@ -175,7 +175,7 @@
String headerClass = (String) sourceElement
.getAttribute(HEADER_CLASS);
if (header != null) {
- encodeTableHeaderOrFooterFacet(creationData, thead,
+ encodeTableHeaderOrFooterFacet(pageContext, creationData, thead,
columnsLength, visualDocument, header,
DR_TABLE_HEADER_RICH_TABLE_HEADER,
DR_TABLE_HEADER_CONTINUE_RICH_TABLE_HEADER_CONTINUE,
@@ -226,7 +226,7 @@
footerClass);
}
if (footer != null) {
- encodeTableHeaderOrFooterFacet(creationData, tfoot,
+ encodeTableHeaderOrFooterFacet(pageContext, creationData, tfoot,
columnsLength, visualDocument, footer,
DR_TABLE_FOOTER_RICH_TABLE_FOOTER,
DR_TABLE_FOOTER_CONTINUE_RICH_TABLE_FOOTER_CONTINUE,
@@ -268,12 +268,12 @@
}
trInfo.addSourceChild(child);
} else if (child.getNodeName().endsWith(COLUMN_GROUP)) {
- RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(
+ RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(pageContext,
creationData, (Element) child, visualDocument,
tbody);
tr = null;
} else if (child.getNodeName().endsWith(SUB_TABLE)) {
- RichFacesSubTableTemplate.DEFAULT_INSTANCE.encode(
+ RichFacesSubTableTemplate.DEFAULT_INSTANCE.encode(pageContext,
creationData, (Element) child, visualDocument,
tbody);
tr = null;
@@ -469,7 +469,7 @@
* @param facetBodyClass
* @param element
*/
- protected void encodeTableHeaderOrFooterFacet(VpeCreationData creationData,
+ protected void encodeTableHeaderOrFooterFacet(final VpePageContext pageContext, VpeCreationData creationData,
nsIDOMElement parentTheadOrTfood, int columns,
nsIDOMDocument visualDocument, Element facetBody,
String skinFirstRowClass, String skinRowClass,
@@ -478,10 +478,10 @@
.endsWith(COLUMN_GROUP);
boolean isSubTable = facetBody.getNodeName().endsWith(SUB_TABLE);
if (isColumnGroup) {
- RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(creationData,
+ RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(pageContext, creationData,
facetBody, visualDocument, parentTheadOrTfood);
} else if (isSubTable) {
- RichFacesSubTableTemplate.DEFAULT_INSTANCE.encode(creationData,
+ RichFacesSubTableTemplate.DEFAULT_INSTANCE.encode(pageContext, creationData,
facetBody, visualDocument, parentTheadOrTfood);
} else {
nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java 2008-10-22 16:30:12 UTC (rev 11086)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java 2008-10-22 19:43:46 UTC (rev 11087)
@@ -170,7 +170,7 @@
Element captionFacet = ComponentUtil.getFacet(sourceElement, CAPTION_FACET);
if (null != captionFacet) {
// Creating table caption with facet content
- nsIDOMElement fecetDiv = encodeFacetsToDiv(captionFacet, false, CSS_CAPTION_CLASS, "", creationData, visualDocument);
+ nsIDOMElement fecetDiv = encodeFacetsToDiv(pageContext, captionFacet, false, CSS_CAPTION_CLASS, "", creationData, visualDocument);
captionRow_TD_DIV.appendChild(fecetDiv);
} else {
captionRow_TD_DIV.appendChild(visualDocument.createTextNode(captionLabel));
@@ -199,7 +199,7 @@
// ---------------------buttons------------------------
if (!"none".equalsIgnoreCase(controlsType)) {
- nsIDOMElement controlsDiv = createControlsDiv(creationData, visualDocument, sourceElement);
+ nsIDOMElement controlsDiv = createControlsDiv(pageContext, creationData, visualDocument, sourceElement);
buttonsTD.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
CSS_BUTTON_VALIGN_CLASS);
buttonsTD.setAttribute(HtmlComponentUtil.HTML_ALIGN_ATTR, "center");
@@ -281,7 +281,7 @@
// --------------------------------------------
- nsIDOMElement contentDiv = createResultList(creationData, visualDocument,
+ nsIDOMElement contentDiv = createResultList(pageContext, creationData, visualDocument,
sourceElement);
tr1_TD1.appendChild(contentDiv);
@@ -297,7 +297,7 @@
*
* @return the element
*/
- private nsIDOMElement createControlsDiv( VpeCreationData creationData, nsIDOMDocument visualDocument,
+ private nsIDOMElement createControlsDiv(final VpePageContext pageContext, VpeCreationData creationData, nsIDOMDocument visualDocument,
Element sourceElement) {
String topControlClass = sourceElement.getAttribute(TOP_CONTROL_CLASS);
@@ -329,7 +329,7 @@
Element bottom_control_facet = ComponentUtil.getFacet(sourceElement, BOTTOM_CONTROL_FACET);
if (fastOrderControlsVisible) {
- nsIDOMElement btnTopDiv = createSingleButtonDiv(creationData, visualDocument,
+ nsIDOMElement btnTopDiv = createSingleButtonDiv(pageContext, creationData, visualDocument,
(null == topControlLabel ? TOP_CONTROL_LABEL_DEFAULT
: topControlLabel), TOP_CONTROL_IMG,
showButtonLabels, top_control_facet, CSS_TOP_CONTROL_CLASS, topControlClass);
@@ -337,11 +337,11 @@
}
if (orderControlsVisible) {
- nsIDOMElement btnUpDiv = createSingleButtonDiv(creationData, visualDocument,
+ nsIDOMElement btnUpDiv = createSingleButtonDiv(pageContext, creationData, visualDocument,
(null == upControlLabel ? UP_CONTROL_LABEL_DEFAULT
: upControlLabel), UP_CONTROL_IMG,
showButtonLabels, up_control_facet, CSS_UP_CONTROL_CLASS, upControlClass);
- nsIDOMElement btnDownDiv = createSingleButtonDiv(creationData, visualDocument,
+ nsIDOMElement btnDownDiv = createSingleButtonDiv(pageContext, creationData, visualDocument,
(null == downControlLabel ? DOWN_CONTROL_LABEL_DEFAULT
: downControlLabel), DOWN_CONTROL_IMG,
showButtonLabels, down_control_facet, CSS_DOWN_CONTROL_CLASS, downControlClass);
@@ -350,7 +350,7 @@
}
if (fastOrderControlsVisible) {
- nsIDOMElement btnBottomDiv = createSingleButtonDiv(creationData, visualDocument,
+ nsIDOMElement btnBottomDiv = createSingleButtonDiv(pageContext, creationData, visualDocument,
(null == bottomControlLabel ? BOTTOM_CONTROL_LABEL_DEFAULT
: bottomControlLabel), BOTTOM_CONTROL_IMG,
showButtonLabels, bottom_control_facet, CSS_BOTTOM_CONTROL_CLASS, bottomControlClass);
@@ -375,7 +375,7 @@
*
* @return the ns idom element
*/
- private nsIDOMElement createSingleButtonDiv(VpeCreationData creationData,
+ private nsIDOMElement createSingleButtonDiv(final VpePageContext pageContext, VpeCreationData creationData,
nsIDOMDocument visualDocument, String btnName, String imgName,
boolean showButtonLabels, Element buttonFacet, String cssStyleName,
String customStyleClass) {
@@ -402,7 +402,7 @@
if (null != buttonFacet) {
// Creating button with facet content
- nsIDOMElement fecetDiv = encodeFacetsToDiv(buttonFacet, true, cssStyleName, customStyleClass, creationData, visualDocument);
+ nsIDOMElement fecetDiv = encodeFacetsToDiv(pageContext, buttonFacet, true, cssStyleName, customStyleClass, creationData, visualDocument);
div2.appendChild(fecetDiv);
} else {
a.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, CSS_BUTTON_SELECTION_CLASS);
@@ -431,7 +431,7 @@
*
* @return the element
*/
- private nsIDOMElement createResultList(VpeCreationData creationData, nsIDOMDocument visualDocument,
+ private nsIDOMElement createResultList(final VpePageContext pageContext, VpeCreationData creationData, nsIDOMDocument visualDocument,
Element sourceElement) {
nsIDOMElement contentDiv = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_DIV);
@@ -554,13 +554,13 @@
if (child.getNodeName().endsWith(":column")) {
trInfo.addSourceChild(child);
} else if (child.getNodeName().endsWith(":columnGroup")) {
- RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(
+ RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(pageContext,
creationData, (Element) child, visualDocument,
tbody);
tr = null;
trInfo = null;
} else if (child.getNodeName().endsWith(":subTable")) {
- RichFacesSubTableTemplate.DEFAULT_INSTANCE.encode(
+ RichFacesSubTableTemplate.DEFAULT_INSTANCE.encode(pageContext,
creationData, (Element) child, visualDocument,
tbody);
tr = null;
@@ -598,7 +598,7 @@
*
* @return the element
*/
- private nsIDOMElement encodeFacetsToDiv(Element facetBody,
+ private nsIDOMElement encodeFacetsToDiv(final VpePageContext pageContext, Element facetBody,
boolean isControlFacet, String cssStyleName,
String customStyleClass, VpeCreationData creationData,
nsIDOMDocument visualDocument) {
@@ -613,10 +613,10 @@
.endsWith(":columnGroup");
boolean isSubTable = facetBody.getNodeName().endsWith(":subTable");
if (isColumnGroup) {
- RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(creationData,
+ RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(pageContext, creationData,
facetBody, visualDocument, tbody);
} else if (isSubTable) {
- RichFacesSubTableTemplate.DEFAULT_INSTANCE.encode(creationData,
+ RichFacesSubTableTemplate.DEFAULT_INSTANCE.encode(pageContext, creationData,
facetBody, visualDocument, tbody);
} else {
nsIDOMElement tr = visualDocument
@@ -675,7 +675,7 @@
* @param facetBodyClass
* @param element
*/
- private void encodeTableHeaderOrFooterFacet(VpeCreationData creationData,
+ private void encodeTableHeaderOrFooterFacet(final VpePageContext pageContext, VpeCreationData creationData,
nsIDOMElement parentTheadOrTfood, int columns,
nsIDOMDocument visualDocument, Element facetBody,
String skinFirstRowClass, String skinCellClass,
@@ -684,10 +684,10 @@
.endsWith(":columnGroup");
boolean isSubTable = facetBody.getNodeName().endsWith(":subTable");
if (isColumnGroup) {
- RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(creationData,
+ RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(pageContext, creationData,
facetBody, visualDocument, parentTheadOrTfood);
} else if (isSubTable) {
- RichFacesSubTableTemplate.DEFAULT_INSTANCE.encode(creationData,
+ RichFacesSubTableTemplate.DEFAULT_INSTANCE.encode(pageContext, creationData,
facetBody, visualDocument, parentTheadOrTfood);
} else {
nsIDOMElement tr = visualDocument
@@ -727,6 +727,9 @@
/**
*
* @param creationData
+ /**
+ *
+ * @param creationData
* @param parentTr
* @param visualDocument
* @param headersOrFooters
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java 2008-10-22 16:30:12 UTC (rev 11086)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java 2008-10-22 19:43:46 UTC (rev 11087)
@@ -165,7 +165,7 @@
String headerClass = (String) sourceElement
.getAttribute(HEADER_CLASS);
if (header != null) {
- encodeTableHeaderOrFooterFacet(creationData, thead,
+ encodeTableHeaderOrFooterFacet(pageContext, creationData, thead,
columnsLength, visualDocument, header,
"dr-table-header rich-table-header",
"dr-table-header-continue rich-table-header-continue",
@@ -215,7 +215,7 @@
footerClass, FOOTER, HtmlComponentUtil.HTML_TAG_TD);
}
if (footer != null) {
- encodeTableHeaderOrFooterFacet(creationData, tfoot,
+ encodeTableHeaderOrFooterFacet(pageContext, creationData, tfoot,
columnsLength, visualDocument, footer,
"dr-table-footer rich-table-footer",
"dr-table-footer-continue rich-table-footer-continue",
@@ -259,12 +259,12 @@
}
trInfo.addSourceChild(child);
} else if (child.getNodeName().endsWith(":columnGroup")) {
- RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(
+ RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(pageContext,
creationData, (Element) child, visualDocument,
tbody);
tr = null;
} else if (child.getNodeName().endsWith(":subTable")) {
- RichFacesSubTableTemplate.DEFAULT_INSTANCE.encode(
+ RichFacesSubTableTemplate.DEFAULT_INSTANCE.encode(pageContext,
creationData, (Element) child, visualDocument,
tbody);
tr = null;
@@ -370,7 +370,7 @@
* @param facetBodyClass
* @param element
*/
- protected void encodeTableHeaderOrFooterFacet(VpeCreationData creationData,
+ protected void encodeTableHeaderOrFooterFacet(final VpePageContext pageContext, VpeCreationData creationData,
nsIDOMElement parentTheadOrTfood, int columns,
nsIDOMDocument visualDocument, Element facetBody,
String skinFirstRowClass, String skinRowClass,
@@ -379,10 +379,10 @@
.endsWith(":columnGroup");
boolean isSubTable = facetBody.getNodeName().endsWith(":subTable");
if (isColumnGroup) {
- RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(creationData,
+ RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(pageContext, creationData,
facetBody, visualDocument, parentTheadOrTfood);
} else if (isSubTable) {
- RichFacesSubTableTemplate.DEFAULT_INSTANCE.encode(creationData,
+ RichFacesSubTableTemplate.DEFAULT_INSTANCE.encode(pageContext, creationData,
facetBody, visualDocument, parentTheadOrTfood);
} else {
nsIDOMElement tr = visualDocument
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java 2008-10-22 16:30:12 UTC (rev 11086)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java 2008-10-22 19:43:46 UTC (rev 11087)
@@ -34,22 +34,10 @@
public class RichFacesSubTableTemplate extends VpeAbstractTemplate {
- /**
- *
- */
- private static final String VAL_TRUE = "true";
- /**
- *
- */
- private static final String ATTR_BREAK_BEFORE = "breakBefore"; //$NON-NLS-1$
- /**
- *
- */
- private static final String COLUMN_CLASSES_EXPRESSION = "{@columnClasses}"; //$NON-NLS-1$
- /**
- *
- */
- private static final String ROW_CLASSES_EXPRESSION = "{@rowClasses}"; //$NON-NLS-1$
+ private static final String COLUMN_CLASSES_EXPRESSION =
+ "{@" + RichFaces.ATTR_COLUMN_CLASSES + "}"; //$NON-NLS-1$ //$NON-NLS-2$
+ private static final String ROW_CLASSES_EXPRESSION =
+ "{@" + RichFaces.ATTR_ROW_CLASSES + "}"; //$NON-NLS-1$ //$NON-NLS-2$
private static final String DEAFAULT_CELL_CLASS = "dr-subtable-cell rich-subtable-cell"; //$NON-NLS-1$
private static List<String> rowClasses;
private static List<String> columnClasses;
@@ -69,15 +57,20 @@
* @param parentVisualNode
* @return
*/
- public VpeCreationData encode(VpeCreationData creationData, final Element sourceElement, final nsIDOMDocument visualDocument, final nsIDOMElement parentVisualNode) {
+ public VpeCreationData encode(final VpePageContext pageContext, VpeCreationData creationData, final Element sourceElement,
+ final nsIDOMDocument visualDocument, nsIDOMElement parentVisualNode) {
+
if(creationData!=null) {
// Encode header
- encodeHeader(creationData, sourceElement, visualDocument, parentVisualNode);
+ encodeHeader(pageContext, creationData, sourceElement, visualDocument, parentVisualNode);
}
initClasses(sourceElement, null);
nsIDOMElement curTr = visualDocument.createElement(HTML.TAG_TR);
+ if (parentVisualNode == null) {
+ parentVisualNode = curTr;
+ }
ComponentUtil.copyAttributes(sourceElement, curTr);
boolean header = false;
@@ -112,7 +105,7 @@
final List<Node> children = ComponentUtil.getChildren(sourceElement);
for (final Node child : children) {
if (child.getNodeName().endsWith(':' + RichFaces.TAG_COLUMN)) {
- final boolean breakBefore = VAL_TRUE.equals( ((Element)child).getAttribute(ATTR_BREAK_BEFORE) );
+ final boolean breakBefore = RichFaces.VAL_TRUE.equals( ((Element)child).getAttribute(RichFaces.ATTR_BREAK_BEFORE) );
if (breakBefore) {
curRow++;
curColumn = 0;
@@ -144,11 +137,11 @@
if(parentVisualNode!=null) {
// Encode footer
- encodeFooter(creationData, sourceElement, visualDocument, parentVisualNode);
+ encodeFooter(pageContext, creationData, sourceElement, visualDocument, parentVisualNode);
}
-
return creationData;
}
+
/** Adds necessary attributes to its children.*/
@Override
@@ -189,19 +182,21 @@
public VpeCreationData create(final VpePageContext pageContext, final Node sourceNode, final nsIDOMDocument visualDocument) {
final Element sourceElement = (Element)sourceNode;
- final VpeCreationData creationData = encode(null, sourceElement, visualDocument, null);
+ final VpeCreationData creationData = encode(pageContext, null, sourceElement, visualDocument, null);
return creationData;
}
- protected void encodeHeader(final VpeCreationData creationData, final Element sourceElement, final nsIDOMDocument visualDocument, final nsIDOMElement parentVisualNode) {
- encodeHeaderOrFooter(creationData, sourceElement, visualDocument, parentVisualNode, "header", "dr-subtable-header rich-subtable-header", "dr-subtable-headercell rich-subtable-headercell");
+ protected void encodeHeader(final VpePageContext pageContext, final VpeCreationData creationData, final Element sourceElement, final nsIDOMDocument visualDocument, final nsIDOMElement parentVisualNode) {
+ encodeHeaderOrFooter(pageContext, creationData, sourceElement, visualDocument, parentVisualNode, "header", "dr-subtable-header rich-subtable-header", "dr-subtable-headercell rich-subtable-headercell");
}
- protected void encodeFooter(final VpeCreationData creationData, final Element sourceElement, final nsIDOMDocument visualDocument, final nsIDOMElement parentVisualNode) {
- encodeHeaderOrFooter(creationData, sourceElement, visualDocument, parentVisualNode, "footer", "dr-subtable-footer rich-subtable-footer", "dr-subtable-footercell rich-subtable-footercell");
+ protected void encodeFooter(final VpePageContext pageContext, final VpeCreationData creationData, final Element sourceElement, final nsIDOMDocument visualDocument, final nsIDOMElement parentVisualNode) {
+ encodeHeaderOrFooter(pageContext, creationData, sourceElement, visualDocument, parentVisualNode, "footer", "dr-subtable-footer rich-subtable-footer", "dr-subtable-footercell rich-subtable-footercell");
}
- protected void encodeHeaderOrFooter(final VpeCreationData creationData, final Element sourceElement, final nsIDOMDocument visualDocument, final nsIDOMElement parentVisualNode, final String facetName, final String trClass, final String tdClass) {
+ protected void encodeHeaderOrFooter(final VpePageContext pageContext, final VpeCreationData creationData,
+ final Element sourceElement, final nsIDOMDocument visualDocument, final nsIDOMElement parentVisualNode,
+ final String facetName, final String trClass, final String tdClass) {
final ArrayList<Element> columns = RichFacesDataTableTemplate.getColumns(sourceElement);
final ArrayList<Element> columnsHeaders = RichFacesDataTableTemplate.getColumnsWithFacet(columns, facetName);
if(!columnsHeaders.isEmpty()) {
@@ -211,7 +206,7 @@
if(styleClass!=null) {
tr.setAttribute(HTML.ATTR_CLASS, styleClass);
}
- RichFacesDataTableTemplate.encodeHeaderOrFooterFacets(creationData, tr, visualDocument, columnsHeaders,
+ RichFacesDataTableTemplate.encodeHeaderOrFooterFacets(pageContext, creationData, tr, visualDocument, columnsHeaders,
tdClass,
null, facetName, HTML.TAG_TD);
}
@@ -307,4 +302,15 @@
final nsIDOMElement visualNode, final Object data, final String name, final String value) {
return true;
}
-}
\ No newline at end of file
+
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#getNodeForUptate(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMNode, java.lang.Object)
+ */
+ @Override
+ public Node getNodeForUptate(VpePageContext pageContext, Node sourceNode,
+ nsIDOMNode visualNode, Object data) {
+ Node parent = sourceNode.getParentNode();
+ return parent;
+ }
+}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java 2008-10-22 16:30:12 UTC (rev 11086)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java 2008-10-22 19:43:46 UTC (rev 11087)
@@ -17,67 +17,73 @@
* @author Sergey Dzmitrovich
*/
public class RichFaces {
-
/**
* The Constructor.
*/
private RichFaces() {
}
- /** jsf tags which are used with richFaces. */
- public static final String TAG_COLUMN = "column"; //$NON-NLS-1$
- public static final String TAG_COLUMNS = "columns"; //$NON-NLS-1$
- /** The Constant TAG_FACET. */
- public static final String TAG_FACET = "facet"; //$NON-NLS-1$
- public static final String TAG_COLUMN_GROUP = "columnGroup"; //$NON-NLS-1$
- public static final String TAG_SUB_TABLE = "subTable"; //$NON-NLS-1$
+ /** The Constant ATTR_ADD_CONTROL_LABEL. */
+ public static final String ATTR_ADD_CONTROL_LABEL = "addControlLabel"; //$NON-NLS-1$
+ public static final String ATTR_ALIGN = "align"; //$NON-NLS-1$
+ public static final String ATTR_BREAK_BEFORE = "breakBefore"; //$NON-NLS-1$
- /** The Constant ATTR_NAME. */
- public static final String ATTR_NAME = "name"; //$NON-NLS-1$
- /** The Constant ATTR_STYLE. */
- public static final String ATTR_STYLE = "style"; //$NON-NLS-1$
- /** The Constant ATTR_WIDTH. */
- public static final String ATTR_WIDTH = "width"; //$NON-NLS-1$
- /** The Constant ATTR_VALUE. */
- public static final String ATTR_VALUE = "value"; //$NON-NLS-1$
+ public static final String ATTR_CAPTION_CLASS = "captionClass"; //$NON-NLS-1$
+ public static final String ATTR_CAPTION_STYLE = "captionStyle"; //$NON-NLS-1$
+ /** The Constant ATTR_COLUMN_CLASSES. */
+ public static final String ATTR_COLUMN_CLASSES = "columnClasses"; //$NON-NLS-1$
+ public static final String ATTR_COLUMNS = "columns"; //$NON-NLS-1$
+ public static final String ATTR_COLUMNS_WIDTH = "columnsWidth"; //$NON-NLS-1$
+
+ /** The Constant ATTR_CONTROLS_TYPE. */
+ public static final String ATTR_CONTROLS_TYPE = "controlsType"; //$NON-NLS-1$
+ /** The Constant ATTR_DEFAULT_LABEL. */
+ public static final String ATTR_DEFAULT_LABEL = "defaultLabel"; //$NON-NLS-1$
+ public static final String ATTR_DIRECTION = "direction"; //$NON-NLS-1$
+ public static final String ATTR_DISABLED = "disabled";//$NON-NLS-1$
+ public static final String ATTR_ELEMENTS = "elements"; //$NON-NLS-1$
+ public static final String ATTR_FOOTER_CLASS = "footerClass"; //$NON-NLS-1$
+ public static final String ATTR_HEADER_CLASS = "headerClass"; //$NON-NLS-1$
+ /** The Constant ATTR_INPUT_CLASS. */
+ public static final String ATTR_INPUT_CLASS = "inputClass"; //$NON-NLS-1$
/** The Constant ATTR_INPUT_SIZE. */
public static final String ATTR_INPUT_SIZE = "inputSize"; //$NON-NLS-1$
- /** The Constant ATTR_INPUT_CLASS. */
- public static final String ATTR_INPUT_CLASS = "inputClass"; //$NON-NLS-1$
/** The Constant ATTR_INPUT_STYLE. */
public static final String ATTR_INPUT_STYLE = "inputStyle"; //$NON-NLS-1$
+ public static final String ATTR_LIST_HEIGHT = "listHeight"; //$NON-NLS-1$
+ public static final String ATTR_LIST_WIDTH = "listWidth"; //$NON-NLS-1$
+ /** The Constant ATTR_NAME. */
+ public static final String ATTR_NAME = "name"; //$NON-NLS-1$
+ public static final String ATTR_POPUP = "popup";//$NON-NLS-1$
/** The Constant ATTR_ROW_CLASSES. */
public static final String ATTR_ROW_CLASSES = "rowClasses"; //$NON-NLS-1$
- /** The Constant ATTR_COLUMN_CLASSES. */
- public static final String ATTR_COLUMN_CLASSES = "columnClasses"; //$NON-NLS-1$
- /** The Constant ATTR_CONTROLS_TYPE. */
- public static final String ATTR_CONTROLS_TYPE = "controlsType"; //$NON-NLS-1$
+ public static final String ATTR_SELECT_ITEM_LABEL = "itemLabel"; //$NON-NLS-1$
+ public static final String ATTR_SELECT_ITEM_VALUE = "itemValue"; //$NON-NLS-1$
/** The Constant ATTR_SHOW_BUTTON_LABELS. */
public static final String ATTR_SHOW_BUTTON_LABELS = "showButtonLabels"; //$NON-NLS-1$
- /** The Constant ATTR_DEFAULT_LABEL. */
- public static final String ATTR_DEFAULT_LABEL = "defaultLabel"; //$NON-NLS-1$
- /** The Constant ATTR_ADD_CONTROL_LABEL. */
- public static final String ATTR_ADD_CONTROL_LABEL = "addControlLabel"; //$NON-NLS-1$
+ public static final String ATTR_SORT_BY = "sortBy"; //$NON-NLS-1$
+ public static final String ATTR_SORT_ICON = "sortIcon"; //$NON-NLS-1$
+ public static final String ATTR_SORTABLE = "sortable"; //$NON-NLS-1$
+ /** The Constant ATTR_STYLE. */
+ public static final String ATTR_STYLE = "style"; //$NON-NLS-1$
/** The Constant ATTR_STYLE_CLASS. */
public static final String ATTR_STYLE_CLASS = "styleClass"; //$NON-NLS-1$
- public static final String ATTR_SELECT_ITEM_LABEL = "itemLabel"; //$NON-NLS-1$
- public static final String ATTR_SELECT_ITEM_VALUE = "itemValue"; //$NON-NLS-1$
- public static final String ATTR_DISABLED = "disabled";//$NON-NLS-1$
- public static final String ATTR_POPUP = "popup";//$NON-NLS-1$
- public static final String ATTR_DIRECTION = "direction"; //$NON-NLS-1$
- public static final String ATTR_ALIGN = "align"; //$NON-NLS-1$
- public static final String ATTR_LIST_WIDTH = "listWidth"; //$NON-NLS-1$
- public static final String ATTR_LIST_HEIGHT = "listHeight"; //$NON-NLS-1$
- public static final String ATTR_COLUMNS_WIDTH = "columnsWidth"; //$NON-NLS-1$
- public static final String ATTR_HEADER_CLASS = "headerClass"; //$NON-NLS-1$
- public static final String ATTR_FOOTER_CLASS = "footerClass"; //$NON-NLS-1$
- public static final String ATTR_CAPTION_CLASS = "captionClass"; //$NON-NLS-1$
- public static final String ATTR_CAPTION_STYLE = "captionStyle"; //$NON-NLS-1$
- public static final String ATTR_COLUMNS = "columns"; //$NON-NLS-1$
- public static final String ATTR_ELEMENTS = "elements"; //$NON-NLS-1$
-
+ /** The Constant ATTR_VALUE. */
+ public static final String ATTR_VALUE = "value"; //$NON-NLS-1$
+ public static final String ATTR_VISIBLE = "visible"; //$NON-NLS-1$
+ /** The Constant ATTR_WIDTH. */
+ public static final String ATTR_WIDTH = "width"; //$NON-NLS-1$
+ public static final String NAME_FACET_CAPTION = "caption"; //$NON-NLS-1$
+ public static final String NAME_FACET_FOOTER = "footer"; //$NON-NLS-1$
public static final String NAME_FACET_HEADER = "header"; //$NON-NLS-1$
- public static final String NAME_FACET_FOOTER = "footer"; //$NON-NLS-1$
- public static final String NAME_FACET_CAPTION = "caption"; //$NON-NLS-1$
-
+ /** jsf tags which are used with richFaces. */
+ public static final String TAG_COLUMN = "column"; //$NON-NLS-1$
+ public static final String TAG_COLUMN_GROUP = "columnGroup"; //$NON-NLS-1$
+ public static final String TAG_COLUMNS = "columns"; //$NON-NLS-1$
+ /** The Constant TAG_FACET. */
+ public static final String TAG_FACET = "facet"; //$NON-NLS-1$
+ public static final String TAG_SUB_TABLE = "subTable"; //$NON-NLS-1$
+
+ public static final String VAL_TRUE = "true"; //$NON-NLS-1$
+ public static final String VAL_FALSE = "false"; //$NON-NLS-1$
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SourceDomUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SourceDomUtil.java 2008-10-22 16:30:12 UTC (rev 11086)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SourceDomUtil.java 2008-10-22 19:43:46 UTC (rev 11087)
@@ -10,6 +10,10 @@
******************************************************************************/
package org.jboss.tools.vpe.editor.util;
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.mapping.VpeDomMapping;
+import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping;
+import org.mozilla.interfaces.nsIDOMNode;
import org.w3c.dom.Node;
public class SourceDomUtil {
@@ -23,4 +27,24 @@
}
return null;
}
+
+
+ /** Finds first n-th parent of <code>sourceNode</code> that has
+ * a linked non-null nodeMaping in <code>domMapping</code>.
+ *
+ * @param domMapping
+ * @param sourceNode
+ * @return first n-th parent of <code>sourceNode</code> that has
+ * a linked non-null nodeMaping in <code>domMapping</code>
+ * or <code>null</code> if there is not any. */
+ public static Node getParentHavingDomMapping(final Node sourceNode, final VpeDomMapping domMapping) {
+ VpeNodeMapping nodeMapping = null;
+ Node parent = sourceNode;
+ do {
+ parent = parent.getParentNode();
+ nodeMapping = domMapping.getNodeMapping(parent);
+ } while (nodeMapping == null && parent != null);
+
+ return parent;
+ }
}
17 years, 2 months
JBoss Tools SVN: r11086 - 21.10.2008 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: aklimkovich
Date: 2008-10-22 12:30:12 -0400 (Wed, 22 Oct 2008)
New Revision: 11086
Added:
trunk/documentation/qa/reports/Tests 21.10.2008/Create_and_run_dif_types_of_projects_22.10.2008.htm
Log:
Added a file remotely
Added: trunk/documentation/qa/reports/Tests 21.10.2008/Create_and_run_dif_types_of_projects_22.10.2008.htm
===================================================================
--- trunk/documentation/qa/reports/Tests 21.10.2008/Create_and_run_dif_types_of_projects_22.10.2008.htm (rev 0)
+++ trunk/documentation/qa/reports/Tests 21.10.2008/Create_and_run_dif_types_of_projects_22.10.2008.htm 2008-10-22 16:30:12 UTC (rev 11086)
@@ -0,0 +1,168 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML><HEAD><TITLE>Execution Report</TITLE>
+<STYLE>H1 {
+ COLOR: #4a5d75; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+H2 {
+ COLOR: #4a5d75; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+TR {
+ BACKGROUND-COLOR: #f5f5f5
+}
+TD {
+ BORDER-RIGHT: dimgray 1px solid; PADDING-RIGHT: 0.5em; BORDER-TOP: dimgray 1px solid; PADDING-LEFT: 0.5em; PADDING-BOTTOM: 0.15em; BORDER-LEFT: dimgray 1px solid; PADDING-TOP: 0.15em; BORDER-BOTTOM: dimgray 1px solid; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+HR {
+ COLOR: #999; BORDER-COLLAPSE: collapse
+}
+BODY {
+ PADDING-RIGHT: 2em; PADDING-LEFT: 2em; FONT-SIZE: 12px; PADDING-BOTTOM: 0em; COLOR: #333; LINE-HEIGHT: 100%; PADDING-TOP: 0em; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; max-width: 55em
+}
+TABLE {
+ BORDER-RIGHT: dimgray 0px solid; BORDER-TOP: dimgray 0px solid; BORDER-LEFT: dimgray 0px solid; COLOR: #4a5d75; BORDER-BOTTOM: dimgray 0px solid; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif
+}
+</STYLE>
+
+<META http-equiv=Content-Type content="text/html; charset=ISO-8859-5">
+<META content="MSHTML 6.00.2900.2180" name=GENERATOR></HEAD>
+<BODY bgColor=#f5f5f5>
+<CENTER>
+<H1>Create and run different types of project</H1>
+<TABLE
+style="BORDER-TOP-WIDTH: 1pt; BORDER-LEFT-WIDTH: 1pt; BORDER-BOTTOM-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"
+cellSpacing=0 cellPadding=4 width="100%" align=center>
+ <TBODY>
+ <TR bgColor=gray>
+ <TD><B>Exec Date</B></TD>
+ <TD><B>Test Name</B></TD>
+ <TD><B>Status</B></TD>
+ <TD><B>Bug Number</B></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating JSF
+ 1.1.02 project with servlet version 2.4.</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating JSF
+ 1.1.02 project with servlet version 2.3.</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating JSF
+ 1.2 - RI with Facelets project with servlet version 2.5.</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating JSF
+ 1.2 project with servlet version 2.5.</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Register
+ applications in the JBoss server</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Running
+ created applications</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Unregister
+ applications from JBoss server</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating
+ Struts 1.1 project with servlet version 2.3.</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating
+ Struts 1.1 project with servlet version 2.4.</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating
+ Struts 1.2 project with servlet version 2.3</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating
+ Struts 1.2 project with servlet version 2.4</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating
+ MyFaces 1.1.4 project (MyFacesKickStart).</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating
+ Struts 1.1 project with servlet version 2.5.</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating
+ Struts 1.2 project with servlet version 2.5</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating JSF
+ 1.2 - RI with Facelets project with servlet version 2.4.</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating JSF
+ 1.2 project with servlet version 2.4.</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white
+size=1> </FONT></TD></TR></TBODY></TABLE></CENTER></BODY></HTML>
17 years, 2 months
JBoss Tools SVN: r11085 - 21.10.2008 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: aklimkovich
Date: 2008-10-22 12:29:36 -0400 (Wed, 22 Oct 2008)
New Revision: 11085
Added:
trunk/documentation/qa/reports/Tests 21.10.2008/Smoke_Test_22.10.2008.htm
Log:
Added a file remotely
Added: trunk/documentation/qa/reports/Tests 21.10.2008/Smoke_Test_22.10.2008.htm
===================================================================
--- trunk/documentation/qa/reports/Tests 21.10.2008/Smoke_Test_22.10.2008.htm (rev 0)
+++ trunk/documentation/qa/reports/Tests 21.10.2008/Smoke_Test_22.10.2008.htm 2008-10-22 16:29:36 UTC (rev 11085)
@@ -0,0 +1,360 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML><HEAD><TITLE>Execution Report</TITLE>
+<STYLE>H1 {
+ COLOR: #4a5d75; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+H2 {
+ COLOR: #4a5d75; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+TR {
+ BACKGROUND-COLOR: #f5f5f5
+}
+TD {
+ BORDER-RIGHT: dimgray 1px solid; PADDING-RIGHT: 0.5em; BORDER-TOP: dimgray 1px solid; PADDING-LEFT: 0.5em; PADDING-BOTTOM: 0.15em; BORDER-LEFT: dimgray 1px solid; PADDING-TOP: 0.15em; BORDER-BOTTOM: dimgray 1px solid; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+HR {
+ COLOR: #999; BORDER-COLLAPSE: collapse
+}
+BODY {
+ PADDING-RIGHT: 2em; PADDING-LEFT: 2em; FONT-SIZE: 12px; PADDING-BOTTOM: 0em; COLOR: #333; LINE-HEIGHT: 100%; PADDING-TOP: 0em; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; max-width: 55em
+}
+TABLE {
+ BORDER-RIGHT: dimgray 0px solid; BORDER-TOP: dimgray 0px solid; BORDER-LEFT: dimgray 0px solid; COLOR: #4a5d75; BORDER-BOTTOM: dimgray 0px solid; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif
+}
+</STYLE>
+
+<META http-equiv=Content-Type content="text/html; charset=ISO-8859-5">
+<META content="MSHTML 6.00.2900.2180" name=GENERATOR></HEAD>
+<BODY bgColor=#f5f5f5>
+<CENTER>
+<H1>Smoke Test</H1>
+<TABLE
+style="BORDER-TOP-WIDTH: 1pt; BORDER-LEFT-WIDTH: 1pt; BORDER-BOTTOM-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"
+cellSpacing=0 cellPadding=4 width="100%" align=center>
+ <TBODY>
+ <TR bgColor=gray>
+ <TD><B>Exec Date</B></TD>
+ <TD><B>Test Name</B></TD>
+ <TD><B>Status</B></TD>
+ <TD><B>Bug Number</B></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Creating new
+ JSF Project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Removeadd
+ JSF Capabilities</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Importing
+ existing JSF Project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Creating new
+ Struts Project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Removeadd
+ Struts Capabilities</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Importing
+ existing Struts Project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Running JSF
+ project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Running
+ Struts project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Outline view
+ and Properties Editor</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Creating JSF
+ JSP page</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Rename
+ faces-config file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Rename JSP
+ file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Rename
+ struts-config.xml</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Rename TLD
+ file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Running Test
+ NG suite runtime 1.2</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Checking
+ generated TestNG report runtime 1.2</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Running Test
+ NG suite runtime 2.0</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: red; BORDER-RIGHT-WIDTH: 1pt">Failed</TD>
+ <TD
+style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">JBIDE-2954</TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Checking
+ generated TestNG report runtime 2.0</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Creating
+ test Seam 1.2 ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Adding new
+ action in test Seam 1.2 ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Creating
+ test Seam 2.0 ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Adding new
+ action in test Seam 2.0 ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Server
+ jboss-seam.jar test</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Creating
+ XHTML page</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Rename XHTML
+ file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Creating
+ test Seam 1.2 war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Creating
+ test Seam 2.0 war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Running test
+ Seam 2.0 ear project on server</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Running test
+ Seam 2.0 war project on server</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Running test
+ Seam 1.2 war project on server</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Running test
+ Seam 1.2 ear project on server</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Deleting
+ test Seam 1.2 projects</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Deleting
+ test Seam 2.0 projects</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Adding new
+ entity in test Seam 2.0 ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Adding new
+ entity in test Seam 1.2 ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Adding new
+ action in test Seam 1.2 war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Adding new
+ action in test Seam 2.0 war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">JSF
+ capabilities after closing,opening a JSF project.</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Adding new
+ entity in test Seam 1.2 war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">22.10.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">Adding new
+ entity in test Seam 2.0 war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white
+size=1> </FONT></TD></TR></TBODY></TABLE></CENTER></BODY></HTML>
17 years, 2 months
JBoss Tools SVN: r11084 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test: src/org/jboss/tools/jsf/vpe/richfaces/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-10-22 11:43:08 -0400 (Wed, 22 Oct 2008)
New Revision: 11084
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panel.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelBar.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelBarItem.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelBarItem.xhtml.xml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panel.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelBar.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2810, tests for rich:panel, rich:panelBar, rich:panelBarItem.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panel.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panel.xhtml 2008-10-22 15:40:40 UTC (rev 11083)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panel.xhtml 2008-10-22 15:43:08 UTC (rev 11084)
@@ -10,12 +10,13 @@
</head>
<body>
-<!-- Panel component -->
- <rich:panel>
+<f:view>
+ <rich:panel id="panel">
<f:facet name="header">
- This rich panel component
+ Panel Header
</f:facet>
- Test rich panel component
+ Panel Content
</rich:panel>
+</f:view>
</body>
</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panel.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panel.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panel.xhtml.xml 2008-10-22 15:43:08 UTC (rev 11084)
@@ -0,0 +1,13 @@
+<tests>
+ <test id="panel">
+ <DIV CLASS="dr-pnl rich-panel">
+ <DIV CLASS="dr-pnl-h rich-panel-header"
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/common/background.gif\);/">
+ <SPAN> Panel Header </SPAN>
+ </DIV>
+ <DIV CLASS="dr-pnl-b rich-panel-body">
+ <SPAN> Panel Content </SPAN>
+ </DIV>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panel.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelBar.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelBar.xhtml 2008-10-22 15:40:40 UTC (rev 11083)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelBar.xhtml 2008-10-22 15:43:08 UTC (rev 11084)
@@ -10,13 +10,12 @@
</head>
<body>
-<!-- Panel bar component -->
- <rich:panelBar height="50" width="500">
+ <rich:panelBar id="panelBar" height="50" width="500">
<rich:panelBarItem label="Panel bar item 1">
- Test panel bar item component
+ Test panel bar item component 1
</rich:panelBarItem>
<rich:panelBarItem label="Panel bar item 2">
- Test panel bar item component
+ Test panel bar item component 2
</rich:panelBarItem>
</rich:panelBar>
</body>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelBar.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelBar.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelBar.xhtml.xml 2008-10-22 15:43:08 UTC (rev 11084)
@@ -0,0 +1,29 @@
+<tests>
+ <test id="panelBar">
+ <TABLE CLASS="dr-pnlbar rich-panelbar dr-pnlbar-b" STYLE="padding: 0px; height: 50px; width: 500px;">
+ <DIV CLASS="dr-pnlbar rich-panelbar dr-pnlbar-ext" STYLE=""
+ VPE-USER-TOGGLE-ID="0">
+ <DIV CLASS="dr-pnlbar-h rich-panelbar-header" STYLE=""
+ VPE-USER-TOGGLE-ID="0"> Panel bar item 1 </DIV>
+ </DIV>
+ <TR HEIGHT="100%" WIDTH="100%">
+ <TD>
+ <TABLE WIDTH="100%" HEIGHT="100%" CELLPADDING="0">
+ <TBODY>
+ <TR>
+ <TD CLASS="dr-pnlbar-c rich-panelbar-content" STYLE="">
+ <SPAN> Test panel bar item component 1 </SPAN>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </TD>
+ </TR>
+ <DIV CLASS="dr-pnlbar rich-panelbar dr-pnlbar-ext" STYLE=""
+ VPE-USER-TOGGLE-ID="1">
+ <DIV CLASS="dr-pnlbar-h rich-panelbar-header" STYLE=""
+ VPE-USER-TOGGLE-ID="1"> Panel bar item 2 </DIV>
+ </DIV>
+ </TABLE>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelBar.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelBarItem.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelBarItem.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelBarItem.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelBarItem.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelBarItem.xhtml.xml 2008-10-22 15:43:08 UTC (rev 11084)
@@ -0,0 +1,9 @@
+<tests>
+ <test id="panelBarItem">
+ <DIV CLASS="dr-pnlbar rich-panelbar dr-pnlbar-ext" STYLE=""
+ VPE-USER-TOGGLE-ID="0">
+ <DIV CLASS="dr-pnlbar-h rich-panelbar-header" STYLE=""
+ VPE-USER-TOGGLE-ID="0"> Panel bar item 1</DIV>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelBarItem.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-22 15:40:40 UTC (rev 11083)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-22 15:43:08 UTC (rev 11084)
@@ -220,15 +220,15 @@
}
public void testPanel() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/panel.xhtml");//$NON-NLS-1$
}
public void testPanelBar() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/panelBar.xhtml");//$NON-NLS-1$
}
public void testPanelBarItem() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/panelBarItem.xhtml");//$NON-NLS-1$
}
public void testPanelMenu() throws Throwable {
17 years, 2 months
JBoss Tools SVN: r11083 - in branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam: internal/core and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-22 11:40:40 -0400 (Wed, 22 Oct 2008)
New Revision: 11083
Modified:
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlComponentDeclaration.java
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamPreferences.java
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPreferenceInitializer.java
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXmlComponentDeclaration.java
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationContext.java
Log:
JBIDE-2958
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlComponentDeclaration.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlComponentDeclaration.java 2008-10-22 15:33:12 UTC (rev 11082)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlComponentDeclaration.java 2008-10-22 15:40:40 UTC (rev 11083)
@@ -43,6 +43,8 @@
*/
public String getClassName();
+ public boolean isClassNameGuessed();
+
/**
* @return string value of 'jndi-name' attribute
*/
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamPreferences.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamPreferences.java 2008-10-22 15:33:12 UTC (rev 11082)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamPreferences.java 2008-10-22 15:40:40 UTC (rev 11083)
@@ -62,6 +62,8 @@
public static final String STATEFUL_COMPONENT_WRONG_SCOPE = createSeverityOption("statefulComponentHasWrongScope"); //$NON-NLS-1$
// If className ('component' element) contains unknown class name then component.xml will be marked.
public static final String UNKNOWN_COMPONENT_CLASS_NAME = createSeverityOption("unknownComponentClassName"); //$NON-NLS-1$
+
+ public static final String UNKNOWN_COMPONENT_CLASS_NAME_GUESS = createSeverityOption("unknownComponentClassNameGuess"); //$NON-NLS-1$
// If component/property@name contains some property name which does not have setter then mark it.
public static final String UNKNOWN_COMPONENT_PROPERTY = createSeverityOption("unknownComponentProperty"); //$NON-NLS-1$
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPreferenceInitializer.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPreferenceInitializer.java 2008-10-22 15:33:12 UTC (rev 11082)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPreferenceInitializer.java 2008-10-22 15:40:40 UTC (rev 11083)
@@ -36,5 +36,8 @@
defaultPreferences.put(SeamPreferences.UNKNOWN_VARIABLE_NAME, SeamPreferences.WARNING);
defaultPreferences.put(SeamPreferences.UNPAIRED_GETTER_OR_SETTER, SeamPreferences.IGNORE);
defaultPreferences.put(SeamPreferences.CHECK_VARS, SeamPreferences.ENABLE);
+
+ //JBIDE-2958 temporary until JBIDE-2957 solved //TODO solve JBIDE-2957
+ defaultPreferences.put(SeamPreferences.UNKNOWN_COMPONENT_CLASS_NAME_GUESS, SeamPreferences.WARNING);
}
}
\ No newline at end of file
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXmlComponentDeclaration.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXmlComponentDeclaration.java 2008-10-22 15:33:12 UTC (rev 11082)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXmlComponentDeclaration.java 2008-10-22 15:40:40 UTC (rev 11083)
@@ -33,6 +33,8 @@
String precedence = null;
String scope = null;
+ boolean isClassNameGuessed = false;
+
public String getAutoCreateAsString() {
return autoCreate;
}
@@ -41,6 +43,10 @@
return className;
}
+ public boolean isClassNameGuessed() {
+ return isClassNameGuessed;
+ }
+
public boolean getInstalledAsString() {
return !"false".equals(installed); //$NON-NLS-1$
}
@@ -83,6 +89,10 @@
setClassName(value == null ? null : value.getValue());
}
+ public void setClassNameGuessed(boolean b) {
+ isClassNameGuessed = b;
+ }
+
public void setAutoCreate(String autoCreate) {
this.autoCreate = autoCreate;
}
@@ -143,6 +153,7 @@
changes = Change.addChange(changes, new Change(this, CLASS, className, xd.className));
className = xd.className;
}
+ this.isClassNameGuessed = xd.isClassNameGuessed;
if(!stringsEqual(autoCreate, xd.autoCreate)) {
changes = Change.addChange(changes, new Change(this, AUTO_CREATE, autoCreate, xd.autoCreate));
autoCreate = xd.autoCreate;
@@ -178,6 +189,10 @@
public Element toXML(Element parent, Properties context) {
Element element = super.toXML(parent, context);
+
+ if(isClassNameGuessed) {
+ element.setAttribute("isClassNameGuessed", "true");
+ }
return element;
}
@@ -192,12 +207,16 @@
setScope(attributes.get(SCOPE));
setClassName(attributes.get(CLASS));
+ isClassNameGuessed = "true".equals(element.getAttribute("isClassNameGuessed"));
+
if(className == null && id instanceof XModelObject) {
XModelObject c = (XModelObject)id;
if(c.getModelEntity().getName().equals("FileSeamComponent12")) {
className = XMLScanner.getImpliedClassName(c, source);
+ isClassNameGuessed = true;
} else {
className = XMLScanner.getDefaultClassName(c);
+ isClassNameGuessed = true;
}
}
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java 2008-10-22 15:33:12 UTC (rev 11082)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java 2008-10-22 15:40:40 UTC (rev 11083)
@@ -173,6 +173,7 @@
String className = getDefaultClassName(c);
if(className != null) {
component.setClassName(className);
+ component.setClassNameGuessed(true);
}
}
component.setScope(new XMLValueInfo(c, ISeamXmlComponentDeclaration.SCOPE));
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2008-10-22 15:33:12 UTC (rev 11082)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2008-10-22 15:40:40 UTC (rev 11083)
@@ -465,7 +465,11 @@
if(isEmptyLocation(location)) {
location = declaration;
}
- addError(UNKNOWN_COMPONENT_CLASS_NAME_MESSAGE_ID, SeamPreferences.UNKNOWN_COMPONENT_CLASS_NAME, new String[]{className}, location, declaration.getResource());
+ if(!declaration.isClassNameGuessed()) {
+ addError(UNKNOWN_COMPONENT_CLASS_NAME_MESSAGE_ID, SeamPreferences.UNKNOWN_COMPONENT_CLASS_NAME, new String[]{className}, location, declaration.getResource());
+ } else {
+ addError(UNKNOWN_COMPONENT_CLASS_NAME_MESSAGE_ID, SeamPreferences.UNKNOWN_COMPONENT_CLASS_NAME_GUESS, new String[]{className}, location, declaration.getResource());
+ }
return;
} else if(!type.isBinary()) {
validationContext.addLinkedCoreResource(componentName, type.getResource().getFullPath());
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationContext.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationContext.java 2008-10-22 15:33:12 UTC (rev 11082)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationContext.java 2008-10-22 15:40:40 UTC (rev 11083)
@@ -280,6 +280,8 @@
if(variableName==null) {
throw new IllegalArgumentException(SeamCoreMessages.SEAM_VALIDATION_CONTEXT_VARIABLE_NAME_MUST_NOT_BE_NULL);
}
+
+ synchronized(this) {
Set<IPath> linkedResources = resourcesByVariableName.get(variableName);
if(linkedResources==null) {
// create set of linked resources with variable name.
@@ -288,6 +290,7 @@
}
// save linked resources.
linkedResources.add(linkedResourcePath);
+ }
// Save link between resource and variable names. It's needed if variable name changes in resource file.
Set<String> variableNames = variableNamesByResource.get(linkedResourcePath);
@@ -304,11 +307,13 @@
* @param linkedResourcePath
*/
public void removeLinkedResource(String name, IPath linkedResourcePath) {
+ synchronized(this) {
Set<IPath> linkedResources = resourcesByVariableName.get(name);
if(linkedResources!=null) {
// remove linked resource.
linkedResources.remove(linkedResourcePath);
}
+ }
// Remove link between resource and variable names.
Set<String> variableNames = variableNamesByResource.get(linkedResourcePath);
if(variableNames!=null) {
@@ -330,7 +335,7 @@
* Removes link between resource and variable names.
* @param linkedResources
*/
- public void removeLinkedResource(IPath resource) {
+ public synchronized void removeLinkedResource(IPath resource) {
Set<String> resourceNames = variableNamesByResource.get(resource);
if(resourceNames!=null) {
for (String name : resourceNames) {
@@ -350,7 +355,7 @@
return resourcesByVariableName.get(variableName);
}
- public Set<String> getVariableNamesByResource(IPath fullPath) {
+ public synchronized Set<String> getVariableNamesByResource(IPath fullPath) {
return variableNamesByResource.get(fullPath);
}
@@ -378,13 +383,13 @@
unnamedResources.remove(fullPath);
}
- public void clearAll() {
+ public synchronized void clearAll() {
resourcesByVariableName.clear();
variableNamesByResource.clear();
unnamedResources.clear();
}
- public void store(Element root) {
+ public synchronized void store(Element root) {
Set<String> variables = resourcesByVariableName.keySet();
for (String name: variables) {
Set<IPath> paths = resourcesByVariableName.get(name);
17 years, 2 months
JBoss Tools SVN: r11082 - in trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test: publishing and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-10-22 11:33:12 -0400 (Wed, 22 Oct 2008)
New Revision: 11082
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/classpath/ProjectRuntimeTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/AbstractDeploymentTest.java
Log:
Fixing test errors in the org.jboss.ide.eclipse.as.test plugin
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/classpath/ProjectRuntimeTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/classpath/ProjectRuntimeTest.java 2008-10-22 15:28:17 UTC (rev 11081)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/classpath/ProjectRuntimeTest.java 2008-10-22 15:33:12 UTC (rev 11082)
@@ -1,110 +1,113 @@
-/**
- * JBoss, a Division of Red Hat
- * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
-* This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ide.eclipse.as.test.classpath;
-
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.wst.server.core.IRuntime;
-import org.jboss.ide.eclipse.as.test.ASTest;
-import org.jboss.ide.eclipse.as.test.util.ProjectRuntimeUtil;
-import org.jboss.tools.common.test.util.TestProjectProvider;
-
-public class ProjectRuntimeTest extends TestCase {
- private TestProjectProvider provider;
- private IProject project;
-
- protected void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.ide.eclipse.as.test", null, "basicwebproject", true);
- project = provider.getProject();
- project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- }
-
- protected void tearDown() throws Exception {
- provider.dispose();
- }
-
- public void testProjectRuntime() {
- try {
- IJavaProject jp = JavaCore.create(project);
- verifyInitialClasspathEntries(jp);
-
- // lets try a runtime
- IRuntime createdRuntime = ProjectRuntimeUtil.createRuntime("runtime1", ASTest.JBOSS_RUNTIME_42, ASTest.JBOSS_AS_HOME);
- ProjectRuntimeUtil.setTargetRuntime(createdRuntime, project);
- verifyPostRuntimeCPE(jp);
-
- ProjectRuntimeUtil.clearRuntime(project);
- verifyInitialClasspathEntries(jp);
-
- } catch( JavaModelException jme ) {
- jme.printStackTrace();
- fail(jme.getMessage());
- } catch( CoreException ce ) {
- ce.printStackTrace();
- fail(ce.getMessage());
- }
- }
-
- protected void verifyPostRuntimeCPE(IJavaProject jp) throws CoreException {
- IClasspathEntry[] entries = jp.getRawClasspath();
- assertEquals(3, entries.length);
- jp.getResolvedClasspath(false); // make sure it can resolve all
- String[] required = new String[] { "org.eclipse.jst.server.core.container",
- "basicwebproject", "org.eclipse.jst.j2ee.internal.web.container" };
- verifyClasspathEntries(entries, required);
- }
-
- protected void verifyInitialClasspathEntries(IJavaProject jp) throws CoreException {
- IClasspathEntry[] entries = jp.getRawClasspath();
- jp.getResolvedClasspath(false); // make sure it can resolve all
- String[] required = new String[] {
- "org.eclipse.jst.j2ee.internal.web.container", "basicwebproject"};
- verifyClasspathEntries(entries, required);
- }
-
- protected void verifyClasspathEntries(IClasspathEntry[] entries, String[] required) {
- List<String> list = Arrays.asList(required);
- for( int i = 0; i < entries.length; i++ ) {
- if( list.contains(entries[i].getPath().segment(0)))
- list.remove(entries[i].getPath().segment(0));
- }
-
- if( list.size() > 0 ) {
- String tmp = "Required enties not found: ";
- for( int i = 0; i < list.size(); i++ ) {
- tmp += list.get(i) + ", ";
- }
- fail(tmp.substring(0, tmp.length() - 2));
- }
- }
-}
+/**
+ * JBoss, a Division of Red Hat
+ * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+* This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ide.eclipse.as.test.classpath;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.wst.server.core.IRuntime;
+import org.jboss.ide.eclipse.as.test.ASTest;
+import org.jboss.ide.eclipse.as.test.util.ProjectRuntimeUtil;
+import org.jboss.tools.common.test.util.TestProjectProvider;
+
+public class ProjectRuntimeTest extends TestCase {
+ private TestProjectProvider provider;
+ private IProject project;
+
+ protected void setUp() throws Exception {
+ provider = new TestProjectProvider("org.jboss.ide.eclipse.as.test", null, "basicwebproject", true);
+ project = provider.getProject();
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ }
+
+ protected void tearDown() throws Exception {
+ provider.dispose();
+ }
+
+ public void testProjectRuntime() {
+ try {
+ IJavaProject jp = JavaCore.create(project);
+ verifyInitialClasspathEntries(jp);
+
+ // lets try a runtime
+ IRuntime createdRuntime = ProjectRuntimeUtil.createRuntime("runtime1", ASTest.JBOSS_RUNTIME_42, ASTest.JBOSS_AS_HOME);
+ ProjectRuntimeUtil.setTargetRuntime(createdRuntime, project);
+ verifyPostRuntimeCPE(jp);
+
+ ProjectRuntimeUtil.clearRuntime(project);
+ verifyInitialClasspathEntries(jp);
+
+ } catch( JavaModelException jme ) {
+ jme.printStackTrace();
+ fail(jme.getMessage());
+ } catch( CoreException ce ) {
+ ce.printStackTrace();
+ fail(ce.getMessage());
+ }
+ }
+
+ protected void verifyPostRuntimeCPE(IJavaProject jp) throws CoreException {
+ IClasspathEntry[] entries = jp.getRawClasspath();
+ assertEquals(3, entries.length);
+ jp.getResolvedClasspath(false); // make sure it can resolve all
+ String[] required = new String[] { "org.eclipse.jst.server.core.container",
+ "basicwebproject", "org.eclipse.jst.j2ee.internal.web.container" };
+ verifyClasspathEntries(entries, required);
+ }
+
+ protected void verifyInitialClasspathEntries(IJavaProject jp) throws CoreException {
+ IClasspathEntry[] entries = jp.getRawClasspath();
+ jp.getResolvedClasspath(false); // make sure it can resolve all
+ String[] required = new String[] {
+ "org.eclipse.jst.j2ee.internal.web.container", "basicwebproject"};
+ verifyClasspathEntries(entries, required);
+ }
+
+ protected void verifyClasspathEntries(IClasspathEntry[] entries, String[] required) {
+ List<String> list = new ArrayList<String>();
+ for (int i = 0; i < required.length; i++) {
+ list.add(required[i]);
+ }
+ for( int i = 0; i < entries.length; i++ ) {
+ if( list.contains(entries[i].getPath().segment(0)))
+ list.remove(entries[i].getPath().segment(0));
+ }
+
+ if( list.size() > 0 ) {
+ String tmp = "Required enties not found: ";
+ for( int i = 0; i < list.size(); i++ ) {
+ tmp += list.get(i) + ", ";
+ }
+ fail(tmp.substring(0, tmp.length() - 2));
+ }
+ }
+}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/AbstractDeploymentTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/AbstractDeploymentTest.java 2008-10-22 15:28:17 UTC (rev 11081)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/AbstractDeploymentTest.java 2008-10-22 15:33:12 UTC (rev 11082)
@@ -1,180 +1,180 @@
-package org.jboss.ide.eclipse.as.test.publishing;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Properties;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.internal.ServerWorkingCopy;
-import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer;
-import org.jboss.ide.eclipse.as.core.util.FileUtil;
-import org.jboss.ide.eclipse.as.test.ASTest;
-import org.jboss.tools.common.test.util.TestProjectProvider;
-import org.osgi.framework.Bundle;
-
-public abstract class AbstractDeploymentTest extends TestCase {
- protected String BUNDLE_NAME = "org.jboss.ide.eclipse.as.test";
- private TestProjectProvider[] provider;
- protected IProject[] workspaceProject;
- protected String[] sourceProjectName;
- protected String[] testProperties;
- protected IRuntime runtime;
- protected IServer server;
- protected String deployLocation;
-
- public AbstractDeploymentTest(String[] projectNames, String[] testProperties) {
- try {
- this.sourceProjectName = projectNames;
- this.testProperties = testProperties;
- this.deployLocation = getFileLocation("/testOutputs").getAbsolutePath();
- this.provider = new TestProjectProvider[sourceProjectName.length];
- this.workspaceProject = new IProject[sourceProjectName.length];
- } catch( CoreException ce ) {
- fail("Could not access deploy location");
- }
- }
- public AbstractDeploymentTest(String projectName, String testProperties) {
- this(new String[]{projectName}, new String[] {testProperties});
- }
-
- protected void setUp() throws Exception {
- createServer();
- for( int i = 0; i < sourceProjectName.length; i++ ) {
- cleanFolder(getProjectLocation("TempProject").getAbsolutePath());
- assembleInTempProject(i);
- String path = "/projects/TempProject/" + sourceProjectName[i];
- provider[i] = new TestProjectProvider(BUNDLE_NAME, path, sourceProjectName[i], true);
- workspaceProject[i] = provider[i].getProject();
- workspaceProject[i].refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- }
- }
-
- protected void cleanFolder(String folder) throws CoreException {
- cleanFolder(new File(folder));
- }
- protected void cleanFolder(File folder) throws CoreException {
- if( folder != null && folder.exists() ) {
- File[] children = folder.listFiles();
- for( int i = 0; i < children.length; i++ )
- FileUtil.safeDelete(children[i]);
- }
- }
-
- protected File getProjectLocation(String name) throws CoreException {
- return getFileLocation("/projects/" + name);
- }
-
- protected File getFileLocation(String path) throws CoreException {
- Bundle bundle = Platform.getBundle(BUNDLE_NAME);
- URL url = null;
- try {
- url = FileLocator.resolve(bundle.getEntry(path));
- } catch (IOException e) {
- String msg = "Cannot find file " + path + " in " + BUNDLE_NAME;
- IStatus status = new Status(IStatus.ERROR, ASTest.PLUGIN_ID, msg, e);
- throw new CoreException(status);
- }
- String location = url.getFile();
- return new File(location);
- }
-
-
- /*
- * The whole reason for all this is so that I don't duplicate
- * jars or archives all over the place and to keep the size
- * of the test plugin small
- */
- protected void assembleInTempProject(int index) throws CoreException {
- String sourceProjectName = this.sourceProjectName[index];
- File tempProject = getProjectLocation("TempProject");
- File srcProject = getProjectLocation(sourceProjectName);
- File destProject = new File(tempProject, sourceProjectName);
- FileUtil.fileSafeCopy(srcProject, destProject);
-
- // now copy files over from the properties file
- if( testProperties[index] != null ) {
- File propertiesFile = getFileLocation("projectPieces/" + testProperties[index]);
- Properties props = new Properties();
- try {
- props.load(new FileInputStream(propertiesFile));
- boolean done = false;
- String srcKey, destKey;
- int i = 1;
- while( !done ) {
- srcKey = "copy" + i + "src";
- destKey = "copy" + i + "dest";
- done = copy(props.getProperty(srcKey), props.getProperty(destKey));
- i++;
- }
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
-
- protected boolean copy(String src, String dest) throws CoreException {
- if( src == null || dest == null )
- return true;
-
- // do the copy
- File srcFile, destFile, tmp;
- srcFile = getFileLocation("projectPieces/" + src);
- tmp = getFileLocation("projects/TempProject/" + sourceProjectName);
- destFile = new File(tmp, dest);
- FileUtil.fileSafeCopy(srcFile, destFile);
-
- return false;
- }
-
-
- protected void createServer() throws CoreException {
- IRuntimeType rt = ServerCore.findRuntimeType("org.jboss.ide.eclipse.as.runtime.stripped");
- IRuntimeWorkingCopy wc = rt.createRuntime("testRuntime", null);
- runtime = wc.save(true, null);
- IServerType st = ServerCore.findServerType("org.jboss.ide.eclipse.as.systemCopyServer");
- ServerWorkingCopy swc = (ServerWorkingCopy) st.createServer("testServer", null, null);
- swc.setServerConfiguration(null);
- swc.setName("testServer");
- swc.setAttribute(DeployableServer.DEPLOY_DIRECTORY, deployLocation);
- server = swc.save(true, null);
- }
-
- protected IStatus publish(IModule module) throws CoreException {
- IServerWorkingCopy copy = server.createWorkingCopy();
- copy.modifyModules(new IModule[]{module}, new IModule[0], new NullProgressMonitor());
- server = copy.save(false, new NullProgressMonitor());
- return server.publish(IServer.PUBLISH_INCREMENTAL, new NullProgressMonitor());
- }
-
- protected void tearDown() throws Exception {
- for( int i = 0; i < sourceProjectName.length; i++ )
- provider[i].dispose();
-
- cleanFolder(getProjectLocation("TempProject").getAbsolutePath());
- cleanFolder(getFileLocation("testOutputs"));
- runtime.delete();
- server.delete();
- }
-}
+package org.jboss.ide.eclipse.as.test.publishing;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Properties;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IRuntimeType;
+import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServerType;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.eclipse.wst.server.core.ServerCore;
+import org.eclipse.wst.server.core.internal.ServerWorkingCopy;
+import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer;
+import org.jboss.ide.eclipse.as.core.util.FileUtil;
+import org.jboss.ide.eclipse.as.test.ASTest;
+import org.jboss.tools.common.test.util.TestProjectProvider;
+import org.osgi.framework.Bundle;
+
+public abstract class AbstractDeploymentTest extends TestCase {
+ protected String BUNDLE_NAME = "org.jboss.ide.eclipse.as.test";
+ private TestProjectProvider[] provider;
+ protected IProject[] workspaceProject;
+ protected String[] sourceProjectName;
+ protected String[] testProperties;
+ protected IRuntime runtime;
+ protected IServer server;
+ protected String deployLocation;
+
+ public AbstractDeploymentTest(String[] projectNames, String[] testProperties) {
+ try {
+ this.sourceProjectName = projectNames;
+ this.testProperties = testProperties;
+ this.deployLocation = getFileLocation("/testOutputs").getAbsolutePath();
+ this.provider = new TestProjectProvider[sourceProjectName.length];
+ this.workspaceProject = new IProject[sourceProjectName.length];
+ } catch( CoreException ce ) {
+ fail("Could not access deploy location");
+ }
+ }
+ public AbstractDeploymentTest(String projectName, String testProperties) {
+ this(new String[]{projectName}, new String[] {testProperties});
+ }
+
+ protected void setUp() throws Exception {
+ createServer();
+ for( int i = 0; i < sourceProjectName.length; i++ ) {
+ cleanFolder(getProjectLocation("TempProject").getAbsolutePath());
+ assembleInTempProject(i);
+ String path = "/projects/TempProject/" + sourceProjectName[i];
+ provider[i] = new TestProjectProvider(BUNDLE_NAME, path, sourceProjectName[i], true);
+ workspaceProject[i] = provider[i].getProject();
+ workspaceProject[i].refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ }
+ }
+
+ protected void cleanFolder(String folder) throws CoreException {
+ cleanFolder(new File(folder));
+ }
+ protected void cleanFolder(File folder) throws CoreException {
+ if( folder != null && folder.exists() ) {
+ File[] children = folder.listFiles();
+ for( int i = 0; i < children.length; i++ )
+ FileUtil.safeDelete(children[i]);
+ }
+ }
+
+ protected File getProjectLocation(String name) throws CoreException {
+ return getFileLocation("/projects/" + name);
+ }
+
+ protected File getFileLocation(String path) throws CoreException {
+ Bundle bundle = Platform.getBundle(BUNDLE_NAME);
+ URL url = null;
+ try {
+ url = FileLocator.resolve(bundle.getEntry(path));
+ } catch (IOException e) {
+ String msg = "Cannot find file " + path + " in " + BUNDLE_NAME;
+ IStatus status = new Status(IStatus.ERROR, ASTest.PLUGIN_ID, msg, e);
+ throw new CoreException(status);
+ }
+ String location = url.getFile();
+ return new File(location);
+ }
+
+
+ /*
+ * The whole reason for all this is so that I don't duplicate
+ * jars or archives all over the place and to keep the size
+ * of the test plugin small
+ */
+ protected void assembleInTempProject(int index) throws CoreException {
+ String sourceProjectName = this.sourceProjectName[index];
+ File tempProject = getProjectLocation("TempProject");
+ File srcProject = getProjectLocation(sourceProjectName);
+ File destProject = new File(tempProject, sourceProjectName);
+ FileUtil.fileSafeCopy(srcProject, destProject);
+
+ // now copy files over from the properties file
+ if( testProperties[index] != null ) {
+ File propertiesFile = getFileLocation("projectPieces/" + testProperties[index]);
+ Properties props = new Properties();
+ try {
+ props.load(new FileInputStream(propertiesFile));
+ boolean done = false;
+ String srcKey, destKey;
+ int i = 1;
+ while( !done ) {
+ srcKey = "copy" + i + "src";
+ destKey = "copy" + i + "dest";
+ done = copy(props.getProperty(srcKey), props.getProperty(destKey),i);
+ i++;
+ }
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ protected boolean copy(String src, String dest,int i) throws CoreException {
+ if( src == null || dest == null )
+ return true;
+
+ // do the copy
+ File srcFile, destFile, tmp;
+ srcFile = getFileLocation("projectPieces/" + src);
+ tmp = getFileLocation("projects/TempProject/" + sourceProjectName[i-1]);
+ destFile = new File(tmp, dest);
+ FileUtil.fileSafeCopy(srcFile, destFile);
+
+ return false;
+ }
+
+
+ protected void createServer() throws CoreException {
+ IRuntimeType rt = ServerCore.findRuntimeType("org.jboss.ide.eclipse.as.runtime.stripped");
+ IRuntimeWorkingCopy wc = rt.createRuntime("testRuntime", null);
+ runtime = wc.save(true, null);
+ IServerType st = ServerCore.findServerType("org.jboss.ide.eclipse.as.systemCopyServer");
+ ServerWorkingCopy swc = (ServerWorkingCopy) st.createServer("testServer", null, null);
+ swc.setServerConfiguration(null);
+ swc.setName("testServer");
+ swc.setAttribute(DeployableServer.DEPLOY_DIRECTORY, deployLocation);
+ server = swc.save(true, null);
+ }
+
+ protected IStatus publish(IModule module) throws CoreException {
+ IServerWorkingCopy copy = server.createWorkingCopy();
+ copy.modifyModules(new IModule[]{module}, new IModule[0], new NullProgressMonitor());
+ server = copy.save(false, new NullProgressMonitor());
+ return server.publish(IServer.PUBLISH_INCREMENTAL, new NullProgressMonitor());
+ }
+
+ protected void tearDown() throws Exception {
+ for( int i = 0; i < sourceProjectName.length; i++ )
+ provider[i].dispose();
+
+ cleanFolder(getProjectLocation("TempProject").getAbsolutePath());
+ cleanFolder(getFileLocation("testOutputs"));
+ runtime.delete();
+ server.delete();
+ }
+}
17 years, 2 months
JBoss Tools SVN: r11081 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam: internal/core and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-22 11:28:17 -0400 (Wed, 22 Oct 2008)
New Revision: 11081
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlComponentDeclaration.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamPreferences.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPreferenceInitializer.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXmlComponentDeclaration.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationContext.java
Log:
JBIDE-2958
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlComponentDeclaration.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlComponentDeclaration.java 2008-10-22 15:26:58 UTC (rev 11080)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlComponentDeclaration.java 2008-10-22 15:28:17 UTC (rev 11081)
@@ -43,6 +43,8 @@
*/
public String getClassName();
+ public boolean isClassNameGuessed();
+
/**
* @return string value of 'jndi-name' attribute
*/
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamPreferences.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamPreferences.java 2008-10-22 15:26:58 UTC (rev 11080)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamPreferences.java 2008-10-22 15:28:17 UTC (rev 11081)
@@ -62,6 +62,8 @@
public static final String STATEFUL_COMPONENT_WRONG_SCOPE = createSeverityOption("statefulComponentHasWrongScope"); //$NON-NLS-1$
// If className ('component' element) contains unknown class name then component.xml will be marked.
public static final String UNKNOWN_COMPONENT_CLASS_NAME = createSeverityOption("unknownComponentClassName"); //$NON-NLS-1$
+
+ public static final String UNKNOWN_COMPONENT_CLASS_NAME_GUESS = createSeverityOption("unknownComponentClassNameGuess"); //$NON-NLS-1$
// If component/property@name contains some property name which does not have setter then mark it.
public static final String UNKNOWN_COMPONENT_PROPERTY = createSeverityOption("unknownComponentProperty"); //$NON-NLS-1$
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPreferenceInitializer.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPreferenceInitializer.java 2008-10-22 15:26:58 UTC (rev 11080)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPreferenceInitializer.java 2008-10-22 15:28:17 UTC (rev 11081)
@@ -36,5 +36,8 @@
defaultPreferences.put(SeamPreferences.UNKNOWN_VARIABLE_NAME, SeamPreferences.WARNING);
defaultPreferences.put(SeamPreferences.UNPAIRED_GETTER_OR_SETTER, SeamPreferences.IGNORE);
defaultPreferences.put(SeamPreferences.CHECK_VARS, SeamPreferences.ENABLE);
+
+ //JBIDE-2958 temporary until JBIDE-2957 solved //TODO solve JBIDE-2957
+ defaultPreferences.put(SeamPreferences.UNKNOWN_COMPONENT_CLASS_NAME_GUESS, SeamPreferences.WARNING);
}
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2008-10-22 15:26:58 UTC (rev 11080)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2008-10-22 15:28:17 UTC (rev 11081)
@@ -623,6 +623,10 @@
long t2 = System.currentTimeMillis();
if(statistics != null) {
statistics.add(new Long(t2 - t1));
+ if(t2 - t1 > 30) {
+ System.out.println("--->" + statistics.size() + " " + (t2 - t1));
+ System.out.println("stop");
+ }
}
}
postBuild();
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXmlComponentDeclaration.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXmlComponentDeclaration.java 2008-10-22 15:26:58 UTC (rev 11080)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamXmlComponentDeclaration.java 2008-10-22 15:28:17 UTC (rev 11081)
@@ -33,6 +33,8 @@
String precedence = null;
String scope = null;
+ boolean isClassNameGuessed = false;
+
public String getAutoCreateAsString() {
return autoCreate;
}
@@ -41,6 +43,10 @@
return className;
}
+ public boolean isClassNameGuessed() {
+ return isClassNameGuessed;
+ }
+
public boolean getInstalledAsString() {
return !"false".equals(installed); //$NON-NLS-1$
}
@@ -83,6 +89,10 @@
setClassName(value == null ? null : value.getValue());
}
+ public void setClassNameGuessed(boolean b) {
+ isClassNameGuessed = b;
+ }
+
public void setAutoCreate(String autoCreate) {
this.autoCreate = autoCreate;
}
@@ -143,6 +153,7 @@
changes = Change.addChange(changes, new Change(this, CLASS, className, xd.className));
className = xd.className;
}
+ this.isClassNameGuessed = xd.isClassNameGuessed;
if(!stringsEqual(autoCreate, xd.autoCreate)) {
changes = Change.addChange(changes, new Change(this, AUTO_CREATE, autoCreate, xd.autoCreate));
autoCreate = xd.autoCreate;
@@ -178,6 +189,10 @@
public Element toXML(Element parent, Properties context) {
Element element = super.toXML(parent, context);
+
+ if(isClassNameGuessed) {
+ element.setAttribute("isClassNameGuessed", "true");
+ }
return element;
}
@@ -192,12 +207,16 @@
setScope(attributes.get(SCOPE));
setClassName(attributes.get(CLASS));
+ isClassNameGuessed = "true".equals(element.getAttribute("isClassNameGuessed"));
+
if(className == null && id instanceof XModelObject) {
XModelObject c = (XModelObject)id;
if(c.getModelEntity().getName().equals("FileSeamComponent12")) {
className = XMLScanner.getImpliedClassName(c, source);
+ isClassNameGuessed = true;
} else {
className = XMLScanner.getDefaultClassName(c);
+ isClassNameGuessed = true;
}
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java 2008-10-22 15:26:58 UTC (rev 11080)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java 2008-10-22 15:28:17 UTC (rev 11081)
@@ -173,6 +173,7 @@
String className = getDefaultClassName(c);
if(className != null) {
component.setClassName(className);
+ component.setClassNameGuessed(true);
}
}
component.setScope(new XMLValueInfo(c, ISeamXmlComponentDeclaration.SCOPE));
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2008-10-22 15:26:58 UTC (rev 11080)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2008-10-22 15:28:17 UTC (rev 11081)
@@ -465,7 +465,11 @@
if(isEmptyLocation(location)) {
location = declaration;
}
- addError(UNKNOWN_COMPONENT_CLASS_NAME_MESSAGE_ID, SeamPreferences.UNKNOWN_COMPONENT_CLASS_NAME, new String[]{className}, location, declaration.getResource());
+ if(!declaration.isClassNameGuessed()) {
+ addError(UNKNOWN_COMPONENT_CLASS_NAME_MESSAGE_ID, SeamPreferences.UNKNOWN_COMPONENT_CLASS_NAME, new String[]{className}, location, declaration.getResource());
+ } else {
+ addError(UNKNOWN_COMPONENT_CLASS_NAME_MESSAGE_ID, SeamPreferences.UNKNOWN_COMPONENT_CLASS_NAME_GUESS, new String[]{className}, location, declaration.getResource());
+ }
return;
} else if(!type.isBinary()) {
validationContext.addLinkedCoreResource(componentName, type.getResource().getFullPath());
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationContext.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationContext.java 2008-10-22 15:26:58 UTC (rev 11080)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationContext.java 2008-10-22 15:28:17 UTC (rev 11081)
@@ -280,6 +280,8 @@
if(variableName==null) {
throw new IllegalArgumentException(SeamCoreMessages.SEAM_VALIDATION_CONTEXT_VARIABLE_NAME_MUST_NOT_BE_NULL);
}
+
+ synchronized(this) {
Set<IPath> linkedResources = resourcesByVariableName.get(variableName);
if(linkedResources==null) {
// create set of linked resources with variable name.
@@ -288,6 +290,7 @@
}
// save linked resources.
linkedResources.add(linkedResourcePath);
+ }
// Save link between resource and variable names. It's needed if variable name changes in resource file.
Set<String> variableNames = variableNamesByResource.get(linkedResourcePath);
@@ -304,11 +307,13 @@
* @param linkedResourcePath
*/
public void removeLinkedResource(String name, IPath linkedResourcePath) {
+ synchronized(this) {
Set<IPath> linkedResources = resourcesByVariableName.get(name);
if(linkedResources!=null) {
// remove linked resource.
linkedResources.remove(linkedResourcePath);
}
+ }
// Remove link between resource and variable names.
Set<String> variableNames = variableNamesByResource.get(linkedResourcePath);
if(variableNames!=null) {
@@ -330,7 +335,7 @@
* Removes link between resource and variable names.
* @param linkedResources
*/
- public void removeLinkedResource(IPath resource) {
+ public synchronized void removeLinkedResource(IPath resource) {
Set<String> resourceNames = variableNamesByResource.get(resource);
if(resourceNames!=null) {
for (String name : resourceNames) {
@@ -350,7 +355,7 @@
return resourcesByVariableName.get(variableName);
}
- public Set<String> getVariableNamesByResource(IPath fullPath) {
+ public synchronized Set<String> getVariableNamesByResource(IPath fullPath) {
return variableNamesByResource.get(fullPath);
}
@@ -378,13 +383,13 @@
unnamedResources.remove(fullPath);
}
- public void clearAll() {
+ public synchronized void clearAll() {
resourcesByVariableName.clear();
variableNamesByResource.clear();
unnamedResources.clear();
}
- public void store(Element root) {
+ public synchronized void store(Element root) {
Set<String> variables = resourcesByVariableName.keySet();
for (String name: variables) {
Set<IPath> paths = resourcesByVariableName.get(name);
17 years, 2 months
JBoss Tools SVN: r11080 - 21.10.2008 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: anis
Date: 2008-10-22 11:26:58 -0400 (Wed, 22 Oct 2008)
New Revision: 11080
Added:
trunk/documentation/qa/reports/Tests 21.10.2008/Seam2fp_22.10.2008.htm
Log:
Added a file remotely
Added: trunk/documentation/qa/reports/Tests 21.10.2008/Seam2fp_22.10.2008.htm
===================================================================
--- trunk/documentation/qa/reports/Tests 21.10.2008/Seam2fp_22.10.2008.htm (rev 0)
+++ trunk/documentation/qa/reports/Tests 21.10.2008/Seam2fp_22.10.2008.htm 2008-10-22 15:26:58 UTC (rev 11080)
@@ -0,0 +1,207 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML><HEAD><TITLE>Seam FP runtime tests</TITLE>
+<STYLE>H1 {
+ COLOR: #4a5d75; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+H2 {
+ COLOR: #4a5d75; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+TR {
+ BACKGROUND-COLOR: #f5f5f5
+}
+TD {
+ BORDER-RIGHT: dimgray 1px solid; PADDING-RIGHT: 0.5em; BORDER-TOP: dimgray 1px solid; PADDING-LEFT: 0.5em; PADDING-BOTTOM: 0.15em; BORDER-LEFT: dimgray 1px solid; PADDING-TOP: 0.15em; BORDER-BOTTOM: dimgray 1px solid; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+HR {
+ COLOR: #999; BORDER-COLLAPSE: collapse
+}
+BODY {
+ PADDING-RIGHT: 2em; PADDING-LEFT: 2em; FONT-SIZE: 12px; PADDING-BOTTOM: 0em; COLOR: #333; LINE-HEIGHT: 100%; PADDING-TOP: 0em; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; max-width: 55em
+}
+TABLE {
+ BORDER-RIGHT: dimgray 0px solid; BORDER-TOP: dimgray 0px solid; BORDER-LEFT: dimgray 0px solid; COLOR: #4a5d75; BORDER-BOTTOM: dimgray 0px solid; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif
+}
+</STYLE>
+
+<META http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+<META content="MSHTML 6.00.2900.3059" name=GENERATOR></HEAD>
+<BODY bgColor=#f5f5f5>
+<CENTER>
+<H1>Seam FP runtime tests</H1>
+<TABLE
+style="BORDER-TOP-WIDTH: 1pt; BORDER-LEFT-WIDTH: 1pt; BORDER-BOTTOM-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"
+cellSpacing=0 cellPadding=4 width="100%" align=center>
+ <TBODY>
+ <TR bgColor=gray>
+ <TD><B>Plan: Test Name</B></TD>
+ <TD><B>Status</B></TD>
+ <TD><B>Bug Number</B></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 01 Creating
+ test Seam war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 06 Running
+ test Seam ear project on server</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 04 Checking
+ created test Seam ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 07 Checking
+ instant changing - war</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 10 Adding
+ new form in test Seam ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 02 Creating
+ test Seam ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 03 Checking
+ created test Seam war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 05 Running
+ test Seam war project on server</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 08 Checking
+ instant changing - ear</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 09 Adding
+ new form in test Seam war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 17 Seam hot
+ deployment for war</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 18 Seam hot
+ deployment for ear</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 11 Adding
+ new action in test Seam war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 12 Adding
+ new action in test Seam ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 13 Adding
+ new conversation in test Seam war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: red; BORDER-RIGHT-WIDTH: 1pt">Failed</TD>
+ <TD
+style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">JBIDE-2489</TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 14 Adding
+ new conversation in test Seam ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 16 Adding
+ new entity in test Seam ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 19 Checking
+ created forms - for Seam war and ear</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 20 Checking
+ created actions - for Seam war and ear</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 21 Checking
+ created conversations - for Seam war and ear</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 24 Deleting
+ test Seam projects</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 23 Renaming
+ Seam projects</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 22 Checking
+ created entities - for Seam war and ear</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 15 Adding
+ new entity in test Seam war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white
+size=1> </FONT></TD></TR></TBODY></TABLE></CENTER></BODY></HTML>
17 years, 2 months
JBoss Tools SVN: r11079 - 21.10.2008 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: anis
Date: 2008-10-22 11:26:46 -0400 (Wed, 22 Oct 2008)
New Revision: 11079
Added:
trunk/documentation/qa/reports/Tests 21.10.2008/SeamCommon_22.10.2008.htm
Log:
Added a file remotely
Added: trunk/documentation/qa/reports/Tests 21.10.2008/SeamCommon_22.10.2008.htm
===================================================================
--- trunk/documentation/qa/reports/Tests 21.10.2008/SeamCommon_22.10.2008.htm (rev 0)
+++ trunk/documentation/qa/reports/Tests 21.10.2008/SeamCommon_22.10.2008.htm 2008-10-22 15:26:46 UTC (rev 11079)
@@ -0,0 +1,109 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML><HEAD><TITLE>Seam Common tests</TITLE>
+<STYLE>H1 {
+ COLOR: #4a5d75; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+H2 {
+ COLOR: #4a5d75; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+TR {
+ BACKGROUND-COLOR: #f5f5f5
+}
+TD {
+ BORDER-RIGHT: dimgray 1px solid; PADDING-RIGHT: 0.5em; BORDER-TOP: dimgray 1px solid; PADDING-LEFT: 0.5em; PADDING-BOTTOM: 0.15em; BORDER-LEFT: dimgray 1px solid; PADDING-TOP: 0.15em; BORDER-BOTTOM: dimgray 1px solid; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+HR {
+ COLOR: #999; BORDER-COLLAPSE: collapse
+}
+BODY {
+ PADDING-RIGHT: 2em; PADDING-LEFT: 2em; FONT-SIZE: 12px; PADDING-BOTTOM: 0em; COLOR: #333; LINE-HEIGHT: 100%; PADDING-TOP: 0em; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; max-width: 55em
+}
+TABLE {
+ BORDER-RIGHT: dimgray 0px solid; BORDER-TOP: dimgray 0px solid; BORDER-LEFT: dimgray 0px solid; COLOR: #4a5d75; BORDER-BOTTOM: dimgray 0px solid; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif
+}
+</STYLE>
+
+<META http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+<META content="MSHTML 6.00.2900.3059" name=GENERATOR></HEAD>
+<BODY bgColor=#f5f5f5>
+<CENTER>
+<H1>Seam Common tests</H1>
+<TABLE
+style="BORDER-TOP-WIDTH: 1pt; BORDER-LEFT-WIDTH: 1pt; BORDER-BOTTOM-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"
+cellSpacing=0 cellPadding=4 width="100%" align=center>
+ <TBODY>
+ <TR bgColor=gray>
+ <TD><B>Plan: Test Name</B></TD>
+ <TD><B>Status</B></TD>
+ <TD><B>Bug Number</B></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 01 Driver
+ selection tests</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 02 Seam goto
+ component</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 03 Add Seam
+ Runtime</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 04 Create
+ Seam Web project wizard tests</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 05 Seam
+ projects with same names creation</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 06 Seam
+ Validator for components.xml property name=...</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 07 Seam
+ Validator resolves EL with strings</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 08 Seam
+ projects with external database creation</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 09 Seam
+ Generate Entities - Reverse Engeneer</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 10 Seam
+ Generate Entities - Existing Entities</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white
+size=1> </FONT></TD></TR></TBODY></TABLE></CENTER></BODY></HTML>
17 years, 2 months
JBoss Tools SVN: r11078 - in branches/jbosstools-3.0.0.Beta1/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test: publishing and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-10-22 11:26:01 -0400 (Wed, 22 Oct 2008)
New Revision: 11078
Modified:
branches/jbosstools-3.0.0.Beta1/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/classpath/ProjectRuntimeTest.java
branches/jbosstools-3.0.0.Beta1/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/AbstractDeploymentTest.java
Log:
Fixing test errors in the org.jboss.ide.eclipse.as.test plugin
Modified: branches/jbosstools-3.0.0.Beta1/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/classpath/ProjectRuntimeTest.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/classpath/ProjectRuntimeTest.java 2008-10-22 15:09:50 UTC (rev 11077)
+++ branches/jbosstools-3.0.0.Beta1/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/classpath/ProjectRuntimeTest.java 2008-10-22 15:26:01 UTC (rev 11078)
@@ -21,7 +21,7 @@
*/
package org.jboss.ide.eclipse.as.test.classpath;
-import java.util.Arrays;
+import java.util.ArrayList;
import java.util.List;
import junit.framework.TestCase;
@@ -93,7 +93,10 @@
}
protected void verifyClasspathEntries(IClasspathEntry[] entries, String[] required) {
- List<String> list = Arrays.asList(required);
+ List<String> list = new ArrayList<String>();
+ for (int i = 0; i < required.length; i++) {
+ list.add(required[i]);
+ }
for( int i = 0; i < entries.length; i++ ) {
if( list.contains(entries[i].getPath().segment(0)))
list.remove(entries[i].getPath().segment(0));
Modified: branches/jbosstools-3.0.0.Beta1/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/AbstractDeploymentTest.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/AbstractDeploymentTest.java 2008-10-22 15:09:50 UTC (rev 11077)
+++ branches/jbosstools-3.0.0.Beta1/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/AbstractDeploymentTest.java 2008-10-22 15:26:01 UTC (rev 11078)
@@ -123,7 +123,7 @@
while( !done ) {
srcKey = "copy" + i + "src";
destKey = "copy" + i + "dest";
- done = copy(props.getProperty(srcKey), props.getProperty(destKey));
+ done = copy(props.getProperty(srcKey), props.getProperty(destKey),i);
i++;
}
} catch (FileNotFoundException e) {
@@ -134,14 +134,14 @@
}
}
- protected boolean copy(String src, String dest) throws CoreException {
+ protected boolean copy(String src, String dest,int i) throws CoreException {
if( src == null || dest == null )
return true;
// do the copy
File srcFile, destFile, tmp;
srcFile = getFileLocation("projectPieces/" + src);
- tmp = getFileLocation("projects/TempProject/" + sourceProjectName);
+ tmp = getFileLocation("projects/TempProject/" + sourceProjectName[i-1]);
destFile = new File(tmp, dest);
FileUtil.fileSafeCopy(srcFile, destFile);
17 years, 2 months
JBoss Tools SVN: r11077 - branches/jbosstools-3.0.0.Beta1/portlet/plugins/org.jboss.tools.portlet.core.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-10-22 11:09:50 -0400 (Wed, 22 Oct 2008)
New Revision: 11077
Modified:
branches/jbosstools-3.0.0.Beta1/portlet/plugins/org.jboss.tools.portlet.core/plugin.xml
Log:
JBIDE-2952 Reduce the number of JBoss Portal facet combinations
Modified: branches/jbosstools-3.0.0.Beta1/portlet/plugins/org.jboss.tools.portlet.core/plugin.xml
===================================================================
--- branches/jbosstools-3.0.0.Beta1/portlet/plugins/org.jboss.tools.portlet.core/plugin.xml 2008-10-22 14:58:44 UTC (rev 11076)
+++ branches/jbosstools-3.0.0.Beta1/portlet/plugins/org.jboss.tools.portlet.core/plugin.xml 2008-10-22 15:09:50 UTC (rev 11077)
@@ -46,6 +46,7 @@
</extension>
+ <!--
<extension
point="org.eclipse.wst.common.project.facet.core.presets">
<static-preset id="preset.jboss.portlet.v20">
@@ -63,6 +64,7 @@
<factory class="org.jboss.tools.portlet.core.internal.project.facet.PortletConfigurationPresetFactory10"/>
</dynamic-preset>
</extension>
+ -->
<extension point="org.eclipse.wst.common.project.facet.core.runtimes">
<supported>
@@ -121,6 +123,7 @@
</extension>
+ <!--
<extension
point="org.eclipse.wst.common.project.facet.core.presets">
<static-preset id="preset.jboss.jsfportlet.v20">
@@ -140,7 +143,7 @@
<factory class="org.jboss.tools.portlet.core.internal.project.facet.JSFPortletConfigurationPresetFactory10"/>
</dynamic-preset>
</extension>
-
+ -->
<extension point="org.eclipse.wst.common.project.facet.core.runtimes">
<supported>
<runtime-component any="true"/>
@@ -203,13 +206,14 @@
</static-preset>
</extension>
+ <!--
<extension
point="org.eclipse.wst.common.project.facet.core.presets">
<dynamic-preset id="preset.jboss.seamportlet.v10">
<factory class="org.jboss.tools.portlet.core.internal.project.facet.SeamPortletConfigurationPresetFactory10"/>
</dynamic-preset>
</extension>
-
+ -->
<extension point="org.eclipse.wst.common.project.facet.core.runtimes">
<supported>
<runtime-component any="true"/>
17 years, 2 months
JBoss Tools SVN: r11076 - trunk/portlet/plugins/org.jboss.tools.portlet.core.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-10-22 10:58:44 -0400 (Wed, 22 Oct 2008)
New Revision: 11076
Modified:
trunk/portlet/plugins/org.jboss.tools.portlet.core/plugin.xml
Log:
JBIDE-2952 Reduce the number of JBoss Portal facet combinations
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/plugin.xml
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/plugin.xml 2008-10-22 14:37:28 UTC (rev 11075)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/plugin.xml 2008-10-22 14:58:44 UTC (rev 11076)
@@ -46,6 +46,7 @@
</extension>
+ <!--
<extension
point="org.eclipse.wst.common.project.facet.core.presets">
<static-preset id="preset.jboss.portlet.v20">
@@ -63,6 +64,7 @@
<factory class="org.jboss.tools.portlet.core.internal.project.facet.PortletConfigurationPresetFactory10"/>
</dynamic-preset>
</extension>
+ -->
<extension point="org.eclipse.wst.common.project.facet.core.runtimes">
<supported>
@@ -121,6 +123,7 @@
</extension>
+ <!--
<extension
point="org.eclipse.wst.common.project.facet.core.presets">
<static-preset id="preset.jboss.jsfportlet.v20">
@@ -140,7 +143,7 @@
<factory class="org.jboss.tools.portlet.core.internal.project.facet.JSFPortletConfigurationPresetFactory10"/>
</dynamic-preset>
</extension>
-
+ -->
<extension point="org.eclipse.wst.common.project.facet.core.runtimes">
<supported>
<runtime-component any="true"/>
@@ -203,13 +206,14 @@
</static-preset>
</extension>
+ <!--
<extension
point="org.eclipse.wst.common.project.facet.core.presets">
<dynamic-preset id="preset.jboss.seamportlet.v10">
<factory class="org.jboss.tools.portlet.core.internal.project.facet.SeamPortletConfigurationPresetFactory10"/>
</dynamic-preset>
</extension>
-
+ -->
<extension point="org.eclipse.wst.common.project.facet.core.runtimes">
<supported>
<runtime-component any="true"/>
17 years, 2 months
JBoss Tools SVN: r11075 - in branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test: projects/JSFKickStartOldFormat/JavaSource/demo/bundle and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-22 10:37:28 -0400 (Wed, 22 Oct 2008)
New Revision: 11075
Added:
branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/JavaSource/demo/bundle/
branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/JavaSource/demo/bundle/Messages.properties
branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/Bundle.properties
branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean9.java
branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/RefBean3.java
Modified:
branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/WEB-INF/faces-config.xml
branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean2.java
branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/WebContent/WEB-INF/faces-config.xml
branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/model/pv/test/JSFPromptingProviderTest.java
branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java
branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFImportTest.java
branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
Log:
JBIDE-2421
Added: branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/JavaSource/demo/bundle/Messages.properties
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/JavaSource/demo/bundle/Messages.properties (rev 0)
+++ branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/JavaSource/demo/bundle/Messages.properties 2008-10-22 14:37:28 UTC (rev 11075)
@@ -0,0 +1 @@
+a=b
\ No newline at end of file
Modified: branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/WEB-INF/faces-config.xml
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/WEB-INF/faces-config.xml 2008-10-22 14:20:58 UTC (rev 11074)
+++ branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/WEB-INF/faces-config.xml 2008-10-22 14:37:28 UTC (rev 11075)
@@ -48,11 +48,11 @@
</converter>
<managed-bean>
<description>Input Value Holder</description>
- <managed-bean-name>nameBean</managed-bean-name>
- <managed-bean-class>demo.NameBean</managed-bean-class>
+ <managed-bean-name>user</managed-bean-name>
+ <managed-bean-class>demo.User</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
- <property-name>userName</property-name>
+ <property-name>name</property-name>
<property-class>java.lang.String</property-class>
<value/>
</managed-property>
Added: branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/Bundle.properties
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/Bundle.properties (rev 0)
+++ branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/Bundle.properties 2008-10-22 14:37:28 UTC (rev 11075)
@@ -0,0 +1,3 @@
+a=1
+b=2
+c=3
\ No newline at end of file
Modified: branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean2.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean2.java 2008-10-22 14:20:58 UTC (rev 11074)
+++ branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean2.java 2008-10-22 14:37:28 UTC (rev 11075)
@@ -10,4 +10,6 @@
public class ManagedBean2 {
public ManagedBean2() {
}
+
+ public void exec() {}
}
Added: branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean9.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean9.java (rev 0)
+++ branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean9.java 2008-10-22 14:37:28 UTC (rev 11075)
@@ -0,0 +1,13 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.test;
+
+/**
+ * @author eskimo
+ *
+ */
+public class ManagedBean9 {
+ public ManagedBean9() {
+ }
+}
Added: branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/RefBean3.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/RefBean3.java (rev 0)
+++ branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/RefBean3.java 2008-10-22 14:37:28 UTC (rev 11075)
@@ -0,0 +1,49 @@
+package org.jboss.tools.jsf.test;
+
+public class RefBean3 {
+ private String property6;
+ private String property7;
+ private String property8;
+ private String property9;
+ private RefBean2 property10;
+
+ public String getProperty6() {
+ return property6;
+ }
+
+ public void setProperty6(String property1) {
+ this.property6 = property1;
+ }
+
+ public String getProperty7() {
+ return property7;
+ }
+
+ public void setProperty7(String property2) {
+ this.property7 = property2;
+ }
+
+ public String getProperty8() {
+ return property8;
+ }
+
+ public void setProperty8(String property3) {
+ this.property8 = property3;
+ }
+
+ public String getProperty9() {
+ return property9;
+ }
+
+ public void setProperty9(String property4) {
+ this.property9 = property4;
+ }
+
+ public RefBean2 getProperty10() {
+ return property10;
+ }
+
+ public void setProperty10(RefBean2 property5) {
+ this.property10 = property5;
+ }
+}
Modified: branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/WebContent/WEB-INF/faces-config.xml
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/WebContent/WEB-INF/faces-config.xml 2008-10-22 14:20:58 UTC (rev 11074)
+++ branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/WebContent/WEB-INF/faces-config.xml 2008-10-22 14:37:28 UTC (rev 11075)
@@ -61,4 +61,14 @@
<referenced-bean-name>refbean2</referenced-bean-name>
<referenced-bean-class>org.jboss.tools.jsf.test.RefBean2</referenced-bean-class>
</referenced-bean>
+ <navigation-rule>
+ <from-view-id>/pages/inputname.jsp</from-view-id>
+ <navigation-case>
+ <from-outcome>greeting</from-outcome>
+ <to-view-id>/pages/greeting.jsp</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <application>
+ <message-bundle>org.jboss.tools.jsf.test.Bundle</message-bundle>
+ </application>
</faces-config>
Modified: branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/model/pv/test/JSFPromptingProviderTest.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/model/pv/test/JSFPromptingProviderTest.java 2008-10-22 14:20:58 UTC (rev 11074)
+++ branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/model/pv/test/JSFPromptingProviderTest.java 2008-10-22 14:37:28 UTC (rev 11075)
@@ -3,14 +3,11 @@
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
+import java.util.Properties;
-import org.eclipse.core.internal.resources.Workspace;
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.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.common.model.XModel;
@@ -18,7 +15,9 @@
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jsf.model.pv.JSFPromptingProvider;
import org.jboss.tools.jsf.plugin.JsfTestPlugin;
+import org.jboss.tools.jst.web.project.list.IWebPromptingProvider;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
+import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
import junit.framework.TestCase;
@@ -57,80 +56,76 @@
}
public void testIsSupporting() {
- fail("Not yet implemented");
+ assertTrue(provider.isSupporting(IWebPromptingProvider.JSF_BUNDLES));
}
public void testGetList() {
- fail("Not yet implemented");
+ List<Object> list = provider.getList(model, "", "", new Properties());
+ assertEquals("Empty list should be returned for unsupported id.",IWebPromptingProvider.EMPTY_LIST, list);
}
/******************************************************************
* getBundles method test
******************************************************************/
- public static final int GET_BUNDLE_EXPECTED_LIST_SIZE = 0;
+ public static final int GET_BUNDLE_EXPECTED_LIST_SIZE = 1;
/**
*
*/
public void testGetBundles() {
- List<Object> list = provider.getBundles(model);
+ List<Object> list = provider.getList(model, IWebPromptingProvider.JSF_BUNDLES, "", new Properties());
assertEquals("Bundles proposal list has wrong size",GET_BUNDLE_EXPECTED_LIST_SIZE, list.size());
}
+ public static final int GET_BUNDLE_PROPERTIES_EXPECTED_LIST_SIZE = 3;
+
public void testGetBundleProperties() {
- fail("Not yet implemented");
+ List<Object> list = provider.getList(model, IWebPromptingProvider.JSF_BUNDLE_PROPERTIES, "org.jboss.tools.jsf.test.Bundle", new Properties());
+ assertEquals("Bundles properties proposal list has wrong size",GET_BUNDLE_PROPERTIES_EXPECTED_LIST_SIZE, list.size());
}
/**
* Expected beans list size
*/
- public static final int GET_BEANS_EXPECTED_LIST_SIZE = 10;
+ public static final int GET_BEANS_EXPECTED_LIST_SIZE = 12;
/**
* <code>JSFPromptingProvider.getBundles()</code> method test
*/
public void testGetBeans() {
- List<Object> list = provider.getBeans(model);
+ List<Object> list = provider.getList(model, IWebPromptingProvider.JSF_MANAGED_BEANS, null, new Properties());
assertEquals("Managed Beans proposal list has wrong size",GET_BEANS_EXPECTED_LIST_SIZE, list.size());
-
}
+ public static final int GET_BEAN_PROPERTIES_LIST_SIZE = 5;
+
public void testGetBeanProperties() {
- fail("Not yet implemented");
+ List<Object> list = provider.getList(model, IWebPromptingProvider.JSF_BEAN_PROPERTIES, "mbean1.", new Properties());
+ assertEquals("Bean properties proposal list has wrong size",GET_BEAN_PROPERTIES_LIST_SIZE, list.size());
}
+ public static final int BUILD_BEAN_PROPERTIES_LIST_SIZE = 5;
+
public void testBuildBeanProperties() {
- fail("Not yet implemented");
+ List list = provider.buildBeanProperties(model, "org.jboss.tools.jsf.test.ManagedBean1", null);
+ assertEquals("Bean properties proposal list has wrong size",BUILD_BEAN_PROPERTIES_LIST_SIZE, list.size());
}
- public void testBuildBean() {
- fail("Not yet implemented");
- }
-
- public void testFindBean() {
- fail("Not yet implemented");
- }
-
- public void testFindBeanClass() {
- fail("Not yet implemented");
- }
-
- public void testFindBeanClassByClassName() {
- fail("Not yet implemented");
- }
-
public void testGetBeanMethods() {
- fail("Not yet implemented");
+ List<Object> list = provider.getList(model, IWebPromptingProvider.JSF_BEAN_METHODS, "mbean2", new Properties());
+ assertEquals(1, list.size());
}
public void testGetViewActions() {
- fail("Not yet implemented");
+ Properties p = new Properties();
+ p.setProperty(IWebPromptingProvider.VIEW_PATH, "/pages/inputname.jsp");
+ List<Object> list = provider.getList(model, IWebPromptingProvider.JSF_VIEW_ACTIONS, "", p);
+ assertEquals(1, list.size());
}
- public void testGetPathAsList() {
- fail("Not yet implemented");
- }
-
public void testGetPath() {
- fail("Not yet implemented");
+ List<Object> list = provider.getList(model, IWebPromptingProvider.JSF_GET_PATH, "/a.jsf", new Properties());
+ assertEquals(1, list.size());
+ String s = (String)list.get(0);
+ assertEquals("/a.jsp", s);
}
public void testOpenBean() {
@@ -148,7 +143,10 @@
@Override
protected void tearDown() throws Exception {
if(project!=null) {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ JobUtils.waitForIdle();
ResourcesUtils.deleteProject(TEST_PROJECT_NAME);
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
}
}
}
Modified: branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java 2008-10-22 14:20:58 UTC (rev 11074)
+++ branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java 2008-10-22 14:37:28 UTC (rev 11075)
@@ -46,9 +46,9 @@
public void testGettersAndSetters() {
IModelNature n = EclipseResourceUtil.getModelNature(project);
List<Object> result = WebPromptingProvider.getInstance().getList(n.getModel(), IWebPromptingProvider.JSF_BEAN_METHODS, "user.", new Properties());
- assertFalse("Method getX1 is not found. It is not a getter because it has type void.", result.contains("getX1"));
- assertFalse("Method getX2 is not found. It is not a getter because it has a parameter.", result.contains("getX2"));
- assertFalse("Method setX3 is not found. It is not a setter because it has 2 parameters", result.contains("setX3"));
+ assertTrue("Method getX1 is not found. It is not a getter because it has type void.", result.contains("getX1"));
+ assertTrue("Method getX2 is not found. It is not a getter because it has a parameter.", result.contains("getX2"));
+ assertTrue("Method setX3 is not found. It is not a setter because it has 2 parameters", result.contains("setX3"));
}
protected void tearDown() throws CoreException{
Modified: branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFImportTest.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFImportTest.java 2008-10-22 14:20:58 UTC (rev 11074)
+++ branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFImportTest.java 2008-10-22 14:37:28 UTC (rev 11075)
@@ -16,6 +16,7 @@
import org.jboss.tools.jsf.web.helpers.context.ImportProjectWizardContext;
import org.jboss.tools.jst.web.context.*;
import org.jboss.tools.test.util.JUnitUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
import org.osgi.framework.Bundle;
import junit.framework.TestCase;
@@ -32,7 +33,7 @@
* FIXME test is disabled because it hangs build for an eternity
* http://jira.jboss.org/jira/browse/JBIDE-2441
*/
- public void disapledTestImportWithoutLinks() {
+ public void testImportWithoutLinks() {
if(projectLocation == null) return;
ImportWebDirProjectContext context = new ImportProjectWizardContext(XModelFactory.getDefaultInstance().getRoot());
@@ -60,7 +61,9 @@
p.getLocation().toFile().equals(projectLocation));
try {
+ boolean save = ResourcesUtils.setBuildAutomatically(false);
p.delete(false, true, new NullProgressMonitor());
+ ResourcesUtils.setBuildAutomatically(save);
} catch (CoreException e) {
JUnitUtils.fail("Error in removing project", e);
}
Modified: branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2008-10-22 14:20:58 UTC (rev 11074)
+++ branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2008-10-22 14:37:28 UTC (rev 11075)
@@ -24,9 +24,9 @@
suite.addTestSuite(JSFModelTest.class);
suite.addTestSuite(ModelFormat_2_0_0_Test.class);
// FIXME http://jira.jboss.org/jira/browse/JBIDE-2441
- // suite.addTestSuite(JSFImportTest.class);
+ suite.addTestSuite(JSFImportTest.class);
suite.addTestSuite(JSFBeansTest.class);
- //suite.addTestSuite(JSFPromptingProviderTest.class);
+ suite.addTestSuite(JSFPromptingProviderTest.class);
return suite;
}
17 years, 2 months
JBoss Tools SVN: r11074 - in trunk/jsf/tests/org.jboss.tools.jsf.test: projects/JSFKickStartOldFormat/JavaSource/demo and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-22 10:20:58 -0400 (Wed, 22 Oct 2008)
New Revision: 11074
Added:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/JavaSource/demo/bundle/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/JavaSource/demo/bundle/Messages.properties
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/Bundle.properties
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean9.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/RefBean3.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/WEB-INF/faces-config.xml
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/testCases.xml
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean2.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/WebContent/WEB-INF/faces-config.xml
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/model/pv/test/JSFPromptingProviderTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFImportTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
Log:
JBIDE-2421
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/JavaSource/demo/bundle/Messages.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/JavaSource/demo/bundle/Messages.properties (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/JavaSource/demo/bundle/Messages.properties 2008-10-22 14:20:58 UTC (rev 11074)
@@ -0,0 +1 @@
+a=b
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/WEB-INF/faces-config.xml 2008-10-22 13:40:07 UTC (rev 11073)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/WEB-INF/faces-config.xml 2008-10-22 14:20:58 UTC (rev 11074)
@@ -48,11 +48,11 @@
</converter>
<managed-bean>
<description>Input Value Holder</description>
- <managed-bean-name>nameBean</managed-bean-name>
- <managed-bean-class>demo.NameBean</managed-bean-class>
+ <managed-bean-name>user</managed-bean-name>
+ <managed-bean-class>demo.User</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
- <property-name>userName</property-name>
+ <property-name>name</property-name>
<property-class>java.lang.String</property-class>
<value/>
</managed-property>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/testCases.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/testCases.xml 2008-10-22 13:40:07 UTC (rev 11073)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/testCases.xml 2008-10-22 14:20:58 UTC (rev 11074)
@@ -359,41 +359,41 @@
<!-- Test Managed Beans -->
<test name="JSFModelTest:testPaths:attribute">
- <property name="path" value="/faces-config.xml/Managed Beans/nameBean"/>
+ <property name="path" value="/faces-config.xml/Managed Beans/user"/>
<property name="attributeName" value="element type"/>
<property name="attributeValue" value="managed-bean"/>
</test>
<test name="JSFModelTest:testPaths:attribute">
- <property name="path" value="/faces-config.xml/Managed Beans/nameBean"/>
+ <property name="path" value="/faces-config.xml/Managed Beans/user"/>
<property name="attributeName" value="managed-bean-class"/>
- <property name="attributeValue" value="demo.NameBean"/>
+ <property name="attributeValue" value="demo.User"/>
</test>
<test name="JSFModelTest:testPaths:attribute">
- <property name="path" value="/faces-config.xml/Managed Beans/nameBean"/>
+ <property name="path" value="/faces-config.xml/Managed Beans/user"/>
<property name="attributeName" value="managed-bean-scope"/>
<property name="attributeValue" value="session"/>
</test>
<test name="JSFModelTest:testPaths:attribute">
- <property name="path" value="/faces-config.xml/Managed Beans/nameBean"/>
+ <property name="path" value="/faces-config.xml/Managed Beans/user"/>
<property name="attributeName" value="description"/>
<property name="attributeValue" value="Input Value Holder"/>
</test>
<!-- Test Managed Property -->
<test name="JSFModelTest:testPaths:attribute">
- <property name="path" value="/faces-config.xml/Managed Beans/nameBean/userName"/>
+ <property name="path" value="/faces-config.xml/Managed Beans/user/name"/>
<property name="attributeName" value="element type"/>
<property name="attributeValue" value="managed-property"/>
</test>
<!-- Test list-values -->
<test name="JSFModelTest:testPaths:attribute">
- <property name="path" value="/faces-config.xml/Managed Beans/nameBean/aliases/Entries"/>
+ <property name="path" value="/faces-config.xml/Managed Beans/user/aliases/Entries"/>
<property name="attributeName" value="element type"/>
<property name="attributeValue" value="list-entries"/>
</test>
<test name="JSFModelTest:testPaths:attribute">
- <property name="path" value="/faces-config.xml/Managed Beans/nameBean/aliases/Entries"/>
+ <property name="path" value="/faces-config.xml/Managed Beans/user/aliases/Entries"/>
<property name="attributeName" value="value-class"/>
<property name="attributeValue" value="java.lang.String"/>
</test>
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/Bundle.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/Bundle.properties (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/Bundle.properties 2008-10-22 14:20:58 UTC (rev 11074)
@@ -0,0 +1,3 @@
+a=1
+b=2
+c=3
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean2.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean2.java 2008-10-22 13:40:07 UTC (rev 11073)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean2.java 2008-10-22 14:20:58 UTC (rev 11074)
@@ -10,4 +10,6 @@
public class ManagedBean2 {
public ManagedBean2() {
}
+
+ public void exec() {}
}
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean9.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean9.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean9.java 2008-10-22 14:20:58 UTC (rev 11074)
@@ -0,0 +1,13 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.test;
+
+/**
+ * @author eskimo
+ *
+ */
+public class ManagedBean9 {
+ public ManagedBean9() {
+ }
+}
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/RefBean3.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/RefBean3.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/RefBean3.java 2008-10-22 14:20:58 UTC (rev 11074)
@@ -0,0 +1,49 @@
+package org.jboss.tools.jsf.test;
+
+public class RefBean3 {
+ private String property6;
+ private String property7;
+ private String property8;
+ private String property9;
+ private RefBean2 property10;
+
+ public String getProperty6() {
+ return property6;
+ }
+
+ public void setProperty6(String property1) {
+ this.property6 = property1;
+ }
+
+ public String getProperty7() {
+ return property7;
+ }
+
+ public void setProperty7(String property2) {
+ this.property7 = property2;
+ }
+
+ public String getProperty8() {
+ return property8;
+ }
+
+ public void setProperty8(String property3) {
+ this.property8 = property3;
+ }
+
+ public String getProperty9() {
+ return property9;
+ }
+
+ public void setProperty9(String property4) {
+ this.property9 = property4;
+ }
+
+ public RefBean2 getProperty10() {
+ return property10;
+ }
+
+ public void setProperty10(RefBean2 property5) {
+ this.property10 = property5;
+ }
+}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/WebContent/WEB-INF/faces-config.xml 2008-10-22 13:40:07 UTC (rev 11073)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/WebContent/WEB-INF/faces-config.xml 2008-10-22 14:20:58 UTC (rev 11074)
@@ -61,4 +61,14 @@
<referenced-bean-name>refbean2</referenced-bean-name>
<referenced-bean-class>org.jboss.tools.jsf.test.RefBean2</referenced-bean-class>
</referenced-bean>
+ <navigation-rule>
+ <from-view-id>/pages/inputname.jsp</from-view-id>
+ <navigation-case>
+ <from-outcome>greeting</from-outcome>
+ <to-view-id>/pages/greeting.jsp</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <application>
+ <message-bundle>org.jboss.tools.jsf.test.Bundle</message-bundle>
+ </application>
</faces-config>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/model/pv/test/JSFPromptingProviderTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/model/pv/test/JSFPromptingProviderTest.java 2008-10-22 13:40:07 UTC (rev 11073)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/model/pv/test/JSFPromptingProviderTest.java 2008-10-22 14:20:58 UTC (rev 11074)
@@ -3,14 +3,11 @@
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
+import java.util.Properties;
-import org.eclipse.core.internal.resources.Workspace;
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.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.common.model.XModel;
@@ -18,7 +15,9 @@
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jsf.model.pv.JSFPromptingProvider;
import org.jboss.tools.jsf.plugin.JsfTestPlugin;
+import org.jboss.tools.jst.web.project.list.IWebPromptingProvider;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
+import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
import junit.framework.TestCase;
@@ -57,80 +56,76 @@
}
public void testIsSupporting() {
- fail("Not yet implemented");
+ assertTrue(provider.isSupporting(IWebPromptingProvider.JSF_BUNDLES));
}
public void testGetList() {
- fail("Not yet implemented");
+ List<Object> list = provider.getList(model, "", "", new Properties());
+ assertEquals("Empty list should be returned for unsupported id.",IWebPromptingProvider.EMPTY_LIST, list);
}
/******************************************************************
* getBundles method test
******************************************************************/
- public static final int GET_BUNDLE_EXPECTED_LIST_SIZE = 0;
+ public static final int GET_BUNDLE_EXPECTED_LIST_SIZE = 1;
/**
*
*/
public void testGetBundles() {
- List<Object> list = provider.getBundles(model);
+ List<Object> list = provider.getList(model, IWebPromptingProvider.JSF_BUNDLES, "", new Properties());
assertEquals("Bundles proposal list has wrong size",GET_BUNDLE_EXPECTED_LIST_SIZE, list.size());
}
+ public static final int GET_BUNDLE_PROPERTIES_EXPECTED_LIST_SIZE = 3;
+
public void testGetBundleProperties() {
- fail("Not yet implemented");
+ List<Object> list = provider.getList(model, IWebPromptingProvider.JSF_BUNDLE_PROPERTIES, "org.jboss.tools.jsf.test.Bundle", new Properties());
+ assertEquals("Bundles properties proposal list has wrong size",GET_BUNDLE_PROPERTIES_EXPECTED_LIST_SIZE, list.size());
}
/**
* Expected beans list size
*/
- public static final int GET_BEANS_EXPECTED_LIST_SIZE = 10;
+ public static final int GET_BEANS_EXPECTED_LIST_SIZE = 12;
/**
* <code>JSFPromptingProvider.getBundles()</code> method test
*/
public void testGetBeans() {
- List<Object> list = provider.getBeans(model);
+ List<Object> list = provider.getList(model, IWebPromptingProvider.JSF_MANAGED_BEANS, null, new Properties());
assertEquals("Managed Beans proposal list has wrong size",GET_BEANS_EXPECTED_LIST_SIZE, list.size());
-
}
+ public static final int GET_BEAN_PROPERTIES_LIST_SIZE = 5;
+
public void testGetBeanProperties() {
- fail("Not yet implemented");
+ List<Object> list = provider.getList(model, IWebPromptingProvider.JSF_BEAN_PROPERTIES, "mbean1.", new Properties());
+ assertEquals("Bean properties proposal list has wrong size",GET_BEAN_PROPERTIES_LIST_SIZE, list.size());
}
+ public static final int BUILD_BEAN_PROPERTIES_LIST_SIZE = 5;
+
public void testBuildBeanProperties() {
- fail("Not yet implemented");
+ List list = provider.buildBeanProperties(model, "org.jboss.tools.jsf.test.ManagedBean1", null);
+ assertEquals("Bean properties proposal list has wrong size",BUILD_BEAN_PROPERTIES_LIST_SIZE, list.size());
}
- public void testBuildBean() {
- fail("Not yet implemented");
- }
-
- public void testFindBean() {
- fail("Not yet implemented");
- }
-
- public void testFindBeanClass() {
- fail("Not yet implemented");
- }
-
- public void testFindBeanClassByClassName() {
- fail("Not yet implemented");
- }
-
public void testGetBeanMethods() {
- fail("Not yet implemented");
+ List<Object> list = provider.getList(model, IWebPromptingProvider.JSF_BEAN_METHODS, "mbean2", new Properties());
+ assertEquals(1, list.size());
}
public void testGetViewActions() {
- fail("Not yet implemented");
+ Properties p = new Properties();
+ p.setProperty(IWebPromptingProvider.VIEW_PATH, "/pages/inputname.jsp");
+ List<Object> list = provider.getList(model, IWebPromptingProvider.JSF_VIEW_ACTIONS, "", p);
+ assertEquals(1, list.size());
}
- public void testGetPathAsList() {
- fail("Not yet implemented");
- }
-
public void testGetPath() {
- fail("Not yet implemented");
+ List<Object> list = provider.getList(model, IWebPromptingProvider.JSF_GET_PATH, "/a.jsf", new Properties());
+ assertEquals(1, list.size());
+ String s = (String)list.get(0);
+ assertEquals("/a.jsp", s);
}
public void testOpenBean() {
@@ -148,7 +143,10 @@
@Override
protected void tearDown() throws Exception {
if(project!=null) {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ JobUtils.waitForIdle();
ResourcesUtils.deleteProject(TEST_PROJECT_NAME);
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
}
}
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java 2008-10-22 13:40:07 UTC (rev 11073)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java 2008-10-22 14:20:58 UTC (rev 11074)
@@ -46,9 +46,9 @@
public void testGettersAndSetters() {
IModelNature n = EclipseResourceUtil.getModelNature(project);
List<Object> result = WebPromptingProvider.getInstance().getList(n.getModel(), IWebPromptingProvider.JSF_BEAN_METHODS, "user.", new Properties());
- assertFalse("Method getX1 is not found. It is not a getter because it has type void.", result.contains("getX1"));
- assertFalse("Method getX2 is not found. It is not a getter because it has a parameter.", result.contains("getX2"));
- assertFalse("Method setX3 is not found. It is not a setter because it has 2 parameters", result.contains("setX3"));
+ assertTrue("Method getX1 is not found. It is not a getter because it has type void.", result.contains("getX1"));
+ assertTrue("Method getX2 is not found. It is not a getter because it has a parameter.", result.contains("getX2"));
+ assertTrue("Method setX3 is not found. It is not a setter because it has 2 parameters", result.contains("setX3"));
}
protected void tearDown() throws CoreException{
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFImportTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFImportTest.java 2008-10-22 13:40:07 UTC (rev 11073)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFImportTest.java 2008-10-22 14:20:58 UTC (rev 11074)
@@ -16,6 +16,7 @@
import org.jboss.tools.jsf.web.helpers.context.ImportProjectWizardContext;
import org.jboss.tools.jst.web.context.*;
import org.jboss.tools.test.util.JUnitUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
import org.osgi.framework.Bundle;
import junit.framework.TestCase;
@@ -32,7 +33,7 @@
* FIXME test is disabled because it hangs build for an eternity
* http://jira.jboss.org/jira/browse/JBIDE-2441
*/
- public void disapledTestImportWithoutLinks() {
+ public void testImportWithoutLinks() {
if(projectLocation == null) return;
ImportWebDirProjectContext context = new ImportProjectWizardContext(XModelFactory.getDefaultInstance().getRoot());
@@ -60,7 +61,9 @@
p.getLocation().toFile().equals(projectLocation));
try {
+ boolean save = ResourcesUtils.setBuildAutomatically(false);
p.delete(false, true, new NullProgressMonitor());
+ ResourcesUtils.setBuildAutomatically(save);
} catch (CoreException e) {
JUnitUtils.fail("Error in removing project", e);
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2008-10-22 13:40:07 UTC (rev 11073)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2008-10-22 14:20:58 UTC (rev 11074)
@@ -24,9 +24,9 @@
suite.addTestSuite(JSFModelTest.class);
suite.addTestSuite(ModelFormat_2_0_0_Test.class);
// FIXME http://jira.jboss.org/jira/browse/JBIDE-2441
- // suite.addTestSuite(JSFImportTest.class);
+ suite.addTestSuite(JSFImportTest.class);
suite.addTestSuite(JSFBeansTest.class);
- //suite.addTestSuite(JSFPromptingProviderTest.class);
+ suite.addTestSuite(JSFPromptingProviderTest.class);
return suite;
}
17 years, 2 months
JBoss Tools SVN: r11073 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test: src/org/jboss/tools/jsf/vpe/richfaces/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-10-22 09:40:07 -0400 (Wed, 22 Oct 2008)
New Revision: 11073
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/paint2D.xhtml.xml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/modalPanel.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/paint2D.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2810, tests for rich:modalPanel, rich:orderingList, rich:paint2D.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/modalPanel.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/modalPanel.xhtml 2008-10-22 13:04:59 UTC (rev 11072)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/modalPanel.xhtml 2008-10-22 13:40:07 UTC (rev 11073)
@@ -9,8 +9,7 @@
<head>
</head>
<body>
-<!-- Modal Panel -->
-<rich:modalPanel id="mp" minHeight="200" minWidth="450" height="200"
+<rich:modalPanel id="modalPanel" minHeight="200" minWidth="450" height="200"
width="500" zindex="2000">
<f:facet name="header">
<h:outputText value="Modal Panel Title" />
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml
===================================================================
(Binary files differ)
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml 2008-10-22 13:40:07 UTC (rev 11073)
@@ -0,0 +1,111 @@
+<tests>
+ <test id="orderingList">
+ <TABLE WIDTH="300" HEIGHT="200" CLASS="rich-ordering-list-body">
+ <TR>
+ <TD>
+ <DIV CLASS="rich-ordering-list-caption" STYLE="width: 350px; height: 300px;">
+ </DIV>
+ <DIV STYLE="overflow: hidden; width: 100%;">
+ <TABLE>
+ <TR>
+ <TD>
+ <DIV STYLE=""
+ CLASS="rich-ordering-list-output rich-ordering-list-content">
+ <TABLE CELLSPACING="1" CLASS="rich-ordering-list-items"
+ ID="orderingList" LISTHEIGHT="300" LISTWIDTH="350" STYLE="width: 100%;">
+ <THEAD>
+ <TR
+ CLASS="rich-ordering-list-header rich-ordering-list-table-header">
+ <TD
+ BACKGROUND="/.*org.jboss.tools.jsf.vpe.richfaces/resources/orderingList/table_header_cell_bg.gif/"
+ CLASS="rich-ordering-list-table-header-cell" SCOP="col">
+ <SPAN> Song Name</SPAN>
+ </TD>
+ <TD
+ BACKGROUND="/.*org.jboss.tools.jsf.vpe.richfaces/resources/orderingList/table_header_cell_bg.gif/"
+ CLASS="rich-ordering-list-table-header-cell" SCOP="col">
+ <SPAN> Artist Name</SPAN>
+ </TD>
+ </TR>
+ </THEAD>
+ <TBODY>
+ <TR CLASS="rich-ordering-list-row">
+ <TD WIDTH="180" CLASS="dr-table-cell rich-table-cell">
+ <SPAN> You must be evil</SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell">
+ <SPAN> Chris Rea</SPAN>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </DIV>
+ </TD>
+ <TD>
+ <DIV STYLE="overflow: scroll; width: 17px; height: 100%;">
+ </DIV>
+ <BR _MOZ_DIRTY="" TYPE="_moz"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD>
+ <DIV STYLE="overflow: scroll; width: 100%; height: 17px;">
+ </DIV>
+ <BR _MOZ_DIRTY="" TYPE="_moz"/>
+ </TD>
+ </TR>
+ </TABLE>
+ </DIV>
+ </TD>
+ <TD ALIGN="center" CLASS="rich-ordering-list-button-valign">
+ <DIV CLASS="rich-ordering-controls null rich-ordering-list-button-layout">
+ <DIV CLASS="dr-buttons-border rich-ordering-control-top null">
+ <DIV CLASS="rich-ordering-list-button"
+ STYLE="/width: 100%; background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/orderingList/button_bg.gif\);/">
+ <A CLASS="rich-ordering-list-button-selection">
+ <DIV CLASS="rich-ordering-list-button-content">
+ <IMG WIDTH="15" HEIGHT="15"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/orderingList/top.gif/"/>First
+ </DIV>
+ </A>
+ </DIV>
+ </DIV>
+ <DIV CLASS="dr-buttons-border rich-ordering-control-up null">
+ <DIV CLASS="rich-ordering-list-button"
+ STYLE="/width: 100%; background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/orderingList/button_bg.gif\);/">
+ <A CLASS="rich-ordering-list-button-selection">
+ <DIV CLASS="rich-ordering-list-button-content">
+ <IMG WIDTH="15" HEIGHT="15"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/orderingList/up.gif/"/>Up
+ </DIV>
+ </A>
+ </DIV>
+ </DIV>
+ <DIV CLASS="dr-buttons-border rich-ordering-control-down null">
+ <DIV CLASS="rich-ordering-list-button"
+ STYLE="/width: 100%; background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/orderingList/button_bg.gif\);/">
+ <A CLASS="rich-ordering-list-button-selection">
+ <DIV CLASS="rich-ordering-list-button-content">
+ <IMG WIDTH="15" HEIGHT="15"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/orderingList/down.gif/"/>Down
+ </DIV>
+ </A>
+ </DIV>
+ </DIV>
+ <DIV CLASS="dr-buttons-border rich-ordering-control-bottom null">
+ <DIV CLASS="rich-ordering-list-button"
+ STYLE="/width: 100%; background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/orderingList/button_bg.gif\);/">
+ <A CLASS="rich-ordering-list-button-selection">
+ <DIV CLASS="rich-ordering-list-button-content">
+ <IMG WIDTH="15" HEIGHT="15"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/orderingList/bottom.gif/"/>Last
+ </DIV>
+ </A>
+ </DIV>
+ </DIV>
+ </DIV>
+ </TD>
+ </TR>
+ </TABLE>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/paint2D.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/paint2D.xhtml 2008-10-22 13:04:59 UTC (rev 11072)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/paint2D.xhtml 2008-10-22 13:40:07 UTC (rev 11073)
@@ -10,9 +10,7 @@
</head>
<body>
-<!-- Paint 2D component -->
-<rich:paint2D id="painter" width="300" height="120" data="#{paintData}"
+<rich:paint2D id="paint2D" width="300" height="120" data="#{paintData}"
format="png" paint="#{paintBean.paint}" />
-<rich:spacer width="720" height="10" />
</body>
</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/paint2D.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/paint2D.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/paint2D.xhtml.xml 2008-10-22 13:40:07 UTC (rev 11073)
@@ -0,0 +1,7 @@
+<tests>
+ <test id="paint2D">
+ <IMG WIDTH="300" HEIGHT="120"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/paint2D/paint2D.gif/"
+ ID="paint2D" DATA="#{paintData}" FORMAT="png" PAINT="#{paintBean.paint}" />
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/paint2D.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-22 13:04:59 UTC (rev 11072)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-22 13:40:07 UTC (rev 11073)
@@ -208,15 +208,15 @@
}
public void testModalPanel() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performInvisibleTagTest("components/modalPanel.xhtml", "modalPanel"); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testOrderingList() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/orderingList.xhtml");//$NON-NLS-1$
}
public void testPaint2D() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/paint2D.xhtml");//$NON-NLS-1$
}
public void testPanel() throws Throwable {
17 years, 2 months
JBoss Tools SVN: r11072 - branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2008-10-22 09:04:59 -0400 (Wed, 22 Oct 2008)
New Revision: 11072
Modified:
branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java
Log:
JBIDE-2956
Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2008-10-22 12:57:57 UTC (rev 11071)
+++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2008-10-22 13:04:59 UTC (rev 11072)
@@ -28,7 +28,7 @@
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.dom.AST;
import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
+import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
import org.eclipse.jdt.internal.core.JavaElement;
import org.eclipse.jdt.internal.core.JavaElementInfo;
import org.eclipse.jdt.internal.core.JavaProject;
@@ -178,7 +178,10 @@
else {
fullyQualifiedName = ""; //$NON-NLS-1$
}
- fullyQualifiedName += ((TypeDeclaration)(resultCU.types().get(0))).getName();
+ Object tmp = resultCU.types().get(0);
+ if (tmp instanceof AbstractTypeDeclaration) {
+ fullyQualifiedName += ((AbstractTypeDeclaration)tmp).getName();
+ }
}
} catch (IllegalArgumentException e) {
HibernateConsolePlugin.getDefault().logErrorMessage("IllegalArgumentException: ", e); //$NON-NLS-1$
17 years, 2 months
JBoss Tools SVN: r11071 - trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2008-10-22 08:57:57 -0400 (Wed, 22 Oct 2008)
New Revision: 11071
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java
Log:
JBIDE-2956
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2008-10-22 10:05:13 UTC (rev 11070)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2008-10-22 12:57:57 UTC (rev 11071)
@@ -28,7 +28,7 @@
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.dom.AST;
import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
+import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
import org.eclipse.jdt.internal.core.JavaElement;
import org.eclipse.jdt.internal.core.JavaElementInfo;
import org.eclipse.jdt.internal.core.JavaProject;
@@ -178,7 +178,10 @@
else {
fullyQualifiedName = ""; //$NON-NLS-1$
}
- fullyQualifiedName += ((TypeDeclaration)(resultCU.types().get(0))).getName();
+ Object tmp = resultCU.types().get(0);
+ if (tmp instanceof AbstractTypeDeclaration) {
+ fullyQualifiedName += ((AbstractTypeDeclaration)tmp).getName();
+ }
}
} catch (IllegalArgumentException e) {
HibernateConsolePlugin.getDefault().logErrorMessage("IllegalArgumentException: ", e); //$NON-NLS-1$
17 years, 2 months
JBoss Tools SVN: r11070 - in branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui: src/org/jboss/tools/smooks/graphical/util and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-10-22 06:05:13 -0400 (Wed, 22 Oct 2008)
New Revision: 11070
Added:
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLTargetModelAnalyzer.java
Removed:
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksNewWizardPage.java
Modified:
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalInformationSaver.java
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/NewJavaBeanStrucutredDataWizard.java
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/IStructuredDataCreationWizard.java
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizardPage.java
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractStructuredDdataWizard.java
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizard.java
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java
Log:
JBIDE-2945
1.Change the data path keys' value of graphical information file .
The old keys' value is "xmlFile".
The new keys' value is "sourceDataPath" or "targetDataPath".
2.Add a extension to make the tools can parse the target xml data type.
3.Modify the creation wizard , if user don't select the source and target both , the wizard can't finish.
Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2008-10-22 09:32:41 UTC (rev 11069)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2008-10-22 10:05:13 UTC (rev 11070)
@@ -154,8 +154,13 @@
</mappingAnalyzer>
<sourceModelAnalyzer
class="org.jboss.tools.smooks.xml2java.analyzer.XMLSourceModelAnalyzer"
- name="XML"
+ name="XML Source"
typeID="org.jboss.tools.smooks.xml.viewerInitor.xml">
</sourceModelAnalyzer>
+ <targetModelAnalyzer
+ class="org.jboss.tools.smooks.xml2java.analyzer.XMLTargetModelAnalyzer"
+ name="XML Target"
+ typeID="org.jboss.tools.smooks.xml.viewerInitor.xml">
+ </targetModelAnalyzer>
</extension>
</plugin>
Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalInformationSaver.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalInformationSaver.java 2008-10-22 09:32:41 UTC (rev 11069)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalInformationSaver.java 2008-10-22 10:05:13 UTC (rev 11070)
@@ -42,7 +42,7 @@
private IEditorInput input;
protected Resource graphicalFileResource;
-
+
private IFile file = null;
/**
@@ -114,6 +114,12 @@
public void doSave(IProgressMonitor monitor, String sourceid,
String targetid) throws IOException, CoreException {
+ this.doSave(monitor, sourceid,targetid,null);
+ }
+
+ public void doSave(IProgressMonitor monitor, String sourceid,
+ String targetid, Properties properties) throws IOException,
+ CoreException {
GraphInformations graph = null;
if (graphicalFileResource != null) {
if (graphicalFileResource.getContents().isEmpty()) {
@@ -125,10 +131,15 @@
}
if (graph != null) {
initMappingTypes(graph, sourceid, targetid);
+ Params params = GraphicalFactory.eINSTANCE.createParams();
+ graph.setParams(params);
+ initParams(params, properties);
}
graphicalFileResource.save(Collections.EMPTY_MAP);
- if(this.file != null) file.refreshLocal(IResource.DEPTH_ONE, monitor);
+ if (this.file != null)
+ file.refreshLocal(IResource.DEPTH_ONE, monitor);
}
+
}
public void doSave(IProgressMonitor monitor,
@@ -136,36 +147,18 @@
CoreException {
String sourceID = context.getSourceDataTypeID();
String targetID = context.getTargetDataTypeID();
- GraphInformations graph = null;
- if (graphicalFileResource != null) {
- if (graphicalFileResource.getContents().isEmpty()) {
- graph = GraphicalFactory.eINSTANCE.createGraphInformations();
- graphicalFileResource.getContents().add(graph);
- } else {
- graph = (GraphInformations) graphicalFileResource.getContents()
- .get(0);
- }
- if (graph != null) {
- initMappingTypes(graph, sourceID, targetID);
- Params params = GraphicalFactory.eINSTANCE.createParams();
- graph.setParams(params);
- initParams(params, context);
- }
- graphicalFileResource.save(Collections.EMPTY_MAP);
- if(this.file != null) file.refreshLocal(IResource.DEPTH_ONE, monitor);
- }
-
+ Properties properties = context.getProperties();
+ this.doSave(monitor, sourceID,targetID,properties);
}
- private void initParams(Params params,
- SmooksConfigurationFileGenerateContext context) {
- Properties pros = context.getProperties();
- Enumeration<Object> keys = pros.keys();
+ private void initParams(Params params, Properties properties) {
+ if(properties == null) return;
+ Enumeration<Object> keys = properties.keys();
while (keys.hasMoreElements()) {
String key = (String) keys.nextElement();
Param param = GraphicalFactory.eINSTANCE.createParam();
param.setName(key);
- param.setValue(pros.getProperty(key));
+ param.setValue(properties.getProperty(key));
params.getParam().add(param);
}
}
Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-10-22 09:32:41 UTC (rev 11069)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-10-22 10:05:13 UTC (rev 11070)
@@ -41,6 +41,8 @@
import org.jboss.tools.smooks.analyzer.MappingResourceConfigList;
import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException;
import org.jboss.tools.smooks.graphical.GraphInformations;
+import org.jboss.tools.smooks.graphical.Param;
+import org.jboss.tools.smooks.graphical.Params;
import org.jboss.tools.smooks.javabean.model.JavaBeanModel;
import org.jboss.tools.smooks.javabean.model.JavaBeanModelFactory;
import org.jboss.tools.smooks.model.AbstractResourceConfig;
@@ -76,6 +78,10 @@
public static final String SPACE_STRING = " ";
+ private static final int TARGET_DATA = 1;
+
+ private static final int SOURCE_DATA = 0;
+
private List usedConnectionList = new ArrayList();
private ComposedAdapterFactory adapterFactory;
@@ -350,7 +356,7 @@
AbstractStructuredDataModel sourceModel) {
JavaBeanModel source = (JavaBeanModel) sourceModel
.getReferenceEntityModel();
- if(source.getBeanClass().isArray()){
+ if (source.getBeanClass().isArray()) {
return source.getName();
}
if (Collection.class.isAssignableFrom(source.getBeanClass())) {
@@ -491,7 +497,11 @@
/*
* (non-Javadoc)
*
- * @see org.jboss.tools.smooks.analyzer.IMappingAnalyzer#analyzeMappingGraphModel(org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext)
+ * @see
+ * org.jboss.tools.smooks.analyzer.IMappingAnalyzer#analyzeMappingGraphModel
+ * (
+ * org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext
+ * )
*/
public void analyzeMappingGraphModel(
SmooksConfigurationFileGenerateContext context)
@@ -541,7 +551,8 @@
}
String beanClass = SmooksModelUtils.getParmaText(
"beanClass", rc);
- if (targetName!=null && targetName.trim().equals(beanClass)) {
+ if (targetName != null
+ && targetName.trim().equals(beanClass)) {
setSelectorIsUsed(sourceName);
// create the first connection
mappingModelList.add(new MappingModel(source, target));
@@ -649,6 +660,27 @@
return null;
}
+ private String getDataSourceClass(GraphInformations info, int dataMode) {
+ String key = "sourceDataPath";
+ if (dataMode == SOURCE_DATA) {
+ key = "sourceDataPath";
+ }
+ if (dataMode == TARGET_DATA) {
+ key = "targetDataPath";
+ }
+
+ Params params = info.getParams();
+ List paramList = params.getParam();
+ for (Iterator iterator = paramList.iterator(); iterator.hasNext();) {
+ Param param = (Param) iterator.next();
+ if (key.equals(param.getName())) {
+ return param.getValue();
+ }
+ }
+
+ return null;
+ }
+
public Object buildSourceInputObjects(GraphInformations graphInfo,
SmooksResourceListType listType, IFile sourceFile,
ClassLoader classLoader) throws InvocationTargetException {
@@ -673,9 +705,12 @@
}
}
}
-
- if (rootClassName == null)
+ if (rootClassName == null) {
+ rootClassName = this.getDataSourceClass(graphInfo, SOURCE_DATA);
+ }
+ if (rootClassName == null) {
return null;
+ }
boolean isWarning = false;
boolean isError = false;
@@ -756,10 +791,16 @@
}
}
}
- if (current == null)
+ if (current == null) {
+ rootClassName = this.getDataSourceClass(graphInfo, TARGET_DATA);
+ }
+ // if can't load the source from GraphicalInformation , return NULL
+ if (current == null && rootClassName == null)
return null;
Class rootClass = null;
- rootClassName = SmooksModelUtils.getParmaText("beanClass", current);
+ if (rootClassName == null) {
+ rootClassName = SmooksModelUtils.getParmaText("beanClass", current);
+ }
if (rootClassName != null && loader != null) {
try {
rootClass = loader.loadClass(rootClassName);
@@ -801,9 +842,6 @@
String selector = SmooksModelUtils
.getAttributeValueFromAnyType(binding,
SmooksModelUtils.ATTRIBUTE_SELECTOR);
- // if(property == null){
- // continue;
- // }
processBindingPropertyFromTargetModel(listType, property,
selector, beanModel, classLoader);
}
Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/NewJavaBeanStrucutredDataWizard.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/NewJavaBeanStrucutredDataWizard.java 2008-10-22 09:32:41 UTC (rev 11069)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/NewJavaBeanStrucutredDataWizard.java 2008-10-22 10:05:13 UTC (rev 11070)
@@ -27,6 +27,7 @@
import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
+import org.jboss.tools.smooks.javabean.model.JavaBeanModel;
import org.jboss.tools.smooks.ui.IStructuredDataCreationWizard;
import org.jboss.tools.smooks.ui.SmooksUIActivator;
@@ -34,24 +35,30 @@
* @author Dart Peng
* @Date Aug 5, 2008
*/
-public class NewJavaBeanStrucutredDataWizard extends Wizard implements IStructuredDataCreationWizard,INewWizard{
+public class NewJavaBeanStrucutredDataWizard extends Wizard implements
+ IStructuredDataCreationWizard, INewWizard {
JavaBeanConfigWizardPage page = null;
IJavaProject project = null;
Object result = null;
Properties properties = new Properties();
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.jface.wizard.Wizard#addPages()
*/
@Override
public void addPages() {
super.addPages();
- if(page == null){
+ if (page == null) {
page = new JavaBeanConfigWizardPage(project);
this.addPage(page);
}
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.jface.wizard.Wizard#performFinish()
*/
@Override
@@ -67,12 +74,12 @@
}
public void init(IEditorSite site, IEditorInput input) {
- if(input != null && input instanceof IFileEditorInput){
- IFileEditorInput fi = (IFileEditorInput)input;
+ if (input != null && input instanceof IFileEditorInput) {
+ IFileEditorInput fi = (IFileEditorInput) input;
IProject project = fi.getFile().getProject();
- if(project instanceof IJavaProject){
- this.project = (IJavaProject)project;
- }else{
+ if (project instanceof IJavaProject) {
+ this.project = (IJavaProject) project;
+ } else {
this.project = JavaCore.create(project);
}
}
@@ -87,23 +94,34 @@
}
public void init(IWorkbench workbench, IStructuredSelection selection) {
- if(selection != null){
+ if (selection != null) {
Object obj = selection.getFirstElement();
- if(obj instanceof JavaProject){
- this.project = (JavaProject)obj;
+ if (obj instanceof JavaProject) {
+ this.project = (JavaProject) obj;
}
- if(obj instanceof IResource){
- IProject project = ((IResource)obj).getProject();
+ if (obj instanceof IResource) {
+ IProject project = ((IResource) obj).getProject();
this.project = JavaCore.create(project);
}
-
- if(project == null){
- if(obj instanceof IAdaptable){
- IResource relateResource =(IResource) ((IAdaptable)obj).getAdapter(IResource.class);
+
+ if (project == null) {
+ if (obj instanceof IAdaptable) {
+ IResource relateResource = (IResource) ((IAdaptable) obj)
+ .getAdapter(IResource.class);
IProject project = relateResource.getProject();
this.project = JavaCore.create(project);
}
}
}
}
+
+ public String getStructuredDataSourcePath() {
+ JavaBeanModel model = page.getJavaBeanModel();
+ if (model != null) {
+ Class clazz = model.getBeanClass();
+ if (clazz != null)
+ return clazz.getName();
+ }
+ return null;
+ }
}
Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/IStructuredDataCreationWizard.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/IStructuredDataCreationWizard.java 2008-10-22 09:32:41 UTC (rev 11069)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/IStructuredDataCreationWizard.java 2008-10-22 10:05:13 UTC (rev 11070)
@@ -31,4 +31,6 @@
public Properties getProperties();
+ public String getStructuredDataSourcePath();
+
}
Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-10-22 09:32:41 UTC (rev 11069)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-10-22 10:05:13 UTC (rev 11070)
@@ -913,7 +913,7 @@
protected void initTransformViewerModel(IEditorSite site, IEditorInput input)
throws Throwable {
graphicalInformationSaver = new GraphicalInformationSaver(input);
-
+
GraphInformations graph = null;
try {
graph = graphicalInformationSaver.doLoad();
Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java 2008-10-22 09:32:41 UTC (rev 11069)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java 2008-10-22 10:05:13 UTC (rev 11070)
@@ -116,8 +116,18 @@
}
return false;
}
+
+
@Override
+ public boolean isPageComplete() {
+ if (this.getSourceID() != null && getTargetID() != null) {
+ return true;
+ }
+ return false;
+ }
+
+ @Override
public IWizardPage getNextPage() {
String sourceID = this.getSourceID();
String targetID = this.getTargetID();
@@ -280,7 +290,6 @@
protected void openTargetWizard() {
targetTreeViewerInputContents = getReturnObjectFromWizard(getTargetID());
- resetLinkText();
}
protected IWizard getWizardViaDataID(String dataID) {
Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java 2008-10-22 09:32:41 UTC (rev 11069)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java 2008-10-22 10:05:13 UTC (rev 11070)
@@ -6,6 +6,7 @@
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Properties;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
@@ -42,6 +43,10 @@
public class SmooksConfigFileNewWizard extends Wizard implements INewWizard,
ISmooksDataCreationAddtionWizard {
+ public static final String PRO_SOURCE_DATA_PATH = "sourceDataPath";
+
+ public static final String PRO_TARGET_DATA_PATH = "targetDataPath";
+
private SmooksConfigFileNewWizardPage page;
private TypeIDSelectionWizardPage typeIDPage;
@@ -60,7 +65,8 @@
super();
setNeedsProgressMonitor(true);
super.setWindowTitle("New Smooks Configuration File");
- setDefaultPageImageDescriptor(ModelUIImages.getImageDescriptor(ModelUIImages.WIZARD_NEW_PROJECT));
+ setDefaultPageImageDescriptor(ModelUIImages
+ .getImageDescriptor(ModelUIImages.WIZARD_NEW_PROJECT));
}
/**
@@ -118,9 +124,10 @@
private void doFinish(final IFile file, IProgressMonitor monitor)
throws CoreException {
// create a sample file
- String sourceTypeID = typeIDPage.getSourceID();
- String targetTypeID = typeIDPage.getTargetID();
-
+ final String sourceTypeID = typeIDPage.getSourceID();
+ final String targetTypeID = typeIDPage.getTargetID();
+ final String[] sourceDataPath = new String[] { null };
+ final String[] targetDataPath = new String[] { null };
try {
InputStream stream = openContentStream();
if (file.exists()) {
@@ -129,11 +136,12 @@
file.create(stream, true, monitor);
}
stream.close();
- GraphicalInformationSaver ginforSave = new GraphicalInformationSaver(
- file);
- ginforSave.doSave(monitor, sourceTypeID, targetTypeID);
} catch (IOException e) {
+ // ignore
}
+ final GraphicalInformationSaver ginforSave = new GraphicalInformationSaver(
+ file);
+
monitor.worked(1);
monitor.setTaskName("Opening file for editing...");
getShell().getDisplay().asyncExec(new Runnable() {
@@ -156,32 +164,41 @@
if (sourceWizard instanceof IStructuredDataCreationWizard) {
Object sourceObj = ((IStructuredDataCreationWizard) sourceWizard)
.getTreeViewerInputContents();
-// if (sourceObj instanceof List) {
-// if (!((List) sourceObj).isEmpty()) {
-// sourceObj = ((List) sourceObj).get(0);
-// }
-// }
+ sourceDataPath[0] = ((IStructuredDataCreationWizard) sourceWizard)
+ .getStructuredDataSourcePath();
input.setSourceTreeViewerInputContents(sourceObj);
}
if (targetWizard instanceof IStructuredDataCreationWizard) {
Object targetObj = ((IStructuredDataCreationWizard) targetWizard)
.getTreeViewerInputContents();
-// if (targetObj instanceof List) {
-// if (!((List) targetObj).isEmpty()) {
-// targetObj = ((List) targetObj).get(0);
-// }
-// }
+ targetDataPath[0] = ((IStructuredDataCreationWizard) targetWizard)
+ .getStructuredDataSourcePath();
input.setTargetTreeViewerInputContents(targetObj);
}
-
+ Properties properties = null;
+ if (sourceDataPath[0] != null || targetDataPath[0] != null) {
+ properties = new Properties();
+ if (sourceDataPath[0] != null) {
+ properties.setProperty(PRO_SOURCE_DATA_PATH, sourceDataPath[0]);
+ }
+ if (targetDataPath[0] != null) {
+ properties.setProperty(PRO_TARGET_DATA_PATH, targetDataPath[0]);
+ }
+ }
+ try {
+ ginforSave.doSave(null, sourceTypeID, targetTypeID, properties);
+ } catch (IOException e) {
+ } catch (CoreException e) {
+ }
IDE.openEditor(page, input, SmooksFormEditor.EDITOR_ID,
true);// openEditor(page, file, true);
} catch (PartInitException e) {
}
}
});
+
monitor.worked(1);
}
Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizardPage.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizardPage.java 2008-10-22 09:32:41 UTC (rev 11069)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizardPage.java 2008-10-22 10:05:13 UTC (rev 11070)
@@ -16,11 +16,13 @@
super.setTitle("Smooks Configuration");
super.setDescription("Create a new Smooks configuration file");
this.setFileName("newConfig.smooks");
+ this.setAllowExistingResources(false);
}
@Override
protected boolean validatePage() {
boolean flag = super.validatePage();
+ if(!flag) return flag;
String name = this.getFileName();
if (name.indexOf(".") == -1)
return flag;
Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksNewWizardPage.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksNewWizardPage.java 2008-10-22 09:32:41 UTC (rev 11069)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksNewWizardPage.java 2008-10-22 10:05:13 UTC (rev 11070)
@@ -1,233 +0,0 @@
-package org.jboss.tools.smooks.ui.wizards;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.IDialogPage;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ContainerSelectionDialog;
-
-/**
- * The "New" wizard page allows setting the container for the new file as well
- * as the file name. The page will only accept file name without the extension
- * OR with the extension that matches the expected one (smooks).
- */
-
-public class SmooksNewWizardPage extends WizardPage {
- private Text containerText;
-
- private Text fileText;
-
- private ISelection selection;
-
- private Combo typeSelectCombo;
-
- /**
- * Constructor for SampleNewWizardPage.
- *
- * @param pageName
- */
- public SmooksNewWizardPage(ISelection selection) {
- super("wizardPage");
- setTitle("Multi-page Editor File");
- setDescription("This wizard creates a new file with *.smooks extension that can be opened by a multi-page editor.");
- this.selection = selection;
- }
-
- /**
- * @see IDialogPage#createControl(Composite)
- */
- public void createControl(Composite parent) {
-// if(true){
-// Button bu = new Button(parent,SWT.BORDER);
-// bu.setText("BUTTON");
-// this.setControl(bu);
-// return;
-// }
-// parent.setLayout(new FillLayout());
- Composite container = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- container.setLayout(layout);
- layout.numColumns = 3;
- layout.verticalSpacing = 9;
- Label label = new Label(container, SWT.NULL);
- label.setText("&Container:");
-
- containerText = new Text(container, SWT.BORDER | SWT.SINGLE);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- containerText.setLayoutData(gd);
- containerText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- dialogChanged();
- }
- });
-
- Button button = new Button(container, SWT.PUSH);
- button.setText("Browse...");
- button.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- handleBrowse();
- }
- });
- {
- Label l = new Label(container, SWT.NULL);
- l.setText("Trasform Type:");
-
- typeSelectCombo = new Combo(container, SWT.BORDER | SWT.READ_ONLY);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- typeSelectCombo.setLayoutData(gd);
- typeSelectCombo.addSelectionListener(new SelectionListener() {
-
- public void widgetDefaultSelected(SelectionEvent evt) {
-
- }
-
- public void widgetSelected(SelectionEvent evt) {
- dialogChanged();
- }
-
- });
- }
- {
- label = new Label(container, SWT.NULL);
- label.setText("&File name:");
-
- fileText = new Text(container, SWT.BORDER | SWT.SINGLE);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- fileText.setLayoutData(gd);
- fileText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- dialogChanged();
- }
- });
- }
-
-
- initTypeSelectCombo();
- initialize();
- dialogChanged();
- setControl(container);
- }
-
- protected void initTypeSelectCombo() {
- typeSelectCombo.add("Java2Java");
- }
-
- /**
- * Tests if the current workbench selection is a suitable container to use.
- */
-
- private void initialize() {
- if (selection != null && selection.isEmpty() == false
- && selection instanceof IStructuredSelection) {
- IStructuredSelection ssel = (IStructuredSelection) selection;
- if (ssel.size() > 1)
- return;
- Object obj = ssel.getFirstElement();
- if (obj instanceof IResource) {
- IContainer container;
- if (obj instanceof IContainer)
- container = (IContainer) obj;
- else
- container = ((IResource) obj).getParent();
- containerText.setText(container.getFullPath().toString());
- }
- }
- fileText.setText("smooks-config.smooks");
- }
-
- /**
- * Uses the standard container selection dialog to choose the new value for
- * the container field.
- */
-
- private void handleBrowse() {
- ContainerSelectionDialog dialog = new ContainerSelectionDialog(
- getShell(), ResourcesPlugin.getWorkspace().getRoot(), false,
- "Select new file container");
- if (dialog.open() == ContainerSelectionDialog.OK) {
- Object[] result = dialog.getResult();
- if (result.length == 1) {
- containerText.setText(((Path) result[0]).toString());
- }
- }
- }
-
- /**
- * Ensures that both text fields are set.
- */
-
- private void dialogChanged() {
- IResource container = ResourcesPlugin.getWorkspace().getRoot()
- .findMember(new Path(getContainerName()));
- String fileName = getFileName();
-
- int index = typeSelectCombo.getSelectionIndex();
-
- if (index == -1) {
- updateStatus("Please select transform type");
- return;
- }
-
- if (getContainerName().length() == 0) {
- updateStatus("File container must be specified");
- return;
- }
- if (container == null
- || (container.getType() & (IResource.PROJECT | IResource.FOLDER)) == 0) {
- updateStatus("File container must exist");
- return;
- }
- if (!container.isAccessible()) {
- updateStatus("Project must be writable");
- return;
- }
- if (fileName.length() == 0) {
- updateStatus("File name must be specified");
- return;
- }
- if (fileName.replace('\\', '/').indexOf('/', 1) > 0) {
- updateStatus("File name must be valid");
- return;
- }
- int dotLoc = fileName.lastIndexOf('.');
- if (dotLoc != -1) {
- String ext = fileName.substring(dotLoc + 1);
- if (ext.equalsIgnoreCase("smooks") == false) {
- updateStatus("File extension must be \"smooks\"");
- return;
- }
- }
- updateStatus(null);
- }
-
- private void updateStatus(String message) {
- setErrorMessage(message);
- setPageComplete(message == null);
- }
-
- public String getContainerName() {
- return containerText.getText();
- }
-
- public String getFileName() {
- return fileText.getText();
- }
-}
\ No newline at end of file
Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java 2008-10-22 09:32:41 UTC (rev 11069)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java 2008-10-22 10:05:13 UTC (rev 11070)
@@ -62,6 +62,7 @@
public String getFilePath(){
return fileText.getText();
}
+
/*
* (non-Javadoc)
*
Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractStructuredDdataWizard.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractStructuredDdataWizard.java 2008-10-22 09:32:41 UTC (rev 11069)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractStructuredDdataWizard.java 2008-10-22 10:05:13 UTC (rev 11070)
@@ -17,31 +17,29 @@
*
*/
public abstract class AbstractStructuredDdataWizard extends Wizard implements
- IStructuredDataCreationWizard ,INewWizard{
+ IStructuredDataCreationWizard, INewWizard {
protected IWorkbench workbench;
-
+
protected IStructuredSelection selection;
-
+
protected AbstractFileSelectionWizardPage page = null;
- protected Object xsdElement = null;
+ protected Object xsdElement = null;
protected IWizardNode strucutredDataCreationWizardNode;
- /**
- *
- */
+
public AbstractStructuredDdataWizard() {
// TODO Auto-generated constructor stub
}
@Override
public void addPages() {
- if(page == null){
+ if (page == null) {
page = createAbstractFileSelectionWizardPage();
page.setSelection(this.selection);
}
this.addPage(page);
}
- abstract protected AbstractFileSelectionWizardPage createAbstractFileSelectionWizardPage() ;
+ abstract protected AbstractFileSelectionWizardPage createAbstractFileSelectionWizardPage();
/*
* (non-Javadoc)
@@ -53,18 +51,28 @@
xsdElement = this.page.getReturnValue();
return true;
}
+
public Object getTreeViewerInputContents() {
return xsdElement;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.jboss.tools.smooks.ui.IStructuredDataCreationWizard#
+ * getStructuredDataSourcePath()
+ */
+ public String getStructuredDataSourcePath() {
+ return page.getFilePath();
+ }
+
public void init(IEditorSite site, IEditorInput input) {
-
+
}
public void init(IWorkbench workbench, IStructuredSelection selection) {
this.workbench = workbench;
this.selection = selection;
}
-
-
+
}
Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizard.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizard.java 2008-10-22 09:32:41 UTC (rev 11069)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizard.java 2008-10-22 10:05:13 UTC (rev 11070)
@@ -35,7 +35,7 @@
public boolean performFinish() {
filePath = page.getFilePath();
- properties.put(XML_FILE, filePath);
+// properties.put(XML_FILE, filePath);
return super.performFinish();
}
Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java (rev 0)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java 2008-10-22 10:05:13 UTC (rev 11070)
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.smooks.xml2java.analyzer;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Iterator;
+import java.util.List;
+
+import org.dom4j.DocumentException;
+import org.eclipse.core.resources.IFile;
+import org.jboss.tools.smooks.analyzer.ISourceModelAnalyzer;
+import org.jboss.tools.smooks.analyzer.ITargetModelAnalyzer;
+import org.jboss.tools.smooks.graphical.GraphInformations;
+import org.jboss.tools.smooks.graphical.Param;
+import org.jboss.tools.smooks.graphical.Params;
+import org.jboss.tools.smooks.model.SmooksResourceListType;
+import org.jboss.tools.smooks.xml.model.DocumentObject;
+import org.jboss.tools.smooks.xml.model.XMLObjectAnalyzer;
+
+/**
+ * @author Dart Peng<br>
+ * Date : Sep 23, 2008
+ */
+public class AbstractXMLModelAnalyzer implements ISourceModelAnalyzer , ITargetModelAnalyzer {
+
+ private String parmaKey = "";
+
+ public AbstractXMLModelAnalyzer(String paramKey){
+ this.parmaKey = paramKey;
+ }
+
+ public Object buildSourceInputObjects(GraphInformations graphInfo,
+ SmooksResourceListType listType, IFile sourceFile)
+ throws InvocationTargetException {
+ Params params = graphInfo.getParams();
+ String path = null;
+ if (params != null) {
+ List<Param> paramList = graphInfo.getParams().getParam();
+ for (Iterator<Param> iterator = paramList.iterator(); iterator
+ .hasNext();) {
+ Param param = (Param) iterator.next();
+ if (param.getName().equals(parmaKey)) {
+ path = param.getValue();
+ break;
+ }
+ }
+ }
+ if (path == null) {
+ // TODO tell user the filepath can't find or not ?
+ return null;
+// throw new InvocationTargetException(new Exception(
+// "xml file path can't find in the graphInfo file"));
+ }
+ XMLObjectAnalyzer objectBuilder = new XMLObjectAnalyzer();
+ try {
+ FileInputStream stream = new FileInputStream(path);
+ DocumentObject document = objectBuilder.analyze(stream);
+ return document;
+ } catch (FileNotFoundException e) {
+ throw new InvocationTargetException(e);
+ } catch (DocumentException e) {
+ throw new InvocationTargetException(e);
+ }
+ }
+
+ public Object buildTargetInputObjects(GraphInformations graphInfo,
+ SmooksResourceListType listType, IFile sourceFile)
+ throws InvocationTargetException {
+ return buildSourceInputObjects(graphInfo,listType,sourceFile);
+ }
+}
Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-10-22 09:32:41 UTC (rev 11069)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-10-22 10:05:13 UTC (rev 11070)
@@ -218,6 +218,8 @@
JavaBeanModel sourceTarget = (JavaBeanModel) targetObject;
ResourceConfigType rootResourceConfig = findFirstMappingResourceConfig(listType);
+ // if can't find the root , return null
+ if(rootResourceConfig ==null) return null;
String xmlName = rootResourceConfig.getSelector();
AbstractXMLObject source = findXMLObjectByName(xmlName, sourceRoot);
if (source == null)
Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java 2008-10-22 09:32:41 UTC (rev 11069)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java 2008-10-22 10:05:13 UTC (rev 11070)
@@ -10,63 +10,15 @@
******************************************************************************/
package org.jboss.tools.smooks.xml2java.analyzer;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.dom4j.DocumentException;
-import org.eclipse.core.resources.IFile;
-import org.jboss.tools.smooks.analyzer.ISourceModelAnalyzer;
-import org.jboss.tools.smooks.graphical.GraphInformations;
-import org.jboss.tools.smooks.graphical.Param;
-import org.jboss.tools.smooks.graphical.Params;
-import org.jboss.tools.smooks.model.SmooksResourceListType;
-import org.jboss.tools.smooks.xml.model.AbstractXMLObject;
-import org.jboss.tools.smooks.xml.model.DocumentObject;
-import org.jboss.tools.smooks.xml.model.XMLObjectAnalyzer;
-
/**
* @author Dart Peng<br>
* Date : Sep 23, 2008
*/
-public class XMLSourceModelAnalyzer implements ISourceModelAnalyzer {
+public class XMLSourceModelAnalyzer extends AbstractXMLModelAnalyzer{
- public static final String XML_FILE = "xmlFile";
-
- public Object buildSourceInputObjects(GraphInformations graphInfo,
- SmooksResourceListType listType, IFile sourceFile)
- throws InvocationTargetException {
- Params params = graphInfo.getParams();
- String path = null;
- if (params != null) {
- List<Param> paramList = graphInfo.getParams().getParam();
- for (Iterator<Param> iterator = paramList.iterator(); iterator
- .hasNext();) {
- Param param = (Param) iterator.next();
- if (param.getName().equals(XML_FILE)) {
- path = param.getValue();
- break;
- }
- }
- }
- if (path == null) {
- // TODO tell user the filepath can't find or not ?
- return null;
-// throw new InvocationTargetException(new Exception(
-// "xml file path can't find in the graphInfo file"));
- }
- XMLObjectAnalyzer objectBuilder = new XMLObjectAnalyzer();
- try {
- FileInputStream stream = new FileInputStream(path);
- DocumentObject document = objectBuilder.analyze(stream);
- return document;
- } catch (FileNotFoundException e) {
- throw new InvocationTargetException(e);
- } catch (DocumentException e) {
- throw new InvocationTargetException(e);
- }
+ public XMLSourceModelAnalyzer() {
+ super("sourceDataPath");
}
+
}
Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLTargetModelAnalyzer.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLTargetModelAnalyzer.java (rev 0)
+++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLTargetModelAnalyzer.java 2008-10-22 10:05:13 UTC (rev 11070)
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.smooks.xml2java.analyzer;
+
+
+/**
+ * @author Dart Peng<br>
+ * Date : Sep 23, 2008
+ */
+public class XMLTargetModelAnalyzer extends AbstractXMLModelAnalyzer{
+
+ public XMLTargetModelAnalyzer() {
+ super("targetDataPath");
+ }
+
+}
Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLTargetModelAnalyzer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 2 months
JBoss Tools SVN: r11069 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-10-22 05:32:41 -0400 (Wed, 22 Oct 2008)
New Revision: 11069
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesListShuttleTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2936, image source paths were updated.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesListShuttleTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesListShuttleTemplate.java 2008-10-22 09:25:33 UTC (rev 11068)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesListShuttleTemplate.java 2008-10-22 09:32:41 UTC (rev 11069)
@@ -913,7 +913,7 @@
headerCell.setAttribute("background", "file:///" //$NON-NLS-1$ //$NON-NLS-2$
+ ComponentUtil
- .getAbsoluteResourcePath(HEADER_IMG_PATH));
+ .getAbsoluteResourcePath(HEADER_IMG_PATH).replace('\\', '/'));
// get header classes
String headerClass = styleClasses.get("headerCell"); //$NON-NLS-1$
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java 2008-10-22 09:25:33 UTC (rev 11068)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java 2008-10-22 09:32:41 UTC (rev 11069)
@@ -410,7 +410,7 @@
div2.appendChild(a);
a.appendChild(div3);
// Creating button with image and label
- img.setAttribute("src", "file:///" + ComponentUtil.getAbsoluteResourcePath(imgName));
+ ComponentUtil.setImg(img, imgName);
img.setAttribute(HTML.ATTR_WIDTH, "15");
img.setAttribute(HTML.ATTR_HEIGHT, "15");
div3.appendChild(img);
@@ -746,7 +746,7 @@
parentTr.appendChild(td);
td.setAttribute(HtmlComponentUtil.HTML_ATTR_BACKGROUND, "file:///"
- + ComponentUtil.getAbsoluteResourcePath(HEADER_CELL_BG));
+ + ComponentUtil.getAbsoluteResourcePath(HEADER_CELL_BG).replace('\\', '/'));
String styleClass = encodeStyleClass(null, skinCellClass,
headerClass, columnHeaderClass);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java 2008-10-22 09:25:33 UTC (rev 11068)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java 2008-10-22 09:32:41 UTC (rev 11069)
@@ -291,8 +291,7 @@
RichFacesTabPanelTemplate.CSS_SIDE_CELL
+ SPACE +
RichFacesTabPanelTemplate.CSS_SIDE_BORDER);
- String borderImgPath = ComponentUtil.getAbsoluteResourcePath(BORDER_FILE_PATH);
- String style = "background-image: url(file:///" + borderImgPath.replace('\\', '/') + ");"; //$NON-NLS-1$ //$NON-NLS-2$
+ String style = ComponentUtil.getBackgoundImgStyle(BORDER_FILE_PATH);
td.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, style);
nsIDOMElement img = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_IMG);
td.appendChild(img);
17 years, 2 months
JBoss Tools SVN: r11068 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test: src/org/jboss/tools/jsf/vpe/richfaces/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-10-22 05:25:33 -0400 (Wed, 22 Oct 2008)
New Revision: 11068
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/message.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/messages.xhtml.xml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/message.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/messages.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2810, tests for rich:message, rich:messages, rich:listShuttle.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml 2008-10-22 09:11:47 UTC (rev 11067)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml 2008-10-22 09:25:33 UTC (rev 11068)
@@ -10,16 +10,25 @@
</head>
<body>
-<rich:listShuttle sourceValue="#{person.source}"
- targetValue="#{person.target}" var="items" targetListWidth="200"
- sourceCaptionLabel="source label" targetCaptionLabel="target label"
- orderControlsVerticalAlign="top">
+<f:view>
- <rich:column>
- <h:outputText value="#{items}"></h:outputText>
- </rich:column>
+ <rich:listShuttle id="listShuttle" sourceValue="#{person.source}"
+ targetValue="#{person.target}" var="items" targetListWidth="200"
+ sourceCaptionLabel="source label" targetCaptionLabel="target label">
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="Song Name" />
+ </f:facet>
+ <h:outputText value="You must be evil"></h:outputText>
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="Artist Name" />
+ </f:facet>
+ <h:outputText value="Chris Rea"></h:outputText>
+ </rich:column>
+ </rich:listShuttle>
-</rich:listShuttle>
-
+/<f:view>
</body>
</html>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml.xml 2008-10-22 09:25:33 UTC (rev 11068)
@@ -0,0 +1,200 @@
+<tests>
+ <test id="listShuttle">
+ <TABLE CLASS="rich-list-shuttle" STYLE="">
+ <TR>
+ <TD COLSPAN="2" CLASS="rich-shuttle-source-caption"> source label</TD>
+ <TD COLSPAN="2" CLASS="rich-shuttle-target-caption"> target label</TD>
+ </TR>
+ <TR>
+ <TD>
+ <DIV CLASS="rich-shuttle-list-content" STYLE="width: 140px; height: 140px;">
+ <TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="0">
+ <TR CLASS="">
+ <TH
+ BACKGROUND="/.*org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/header.gif/"
+ CLASS="rich-shuttle-header-tab-cell">
+ <DIV>
+ <SPAN> Song Name</SPAN>
+ </DIV>
+ </TH>
+ <TH
+ BACKGROUND="/.*org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/header.gif/"
+ CLASS="rich-shuttle-header-tab-cell">
+ <DIV>
+ <SPAN> Artist Name</SPAN>
+ </DIV>
+ </TH>
+ </TR>
+ <TR STYLE="vertical-align: top;" CLASS="rich-shuttle-source-row null">
+ <TD>
+ <TABLE>
+ <TR>
+ <TD CLASS="dr-table-cell rich-table-cell">
+ <SPAN> You must be evil</SPAN>
+ </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ <TD>
+ <TABLE>
+ <TR>
+ <TD CLASS="dr-table-cell rich-table-cell">
+ <SPAN> Chris Rea</SPAN>
+ </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ </TR>
+ </TABLE>
+ </DIV>
+ </TD>
+ <TD STYLE="vertical-align: middle;">
+ <DIV CLASS="rich-shuttle-controls">
+ <DIV CLASS="rich-shuttle-control">
+ <DIV
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/button.gif\);/"
+ CLASS="rich-shuttle-meta-button">
+ <DIV CLASS="rich-shuttle-button rich-shuttle-copyAll">
+ <DIV CLASS="rich-shuttle-button-content">
+ <IMG WIDTH="15" HEIGHT="15"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/arrow_copy_all.gif/"/> Copy all
+ </DIV>
+ </DIV>
+ </DIV>
+ </DIV>
+ <DIV CLASS="rich-shuttle-control">
+ <DIV
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/button.gif\);/"
+ CLASS="rich-shuttle-meta-button">
+ <DIV CLASS="rich-shuttle-button rich-shuttle-copy">
+ <DIV CLASS="rich-shuttle-button-content">
+ <IMG WIDTH="15" HEIGHT="15"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/arrow_copy.gif/"/> Copy
+ </DIV>
+ </DIV>
+ </DIV>
+ </DIV>
+ <DIV CLASS="rich-shuttle-control">
+ <DIV
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/button.gif\);/"
+ CLASS="rich-shuttle-meta-button">
+ <DIV CLASS="rich-shuttle-button rich-shuttle-remove">
+ <DIV CLASS="rich-shuttle-button-content">
+ <IMG WIDTH="15" HEIGHT="15"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/arrow_remove.gif/"/> Remove
+ </DIV>
+ </DIV>
+ </DIV>
+ </DIV>
+ <DIV CLASS="rich-shuttle-control">
+ <DIV
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/button.gif\);/"
+ CLASS="rich-shuttle-meta-button">
+ <DIV CLASS="rich-shuttle-button rich-shuttle-removeAll">
+ <DIV CLASS="rich-shuttle-button-content">
+ <IMG WIDTH="15" HEIGHT="15"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/arrow_remove_all.gif/"/> Remove All
+ </DIV>
+ </DIV>
+ </DIV>
+ </DIV>
+ </DIV>
+ </TD>
+ <TD>
+ <DIV CLASS="rich-shuttle-list-content" STYLE="height: 140px;">
+ <TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="0">
+ <TR CLASS="">
+ <TH
+ BACKGROUND="/.*org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/header.gif/"
+ CLASS="rich-shuttle-header-tab-cell">
+ <DIV>
+ <SPAN> Song Name</SPAN>
+ </DIV>
+ </TH>
+ <TH
+ BACKGROUND="/.*org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/header.gif/"
+ CLASS="rich-shuttle-header-tab-cell">
+ <DIV>
+ <SPAN> Artist Name</SPAN>
+ </DIV>
+ </TH>
+ </TR>
+ <TR STYLE="vertical-align: top;" CLASS="rich-shuttle-target-row null">
+ <TD>
+ <TABLE>
+ <TR>
+ <TD CLASS="dr-table-cell rich-table-cell">
+ <SPAN> You must be evil</SPAN>
+ </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ <TD>
+ <TABLE>
+ <TR>
+ <TD CLASS="dr-table-cell rich-table-cell">
+ <SPAN> Chris Rea</SPAN>
+ </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ </TR>
+ </TABLE>
+ </DIV>
+ </TD>
+ <TD STYLE="vertical-align: middle;">
+ <DIV CLASS="rich-shuttle-controls">
+ <DIV CLASS="rich-shuttle-control">
+ <DIV
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/button.gif\);/"
+ CLASS="rich-shuttle-meta-button">
+ <DIV CLASS="rich-shuttle-button rich-shuttle-top">
+ <DIV CLASS="rich-shuttle-button-content">
+ <IMG WIDTH="15" HEIGHT="15"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/arrow_first.gif/"/> First
+ </DIV>
+ </DIV>
+ </DIV>
+ </DIV>
+ <DIV CLASS="rich-shuttle-control">
+ <DIV
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/button.gif\);/"
+ CLASS="rich-shuttle-meta-button">
+ <DIV CLASS="rich-shuttle-button rich-shuttle-up">
+ <DIV CLASS="rich-shuttle-button-content">
+ <IMG WIDTH="15" HEIGHT="15"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/arrow_up.gif/"/> Up
+ </DIV>
+ </DIV>
+ </DIV>
+ </DIV>
+ <DIV CLASS="rich-shuttle-control">
+ <DIV
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/button.gif\);/"
+ CLASS="rich-shuttle-meta-button">
+ <DIV CLASS="rich-shuttle-button rich-shuttle-down">
+ <DIV CLASS="rich-shuttle-button-content">
+ <IMG WIDTH="15" HEIGHT="15"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/arrow_down.gif/"/> Down
+ </DIV>
+ </DIV>
+ </DIV>
+ </DIV>
+ <DIV CLASS="rich-shuttle-control">
+ <DIV
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/button.gif\);/"
+ CLASS="rich-shuttle-meta-button">
+ <DIV CLASS="rich-shuttle-button rich-shuttle-bottom">
+ <DIV CLASS="rich-shuttle-button-content">
+ <IMG WIDTH="15" HEIGHT="15"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/shuttle/arrow_last.gif/"/> Last
+ </DIV>
+ </DIV>
+ </DIV>
+ </DIV>
+ </DIV>
+ </TD>
+ </TR>
+ </TABLE>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/listShuttle.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/message.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/message.xhtml 2008-10-22 09:11:47 UTC (rev 11067)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/message.xhtml 2008-10-22 09:25:33 UTC (rev 11068)
@@ -9,8 +9,9 @@
<head>
</head>
<body>
- <!-- Message -->
- <rich:message>
- </rich:message>
+ <f:view>
+ <rich:message id="message">
+ </rich:message>
+</f:view>
</body>
</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/message.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/message.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/message.xhtml.xml 2008-10-22 09:25:33 UTC (rev 11068)
@@ -0,0 +1,5 @@
+<tests>
+ <test id="message">
+ <SPAN> Validation message</SPAN>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/message.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/messages.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/messages.xhtml 2008-10-22 09:11:47 UTC (rev 11067)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/messages.xhtml 2008-10-22 09:25:33 UTC (rev 11068)
@@ -9,8 +9,9 @@
<head>
</head>
<body>
- <!-- Messages -->
- <rich:messages>
- </rich:messages>
+<f:view>
+ <rich:messages id="messages">
+ </rich:messages>
+</f:view>
</body>
</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/messages.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/messages.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/messages.xhtml.xml 2008-10-22 09:25:33 UTC (rev 11068)
@@ -0,0 +1,38 @@
+<tests>
+ <test id="messages">
+ <TABLE>
+ <TR>
+ <TD>
+ <BR _MOZ_DIRTY="" TYPE="_moz"/>
+ </TD>
+ <TD>
+ <BR _MOZ_DIRTY="" TYPE="_moz"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD>
+ <BR _MOZ_DIRTY="" TYPE="_moz"/>
+ </TD>
+ <TD> Error message</TD>
+ </TR>
+ <TR>
+ <TD>
+ <BR _MOZ_DIRTY="" TYPE="_moz"/>
+ </TD>
+ <TD> Fatal message</TD>
+ </TR>
+ <TR>
+ <TD>
+ <BR _MOZ_DIRTY="" TYPE="_moz"/>
+ </TD>
+ <TD> Info message</TD>
+ </TR>
+ <TR>
+ <TD>
+ <BR _MOZ_DIRTY="" TYPE="_moz"/>
+ </TD>
+ <TD> Warning message</TD>
+ </TR>
+ </TABLE>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/messages.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-22 09:11:47 UTC (rev 11067)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-22 09:25:33 UTC (rev 11068)
@@ -196,15 +196,15 @@
}
public void testListShuttle() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/listShuttle.xhtml");//$NON-NLS-1$
}
public void testMessage() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/message.xhtml");//$NON-NLS-1$
}
public void testMessages() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/messages.xhtml");//$NON-NLS-1$
}
public void testModalPanel() throws Throwable {
17 years, 2 months
JBoss Tools SVN: r11067 - branches/jbosstools-3.0.0.Beta1/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-10-22 05:11:47 -0400 (Wed, 22 Oct 2008)
New Revision: 11067
Modified:
branches/jbosstools-3.0.0.Beta1/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeClassPathInitializer.java
Log:
JBIDE-2955: fix the null exception error when remove jboss ws classpath entry
Modified: branches/jbosstools-3.0.0.Beta1/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeClassPathInitializer.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeClassPathInitializer.java 2008-10-22 08:33:10 UTC (rev 11066)
+++ branches/jbosstools-3.0.0.Beta1/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeClassPathInitializer.java 2008-10-22 09:11:47 UTC (rev 11067)
@@ -82,12 +82,14 @@
JBossWSRuntime jbws = JBossWSRuntimeManager.getInstance()
.findRuntimeByName(segment);
if (jbws != null) {
-
- List<String> jars = JBossWSRuntimeManager.getInstance().getAllRuntimeJars(jbws);
+
+ List<String> jars = JBossWSRuntimeManager.getInstance()
+ .getAllRuntimeJars(jbws);
for (String jar : jars) {
entryList.add(getEntry(new Path(jar)));
}
- entries = entryList.toArray(new IClasspathEntry[entryList.size()]);
+ entries = entryList.toArray(new IClasspathEntry[entryList
+ .size()]);
if (entries == null)
return new IClasspathEntry[0];
}
@@ -104,14 +106,21 @@
if (entries == null) {
return;
}
- IClasspathEntry[] newEntries = new IClasspathEntry[entries.length - 1];
- int i = 0;
+
+ List<IClasspathEntry> entriesList = new ArrayList<IClasspathEntry>();
for (IClasspathEntry entry : entries) {
- if (!entry.toString().contains(jarName)) {
- newEntries[i++] = entry;
+ if (entry != null) {
+ IPath path = entry.getPath();
+ if (path != null) {
+ if (path != null && path.lastSegment() != null
+ && path.lastSegment().equals(jarName)) {
+ continue;
+ }
+ }
+ entriesList.add(entry);
}
}
- entries = newEntries;
+ entries = entriesList.toArray(new IClasspathEntry[0]);
}
}
17 years, 2 months
JBoss Tools SVN: r11066 - trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-10-22 04:33:10 -0400 (Wed, 22 Oct 2008)
New Revision: 11066
Modified:
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeClassPathInitializer.java
Log:
JBIDE-2955: fix the null exception error when remove jboss ws classpath entry
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeClassPathInitializer.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeClassPathInitializer.java 2008-10-21 22:13:36 UTC (rev 11065)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeClassPathInitializer.java 2008-10-22 08:33:10 UTC (rev 11066)
@@ -82,12 +82,14 @@
JBossWSRuntime jbws = JBossWSRuntimeManager.getInstance()
.findRuntimeByName(segment);
if (jbws != null) {
-
- List<String> jars = JBossWSRuntimeManager.getInstance().getAllRuntimeJars(jbws);
+
+ List<String> jars = JBossWSRuntimeManager.getInstance()
+ .getAllRuntimeJars(jbws);
for (String jar : jars) {
entryList.add(getEntry(new Path(jar)));
}
- entries = entryList.toArray(new IClasspathEntry[entryList.size()]);
+ entries = entryList.toArray(new IClasspathEntry[entryList
+ .size()]);
if (entries == null)
return new IClasspathEntry[0];
}
@@ -104,14 +106,21 @@
if (entries == null) {
return;
}
- IClasspathEntry[] newEntries = new IClasspathEntry[entries.length - 1];
- int i = 0;
+
+ List<IClasspathEntry> entriesList = new ArrayList<IClasspathEntry>();
for (IClasspathEntry entry : entries) {
- if (!entry.toString().contains(jarName)) {
- newEntries[i++] = entry;
+ if (entry != null) {
+ IPath path = entry.getPath();
+ if (path != null) {
+ if (path != null && path.lastSegment() != null
+ && path.lastSegment().equals(jarName)) {
+ continue;
+ }
+ }
+ entriesList.add(entry);
}
}
- entries = newEntries;
+ entries = entriesList.toArray(new IClasspathEntry[0]);
}
}
17 years, 2 months
JBoss Tools SVN: r11064 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server: internal and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-10-21 18:06:31 -0400 (Tue, 21 Oct 2008)
New Revision: 11064
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
Log:
JBIDE-2735 - environment vars for native support
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java 2008-10-21 21:54:02 UTC (rev 11063)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java 2008-10-21 22:06:31 UTC (rev 11064)
@@ -21,6 +21,8 @@
*/
package org.jboss.ide.eclipse.as.core.server;
+import java.util.HashMap;
+
import org.eclipse.jdt.launching.IVMInstall;
import org.eclipse.wst.server.core.IRuntime;
@@ -43,4 +45,5 @@
// for startup
public String getDefaultRunArgs();
public String getDefaultRunVMArgs();
+ public HashMap<String, String> getDefaultRunEnvVars();
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2008-10-21 21:54:02 UTC (rev 11063)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2008-10-21 22:06:31 UTC (rev 11064)
@@ -21,6 +21,8 @@
*/
package org.jboss.ide.eclipse.as.core.server.internal;
+import java.util.HashMap;
+
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
@@ -127,4 +129,10 @@
return ret;
}
+
+ public HashMap<String, String> getDefaultRunEnvVars(){
+ HashMap<String, String> envVars = new HashMap<String, String>(1);
+ envVars.put("Path", "native");
+ return envVars;
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 2008-10-21 21:54:02 UTC (rev 11063)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 2008-10-21 22:06:31 UTC (rev 11064)
@@ -1,219 +1,223 @@
-package org.jboss.ide.eclipse.as.core.server.internal.launch;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate;
-import org.eclipse.jdt.launching.ExecutionArguments;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMRunner;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.VMRunnerConfiguration;
-import org.eclipse.jst.server.core.ServerProfilerDelegate;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
-import org.jboss.ide.eclipse.as.core.Messages;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
-import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
-import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
-import org.jboss.ide.eclipse.as.core.util.ServerConverter;
-
-public abstract class AbstractJBossLaunchConfigType extends AbstractJavaLaunchConfigurationDelegate {
- public static final String SERVER_ID = "server-id";
-
- // we have no need to do anything in pre-launch check
- public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
- return true;
- }
-
- protected void preLaunch(ILaunchConfiguration configuration,
- String mode, ILaunch launch, IProgressMonitor monitor) {
- // override me
- }
- protected void postLaunch(ILaunchConfiguration configuration,
- String mode, ILaunch launch, IProgressMonitor monitor) {
- // override me
- }
-
- public void launch(ILaunchConfiguration configuration, String mode,
- ILaunch launch, IProgressMonitor monitor) throws CoreException {
- preLaunch(configuration, mode, launch, monitor);
- actualLaunch(configuration, mode, launch, monitor);
- postLaunch(configuration, mode, launch, monitor);
- }
-
- protected void actualLaunch(ILaunchConfiguration configuration,
- String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
- // And off we go!
- IVMInstall vm = verifyVMInstall(configuration);
- IVMRunner runner = vm.getVMRunner(mode);
-
- if(runner == null && ILaunchManager.PROFILE_MODE.equals(mode)){
- runner = vm.getVMRunner(ILaunchManager.RUN_MODE);
- }
- if(runner == null){
- throw new CoreException(new Status(IStatus.ERROR,JBossServerCorePlugin.PLUGIN_ID,0,Messages.runModeNotSupported,null));
- }
-
- File workingDir = verifyWorkingDirectory(configuration);
- String workingDirName = null;
- if (workingDir != null)
- workingDirName = workingDir.getAbsolutePath();
-
- // Program & VM args
- String pgmArgs = getProgramArguments(configuration);
- String vmArgs = getVMArguments(configuration);
- ExecutionArguments execArgs = new ExecutionArguments(vmArgs, pgmArgs);
-
- // VM-specific attributes
- Map vmAttributesMap = getVMSpecificAttributesMap(configuration);
-
- // Classpath
- String[] classpath = getClasspath(configuration);
-
- // Create VM config
- String mainType = getMainTypeName(configuration);
- VMRunnerConfiguration runConfig = new VMRunnerConfiguration(mainType, classpath);
- runConfig.setProgramArguments(execArgs.getProgramArgumentsArray());
- runConfig.setVMArguments(execArgs.getVMArgumentsArray());
- runConfig.setWorkingDirectory(workingDirName);
- runConfig.setVMSpecificAttributesMap(vmAttributesMap);
-
- // Bootpath
- String[] bootpath = getBootpath(configuration);
- if (bootpath != null && bootpath.length > 0)
- runConfig.setBootClassPath(bootpath);
-
- setDefaultSourceLocator(launch, configuration);
-
- if (ILaunchManager.PROFILE_MODE.equals(mode)) {
- try {
- ServerProfilerDelegate.configureProfiling(launch, vm, runConfig, monitor);
- } catch (CoreException ce) {
- IServer server = ServerUtil.getServer(configuration);
- JBossServerBehavior jbsb = (JBossServerBehavior) server.getAdapter(JBossServerBehavior.class);
- jbsb.stop(true);
- //genericServer.stopImpl();
- throw ce;
- }
- }
- // Launch the configuration
- runner.run(runConfig, launch, monitor);
- }
-
-
- protected static JBossServer findJBossServer(String serverId) throws CoreException {
- if( serverId == null )
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "No server specified"));
-
- IServer s = ServerCore.findServer(serverId);
- if( s == null )
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Server Not Found"));
-
- JBossServer jbs = ServerConverter.getJBossServer(s);
- if( jbs == null )
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Server Not Found"));
-
- return jbs;
- }
-
- protected static IJBossServerRuntime findJBossServerRuntime(IServer server) throws CoreException {
- IRuntime rt = server.getRuntime();
- IJBossServerRuntime jbrt = null;
- if( rt != null )
- jbrt = (IJBossServerRuntime)rt.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
- if( jbrt == null )
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Runtime Not Found"));
- return jbrt;
- }
-
- protected static void addCPEntry(ArrayList<IRuntimeClasspathEntry> list, JBossServer jbs, String relative) {
- list.add(JavaRuntime.newArchiveRuntimeClasspathEntry(new Path(getServerHome(jbs)).append(relative)));
- }
-
- @Deprecated
- protected static ArrayList<String> convertClasspath(ArrayList<IRuntimeClasspathEntry> cp, IVMInstall vmInstall) {
- addJREEntry(cp, vmInstall);
- return convertClasspath(cp);
- }
-
- protected static void addJREEntry(ArrayList<IRuntimeClasspathEntry> cp, IVMInstall vmInstall) {
- if (vmInstall != null) {
- try {
- cp.add(JavaRuntime.newRuntimeContainerClasspathEntry(
- new Path(JavaRuntime.JRE_CONTAINER)
- .append(vmInstall.getVMInstallType().getId()).append(vmInstall.getName()),
-// "org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType")
- IRuntimeClasspathEntry.BOOTSTRAP_CLASSES));
- } catch (CoreException e) {
- IStatus s = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
- "Unexpected Exception converting launch classpath: ", e);
- JBossServerCorePlugin.getDefault().getLog().log(s);
- }
- }
- }
-
- protected static ArrayList<String> convertClasspath(ArrayList<IRuntimeClasspathEntry> cp) {
- Iterator<IRuntimeClasspathEntry> cpi = cp.iterator();
- ArrayList<String> list = new ArrayList<String>();
- while (cpi.hasNext()) {
- IRuntimeClasspathEntry entry = cpi.next();
- try {
- list.add(entry.getMemento());
- } catch (Exception e) {
- // Trace.trace(Trace.SEVERE, "Could not resolve classpath entry:
- // " + entry, e);
- }
- }
-
- return list;
- }
-
- protected static void addDirectory(String serverHome, ArrayList<IRuntimeClasspathEntry> classpath,
- String dirName) {
- String libPath = serverHome + File.separator + dirName;
- File libDir = new File(libPath);
- File libs[] = libDir.listFiles(new FilenameFilter() {
- public boolean accept(File dir, String name) {
- return (name != null && name.endsWith("jar"));
- }
- });
-
- if (libs == null)
- return;
-
- for (int i = 0; i < libs.length; i++) {
- classpath.add(JavaRuntime.newArchiveRuntimeClasspathEntry(new Path(
- libPath + File.separator + libs[i].getName())));
- }
- } // end method
-
-
- public static String getServerHome(JBossServer jbs) {
- return jbs.getServer().getRuntime().getLocation().toOSString();
- }
-
- public IVMInstall getVMInstall(ILaunchConfiguration configuration) throws CoreException {
- String serverId = configuration.getAttribute(SERVER_ID, (String)null);
- JBossServer jbs = findJBossServer(serverId);
- IJBossServerRuntime jbrt = findJBossServerRuntime(jbs.getServer());
- return jbrt.getVM();
- }
-
-}
+package org.jboss.ide.eclipse.as.core.server.internal.launch;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate;
+import org.eclipse.jdt.launching.ExecutionArguments;
+import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
+import org.eclipse.jdt.launching.IVMInstall;
+import org.eclipse.jdt.launching.IVMRunner;
+import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.jdt.launching.VMRunnerConfiguration;
+import org.eclipse.jst.server.core.ServerProfilerDelegate;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.ServerCore;
+import org.eclipse.wst.server.core.ServerUtil;
+import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.core.Messages;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+
+public abstract class AbstractJBossLaunchConfigType extends AbstractJavaLaunchConfigurationDelegate {
+ public static final String SERVER_ID = "server-id";
+
+ // we have no need to do anything in pre-launch check
+ public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
+ return true;
+ }
+
+ protected void preLaunch(ILaunchConfiguration configuration,
+ String mode, ILaunch launch, IProgressMonitor monitor) {
+ // override me
+ }
+ protected void postLaunch(ILaunchConfiguration configuration,
+ String mode, ILaunch launch, IProgressMonitor monitor) {
+ // override me
+ }
+
+ public void launch(ILaunchConfiguration configuration, String mode,
+ ILaunch launch, IProgressMonitor monitor) throws CoreException {
+ preLaunch(configuration, mode, launch, monitor);
+ actualLaunch(configuration, mode, launch, monitor);
+ postLaunch(configuration, mode, launch, monitor);
+ }
+
+ protected void actualLaunch(ILaunchConfiguration configuration,
+ String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
+ // And off we go!
+ IVMInstall vm = verifyVMInstall(configuration);
+ IVMRunner runner = vm.getVMRunner(mode);
+
+ if(runner == null && ILaunchManager.PROFILE_MODE.equals(mode)){
+ runner = vm.getVMRunner(ILaunchManager.RUN_MODE);
+ }
+ if(runner == null){
+ throw new CoreException(new Status(IStatus.ERROR,JBossServerCorePlugin.PLUGIN_ID,0,Messages.runModeNotSupported,null));
+ }
+
+ File workingDir = verifyWorkingDirectory(configuration);
+ String workingDirName = null;
+ if (workingDir != null)
+ workingDirName = workingDir.getAbsolutePath();
+
+ // Program & VM args
+ String pgmArgs = getProgramArguments(configuration);
+ String vmArgs = getVMArguments(configuration);
+ ExecutionArguments execArgs = new ExecutionArguments(vmArgs, pgmArgs);
+
+ // VM-specific attributes
+ Map vmAttributesMap = getVMSpecificAttributesMap(configuration);
+
+ // Classpath
+ String[] classpath = getClasspath(configuration);
+
+ // Environment
+ String[] environment = getEnvironment(configuration);
+
+ // Create VM config
+ String mainType = getMainTypeName(configuration);
+ VMRunnerConfiguration runConfig = new VMRunnerConfiguration(mainType, classpath);
+ runConfig.setProgramArguments(execArgs.getProgramArgumentsArray());
+ runConfig.setVMArguments(execArgs.getVMArgumentsArray());
+ runConfig.setWorkingDirectory(workingDirName);
+ runConfig.setVMSpecificAttributesMap(vmAttributesMap);
+ runConfig.setEnvironment(environment);
+
+ // Bootpath
+ String[] bootpath = getBootpath(configuration);
+ if (bootpath != null && bootpath.length > 0)
+ runConfig.setBootClassPath(bootpath);
+
+ setDefaultSourceLocator(launch, configuration);
+
+ if (ILaunchManager.PROFILE_MODE.equals(mode)) {
+ try {
+ ServerProfilerDelegate.configureProfiling(launch, vm, runConfig, monitor);
+ } catch (CoreException ce) {
+ IServer server = ServerUtil.getServer(configuration);
+ JBossServerBehavior jbsb = (JBossServerBehavior) server.getAdapter(JBossServerBehavior.class);
+ jbsb.stop(true);
+ //genericServer.stopImpl();
+ throw ce;
+ }
+ }
+ // Launch the configuration
+ runner.run(runConfig, launch, monitor);
+ }
+
+
+ protected static JBossServer findJBossServer(String serverId) throws CoreException {
+ if( serverId == null )
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "No server specified"));
+
+ IServer s = ServerCore.findServer(serverId);
+ if( s == null )
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Server Not Found"));
+
+ JBossServer jbs = ServerConverter.getJBossServer(s);
+ if( jbs == null )
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Server Not Found"));
+
+ return jbs;
+ }
+
+ protected static IJBossServerRuntime findJBossServerRuntime(IServer server) throws CoreException {
+ IRuntime rt = server.getRuntime();
+ IJBossServerRuntime jbrt = null;
+ if( rt != null )
+ jbrt = (IJBossServerRuntime)rt.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
+ if( jbrt == null )
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Runtime Not Found"));
+ return jbrt;
+ }
+
+ protected static void addCPEntry(ArrayList<IRuntimeClasspathEntry> list, JBossServer jbs, String relative) {
+ list.add(JavaRuntime.newArchiveRuntimeClasspathEntry(new Path(getServerHome(jbs)).append(relative)));
+ }
+
+ @Deprecated
+ protected static ArrayList<String> convertClasspath(ArrayList<IRuntimeClasspathEntry> cp, IVMInstall vmInstall) {
+ addJREEntry(cp, vmInstall);
+ return convertClasspath(cp);
+ }
+
+ protected static void addJREEntry(ArrayList<IRuntimeClasspathEntry> cp, IVMInstall vmInstall) {
+ if (vmInstall != null) {
+ try {
+ cp.add(JavaRuntime.newRuntimeContainerClasspathEntry(
+ new Path(JavaRuntime.JRE_CONTAINER)
+ .append(vmInstall.getVMInstallType().getId()).append(vmInstall.getName()),
+// "org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType")
+ IRuntimeClasspathEntry.BOOTSTRAP_CLASSES));
+ } catch (CoreException e) {
+ IStatus s = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
+ "Unexpected Exception converting launch classpath: ", e);
+ JBossServerCorePlugin.getDefault().getLog().log(s);
+ }
+ }
+ }
+
+ protected static ArrayList<String> convertClasspath(ArrayList<IRuntimeClasspathEntry> cp) {
+ Iterator<IRuntimeClasspathEntry> cpi = cp.iterator();
+ ArrayList<String> list = new ArrayList<String>();
+ while (cpi.hasNext()) {
+ IRuntimeClasspathEntry entry = cpi.next();
+ try {
+ list.add(entry.getMemento());
+ } catch (Exception e) {
+ // Trace.trace(Trace.SEVERE, "Could not resolve classpath entry:
+ // " + entry, e);
+ }
+ }
+
+ return list;
+ }
+
+ protected static void addDirectory(String serverHome, ArrayList<IRuntimeClasspathEntry> classpath,
+ String dirName) {
+ String libPath = serverHome + File.separator + dirName;
+ File libDir = new File(libPath);
+ File libs[] = libDir.listFiles(new FilenameFilter() {
+ public boolean accept(File dir, String name) {
+ return (name != null && name.endsWith("jar"));
+ }
+ });
+
+ if (libs == null)
+ return;
+
+ for (int i = 0; i < libs.length; i++) {
+ classpath.add(JavaRuntime.newArchiveRuntimeClasspathEntry(new Path(
+ libPath + File.separator + libs[i].getName())));
+ }
+ } // end method
+
+
+ public static String getServerHome(JBossServer jbs) {
+ return jbs.getServer().getRuntime().getLocation().toOSString();
+ }
+
+ public IVMInstall getVMInstall(ILaunchConfiguration configuration) throws CoreException {
+ String serverId = configuration.getAttribute(SERVER_ID, (String)null);
+ JBossServer jbs = findJBossServer(serverId);
+ IJBossServerRuntime jbrt = findJBossServerRuntime(jbs.getServer());
+ return jbrt.getVM();
+ }
+
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2008-10-21 21:54:02 UTC (rev 11063)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2008-10-21 22:06:31 UTC (rev 11064)
@@ -1,222 +1,231 @@
-/**
- * JBoss, a Division of Red Hat
- * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
-* This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ide.eclipse.as.core.server.internal.launch;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.StandardClasspathProvider;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
-import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
-import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
-
-public class JBossServerStartupLaunchConfiguration extends AbstractJBossLaunchConfigType {
-
- protected static final char[] INVALID_CHARS = new char[] {'\\', '/', ':', '*', '?', '"', '<', '>', '|', '\0', '@', '&'};
- private static final String LAUNCH_TYPE = "org.jboss.ide.eclipse.as.core.server.startupConfiguration";
- private static final String DEFAULTS_SET = "jboss.defaults.been.set";
- private static final String START_JAR_LOC = "bin" + Path.SEPARATOR + "run.jar";
- private static final String START_MAIN_TYPE = "org.jboss.Main";
-
-
- public static ILaunchConfigurationWorkingCopy setupLaunchConfiguration(IServer server, String action) throws CoreException {
- ILaunchConfigurationWorkingCopy config = createLaunchConfiguration(server);
- setupLaunchConfiguration(config, server);
- return config;
- }
-
- public static void setupLaunchConfiguration(
- ILaunchConfigurationWorkingCopy workingCopy, IServer server) throws CoreException {
- if(!workingCopy.getAttributes().containsKey(DEFAULTS_SET)) {
- forceDefaultsSet(workingCopy, server);
- }
- }
-
- public static void forceDefaultsSet(ILaunchConfigurationWorkingCopy wc, IServer server) throws CoreException {
- JBossServer jbs = findJBossServer(server.getId());
- if( jbs == null )
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Server " + server.getName() + " is not a proper JBoss Server"));
-
- String serverHome = getServerHome(jbs);
- if( serverHome == null )
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Server " + server.getName() + " is corrupt and the server home is unable to be located."));
-
- IRuntime rt = jbs.getServer().getRuntime();
- String jrePath = null;
- if( rt != null ) {
- IJBossServerRuntime jbrt = (IJBossServerRuntime)rt.getAdapter(IJBossServerRuntime.class);
- if( jbrt != null ) {
- IVMInstall install = jbrt.getVM();
- IPath path = JavaRuntime.newJREContainerPath(install);
- jrePath = path.toPortableString();
- }
- }
-
- wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, getDefaultArgs(jbs));
- wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, getDefaultVMArgs(jbs));
- wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, START_MAIN_TYPE);
- wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, serverHome + Path.SEPARATOR + "bin");
- wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, "org.jboss.ide.eclipse.as.core.launch.classpathProvider");
- wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH, jrePath);
- wc.setAttribute(DEFAULTS_SET, true);
- }
-
- public static String getDefaultArgs(JBossServer jbs) throws CoreException {
- IJBossServerRuntime rt = findJBossServerRuntime(jbs.getServer());
- if (rt != null) {
- return rt.getDefaultRunArgs() + " -b " + jbs.getServer().getHost();
- }
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Runtime not found"));
- }
-
- public static String getDefaultVMArgs(JBossServer jbs) throws CoreException {
- IJBossServerRuntime rt = findJBossServerRuntime(jbs.getServer());
- if (rt != null) {
- return rt.getDefaultRunVMArgs();
- }
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Runtime not found"));
- }
-
-
- protected void preLaunch(ILaunchConfiguration configuration,
- String mode, ILaunch launch, IProgressMonitor monitor) {
- try {
- JBossServerBehavior jbsBehavior = getServerBehavior(configuration);
- jbsBehavior.setRunMode(mode);
- jbsBehavior.serverStarting();
- } catch( CoreException ce ) {
- // report it
- }
- }
-
- public void postLaunch(ILaunchConfiguration configuration, String mode,
- ILaunch launch, IProgressMonitor monitor) {
- try {
- IProcess[] processes = launch.getProcesses();
- JBossServerBehavior jbsBehavior = getServerBehavior(configuration);
- jbsBehavior.setProcess(processes[0]);
- } catch( CoreException ce ) {
- // report
- }
- }
-
- public static JBossServerBehavior getServerBehavior(ILaunchConfiguration configuration) throws CoreException {
- IServer server = ServerUtil.getServer(configuration);
- JBossServerBehavior jbossServerBehavior = (JBossServerBehavior) server.getAdapter(JBossServerBehavior.class);
- return jbossServerBehavior;
- }
-
- protected static String getValidLaunchConfigurationName(String s) {
- if (s == null || s.length() == 0)
- return "1";
- int size = INVALID_CHARS.length;
- for (int i = 0; i < size; i++) {
- s = s.replace(INVALID_CHARS[i], '_');
- }
- return s;
- }
-
- /**
- * Will create a launch configuration for the server
- * if one does not already exist.
- */
- public static ILaunchConfigurationWorkingCopy createLaunchConfiguration(IServer server) throws CoreException {
- ILaunchConfigurationType launchConfigType = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(LAUNCH_TYPE);
- if (launchConfigType == null)
- return null;
-
- ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
- ILaunchConfiguration[] launchConfigs = null;
- try {
- launchConfigs = launchManager.getLaunchConfigurations(launchConfigType);
- } catch (CoreException e) {
- // ignore
- }
-
- if (launchConfigs != null) {
- int size = launchConfigs.length;
- for (int i = 0; i < size; i++) {
- try {
- String serverId = launchConfigs[i].getAttribute(SERVER_ID, (String) null);
- if (server.getId().equals(serverId)) {
- ILaunchConfigurationWorkingCopy wc = launchConfigs[i].getWorkingCopy();
- return wc;
- }
- } catch (CoreException e) {
- }
- }
- }
-
- // create a new launch configuration
- String launchName = getValidLaunchConfigurationName(server.getName());
- launchName = launchManager.generateUniqueLaunchConfigurationNameFrom(launchName);
- ILaunchConfigurationWorkingCopy wc = launchConfigType.newInstance(null, launchName);
- wc.setAttribute(SERVER_ID, server.getId());
- return wc;
- }
-
-
- public static class StartupClasspathProvider extends StandardClasspathProvider {
-
- public IRuntimeClasspathEntry[] computeUnresolvedClasspath(ILaunchConfiguration configuration) throws CoreException {
- boolean useDefault = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, true);
- if (useDefault) {
- return computeUnresolvedDefaultClasspath(configuration);
- }
- // recover persisted classpath
- return recoverRuntimePath(configuration, IJavaLaunchConfigurationConstants.ATTR_CLASSPATH);
- }
-
- protected IRuntimeClasspathEntry[] computeUnresolvedDefaultClasspath(ILaunchConfiguration configuration) throws CoreException {
- String serverId = configuration.getAttribute(SERVER_ID, (String)null);
- JBossServer jbs = findJBossServer(serverId);
- IJBossServerRuntime jbrt = findJBossServerRuntime(jbs.getServer());
- ArrayList<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>();
- addCPEntry(classpath, jbs, START_JAR_LOC);
- addJREEntry(classpath, jbrt.getVM());
- return (IRuntimeClasspathEntry[]) classpath
- .toArray(new IRuntimeClasspathEntry[classpath.size()]);
- }
-
- }
-
-}
+/**
+ * JBoss, a Division of Red Hat
+ * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+* This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ide.eclipse.as.core.server.internal.launch;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationType;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.debug.core.model.IProcess;
+import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
+import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
+import org.eclipse.jdt.launching.IVMInstall;
+import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.jdt.launching.StandardClasspathProvider;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.ServerUtil;
+import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
+
+public class JBossServerStartupLaunchConfiguration extends AbstractJBossLaunchConfigType {
+
+ protected static final char[] INVALID_CHARS = new char[] {'\\', '/', ':', '*', '?', '"', '<', '>', '|', '\0', '@', '&'};
+ private static final String LAUNCH_TYPE = "org.jboss.ide.eclipse.as.core.server.startupConfiguration";
+ private static final String DEFAULTS_SET = "jboss.defaults.been.set";
+ private static final String START_JAR_LOC = "bin" + Path.SEPARATOR + "run.jar";
+ private static final String START_MAIN_TYPE = "org.jboss.Main";
+
+
+ public static ILaunchConfigurationWorkingCopy setupLaunchConfiguration(IServer server, String action) throws CoreException {
+ ILaunchConfigurationWorkingCopy config = createLaunchConfiguration(server);
+ setupLaunchConfiguration(config, server);
+ return config;
+ }
+
+ public static void setupLaunchConfiguration(
+ ILaunchConfigurationWorkingCopy workingCopy, IServer server) throws CoreException {
+ if(!workingCopy.getAttributes().containsKey(DEFAULTS_SET)) {
+ forceDefaultsSet(workingCopy, server);
+ }
+ }
+
+ public static void forceDefaultsSet(ILaunchConfigurationWorkingCopy wc, IServer server) throws CoreException {
+ JBossServer jbs = findJBossServer(server.getId());
+ if( jbs == null )
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Server " + server.getName() + " is not a proper JBoss Server"));
+
+ String serverHome = getServerHome(jbs);
+ if( serverHome == null )
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Server " + server.getName() + " is corrupt and the server home is unable to be located."));
+
+ IRuntime rt = jbs.getServer().getRuntime();
+ String jrePath = null;
+ if( rt != null ) {
+ IJBossServerRuntime jbrt = (IJBossServerRuntime)rt.getAdapter(IJBossServerRuntime.class);
+ if( jbrt != null ) {
+ IVMInstall install = jbrt.getVM();
+ IPath path = JavaRuntime.newJREContainerPath(install);
+ jrePath = path.toPortableString();
+ }
+ }
+
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, getDefaultArgs(jbs));
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, getDefaultVMArgs(jbs));
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, START_MAIN_TYPE);
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, serverHome + Path.SEPARATOR + "bin");
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, "org.jboss.ide.eclipse.as.core.launch.classpathProvider");
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH, jrePath);
+ wc.setAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, getDefaultEnvVars(jbs));
+ wc.setAttribute(DEFAULTS_SET, true);
+ }
+
+ public static String getDefaultArgs(JBossServer jbs) throws CoreException {
+ IJBossServerRuntime rt = findJBossServerRuntime(jbs.getServer());
+ if (rt != null) {
+ return rt.getDefaultRunArgs() + " -b " + jbs.getServer().getHost();
+ }
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Runtime not found"));
+ }
+
+ public static String getDefaultVMArgs(JBossServer jbs) throws CoreException {
+ IJBossServerRuntime rt = findJBossServerRuntime(jbs.getServer());
+ if (rt != null) {
+ return rt.getDefaultRunVMArgs();
+ }
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Runtime not found"));
+ }
+
+ public static HashMap<String, String> getDefaultEnvVars(JBossServer jbs) throws CoreException {
+ IJBossServerRuntime rt = findJBossServerRuntime(jbs.getServer());
+ if (rt != null) {
+ return rt.getDefaultRunEnvVars();
+ }
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Runtime not found"));
+ }
+
+ protected void preLaunch(ILaunchConfiguration configuration,
+ String mode, ILaunch launch, IProgressMonitor monitor) {
+ try {
+ JBossServerBehavior jbsBehavior = getServerBehavior(configuration);
+ jbsBehavior.setRunMode(mode);
+ jbsBehavior.serverStarting();
+ } catch( CoreException ce ) {
+ // report it
+ }
+ }
+
+ public void postLaunch(ILaunchConfiguration configuration, String mode,
+ ILaunch launch, IProgressMonitor monitor) {
+ try {
+ IProcess[] processes = launch.getProcesses();
+ JBossServerBehavior jbsBehavior = getServerBehavior(configuration);
+ jbsBehavior.setProcess(processes[0]);
+ } catch( CoreException ce ) {
+ // report
+ }
+ }
+
+ public static JBossServerBehavior getServerBehavior(ILaunchConfiguration configuration) throws CoreException {
+ IServer server = ServerUtil.getServer(configuration);
+ JBossServerBehavior jbossServerBehavior = (JBossServerBehavior) server.getAdapter(JBossServerBehavior.class);
+ return jbossServerBehavior;
+ }
+
+ protected static String getValidLaunchConfigurationName(String s) {
+ if (s == null || s.length() == 0)
+ return "1";
+ int size = INVALID_CHARS.length;
+ for (int i = 0; i < size; i++) {
+ s = s.replace(INVALID_CHARS[i], '_');
+ }
+ return s;
+ }
+
+ /**
+ * Will create a launch configuration for the server
+ * if one does not already exist.
+ */
+ public static ILaunchConfigurationWorkingCopy createLaunchConfiguration(IServer server) throws CoreException {
+ ILaunchConfigurationType launchConfigType = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(LAUNCH_TYPE);
+ if (launchConfigType == null)
+ return null;
+
+ ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
+ ILaunchConfiguration[] launchConfigs = null;
+ try {
+ launchConfigs = launchManager.getLaunchConfigurations(launchConfigType);
+ } catch (CoreException e) {
+ // ignore
+ }
+
+ if (launchConfigs != null) {
+ int size = launchConfigs.length;
+ for (int i = 0; i < size; i++) {
+ try {
+ String serverId = launchConfigs[i].getAttribute(SERVER_ID, (String) null);
+ if (server.getId().equals(serverId)) {
+ ILaunchConfigurationWorkingCopy wc = launchConfigs[i].getWorkingCopy();
+ return wc;
+ }
+ } catch (CoreException e) {
+ }
+ }
+ }
+
+ // create a new launch configuration
+ String launchName = getValidLaunchConfigurationName(server.getName());
+ launchName = launchManager.generateUniqueLaunchConfigurationNameFrom(launchName);
+ ILaunchConfigurationWorkingCopy wc = launchConfigType.newInstance(null, launchName);
+ wc.setAttribute(SERVER_ID, server.getId());
+ return wc;
+ }
+
+
+ public static class StartupClasspathProvider extends StandardClasspathProvider {
+
+ public IRuntimeClasspathEntry[] computeUnresolvedClasspath(ILaunchConfiguration configuration) throws CoreException {
+ boolean useDefault = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, true);
+ if (useDefault) {
+ return computeUnresolvedDefaultClasspath(configuration);
+ }
+ // recover persisted classpath
+ return recoverRuntimePath(configuration, IJavaLaunchConfigurationConstants.ATTR_CLASSPATH);
+ }
+
+ protected IRuntimeClasspathEntry[] computeUnresolvedDefaultClasspath(ILaunchConfiguration configuration) throws CoreException {
+ String serverId = configuration.getAttribute(SERVER_ID, (String)null);
+ JBossServer jbs = findJBossServer(serverId);
+ IJBossServerRuntime jbrt = findJBossServerRuntime(jbs.getServer());
+ ArrayList<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>();
+ addCPEntry(classpath, jbs, START_JAR_LOC);
+ addJREEntry(classpath, jbrt.getVM());
+ return (IRuntimeClasspathEntry[]) classpath
+ .toArray(new IRuntimeClasspathEntry[classpath.size()]);
+ }
+
+ }
+
+}
17 years, 2 months
JBoss Tools SVN: r11063 - branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.archives.webtools.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-10-21 17:54:02 -0400 (Tue, 21 Oct 2008)
New Revision: 11063
Modified:
branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.archives.webtools/build.properties
Log:
jbide-2878
Modified: branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.archives.webtools/build.properties
===================================================================
--- branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.archives.webtools/build.properties 2008-10-21 21:44:58 UTC (rev 11062)
+++ branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.archives.webtools/build.properties 2008-10-21 21:54:02 UTC (rev 11063)
@@ -2,4 +2,5 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ icons/
17 years, 2 months
JBoss Tools SVN: r11062 - trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-10-21 17:44:58 -0400 (Tue, 21 Oct 2008)
New Revision: 11062
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/build.properties
Log:
JBIDE-2878 - icons needed to be exported
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/build.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/build.properties 2008-10-21 19:52:00 UTC (rev 11061)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/build.properties 2008-10-21 21:44:58 UTC (rev 11062)
@@ -2,4 +2,5 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ icons/
17 years, 2 months
JBoss Tools SVN: r11061 - 21.10.2008 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: anis
Date: 2008-10-21 15:52:00 -0400 (Tue, 21 Oct 2008)
New Revision: 11061
Added:
trunk/documentation/qa/reports/Tests 21.10.2008/Seam20_21.10.2008.htm
Log:
Added a file remotely
Added: trunk/documentation/qa/reports/Tests 21.10.2008/Seam20_21.10.2008.htm
===================================================================
--- trunk/documentation/qa/reports/Tests 21.10.2008/Seam20_21.10.2008.htm (rev 0)
+++ trunk/documentation/qa/reports/Tests 21.10.2008/Seam20_21.10.2008.htm 2008-10-21 19:52:00 UTC (rev 11061)
@@ -0,0 +1,207 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML><HEAD><TITLE>Seam 2.0.2GA Runtime tests</TITLE>
+<STYLE>H1 {
+ COLOR: #4a5d75; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+H2 {
+ COLOR: #4a5d75; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+TR {
+ BACKGROUND-COLOR: #f5f5f5
+}
+TD {
+ BORDER-RIGHT: dimgray 1px solid; PADDING-RIGHT: 0.5em; BORDER-TOP: dimgray 1px solid; PADDING-LEFT: 0.5em; PADDING-BOTTOM: 0.15em; BORDER-LEFT: dimgray 1px solid; PADDING-TOP: 0.15em; BORDER-BOTTOM: dimgray 1px solid; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+HR {
+ COLOR: #999; BORDER-COLLAPSE: collapse
+}
+BODY {
+ PADDING-RIGHT: 2em; PADDING-LEFT: 2em; FONT-SIZE: 12px; PADDING-BOTTOM: 0em; COLOR: #333; LINE-HEIGHT: 100%; PADDING-TOP: 0em; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; max-width: 55em
+}
+TABLE {
+ BORDER-RIGHT: dimgray 0px solid; BORDER-TOP: dimgray 0px solid; BORDER-LEFT: dimgray 0px solid; COLOR: #4a5d75; BORDER-BOTTOM: dimgray 0px solid; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif
+}
+</STYLE>
+
+<META http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+<META content="MSHTML 6.00.2900.3059" name=GENERATOR></HEAD>
+<BODY bgColor=#f5f5f5>
+<CENTER>
+<H1>Seam 2.0.2GA Runtime tests</H1>
+<TABLE
+style="BORDER-TOP-WIDTH: 1pt; BORDER-LEFT-WIDTH: 1pt; BORDER-BOTTOM-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"
+cellSpacing=0 cellPadding=4 width="100%" align=center>
+ <TBODY>
+ <TR bgColor=gray>
+ <TD><B>Plan: Test Name</B></TD>
+ <TD><B>Status</B></TD>
+ <TD><B>Bug Number</B></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 01 Creating
+ test Seam war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 06 Running
+ test Seam ear project on server</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 04 Checking
+ created test Seam ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 07 Checking
+ instant changing - war</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 10 Adding
+ new form in test Seam ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 02 Creating
+ test Seam ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 03 Checking
+ created test Seam war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 05 Running
+ test Seam war project on server</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 08 Checking
+ instant changing - ear</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 09 Adding
+ new form in test Seam war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 17 Seam hot
+ deployment for war</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 18 Seam hot
+ deployment for ear</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 11 Adding
+ new action in test Seam war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 12 Adding
+ new action in test Seam ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 13 Adding
+ new conversation in test Seam war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: red; BORDER-RIGHT-WIDTH: 1pt">Failed</TD>
+ <TD
+style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">JBIDE-2489</TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 14 Adding
+ new conversation in test Seam ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 16 Adding
+ new entity in test Seam ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 19 Checking
+ created forms - for Seam war and ear</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 20 Checking
+ created actions - for Seam war and ear</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 21 Checking
+ created conversations - for Seam war and ear</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 24 Deleting
+ test Seam projects</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 23 Renaming
+ Seam projects</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 22 Checking
+ created entities - for Seam war and ear</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 15 Adding
+ new entity in test Seam war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white
+size=1> </FONT></TD></TR></TBODY></TABLE></CENTER></BODY></HTML>
17 years, 2 months
JBoss Tools SVN: r11060 - 21.10.2008 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: anis
Date: 2008-10-21 15:51:50 -0400 (Tue, 21 Oct 2008)
New Revision: 11060
Added:
trunk/documentation/qa/reports/Tests 21.10.2008/Seam12_21.10.2008.htm
Log:
Added a file remotely
Added: trunk/documentation/qa/reports/Tests 21.10.2008/Seam12_21.10.2008.htm
===================================================================
--- trunk/documentation/qa/reports/Tests 21.10.2008/Seam12_21.10.2008.htm (rev 0)
+++ trunk/documentation/qa/reports/Tests 21.10.2008/Seam12_21.10.2008.htm 2008-10-21 19:51:50 UTC (rev 11060)
@@ -0,0 +1,207 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML><HEAD><TITLE>Seam 1.2AP Runtime tests</TITLE>
+<STYLE>H1 {
+ COLOR: #4a5d75; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+H2 {
+ COLOR: #4a5d75; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+TR {
+ BACKGROUND-COLOR: #f5f5f5
+}
+TD {
+ BORDER-RIGHT: dimgray 1px solid; PADDING-RIGHT: 0.5em; BORDER-TOP: dimgray 1px solid; PADDING-LEFT: 0.5em; PADDING-BOTTOM: 0.15em; BORDER-LEFT: dimgray 1px solid; PADDING-TOP: 0.15em; BORDER-BOTTOM: dimgray 1px solid; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+HR {
+ COLOR: #999; BORDER-COLLAPSE: collapse
+}
+BODY {
+ PADDING-RIGHT: 2em; PADDING-LEFT: 2em; FONT-SIZE: 12px; PADDING-BOTTOM: 0em; COLOR: #333; LINE-HEIGHT: 100%; PADDING-TOP: 0em; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; max-width: 55em
+}
+TABLE {
+ BORDER-RIGHT: dimgray 0px solid; BORDER-TOP: dimgray 0px solid; BORDER-LEFT: dimgray 0px solid; COLOR: #4a5d75; BORDER-BOTTOM: dimgray 0px solid; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif
+}
+</STYLE>
+
+<META http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+<META content="MSHTML 6.00.2900.3059" name=GENERATOR></HEAD>
+<BODY bgColor=#f5f5f5>
+<CENTER>
+Seam 1.2AP Runtime tests</H1>
+<TABLE
+style="BORDER-TOP-WIDTH: 1pt; BORDER-LEFT-WIDTH: 1pt; BORDER-BOTTOM-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"
+cellSpacing=0 cellPadding=4 width="100%" align=center>
+ <TBODY>
+ <TR bgColor=gray>
+ <TD><B>Plan: Test Name</B></TD>
+ <TD><B>Status</B></TD>
+ <TD><B>Bug Number</B></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 01 Creating
+ test Seam war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 04 Checking
+ created test Seam ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 07 Checking
+ instant changing - war</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 10 Adding
+ new form in test Seam ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 02 Creating
+ test Seam ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 03 Checking
+ created test Seam war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 05 Running
+ test Seam war project on server</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 08 Checking
+ instant changing - ear</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 09 Adding
+ new form in test Seam war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 17 Seam hot
+ deployment for war</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 18 Seam hot
+ deployment for ear</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 11 Adding
+ new action in test Seam war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 12 Adding
+ new action in test Seam ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 13 Adding
+ new conversation in test Seam war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 14 Adding
+ new conversation in test Seam ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 16 Adding
+ new entity in test Seam ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 19 Checking
+ created forms - for Seam war and ear</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 20 Checking
+ created actions - for Seam war and ear</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 21 Checking
+ created conversations - for Seam war and ear</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 22 Checking
+ created entities - for Seam war and ear</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 24 Deleting
+ test Seam projects</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 06 Running
+ test Seam ear project on server</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 23 Renaming
+ Seam projects</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> 15 Adding
+ new entity in test Seam war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white
+size=1> </FONT></TD></TR></TBODY></TABLE></CENTER></BODY></HTML>
17 years, 2 months
JBoss Tools SVN: r11058 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-21 15:08:09 -0400 (Tue, 21 Oct 2008)
New Revision: 11058
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamBigProjectTest.java
Log:
fix bulid hanging
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamBigProjectTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamBigProjectTest.java 2008-10-21 16:21:10 UTC (rev 11057)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamBigProjectTest.java 2008-10-21 19:08:09 UTC (rev 11058)
@@ -155,17 +155,17 @@
sb.append(s.substring(j));
IFile file = webContent.getFile("long.xhtml");
try {
- boolean save = ResourcesUtils.setBuildAutomatically(false);
+// boolean save = ResourcesUtils.setBuildAutomatically(false);
file.create(new ByteArrayInputStream(sb.toString().getBytes()), true, new NullProgressMonitor());
long time = System.currentTimeMillis();
- project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
-
+// project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
+ JobUtils.waitForIdle();
long dt = System.currentTimeMillis() - time;
System.out.println("validated in " + dt);
- ResourcesUtils.setBuildAutomatically(save);
+// ResourcesUtils.setBuildAutomatically(save);
- assertTrue("Validator takes more than 5s (" + (dt/1000d) + ") for validating generated long.xhtml", dt < 5000);
+ assertTrue("Validator takes more than 5s (" + ((dt-500)/1000d) + ") for validating generated long.xhtml", dt < 5000);
} catch (CoreException e) {
JUnitUtils.fail("", e);
}
17 years, 2 months
JBoss Tools SVN: r11057 - trunk/birt/docs/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2008-10-21 12:21:10 -0400 (Tue, 21 Oct 2008)
New Revision: 11057
Modified:
trunk/birt/docs/en/modules/birt_designer.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-388 - verification of the whole guide, conclusion made.
Modified: trunk/birt/docs/en/modules/birt_designer.xml
===================================================================
--- trunk/birt/docs/en/modules/birt_designer.xml 2008-10-21 16:01:18 UTC (rev 11056)
+++ trunk/birt/docs/en/modules/birt_designer.xml 2008-10-21 16:21:10 UTC (rev 11057)
@@ -67,5 +67,7 @@
- </section>
+ </section>
+
+ <para>In this guide we made a simple overview of the BIRT plugin: its installation, support, features etc. that will help you to make your first steps with it.</para>
</chapter>
17 years, 2 months