JBoss Tools SVN: r18688 - trunk/jst/plugins/org.jboss.tools.jst.jsp.
by jbosstools-commits@lists.jboss.org
Author: vrubezhny
Date: 2009-11-14 09:59:31 -0500 (Sat, 14 Nov 2009)
New Revision: 18688
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
Log:
JBIDE-5068: CA for <% code fragment %> doesn't work properly
Issue is fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2009-11-14 11:59:14 UTC (rev 18687)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2009-11-14 14:59:31 UTC (rev 18688)
@@ -444,7 +444,19 @@
</contenttype>
</contentAssistProcessor>
+ <!--
+ // Fix for JBIDE-5068
+ -->
<contentAssistProcessor
+ class="org.eclipse.jst.jsp.ui.internal.contentassist.JSPJavaContentAssistProcessor"
+ id="org.eclipse.jst.jsp.ui.internal.contentassist.JSPJavaContentAssistProcessor">
+ <contenttype id="org.eclipse.jst.jsp.core.jspsource">
+ <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JAVA" />
+ </contenttype>
+ </contentAssistProcessor>
+
+
+ <contentAssistProcessor
class="org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor"
id="org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor">
<contenttype id="org.eclipse.jst.jsp.core.jspsource">
15 years, 1 month
JBoss Tools SVN: r18687 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
by jbosstools-commits@lists.jboss.org
Author: vrubezhny
Date: 2009-11-14 06:59:14 -0500 (Sat, 14 Nov 2009)
New Revision: 18687
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AutoContentAssistantProposal.java
Log:
JBIDE-5125: EL Component Suggest does not filter
Issue is fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AutoContentAssistantProposal.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AutoContentAssistantProposal.java 2009-11-13 21:18:33 UTC (rev 18686)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AutoContentAssistantProposal.java 2009-11-14 11:59:14 UTC (rev 18687)
@@ -10,6 +10,9 @@
******************************************************************************/
package org.jboss.tools.jst.jsp.contentassist;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.ITextOperationTarget;
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.contentassist.ICompletionProposalExtension6;
@@ -24,29 +27,26 @@
/**
* @author Igels
*/
-public class AutoContentAssistantProposal extends CustomCompletionProposal implements ICompletionProposalExtension6
-
-{
-
+@SuppressWarnings("restriction")
+public class AutoContentAssistantProposal extends CustomCompletionProposal implements ICompletionProposalExtension6 {
private boolean autoContentAssistant = false;
public AutoContentAssistantProposal(String replacementString, int replacementOffset, int replacementLength, int cursorPosition, Image image, String displayString, IContextInformation contextInformation, String additionalProposalInfo) {
super(replacementString, replacementOffset, replacementLength, cursorPosition, image, displayString, contextInformation, additionalProposalInfo, IRelevanceConstants.R_NONE);
+ this.fOriginalReplacementLength = replacementLength;
}
public AutoContentAssistantProposal(String replacementString, int replacementOffset, int replacementLength, int cursorPosition, Image image, String displayString, IContextInformation contextInformation, String additionalProposalInfo, int relevance) {
super(replacementString, replacementOffset, replacementLength, cursorPosition, image, displayString, contextInformation, additionalProposalInfo, relevance);
+ this.fOriginalReplacementLength = replacementLength;
}
public AutoContentAssistantProposal(boolean autoContentAssistant, String replacementString, int replacementOffset, int replacementLength, int cursorPosition, Image image, String displayString, IContextInformation contextInformation, String additionalProposalInfo, int relevance) {
super(replacementString, replacementOffset, replacementLength, cursorPosition, image, displayString, contextInformation, additionalProposalInfo, relevance);
this.autoContentAssistant = autoContentAssistant;
+ this.fOriginalReplacementLength = replacementLength;
}
- public AutoContentAssistantProposal(String replacementString, int replacementOffset, int replacementLength, int cursorPosition, Image image, String displayString, IContextInformation contextInformation, String additionalProposalInfo, int relevance, boolean updateReplacementLengthOnValidate) {
- super(replacementString, replacementOffset, replacementLength, cursorPosition, image, displayString, contextInformation, additionalProposalInfo, relevance, updateReplacementLengthOnValidate);
- }
-
public void apply(ITextViewer viewer, char trigger, int stateMask, int offset) {
super.apply(viewer, trigger, stateMask, offset);
if(autoContentAssistant) {
@@ -61,12 +61,11 @@
/**
* Return cursor position of proposal replacement string.
*/
- @SuppressWarnings("nls")
public int getCursorPosition() {
int cursorPosition = -1;
- int firstAttributeEndPosition = getReplacementString().indexOf("=");
- int openEndTagPosition = getReplacementString().indexOf("</");
- int closeStartAndEndTagPosition = getReplacementString().indexOf("/>");
+ int firstAttributeEndPosition = getReplacementString().indexOf("="); //$NON-NLS-1$
+ int openEndTagPosition = getReplacementString().indexOf("</"); //$NON-NLS-1$
+ int closeStartAndEndTagPosition = getReplacementString().indexOf("/>"); //$NON-NLS-1$
if(firstAttributeEndPosition>-1) {
cursorPosition = firstAttributeEndPosition + 2;
} else if(openEndTagPosition>-1) {
@@ -99,7 +98,7 @@
boolean hasRetType = isJavaWordPart && string.indexOf(':') > 0;
boolean hasDeclType = isJavaWordPart && string.lastIndexOf('-') > 0;
- int p1i = string.indexOf(':');
+// int p1i = string.indexOf(':');
int p2i = string.lastIndexOf('-');
String p1 = hasRetType && hasDeclType ? string.substring(0, p2i) : string;
@@ -125,6 +124,42 @@
public void setStyledDisplayString(StyledString text) {
fStyledDisplayString = text;
- super.setDisplayString(fStyledDisplayString == null ? "" : fStyledDisplayString.getString());
+ super.setDisplayString(fStyledDisplayString == null ? "" : fStyledDisplayString.getString()); //$NON-NLS-1$
}
+
+ private int fOriginalReplacementLength;
+
+
+ // Fix for JBIDE-5125 >>>
+ @Override
+ public boolean validate(IDocument document, int offset, DocumentEvent event) {
+ int fReplacementOffset = getReplacementOffset();
+
+ if (offset < fReplacementOffset)
+ return false;
+ boolean validated = startsWith(document, offset, getReplacementString());
+
+ // it would be better to use "originalCursorPosition" instead of
+ // getReplacementOffset(), but we don't have that info.
+ int newLength = offset - getReplacementOffset();
+ int delta = newLength - fOriginalReplacementLength;
+ int newReplacementLength = delta + fOriginalReplacementLength;
+ setReplacementLength(newReplacementLength);
+
+ // if it's an attribute value, replacement offset is
+ // going to be one off from the actual cursor offset...
+ try {
+ char firstChar = document.getChar(getReplacementOffset());
+ if (firstChar == '"' || firstChar == '\'') {
+ setReplacementLength(getReplacementLength() + 1);
+ }
+ }
+ catch (BadLocationException e) {
+ // just don't increment
+ }
+ return validated;
+ }
+ // Fix for JBIDE-5125 <<<
+
+
}
\ No newline at end of file
15 years, 1 month
JBoss Tools SVN: r18686 - trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-11-13 16:18:33 -0500 (Fri, 13 Nov 2009)
New Revision: 18686
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/JBIDE2512aTest.java
Log:
fixing a few tests
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 2009-11-13 21:04:54 UTC (rev 18685)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/AbstractDeploymentTest.java 2009-11-13 21:18:33 UTC (rev 18686)
@@ -47,7 +47,9 @@
try {
this.sourceProjectName = projectNames;
this.testProperties = testProperties;
- File f = getFileLocation("/testOutputs");
+ File to = getFileLocation("/testOutputs");
+ File f = new File(to, "inner");
+ f.mkdirs();
File fDeploy = new File(f, "1");
File fTmpDeploy = new File(f, "2");
fDeploy.mkdir();
@@ -182,7 +184,8 @@
provider[i].dispose();
cleanFolder(getProjectLocation("TempProject").getAbsolutePath());
- cleanFolder(getFileLocation("testOutputs"));
+ FileUtil.safeDelete(new File(
+ getFileLocation("testOutputs"), "inner"));
runtime.delete();
server.delete();
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/JBIDE2512aTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/JBIDE2512aTest.java 2009-11-13 21:04:54 UTC (rev 18685)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/JBIDE2512aTest.java 2009-11-13 21:18:33 UTC (rev 18686)
@@ -43,12 +43,7 @@
File shouldExist = new File(libFolder, "EJB3WithDescriptor.jar");
// Expected to fail currently so wrap
- try {
- assertTrue(shouldExist.exists());
- assertFalse(shouldNotExist.exists());
- } catch( AssertionFailedError afe ) {
- return;
- }
- assertTrue(false);
+ assertTrue(shouldExist.exists());
+ assertFalse(shouldNotExist.exists());
}
}
15 years, 1 month
JBoss Tools SVN: r18685 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/css.
by jbosstools-commits@lists.jboss.org
Author: yzhishko
Date: 2009-11-13 16:04:54 -0500 (Fri, 13 Nov 2009)
New Revision: 18685
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/css/StyleAttribute.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5193 fixed
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/css/StyleAttribute.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/css/StyleAttribute.java 2009-11-13 19:35:27 UTC (rev 18684)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/css/StyleAttribute.java 2009-11-13 21:04:54 UTC (rev 18685)
@@ -215,7 +215,7 @@
for(int i=0; i<tokens.size(); i++) {
if(tokens.get(i) instanceof StyleProperty) {
StyleProperty property = (StyleProperty)tokens.get(i);
- if(name.equalsIgnoreCase(property.getName().getCleanValue())) {
+ if (property.getName()!=null && name.equalsIgnoreCase(property.getName().getCleanValue())) {
return property;
}
}
15 years, 1 month
JBoss Tools SVN: r18684 - trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-11-13 14:35:27 -0500 (Fri, 13 Nov 2009)
New Revision: 18684
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java
Log:
silly stack overflow infinite recursion mutter
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java 2009-11-13 17:57:01 UTC (rev 18683)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java 2009-11-13 19:35:27 UTC (rev 18684)
@@ -179,7 +179,7 @@
}
protected void assertContents(File file, int val) throws IOException, CoreException {
- assertContents(file, val);
+ assertContents(file, "" + val);
}
protected void assertContents(File file, String val) throws IOException, CoreException {
15 years, 1 month
JBoss Tools SVN: r18683 - in trunk/jsf: plugins/org.jboss.tools.jsf.vpe.seam/templates and 3 other directories.
by jbosstools-commits@lists.jboss.org
Author: yzhishko
Date: 2009-11-13 12:57:01 -0500 (Fri, 13 Nov 2009)
New Revision: 18683
Added:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamMailBodyTemplate.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/attachment.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/bcc.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/body.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/body.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/cc.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/from.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/header.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/message.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/message.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/replyTo.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/subject.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/to.xhtml
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/templates/vpe-templates-seam.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentContentTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1451 fix
Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamMailBodyTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamMailBodyTemplate.java (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamMailBodyTemplate.java 2009-11-13 17:57:01 UTC (rev 18683)
@@ -0,0 +1,60 @@
+package org.jboss.tools.jsf.vpe.seam.template;
+
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
+import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMNode;
+import org.mozilla.interfaces.nsIDOMNodeList;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+public class SeamMailBodyTemplate extends VpeAbstractTemplate {
+
+ private static final String ATTR_TYPE = "type";
+ private static final String ATTR_VALUE_PLAIN = "plain";
+
+ public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
+ nsIDOMDocument visualDocument) {
+ Element sourceElement = (Element) sourceNode;
+ nsIDOMNode visualNode = null;
+ if (sourceElement.hasChildNodes()) {
+ visualNode = visualDocument.createElement(HTML.TAG_DIV);
+ }
+ return new VpeCreationData(visualNode);
+ }
+
+ private nsIDOMNode clearAllStyleAttrs(nsIDOMNode visualNode) {
+ if (visualNode.getNodeType() == nsIDOMNode.ELEMENT_NODE) {
+ nsIDOMElement visualElement = (nsIDOMElement) visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
+ visualElement.removeAttribute(HTML.ATTR_CLASS);
+ visualElement.removeAttribute(HTML.ATTR_STYLE);
+ }
+ if (visualNode != null) {
+ nsIDOMNodeList children = visualNode.getChildNodes();
+ for (int i = 0; i < children.getLength(); i++) {
+ clearAllStyleAttrs(children.item(i));
+ }
+ }
+ return visualNode;
+ }
+
+ @Override
+ public void validate(VpePageContext pageContext, Node sourceNode,
+ nsIDOMDocument visualDocument, VpeCreationData data) {
+ super.validate(pageContext, sourceNode, visualDocument, data);
+ String attrValue =((Element)sourceNode).getAttribute(ATTR_TYPE);
+ if (attrValue!=null && ATTR_VALUE_PLAIN.equals(attrValue.trim())) {
+ nsIDOMNode parentNode = data.getNode();
+ if (parentNode!=null) {
+ nsIDOMNodeList nodeList = parentNode.getChildNodes();
+ for (int i = 0; i < nodeList.getLength(); i++) {
+ clearAllStyleAttrs(nodeList.item(i));
+ }
+ }
+ }
+ }
+
+}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/templates/vpe-templates-seam.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/templates/vpe-templates-seam.xml 2009-11-13 15:22:37 UTC (rev 18682)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/templates/vpe-templates-seam.xml 2009-11-13 17:57:01 UTC (rev 18683)
@@ -1,66 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <vpe:template-taglib uri="http://jboss.com/products/seam/taglib"
- prefix="s" />
-
- <vpe:tag name="s:button" case-sensitive="yes">
- <!-- This is a very big if-statement.
- Its goal is to add support of 'disabled property'
- DO NOT FORGET TO EDIT 'ELSE' PART IN FUTURE MODIFICATIONS -->
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <vpe:template-taglib uri="http://jboss.com/products/seam/taglib"
+ prefix="s" />
+ <vpe:template-taglib uri="http://jboss.com/products/seam/mail"
+ prefix="m" />
+
+ <vpe:tag name="s:button" case-sensitive="yes">
+ <!--
+ This is a very big if-statement. Its goal is to add support of
+ 'disabled property' DO NOT FORGET TO EDIT 'ELSE' PART IN FUTURE
+ MODIFICATIONS
+ -->
<vpe:if test="(@disabled='true')">
<vpe:if test="not(attrpresent('image'))">
- <vpe:template children="no" modify="no">
- <input type="button" value="{iif(@value='',' ',jsfvalue(@value))}"
- class="{@styleClass}" style="{@style}"
- title="{tagstring()}" dir="{@dir}"
- disabled='disabled'/>
- <vpe:resize>
- <vpe:width width-attr="style.width" />
- <vpe:height height-attr="style.height" />
- </vpe:resize>
- <vpe:dnd>
- <vpe:drag start-enable="yes" />
- </vpe:dnd>
- <vpe:textFormatting use-default-formats="yes">
- </vpe:textFormatting>
- </vpe:template>
- </vpe:if>
- <vpe:if test="attrpresent('image')">
<vpe:template children="no" modify="no">
- <input type="image" src="{src(@image)}"
- class="{@styleClass}" style="{@style}" title="{tagstring()}"
- disabled='disabled'/>
+ <input type="button" value="{iif(@value='',' ',jsfvalue(@value))}"
+ class="{@styleClass}" style="{@style}" title="{tagstring()}" dir="{@dir}"
+ disabled='disabled' />
<vpe:resize>
<vpe:width width-attr="style.width" />
<vpe:height height-attr="style.height" />
</vpe:resize>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes" />
+ </vpe:dnd>
<vpe:textFormatting use-default-formats="yes">
</vpe:textFormatting>
</vpe:template>
</vpe:if>
- </vpe:if>
- <!--else-->
- <vpe:if test="not(attrpresent('image'))">
- <vpe:template children="no" modify="no">
- <input type="button" value="{iif(@value='',' ',jsfvalue(@value))}"
- class="{@styleClass}" style="{@style}"
- title="{tagstring()}" dir="{@dir}"/>
- <vpe:resize>
- <vpe:width width-attr="style.width" />
- <vpe:height height-attr="style.height" />
- </vpe:resize>
- <vpe:dnd>
- <vpe:drag start-enable="yes" />
- </vpe:dnd>
- <vpe:textFormatting use-default-formats="yes">
- </vpe:textFormatting>
- </vpe:template>
- </vpe:if>
<vpe:if test="attrpresent('image')">
<vpe:template children="no" modify="no">
- <input type="image" src="{src(@image)}"
- class="{@styleClass}" style="{@style}" title="{tagstring()}" />
+ <input type="image" src="{src(@image)}" class="{@styleClass}"
+ style="{@style}" title="{tagstring()}" disabled='disabled' />
<vpe:resize>
<vpe:width width-attr="style.width" />
<vpe:height height-attr="style.height" />
@@ -69,156 +41,188 @@
</vpe:textFormatting>
</vpe:template>
</vpe:if>
+ </vpe:if>
+ <!--else-->
+ <vpe:if test="not(attrpresent('image'))">
+ <vpe:template children="no" modify="no">
+ <input type="button" value="{iif(@value='',' ',jsfvalue(@value))}"
+ class="{@styleClass}" style="{@style}" title="{tagstring()}" dir="{@dir}" />
+ <vpe:resize>
+ <vpe:width width-attr="style.width" />
+ <vpe:height height-attr="style.height" />
+ </vpe:resize>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes" />
+ </vpe:dnd>
+ <vpe:textFormatting use-default-formats="yes">
+ </vpe:textFormatting>
+ </vpe:template>
+ </vpe:if>
+ <vpe:if test="attrpresent('image')">
+ <vpe:template children="no" modify="no">
+ <input type="image" src="{src(@image)}" class="{@styleClass}"
+ style="{@style}" title="{tagstring()}" />
+ <vpe:resize>
+ <vpe:width width-attr="style.width" />
+ <vpe:height height-attr="style.height" />
+ </vpe:resize>
+ <vpe:textFormatting use-default-formats="yes">
+ </vpe:textFormatting>
+ </vpe:template>
+ </vpe:if>
<!--end-of-else-->
</vpe:tag>
- <vpe:tag name="s:cache" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <span class="vpe-text"/>
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="s:conversationId" case-sensitive="yes">
- <vpe:template children="yes" modify="yes" >
- <span class="vpe-text"/>
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="s:conversationPropagation" case-sensitive="yes">
- <vpe:template children="no" modify="no" />
- </vpe:tag>
-
- <vpe:tag name="s:convertDateTime" case-sensitive="yes">
- <vpe:template children="no" modify="no" />
- </vpe:tag>
-
- <vpe:tag name="s:convertEntity" case-sensitive="yes">
- <vpe:template children="no" modify="no" />
- </vpe:tag>
-
- <vpe:tag name="s:convertEnum" case-sensitive="yes">
- <vpe:template children="no" modify="no" />
- </vpe:tag>
-
- <vpe:tag name="s:decorate" case-sensitive="yes">
- <vpe:template children="yes" modify="yes"
- class="org.jboss.tools.jsf.vpe.seam.template.SeamDecorateTemplate">
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="s:div" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <div style="{@style}" class="{@styleClass}" />
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="s:defaultAction" case-sensitive="yes">
- <vpe:template children="no" modify="no"/>
- </vpe:tag>
-
- <vpe:tag name="s:enumItem" case-sensitive="yes">
- <vpe:if test="hasinparents('h:selectManyCheckbox')">
- <vpe:template children="yes" modify="yes"
- class="org.jboss.tools.jsf.vpe.seam.template.SeamCheckboxEnumItemTemplate">
- </vpe:template>
- </vpe:if>
- <vpe:if
- test="hasinparents('h:selectManyListbox')|hasinparents('h:selectManyMenu')|hasinparents('h:selectOneListbox')|hasinparents('h:selectOneMenu')|hasinparents('rich:pickList')">
- <vpe:template children="yes" modify="yes"
- class="org.jboss.tools.jsf.vpe.seam.template.SeamOptionEnumItemTemplate">
- </vpe:template>
- </vpe:if>
- <vpe:if
- test="hasinparents('h:selectOneRadio')|hasinparents('x:selectOneRadio')">
- <vpe:template children="yes" modify="yes"
- class="org.jboss.tools.jsf.vpe.seam.template.SeamRadioEnumItemTemplate">
- </vpe:template>
- </vpe:if>
- <vpe:if
- test="hasinparents('x:selectManyCheckbox')|hasinparents('t:selectManyCheckbox')">
- <vpe:template children="no" modify="yes">
- <span title="{tagstring()}">
- <input type="checkbox" />
- <vpe:value expr="{jsfvalue(@itemLabel)}" />
- </span>
- <vpe:dnd>
- <vpe:drag start-enable="yes" />
- </vpe:dnd>
- <vpe:breaker type="selectItem" />
- </vpe:template>
- </vpe:if>
- <vpe:if
- test="hasinparents('t:selectManyMenu')|
+ <vpe:tag name="s:cache" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <span class="vpe-text" />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="s:conversationId" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <span class="vpe-text" />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="s:conversationPropagation" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="s:convertDateTime" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="s:convertEntity" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="s:convertEnum" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="s:decorate" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes"
+ class="org.jboss.tools.jsf.vpe.seam.template.SeamDecorateTemplate">
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="s:div" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <div style="{@style}" class="{@styleClass}" />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="s:defaultAction" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="s:enumItem" case-sensitive="yes">
+ <vpe:if test="hasinparents('h:selectManyCheckbox')">
+ <vpe:template children="yes" modify="yes"
+ class="org.jboss.tools.jsf.vpe.seam.template.SeamCheckboxEnumItemTemplate">
+ </vpe:template>
+ </vpe:if>
+ <vpe:if
+ test="hasinparents('h:selectManyListbox')|hasinparents('h:selectManyMenu')|hasinparents('h:selectOneListbox')|hasinparents('h:selectOneMenu')|hasinparents('rich:pickList')">
+ <vpe:template children="yes" modify="yes"
+ class="org.jboss.tools.jsf.vpe.seam.template.SeamOptionEnumItemTemplate">
+ </vpe:template>
+ </vpe:if>
+ <vpe:if
+ test="hasinparents('h:selectOneRadio')|hasinparents('x:selectOneRadio')">
+ <vpe:template children="yes" modify="yes"
+ class="org.jboss.tools.jsf.vpe.seam.template.SeamRadioEnumItemTemplate">
+ </vpe:template>
+ </vpe:if>
+ <vpe:if
+ test="hasinparents('x:selectManyCheckbox')|hasinparents('t:selectManyCheckbox')">
+ <vpe:template children="no" modify="yes">
+ <span title="{tagstring()}">
+ <input type="checkbox" />
+ <vpe:value expr="{jsfvalue(@itemLabel)}" />
+ </span>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes" />
+ </vpe:dnd>
+ <vpe:breaker type="selectItem" />
+ </vpe:template>
+ </vpe:if>
+ <vpe:if
+ test="hasinparents('t:selectManyMenu')|
hasinparents('x:selectOneRadio')|
hasinparents('x:selectOneMenu')">
- <vpe:template children="no" modify="yes">
- <option value="{@itemValue}" title="{tagstring()}">
- <vpe:value expr="{jsfvalue(@itemLabel)}" />
- </option>
- </vpe:template>
- </vpe:if>
-
- </vpe:tag>
-
- <vpe:tag name="s:fileUpload" case-sensitive="yes">
- <vpe:template children="no" modify="no">
- <input type="file" style="{@style}" class="{@styleClass}"
- title="{tagstring()}" size="{@size}" />
- <vpe:dnd>
- <vpe:drag start-enable="yes" />
- <vpe:drop container="no" />
- </vpe:dnd>
- <vpe:resize>
- <vpe:width width-attr="style.width" />
- <vpe:height height-attr="style.height" />
- </vpe:resize>
- <vpe:textFormatting use-default-formats="yes">
- </vpe:textFormatting>
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="s:formattedText" case-sensitive="yes">
- <vpe:template children="yes" modify="yes"
- class="org.jboss.tools.jsf.vpe.seam.template.SeamFormattedTextTemplate">
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="s:fragment" case-sensitive="yes">
- <vpe:template children="yes" modify="yes" >
- <span class="vpe-text"/>
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="s:graphicImage" case-sensitive="yes">
- <vpe:template children="no" modify="yes" class="org.jboss.tools.jsf.vpe.seam.template.SeamGraphicImageTemplate" />
- </vpe:tag>
-
- <vpe:tag name="s:label" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <label style="{@style}" class="{@styleClass}" title="{tagstring()}" for="{@for}">
- <vpe:value expr="{jsfvalue(@value)}"/>
- </label>
- <vpe:dnd>
- <vpe:drag start-enable="yes"/>
- <vpe:drop container="yes">
- <vpe:container-child tag-name="outputText"/>
- </vpe:drop>
- </vpe:dnd>
- <vpe:textFormatting use-default-formats="yes">
- <vpe:format type="BlockFormat" addChildren="deny" handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BlockFormatHandler" />
- </vpe:textFormatting>
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="s:link" case-sensitive="yes">
- <vpe:template children="yes" modify="yes"
- class="org.jboss.tools.jsf.vpe.seam.template.SeamLinkTemplate">
- <vpe:dnd>
+ <vpe:template children="no" modify="yes">
+ <option value="{@itemValue}" title="{tagstring()}">
+ <vpe:value expr="{jsfvalue(@itemLabel)}" />
+ </option>
+ </vpe:template>
+ </vpe:if>
+
+ </vpe:tag>
+
+ <vpe:tag name="s:fileUpload" case-sensitive="yes">
+ <vpe:template children="no" modify="no">
+ <input type="file" style="{@style}" class="{@styleClass}"
+ title="{tagstring()}" size="{@size}" />
+ <vpe:dnd>
<vpe:drag start-enable="yes" />
+ <vpe:drop container="no" />
+ </vpe:dnd>
+ <vpe:resize>
+ <vpe:width width-attr="style.width" />
+ <vpe:height height-attr="style.height" />
+ </vpe:resize>
+ <vpe:textFormatting use-default-formats="yes">
+ </vpe:textFormatting>
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="s:formattedText" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes"
+ class="org.jboss.tools.jsf.vpe.seam.template.SeamFormattedTextTemplate">
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="s:fragment" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <span class="vpe-text" />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="s:graphicImage" case-sensitive="yes">
+ <vpe:template children="no" modify="yes"
+ class="org.jboss.tools.jsf.vpe.seam.template.SeamGraphicImageTemplate" />
+ </vpe:tag>
+
+ <vpe:tag name="s:label" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <label style="{@style}" class="{@styleClass}" title="{tagstring()}"
+ for="{@for}">
+ <vpe:value expr="{jsfvalue(@value)}" />
+ </label>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes" />
<vpe:drop container="yes">
<vpe:container-child tag-name="outputText" />
</vpe:drop>
</vpe:dnd>
+ <vpe:textFormatting use-default-formats="yes">
+ <vpe:format type="BlockFormat" addChildren="deny"
+ handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BlockFormatHandler" />
+ </vpe:textFormatting>
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="s:link" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes"
+ class="org.jboss.tools.jsf.vpe.seam.template.SeamLinkTemplate">
+ <vpe:dnd>
+ <vpe:drag start-enable="yes" />
+ <vpe:drop container="yes">
+ <vpe:container-child tag-name="outputText" />
+ </vpe:drop>
+ </vpe:dnd>
<vpe:textFormatting>
<vpe:format type="BoldFormat">
<vpe:formatAttribute type="style" />
@@ -240,114 +244,160 @@
</vpe:format>
</vpe:textFormatting>
<vpe:pseudoContent />
- </vpe:template>
- </vpe:tag>
+ </vpe:template>
+ </vpe:tag>
- <vpe:tag name="s:message" case-sensitive="yes">
- <vpe:template children="no" modify="no">
- <span class="{@styleClass}" style="{@style}">
- Error Messages
+ <vpe:tag name="s:message" case-sensitive="yes">
+ <vpe:template children="no" modify="no">
+ <span class="{@styleClass}" style="{@style}">
+ Error Messages
</span>
- <vpe:dnd>
- <vpe:drag start-enable="yes" />
- <vpe:drop container="no"/>
- </vpe:dnd>
- <vpe:textFormatting use-default-formats="yes">
- <vpe:format type="BlockFormat" handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BlockFormatHandler"/>
- </vpe:textFormatting>
- </vpe:template>
- </vpe:tag>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes" />
+ <vpe:drop container="no" />
+ </vpe:dnd>
+ <vpe:textFormatting use-default-formats="yes">
+ <vpe:format type="BlockFormat"
+ handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BlockFormatHandler" />
+ </vpe:textFormatting>
+ </vpe:template>
+ </vpe:tag>
- <vpe:tag name="s:remote" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <span class="vpe-text"/>
- </vpe:template>
- </vpe:tag>
+ <vpe:tag name="s:remote" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <span class="vpe-text" />
+ </vpe:template>
+ </vpe:tag>
- <vpe:tag name="s:selectDate" case-sensitive="yes">
- <vpe:template children="yes" modify="yes"
- namespaceIdentifier="org.jboss.tools.jsf.vpe.richfaces"
- class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesCalendarTemplate">
- </vpe:template>
- </vpe:tag>
+ <vpe:tag name="s:selectDate" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes"
+ namespaceIdentifier="org.jboss.tools.jsf.vpe.richfaces"
+ class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesCalendarTemplate">
+ </vpe:template>
+ </vpe:tag>
- <vpe:tag name="s:selectItems" case-sensitive="yes">
- <vpe:if test="hasinparents('h:selectManyCheckbox')">
- <vpe:template children="yes" modify="yes" namespaceIdentifier="org.jboss.tools.jsf.vpe.jsf"
- class="org.jboss.tools.jsf.vpe.jsf.template.selectitem.JsfCheckboxSelectItemsTemplate">
- </vpe:template>
- </vpe:if>
- <vpe:if
- test="hasinparents('h:selectManyListbox')|hasinparents('h:selectManyMenu')|hasinparents('h:selectOneListbox')|hasinparents('h:selectOneMenu')|hasinparents('rich:pickList')">
- <vpe:template children="yes" modify="yes" namespaceIdentifier="org.jboss.tools.jsf.vpe.jsf"
- class="org.jboss.tools.jsf.vpe.jsf.template.selectitem.JsfOptionSelectItemsTemplate">
- </vpe:template>
- </vpe:if>
- <vpe:if
- test="hasinparents('h:selectOneRadio')|hasinparents('x:selectOneRadio')">
- <vpe:template children="yes" modify="yes" namespaceIdentifier="org.jboss.tools.jsf.vpe.jsf"
- class="org.jboss.tools.jsf.vpe.jsf.template.selectitem.JsfRadioSelectItemsTemplate">
- </vpe:template>
- </vpe:if>
- <vpe:if
- test="hasinparents('x:selectManyCheckbox')|hasinparents('t:selectManyCheckbox')">
- <vpe:template children="no" modify="yes">
- <span title="{tagstring()}">
- <input type="checkbox" />
- <vpe:value expr="{jsfvalue(@itemLabel)}" />
- </span>
- <vpe:dnd>
- <vpe:drag start-enable="yes" />
- </vpe:dnd>
- <vpe:breaker type="selectItem" />
- </vpe:template>
- </vpe:if>
- <vpe:if
- test="hasinparents('t:selectManyMenu')|
+ <vpe:tag name="s:selectItems" case-sensitive="yes">
+ <vpe:if test="hasinparents('h:selectManyCheckbox')">
+ <vpe:template children="yes" modify="yes"
+ namespaceIdentifier="org.jboss.tools.jsf.vpe.jsf"
+ class="org.jboss.tools.jsf.vpe.jsf.template.selectitem.JsfCheckboxSelectItemsTemplate">
+ </vpe:template>
+ </vpe:if>
+ <vpe:if
+ test="hasinparents('h:selectManyListbox')|hasinparents('h:selectManyMenu')|hasinparents('h:selectOneListbox')|hasinparents('h:selectOneMenu')|hasinparents('rich:pickList')">
+ <vpe:template children="yes" modify="yes"
+ namespaceIdentifier="org.jboss.tools.jsf.vpe.jsf"
+ class="org.jboss.tools.jsf.vpe.jsf.template.selectitem.JsfOptionSelectItemsTemplate">
+ </vpe:template>
+ </vpe:if>
+ <vpe:if
+ test="hasinparents('h:selectOneRadio')|hasinparents('x:selectOneRadio')">
+ <vpe:template children="yes" modify="yes"
+ namespaceIdentifier="org.jboss.tools.jsf.vpe.jsf"
+ class="org.jboss.tools.jsf.vpe.jsf.template.selectitem.JsfRadioSelectItemsTemplate">
+ </vpe:template>
+ </vpe:if>
+ <vpe:if
+ test="hasinparents('x:selectManyCheckbox')|hasinparents('t:selectManyCheckbox')">
+ <vpe:template children="no" modify="yes">
+ <span title="{tagstring()}">
+ <input type="checkbox" />
+ <vpe:value expr="{jsfvalue(@itemLabel)}" />
+ </span>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes" />
+ </vpe:dnd>
+ <vpe:breaker type="selectItem" />
+ </vpe:template>
+ </vpe:if>
+ <vpe:if
+ test="hasinparents('t:selectManyMenu')|
hasinparents('x:selectOneRadio')|
hasinparents('x:selectOneMenu')">
- <vpe:template children="no" modify="yes">
- <option value="{@itemValue}" title="{tagstring()}">
- <vpe:value expr="{jsfvalue(@itemLabel)}" />
- </option>
- </vpe:template>
- </vpe:if>
- </vpe:tag>
+ <vpe:template children="no" modify="yes">
+ <option value="{@itemValue}" title="{tagstring()}">
+ <vpe:value expr="{jsfvalue(@itemLabel)}" />
+ </option>
+ </vpe:template>
+ </vpe:if>
+ </vpe:tag>
- <vpe:tag name="s:span" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <span style="{@style}" class="{@styleClass}" />
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="s:transformImageSize" case-sensitive="yes">
- <vpe:template children="no" modify="no" />
- </vpe:tag>
-
- <vpe:tag name="s:transformImageBlur" case-sensitive="yes">
- <vpe:template children="no" modify="no" />
- </vpe:tag>
-
- <vpe:tag name="s:transformImageType" case-sensitive="yes">
- <vpe:template children="no" modify="no" />
- </vpe:tag>
-
- <vpe:tag name="s:validate" case-sensitive="yes">
- <vpe:template children="no" modify="no" />
- </vpe:tag>
-
- <vpe:tag name="s:validateAll" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <span class="vpe-text"/>
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="s:validateFormattedText" case-sensitive="yes">
- <vpe:template children="no" modify="no"/>
- </vpe:tag>
-
- <vpe:tag name="s:taskId" case-sensitive="yes">
- <vpe:template children="no" modify="no"/>
- </vpe:tag>
-
+ <vpe:tag name="s:span" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <span style="{@style}" class="{@styleClass}" />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="s:transformImageSize" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="s:transformImageBlur" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="s:transformImageType" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="s:validate" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="s:validateAll" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <span class="vpe-text" />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="s:validateFormattedText" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="s:taskId" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="m:message" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <div/>
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="m:body" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.seam.template.SeamMailBodyTemplate"/>
+ </vpe:tag>
+
+ <vpe:tag name="m:from" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="m:to" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="m:subject" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="m:attachment" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="m:bcc" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="m:cc" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="m:header" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="m:replyTo" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
</vpe:templates>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/attachment.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/attachment.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/attachment.xhtml 2009-11-13 17:57:01 UTC (rev 18683)
@@ -0,0 +1,7 @@
+<m:message xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:m="http://jboss.com/products/seam/mail"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <m:attachment id="id1" value="img.img"/>
+
+</m:message>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/bcc.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/bcc.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/bcc.xhtml 2009-11-13 17:57:01 UTC (rev 18683)
@@ -0,0 +1,7 @@
+<m:message xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:m="http://jboss.com/products/seam/mail"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <m:bcc id="id1" name="Yura" adress="yzhishko(a)exadel.com"></m:bcc>
+
+</m:message>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/body.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/body.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/body.xhtml 2009-11-13 17:57:01 UTC (rev 18683)
@@ -0,0 +1,22 @@
+<m:message xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:m="http://jboss.com/products/seam/mail"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+
+ <m:body id="id1" type="plain">
+ <p style="color:red"><h:outputText value="Dear Yura" />,</p>
+ <p style="color:green">You can try out Seam by visiting
+ <a href="http://labs.jboss.com/jbossseam">http://labs.jboss.com/jbossseam</a>.</p>
+ <p>Regards,</p>
+ <p>Pete</p>
+ </m:body>
+
+ <m:body id="id2">
+ <p style="color:red"><h:outputText value="Dear Yura" />,</p>
+ <p style="color:green">You can try out Seam by visiting
+ <a href="http://labs.jboss.com/jbossseam">http://labs.jboss.com/jbossseam</a>.</p>
+ <p>Regards,</p>
+ <p>Pete</p>
+ </m:body>
+
+</m:message>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/body.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/body.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/body.xhtml.xml 2009-11-13 17:57:01 UTC (rev 18683)
@@ -0,0 +1,62 @@
+<tests>
+ <test id="id2">
+ <DIV>
+<P>
+<SPAN>
+Dear Yura
+</SPAN>
+<SPAN>
+,
+</SPAN>
+</P>
+<P>
+<SPAN>
+You can try out Seam by visiting
+</SPAN><A><SPAN>http://labs.jboss.com/jbossseam</SPAN></A>
+<SPAN>
+.
+</SPAN>
+</P>
+<P>
+<SPAN>
+Regards,
+</SPAN>
+</P>
+<P>
+<SPAN>
+Pete
+</SPAN>
+</P>
+</DIV>
+ </test>
+ <test id="id2">
+ <DIV>
+<P STYLE="color: red; -moz-user-modify: read-write;">
+<SPAN CLASS="vpe-text">
+Dear Yura
+</SPAN>
+<SPAN CLASS="vpe-text">
+,
+</SPAN>
+</P>
+<P STYLE="color: green; -moz-user-modify: read-write;">
+<SPAN CLASS="vpe-text">
+You can try out Seam by visiting
+</SPAN><A STYLE="-moz-user-modify: read-write;"><SPAN CLASS="vpe-text">http://labs.jboss.com/jbossseam</SPAN></A>
+<SPAN CLASS="vpe-text">
+.
+</SPAN>
+</P>
+<P STYLE="-moz-user-modify: read-write;">
+<SPAN CLASS="vpe-text">
+Regards,
+</SPAN>
+</P>
+<P STYLE="-moz-user-modify: read-write;">
+<SPAN CLASS="vpe-text">
+Pete
+</SPAN>
+</P>
+</DIV>
+ </test>
+</tests>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/cc.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/cc.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/cc.xhtml 2009-11-13 17:57:01 UTC (rev 18683)
@@ -0,0 +1,7 @@
+<m:message xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:m="http://jboss.com/products/seam/mail"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <m:cc id="id1" name="Yura" adress="yzhishko(a)exadel.com"></m:cc>
+
+</m:message>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/from.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/from.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/from.xhtml 2009-11-13 17:57:01 UTC (rev 18683)
@@ -0,0 +1,7 @@
+<m:message xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:m="http://jboss.com/products/seam/mail"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <m:from id="id1" name="Peter" address="devill-87(a)mail.com" />
+
+</m:message>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/header.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/header.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/header.xhtml 2009-11-13 17:57:01 UTC (rev 18683)
@@ -0,0 +1,7 @@
+<m:message xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:m="http://jboss.com/products/seam/mail"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <m:header id="id1" name="X-Sent-From" value="JBoss Seam"></m:header>
+
+</m:message>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/message.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/message.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/message.xhtml 2009-11-13 17:57:01 UTC (rev 18683)
@@ -0,0 +1,9 @@
+<m:message id="id1" xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:m="http://jboss.com/products/seam/mail"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <m:body>
+ <p style="color:red"><h:outputText value="Dear Yura" />,</p>
+ </m:body>
+
+</m:message>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/message.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/message.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/message.xhtml.xml 2009-11-13 17:57:01 UTC (rev 18683)
@@ -0,0 +1,16 @@
+<tests>
+ <test id="id1">
+ <DIV STYLE="-moz-user-modify: read-write;">
+<DIV>
+<P STYLE="color: red; -moz-user-modify: read-write;">
+<SPAN CLASS="vpe-text">
+Dear Yura
+</SPAN>
+<SPAN CLASS="vpe-text">
+,
+</SPAN>
+</P>
+</DIV>
+</DIV>
+ </test>
+</tests>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/replyTo.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/replyTo.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/replyTo.xhtml 2009-11-13 17:57:01 UTC (rev 18683)
@@ -0,0 +1,7 @@
+<m:message xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:m="http://jboss.com/products/seam/mail"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <m:replyTo id="id1" adress="yzhishko(a)exadel.com"></m:replyTo>
+
+</m:message>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/subject.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/subject.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/subject.xhtml 2009-11-13 17:57:01 UTC (rev 18683)
@@ -0,0 +1,7 @@
+<m:message xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:m="http://jboss.com/products/seam/mail"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <m:subject id="id1">Try out Seam!</m:subject>
+
+</m:message>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/to.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/to.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/mail/to.xhtml 2009-11-13 17:57:01 UTC (rev 18683)
@@ -0,0 +1,7 @@
+<m:message xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:m="http://jboss.com/products/seam/mail"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <m:to id="id1" name="Yura Zhishko">yzhishko(a)mail.ru</m:to>
+
+</m:message>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentContentTest.java 2009-11-13 15:22:37 UTC (rev 18682)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentContentTest.java 2009-11-13 17:57:01 UTC (rev 18683)
@@ -4,125 +4,168 @@
public class SeamComponentContentTest extends ComponentContentTest {
- public SeamComponentContentTest(String name) {
- super(name);
- setCheckWarning(false);
- }
+ public SeamComponentContentTest(String name) {
+ super(name);
+ setCheckWarning(false);
+ }
- @Override
- protected String getTestProjectName() {
- return SeamAllTests.IMPORT_PROJECT_NAME;
- }
-
- public void testButton() throws Throwable {
- performContentTest("components/button.xhtml"); //$NON-NLS-1$
- }
-
- public void testCache() throws Throwable {
- performContentTest("components/cache.xhtml"); //$NON-NLS-1$
- }
-
- public void testConversationId() throws Throwable {
- performContentTest("components/conversationId.xhtml"); //$NON-NLS-1$ //$NON-NLS-2$
- }
+ @Override
+ protected String getTestProjectName() {
+ return SeamAllTests.IMPORT_PROJECT_NAME;
+ }
- public void testConvertDateTime() throws Throwable {
- performInvisibleTagTest("components/convertDateTime.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- public void testConvertEntity() throws Throwable {
- performInvisibleTagTest("components/convertEntity.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- public void testConvertEnum() throws Throwable {
- performInvisibleTagTest("components/convertEnum.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- public void testDecorate() throws Throwable {
- performContentTest("components/decorate.xhtml"); //$NON-NLS-1$
- }
-
- public void testDefaultAction() throws Throwable {
- performInvisibleTagTest("components/defaultAction.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- public void testDiv() throws Throwable {
- performContentTest("components/div.xhtml"); //$NON-NLS-1$
- }
-
- public void testEnumItem() throws Throwable {
- performContentTest("components/enumItem.xhtml"); //$NON-NLS-1$
- }
-
- public void testFileUpload() throws Throwable {
- performContentTest("components/fileUpload.xhtml"); //$NON-NLS-1$
- }
-
- public void testFormattedText() throws Throwable {
- performContentTest("components/formattedText.xhtml"); //$NON-NLS-1$
- }
-
- public void testFragment() throws Throwable {
- performContentTest("components/fragment.xhtml"); //$NON-NLS-1$
- }
-
- public void testGraphicImage() throws Throwable {
- performContentTest("components/graphicImage.xhtml"); //$NON-NLS-1$
- }
-
- public void testLabel() throws Throwable {
- performContentTest("components/label.xhtml"); //$NON-NLS-1$
- }
-
- public void testLink() throws Throwable {
- performContentTest("components/link.xhtml"); //$NON-NLS-1$
- }
-
- public void testMessage() throws Throwable {
- performContentTest("components/message.xhtml"); //$NON-NLS-1$
- }
-
- public void testRemote() throws Throwable {
- performContentTest("components/remote.xhtml"); //$NON-NLS-1$
- }
-
- public void testSelectDate() throws Throwable {
- performContentTest("components/selectDate.xhtml"); //$NON-NLS-1$
- }
-
- public void testSelectItems() throws Throwable {
- performContentTest("components/selectItems.xhtml"); //$NON-NLS-1$
- }
-
- public void testSpan() throws Throwable {
- performContentTest("components/span.xhtml"); //$NON-NLS-1$
- }
-
- public void testTransformImageSize() throws Throwable {
- performContentTest("components/transformImageSize.xhtml"); //$NON-NLS-1$
- }
-
- public void testTransformImageBlur() throws Throwable {
- performInvisibleTagTest("components/transformImageBlur.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- public void testTransformImageType() throws Throwable {
- performInvisibleTagTest("components/transformImageType.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- public void testValidate() throws Throwable {
- performInvisibleTagTest("components/validate.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- public void testValidateAll() throws Throwable {
- performContentTest("components/validateAll.xhtml"); //$NON-NLS-1$ //$NON-NLS-2$
- }
+ public void testButton() throws Throwable {
+ performContentTest("components/button.xhtml"); //$NON-NLS-1$
+ }
- public void testValidateFormattedText() throws Throwable{
- performInvisibleTagTest("components/validateFormattedText.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- public void testTaskId() throws Throwable{
- performInvisibleTagTest("components/taskId.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$
- }
+ public void testCache() throws Throwable {
+ performContentTest("components/cache.xhtml"); //$NON-NLS-1$
+ }
+
+ public void testConversationId() throws Throwable {
+ performContentTest("components/conversationId.xhtml"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testConvertDateTime() throws Throwable {
+ performInvisibleTagTest("components/convertDateTime.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testConvertEntity() throws Throwable {
+ performInvisibleTagTest("components/convertEntity.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testConvertEnum() throws Throwable {
+ performInvisibleTagTest("components/convertEnum.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testDecorate() throws Throwable {
+ performContentTest("components/decorate.xhtml"); //$NON-NLS-1$
+ }
+
+ public void testDefaultAction() throws Throwable {
+ performInvisibleTagTest("components/defaultAction.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testDiv() throws Throwable {
+ performContentTest("components/div.xhtml"); //$NON-NLS-1$
+ }
+
+ public void testEnumItem() throws Throwable {
+ performContentTest("components/enumItem.xhtml"); //$NON-NLS-1$
+ }
+
+ public void testFileUpload() throws Throwable {
+ performContentTest("components/fileUpload.xhtml"); //$NON-NLS-1$
+ }
+
+ public void testFormattedText() throws Throwable {
+ performContentTest("components/formattedText.xhtml"); //$NON-NLS-1$
+ }
+
+ public void testFragment() throws Throwable {
+ performContentTest("components/fragment.xhtml"); //$NON-NLS-1$
+ }
+
+ public void testGraphicImage() throws Throwable {
+ performContentTest("components/graphicImage.xhtml"); //$NON-NLS-1$
+ }
+
+ public void testLabel() throws Throwable {
+ performContentTest("components/label.xhtml"); //$NON-NLS-1$
+ }
+
+ public void testLink() throws Throwable {
+ performContentTest("components/link.xhtml"); //$NON-NLS-1$
+ }
+
+ public void testMessage() throws Throwable {
+ performContentTest("components/message.xhtml"); //$NON-NLS-1$
+ }
+
+ public void testRemote() throws Throwable {
+ performContentTest("components/remote.xhtml"); //$NON-NLS-1$
+ }
+
+ public void testSelectDate() throws Throwable {
+ performContentTest("components/selectDate.xhtml"); //$NON-NLS-1$
+ }
+
+ public void testSelectItems() throws Throwable {
+ performContentTest("components/selectItems.xhtml"); //$NON-NLS-1$
+ }
+
+ public void testSpan() throws Throwable {
+ performContentTest("components/span.xhtml"); //$NON-NLS-1$
+ }
+
+ public void testTransformImageSize() throws Throwable {
+ performContentTest("components/transformImageSize.xhtml"); //$NON-NLS-1$
+ }
+
+ public void testTransformImageBlur() throws Throwable {
+ performInvisibleTagTest("components/transformImageBlur.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testTransformImageType() throws Throwable {
+ performInvisibleTagTest("components/transformImageType.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testValidate() throws Throwable {
+ performInvisibleTagTest("components/validate.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testValidateAll() throws Throwable {
+ performContentTest("components/validateAll.xhtml"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testValidateFormattedText() throws Throwable {
+ performInvisibleTagTest("components/validateFormattedText.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testTaskId() throws Throwable {
+ performInvisibleTagTest("components/taskId.xhtml", "id1"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ //mail components
+
+ public void testMailMessage() throws Throwable{
+ performContentTest("components/mail/message.xhtml");
+ }
+
+ public void testMailBody() throws Throwable{
+ performContentTest("components/mail/body.xhtml");
+ }
+
+ public void testMailFrom() throws Throwable{
+ performInvisibleTagTest("components/mail/from.xhtml", "id1");
+ }
+
+ public void testMailTo() throws Throwable{
+ performInvisibleTagTest("components/mail/to.xhtml", "id1");
+ }
+
+ public void testMailSubject() throws Throwable{
+ performInvisibleTagTest("components/mail/subject.xhtml", "id1");
+ }
+
+ public void testMailAttachment() throws Throwable{
+ performInvisibleTagTest("components/mail/attachment.xhtml", "id1");
+ }
+
+ public void testMailBcc() throws Throwable{
+ performInvisibleTagTest("components/mail/bcc.xhtml", "id1");
+ }
+
+ public void testMailCc() throws Throwable{
+ performInvisibleTagTest("components/mail/cc.xhtml", "id1");
+ }
+
+ public void testMailHeader() throws Throwable{
+ performInvisibleTagTest("components/mail/header.xhtml", "id1");
+ }
+
+ public void testMailReplyTo() throws Throwable{
+ performInvisibleTagTest("components/mail/replyTo.xhtml", "id1");
+ }
+
}
15 years, 1 month
JBoss Tools SVN: r18682 - in trunk/seam/plugins/org.jboss.tools.seam.xml: src/org/jboss/tools/seam/xml/ds/model and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2009-11-13 10:22:37 -0500 (Fri, 13 Nov 2009)
New Revision: 18682
Modified:
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/ds.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/ds/model/DSConstants.java
trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/ds/model/DSFileLoaderUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1253
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/ds.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/ds.meta 2009-11-13 13:09:11 UTC (rev 18681)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/ds.meta 2009-11-13 15:22:37 UTC (rev 18682)
@@ -82,6 +82,20 @@
name="driver-class" xmlname="driver-class.#text">
<Editor name="AccessibleJava"/>
</XModelAttribute>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="transaction-isolation" xmlname="transaction-isolation.#text">
+ <Constraint loader="ListString">
+ <value/>
+ <value name="TRANSACTION_READ_UNCOMMITTED"/>
+ <value name="TRANSACTION_READ_COMMITTED"/>
+ <value name="TRANSACTION_REPEATABLE_READ"/>
+ <value name="TRANSACTION_SERIALIZABLE"/>
+ <value name="TRANSACTION_NONE"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="user-name" xmlname="user-name.#text"/>
+ <XModelAttribute PROPERTIES="category=general" name="password" xmlname="password.#text"/>
<XModelAttribute PROPERTIES="category=advanced" name="security-type" xmlname="security-type">
<Constraint loader="List">
<value/>
@@ -93,6 +107,22 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced"
name="security-domain" xmlname="security-domain"/>
+ <XModelAttribute PROPERTIES="category=advanced" name="min-pool-size" xmlname="min-pool-size.#text"/>
+ <XModelAttribute PROPERTIES="category=advanced" name="max-pool-size" xmlname="max-pool-size.#text"/>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="blocking-timeout-millis" xmlname="blocking-timeout-millis.#text"/>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="idle-timeout-minutes" xmlname="idle-timeout-minutes.#text"/>
+ <XModelAttribute PROPERTIES="category=advanced" default="false"
+ name="no-tx-separate-pools" xmlname="no-tx-separate-pools">
+ <Constraint loader="List">
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=advanced" name="metadata" xmlname="metadata.type-mapping.#text"/>
+ <XModelAttribute PROPERTIES="category=advanced" name="type-mapping" xmlname="type-mapping.#text"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -142,6 +172,10 @@
name="driver-class" xmlname="driver-class.#text">
<Editor name="AccessibleJava"/>
</XModelAttribute>
+ <XModelAttributeReference attributes="transaction-isolation"
+ entity="DSHALocalTXDatasource" name="transaction-isolation"/>
+ <XModelAttributeReference attributes="user-name,password"
+ entity="DSHALocalTXDatasource" name="user-name"/>
<XModelAttribute PROPERTIES="category=advanced" name="security-type" xmlname="security-type">
<Constraint loader="List">
<value/>
@@ -153,6 +187,13 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced"
name="security-domain" xmlname="security-domain"/>
+ <XModelAttributeReference attributes="min-pool-size,max-pool-size"
+ entity="DSHALocalTXDatasource" name="pool-size"/>
+ <XModelAttributeReference
+ attributes="blocking-timeout-millis,idle-timeout-minutes"
+ entity="DSHALocalTXDatasource" name="timeout"/>
+ <XModelAttributeReference attributes="metadata,type-mapping"
+ entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -204,6 +245,10 @@
name="xa-datasource-class" xmlname="xa-datasource-class.#text">
<Editor name="AccessibleJava"/>
</XModelAttribute>
+ <XModelAttributeReference attributes="transaction-isolation"
+ entity="DSHALocalTXDatasource" name="transaction-isolation"/>
+ <XModelAttributeReference attributes="user-name,password"
+ entity="DSHALocalTXDatasource" name="user-name"/>
<XModelAttribute PROPERTIES="category=general;save=always"
name="url-property" xmlname="url-property.#text"/>
<XModelAttribute PROPERTIES="category=general;save=always"
@@ -219,6 +264,15 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced"
name="security-domain" xmlname="security-domain"/>
+ <XModelAttributeReference attributes="min-pool-size,max-pool-size"
+ entity="DSHALocalTXDatasource" name="pool-size"/>
+ <XModelAttributeReference
+ attributes="blocking-timeout-millis,idle-timeout-minutes"
+ entity="DSHALocalTXDatasource" name="timeout"/>
+ <XModelAttributeReference attributes="no-tx-separate-pools"
+ entity="DSHALocalTXDatasource" name="no-tx-separate-pools"/>
+ <XModelAttributeReference attributes="type-mapping"
+ entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -274,6 +328,10 @@
name="url-property" xmlname="url-property.#text"/>
<XModelAttribute PROPERTIES="category=general;save=always"
name="url-delimiter" xmlname="url-delimiter.#text"/>
+ <XModelAttributeReference attributes="transaction-isolation"
+ entity="DSHALocalTXDatasource" name="transaction-isolation"/>
+ <XModelAttributeReference attributes="user-name,password"
+ entity="DSHALocalTXDatasource" name="user-name"/>
<XModelAttribute PROPERTIES="category=advanced" name="security-type" xmlname="security-type">
<Constraint loader="List">
<value/>
@@ -285,6 +343,15 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced"
name="security-domain" xmlname="security-domain"/>
+ <XModelAttributeReference attributes="min-pool-size,max-pool-size"
+ entity="DSHALocalTXDatasource" name="pool-size"/>
+ <XModelAttributeReference
+ attributes="blocking-timeout-millis,idle-timeout-minutes"
+ entity="DSHALocalTXDatasource" name="timeout"/>
+ <XModelAttributeReference attributes="no-tx-separate-pools"
+ entity="DSHALocalTXDatasource" name="no-tx-separate-pools"/>
+ <XModelAttributeReference attributes="type-mapping"
+ entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -380,10 +447,19 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;save=always"
name="connection-url" xmlname="connection-url.#text"/>
+ <XModelAttribute PROPERTIES="category=general" name="url-delimiter" xmlname="url-delimiter.#text"/>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="url-selector-strategy-class-name" xmlname="url-selector-strategy-class-name.#text">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
<XModelAttribute PROPERTIES="category=general;save=always"
name="driver-class" xmlname="driver-class.#text">
<Editor name="AccessibleJava"/>
</XModelAttribute>
+ <XModelAttributeReference attributes="transaction-isolation"
+ entity="DSHALocalTXDatasource" name="transaction-isolation"/>
+ <XModelAttributeReference attributes="user-name,password"
+ entity="DSHALocalTXDatasource" name="user-name"/>
<XModelAttribute PROPERTIES="category=advanced" name="security-type" xmlname="security-type">
<Constraint loader="List">
<value/>
@@ -395,6 +471,32 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced"
name="security-domain" xmlname="security-domain"/>
+ <XModelAttributeReference attributes="min-pool-size,max-pool-size"
+ entity="DSHALocalTXDatasource" name="pool-size"/>
+ <XModelAttributeReference attributes="blocking-timeout-millis"
+ entity="DSHALocalTXDatasource" name="blocking-timeout"/>
+ <XModelAttributeReference attributes="idle-timeout-minutes"
+ entity="DSHALocalTXDatasource" name="idle-timeout"/>
+ <XModelAttributeReference attributes="no-tx-separate-pools"
+ entity="DSHALocalTXDatasource" name="no-tx-separate-pools"/>
+ <XModelAttribute PROPERTIES="category=advanced" name="prefill" xmlname="prefill.#text">
+ <Constraint loader="ListString">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=advanced" name="use-fast-fail" xmlname="use-fast-fail.#text">
+ <Constraint loader="ListString">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
+ <XModelAttributeReference attributes="metadata,type-mapping"
+ entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -437,10 +539,17 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;save=always"
name="connection-url" xmlname="connection-url.#text"/>
+ <XModelAttributeReference
+ attributes="url-delimiter,url-selector-strategy-class-name"
+ entity="DSLocalTXDatasource" name="url"/>
<XModelAttribute PROPERTIES="category=general;save=always"
name="driver-class" xmlname="driver-class.#text">
<Editor name="AccessibleJava"/>
</XModelAttribute>
+ <XModelAttributeReference attributes="transaction-isolation"
+ entity="DSHALocalTXDatasource" name="transaction-isolation"/>
+ <XModelAttributeReference attributes="user-name,password"
+ entity="DSHALocalTXDatasource" name="user-name"/>
<XModelAttribute PROPERTIES="category=advanced" name="security-type" xmlname="security-type">
<Constraint loader="List">
<value/>
@@ -452,6 +561,18 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced"
name="security-domain" xmlname="security-domain"/>
+ <XModelAttributeReference attributes="min-pool-size,max-pool-size"
+ entity="DSHALocalTXDatasource" name="pool-size"/>
+ <XModelAttributeReference attributes="blocking-timeout-millis"
+ entity="DSHALocalTXDatasource" name="blocking-timeout"/>
+ <XModelAttributeReference attributes="idle-timeout-minutes"
+ entity="DSHALocalTXDatasource" name="idle-timeout"/>
+ <XModelAttributeReference attributes="no-tx-separate-pools"
+ entity="DSHALocalTXDatasource" name="no-tx-separate-pools"/>
+ <XModelAttributeReference attributes="prefill,use-fast-fail"
+ entity="DSLocalTXDatasource" name="prefill"/>
+ <XModelAttributeReference attributes="metadata,type-mapping"
+ entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -537,6 +658,9 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
name="jndi-name" xmlname="jndi-name.#text"/>
+ <XModelAttribute PROPERTIES="category=general" name="rar-name" xmlname="rar-name.#text"/>
+ <XModelAttribute PROPERTIES="category=general"
+ name="connection-definition" xmlname="connection-definition.#text"/>
<XModelAttribute PROPERTIES="category=advanced" name="security-type" xmlname="security-type">
<Constraint loader="List">
<value/>
@@ -548,6 +672,16 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced"
name="security-domain" xmlname="security-domain"/>
+ <XModelAttributeReference attributes="min-pool-size,max-pool-size"
+ entity="DSHALocalTXDatasource" name="pool-size"/>
+ <XModelAttributeReference attributes="blocking-timeout-millis"
+ entity="DSHALocalTXDatasource" name="blocking-timeout"/>
+ <XModelAttributeReference attributes="idle-timeout-minutes"
+ entity="DSHALocalTXDatasource" name="idle-timeout"/>
+ <XModelAttributeReference attributes="prefill,use-fast-fail"
+ entity="DSLocalTXDatasource" name="prefill"/>
+ <XModelAttributeReference attributes="metadata,type-mapping"
+ entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -580,6 +714,8 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
name="jndi-name" xmlname="jndi-name.#text"/>
+ <XModelAttributeReference attributes="rar-name,connection-definition"
+ entity="DSNoTXConnectionFactory" name="rar"/>
<XModelAttribute PROPERTIES="category=advanced" name="security-type" xmlname="security-type">
<Constraint loader="List">
<value/>
@@ -591,6 +727,16 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced"
name="security-domain" xmlname="security-domain"/>
+ <XModelAttributeReference attributes="min-pool-size,max-pool-size"
+ entity="DSHALocalTXDatasource" name="pool-size"/>
+ <XModelAttributeReference attributes="blocking-timeout-millis"
+ entity="DSHALocalTXDatasource" name="blocking-timeout"/>
+ <XModelAttributeReference attributes="idle-timeout-minutes"
+ entity="DSHALocalTXDatasource" name="idle-timeout"/>
+ <XModelAttributeReference attributes="prefill,use-fast-fail"
+ entity="DSLocalTXDatasource" name="prefill"/>
+ <XModelAttributeReference attributes="metadata,type-mapping"
+ entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -633,10 +779,15 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;save=always"
name="connection-url" xmlname="connection-url.#text"/>
+ <XModelAttributeReference
+ attributes="url-delimiter,url-selector-strategy-class-name"
+ entity="DSLocalTXDatasource" name="url"/>
<XModelAttribute PROPERTIES="category=general;save=always"
name="driver-class" xmlname="driver-class.#text">
<Editor name="AccessibleJava"/>
</XModelAttribute>
+ <XModelAttributeReference attributes="user-name,password"
+ entity="DSHALocalTXDatasource" name="user-name"/>
<XModelAttribute PROPERTIES="category=advanced" name="security-type" xmlname="security-type">
<Constraint loader="List">
<value/>
@@ -648,6 +799,16 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced"
name="security-domain" xmlname="security-domain"/>
+ <XModelAttributeReference attributes="min-pool-size,max-pool-size"
+ entity="DSHALocalTXDatasource" name="pool-size"/>
+ <XModelAttributeReference attributes="blocking-timeout-millis"
+ entity="DSHALocalTXDatasource" name="blocking-timeout"/>
+ <XModelAttributeReference attributes="idle-timeout-minutes"
+ entity="DSHALocalTXDatasource" name="idle-timeout"/>
+ <XModelAttributeReference attributes="prefill,use-fast-fail"
+ entity="DSLocalTXDatasource" name="prefill"/>
+ <XModelAttributeReference attributes="metadata,type-mapping"
+ entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -692,10 +853,15 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;save=always"
name="connection-url" xmlname="connection-url.#text"/>
+ <XModelAttributeReference
+ attributes="url-delimiter,url-selector-strategy-class-name"
+ entity="DSLocalTXDatasource" name="url"/>
<XModelAttribute PROPERTIES="category=general;save=always"
name="driver-class" xmlname="driver-class.#text">
<Editor name="AccessibleJava"/>
</XModelAttribute>
+ <XModelAttributeReference attributes="user-name,password"
+ entity="DSHALocalTXDatasource" name="user-name"/>
<XModelAttribute PROPERTIES="category=advanced" name="security-type" xmlname="security-type">
<Constraint loader="List">
<value/>
@@ -707,6 +873,16 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced"
name="security-domain" xmlname="security-domain"/>
+ <XModelAttributeReference attributes="min-pool-size,max-pool-size"
+ entity="DSHALocalTXDatasource" name="pool-size"/>
+ <XModelAttributeReference attributes="blocking-timeout-millis"
+ entity="DSHALocalTXDatasource" name="blocking-timeout"/>
+ <XModelAttributeReference attributes="idle-timeout-minutes"
+ entity="DSHALocalTXDatasource" name="idle-timeout"/>
+ <XModelAttributeReference attributes="prefill,use-fast-fail"
+ entity="DSLocalTXDatasource" name="prefill"/>
+ <XModelAttributeReference attributes="metadata,type-mapping"
+ entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -754,6 +930,8 @@
</Constraint>
<Editor name="List"/>
</XModelAttribute>
+ <XModelAttributeReference attributes="rar-name,connection-definition"
+ entity="DSNoTXConnectionFactory" name="rar"/>
<XModelAttribute PROPERTIES="category=advanced" name="security-type" xmlname="security-type">
<Constraint loader="List">
<value/>
@@ -765,6 +943,18 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced"
name="security-domain" xmlname="security-domain"/>
+ <XModelAttributeReference attributes="min-pool-size,max-pool-size"
+ entity="DSHALocalTXDatasource" name="pool-size"/>
+ <XModelAttributeReference attributes="blocking-timeout-millis"
+ entity="DSHALocalTXDatasource" name="blocking-timeout"/>
+ <XModelAttributeReference attributes="idle-timeout-minutes"
+ entity="DSHALocalTXDatasource" name="idle-timeout"/>
+ <XModelAttributeReference attributes="no-tx-separate-pools"
+ entity="DSHALocalTXDatasource" name="no-tx-separate-pools"/>
+ <XModelAttributeReference attributes="prefill,use-fast-fail"
+ entity="DSLocalTXDatasource" name="prefill"/>
+ <XModelAttributeReference attributes="metadata,type-mapping"
+ entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -812,6 +1002,8 @@
</Constraint>
<Editor name="List"/>
</XModelAttribute>
+ <XModelAttributeReference attributes="rar-name,connection-definition"
+ entity="DSNoTXConnectionFactory" name="rar"/>
<XModelAttribute PROPERTIES="category=advanced" name="security-type" xmlname="security-type">
<Constraint loader="List">
<value/>
@@ -823,6 +1015,18 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced"
name="security-domain" xmlname="security-domain"/>
+ <XModelAttributeReference attributes="min-pool-size,max-pool-size"
+ entity="DSHALocalTXDatasource" name="pool-size"/>
+ <XModelAttributeReference attributes="blocking-timeout-millis"
+ entity="DSHALocalTXDatasource" name="blocking-timeout"/>
+ <XModelAttributeReference attributes="idle-timeout-minutes"
+ entity="DSHALocalTXDatasource" name="idle-timeout"/>
+ <XModelAttributeReference attributes="no-tx-separate-pools"
+ entity="DSHALocalTXDatasource" name="no-tx-separate-pools"/>
+ <XModelAttributeReference attributes="prefill,use-fast-fail"
+ entity="DSLocalTXDatasource" name="prefill"/>
+ <XModelAttributeReference attributes="metadata,type-mapping"
+ entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -845,7 +1049,7 @@
<XChildrenEntities/>
<XEntityRenderer>
<ICONS>
- <ICON info="main.ds.datasources" type="main"/>
+ <ICON info="main.ds.datasource" type="main"/>
</ICONS>
</XEntityRenderer>
<XModelAttributes>
@@ -875,6 +1079,14 @@
name="xa-datasource-class" xmlname="xa-datasource-class.#text">
<Editor name="AccessibleJava"/>
</XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="url-property" xmlname="url-property.#text"/>
+ <XModelAttributeReference
+ attributes="url-delimiter,url-selector-strategy-class-name"
+ entity="DSLocalTXDatasource" name="url"/>
+ <XModelAttributeReference attributes="transaction-isolation"
+ entity="DSHALocalTXDatasource" name="transaction-isolation"/>
+ <XModelAttributeReference attributes="user-name,password"
+ entity="DSHALocalTXDatasource" name="user-name"/>
<XModelAttribute PROPERTIES="category=advanced" name="security-type" xmlname="security-type">
<Constraint loader="List">
<value/>
@@ -886,6 +1098,18 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced"
name="security-domain" xmlname="security-domain"/>
+ <XModelAttributeReference attributes="min-pool-size,max-pool-size"
+ entity="DSHALocalTXDatasource" name="pool-size"/>
+ <XModelAttributeReference attributes="blocking-timeout-millis"
+ entity="DSHALocalTXDatasource" name="blocking-timeout"/>
+ <XModelAttributeReference attributes="idle-timeout-minutes"
+ entity="DSHALocalTXDatasource" name="idle-timeout"/>
+ <XModelAttributeReference attributes="no-tx-separate-pools"
+ entity="DSHALocalTXDatasource" name="no-tx-separate-pools"/>
+ <XModelAttributeReference attributes="prefill,use-fast-fail"
+ entity="DSLocalTXDatasource" name="prefill"/>
+ <XModelAttributeReference attributes="metadata,type-mapping"
+ entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -938,6 +1162,14 @@
name="xa-datasource-class" xmlname="xa-datasource-class.#text">
<Editor name="AccessibleJava"/>
</XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="url-property" xmlname="url-property.#text"/>
+ <XModelAttributeReference
+ attributes="url-delimiter,url-selector-strategy-class-name"
+ entity="DSLocalTXDatasource" name="url"/>
+ <XModelAttributeReference attributes="transaction-isolation"
+ entity="DSHALocalTXDatasource" name="transaction-isolation"/>
+ <XModelAttributeReference attributes="user-name,password"
+ entity="DSHALocalTXDatasource" name="user-name"/>
<XModelAttribute PROPERTIES="category=advanced" name="security-type" xmlname="security-type">
<Constraint loader="List">
<value/>
@@ -949,6 +1181,18 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced"
name="security-domain" xmlname="security-domain"/>
+ <XModelAttributeReference attributes="min-pool-size,max-pool-size"
+ entity="DSHALocalTXDatasource" name="pool-size"/>
+ <XModelAttributeReference attributes="blocking-timeout-millis"
+ entity="DSHALocalTXDatasource" name="blocking-timeout"/>
+ <XModelAttributeReference attributes="idle-timeout-minutes"
+ entity="DSHALocalTXDatasource" name="idle-timeout"/>
+ <XModelAttributeReference attributes="no-tx-separate-pools"
+ entity="DSHALocalTXDatasource" name="no-tx-separate-pools"/>
+ <XModelAttributeReference attributes="prefill,use-fast-fail"
+ entity="DSLocalTXDatasource" name="prefill"/>
+ <XModelAttributeReference attributes="metadata,type-mapping"
+ entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/ds/model/DSConstants.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/ds/model/DSConstants.java 2009-11-13 13:09:11 UTC (rev 18681)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/ds/model/DSConstants.java 2009-11-13 15:22:37 UTC (rev 18682)
@@ -18,5 +18,6 @@
public String ATTR_TRANSACTION = "transaction"; //$NON-NLS-1$
public String ATTR_SECURITY_TYPE = "security-type"; //$NON-NLS-1$
public String ATTR_SECURITY_DOMAIN = "security-domain"; //$NON-NLS-1$
+ public String ATTR_NO_TX_SEPARATE_POOLS = "no-tx-separate-pools"; //$NON-NLS-1$
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/ds/model/DSFileLoaderUtil.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/ds/model/DSFileLoaderUtil.java 2009-11-13 13:09:11 UTC (rev 18681)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/ds/model/DSFileLoaderUtil.java 2009-11-13 15:22:37 UTC (rev 18682)
@@ -53,7 +53,7 @@
}
public void saveAttribute(Element element, String xmlname, String value) {
- if(ATTR_TRACK_CONN.equals(xmlname)) {
+ if(ATTR_TRACK_CONN.equals(xmlname) || ATTR_NO_TX_SEPARATE_POOLS.equals(xmlname)) {
XMLUtilities.createElement(element, xmlname);
} else if(ATTR_TRANSACTION.equals(xmlname)) {
if(value.length() > 0) XMLUtilities.createElement(element, value);
@@ -69,7 +69,7 @@
}
public String getAttribute(Element element, String xmlname, XAttribute attr) {
- if(ATTR_TRACK_CONN.equals(xmlname)) {
+ if(ATTR_TRACK_CONN.equals(xmlname) || ATTR_NO_TX_SEPARATE_POOLS.equals(xmlname)) {
return (XMLUtilities.getUniqueChild(element, xmlname) != null) ? "true" : "false"; //$NON-NLS-1$ //$NON-NLS-2$
} else if(ATTR_TRANSACTION.equals(xmlname) || ATTR_SECURITY_TYPE.equals(xmlname)) {
String[] vs = ((XAttributeConstraintAList)attr.getConstraint()).getValues();
15 years, 1 month
JBoss Tools SVN: r18681 - trunk/jsf/docs/userguide/en/modules.
by jbosstools-commits@lists.jboss.org
Author: smukhina
Date: 2009-11-13 08:09:11 -0500 (Fri, 13 Nov 2009)
New Revision: 18681
Modified:
trunk/jsf/docs/userguide/en/modules/editors.xml
Log:
JBDS-946 Migration to XULRunner 1.9 - VPE 3.2.6. Setup notes for Linux section is updated
Modified: trunk/jsf/docs/userguide/en/modules/editors.xml
===================================================================
--- trunk/jsf/docs/userguide/en/modules/editors.xml 2009-11-13 11:55:29 UTC (rev 18680)
+++ trunk/jsf/docs/userguide/en/modules/editors.xml 2009-11-13 13:09:11 UTC (rev 18681)
@@ -1811,11 +1811,15 @@
<title>Setup notes for Linux</title>
- <para>Linux users may need to do the following to get the <property>Visual Page
- Editor</property> to work correctly on their machines.</para>
+ <para>Linux users who are going to use earlier then JBoss Tools 3.1.0.M4 versions may need to do the following to get the <property>Visual Page
+ Editor</property> to work correctly on their machines.</para>
+
<para> The Visual Page Editor requires the library libstdc++.so.5. This library is
- contained in the compat-libstdc++-33.i386 package.</para>
+ contained in the compat-libstdc++-33.i386 package.</para>
+
+ <note><title>Note</title>
+ Starting from JBoss Tools 3.1.0.M4 the libstdc++.so.5 library isn't required. </note>
<itemizedlist>
<listitem>
15 years, 1 month
JBoss Tools SVN: r18680 - trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2009-11-13 06:55:29 -0500 (Fri, 13 Nov 2009)
New Revision: 18680
Modified:
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageSupport.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5185
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageSupport.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageSupport.java 2009-11-13 11:14:51 UTC (rev 18679)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageSupport.java 2009-11-13 11:55:29 UTC (rev 18680)
@@ -73,7 +73,8 @@
if(s.length > 0) {
setAttributeValue(getStepId(), "template", getDefaultTemplate(s));
}
- String last = StrutsModelPlugin.getDefault().getPluginPreferences().getString(LAST_CREATE_FILE_PREFERENCE);
+ String last = StrutsModelPlugin.getDefault().getPreferenceStore().getString(LAST_CREATE_FILE_PREFERENCE);
+// String last = StrutsModelPlugin.getDefault().getPluginPreferences().getString(LAST_CREATE_FILE_PREFERENCE);
if(last == null || last.length() == 0) {
last = "true";
} else if(!"true".equals(last)) {
@@ -240,7 +241,8 @@
if(!canCreateFile()) return;
String lastCreateFileValue = getAttributeValue(getStepId(), "create file");
- StrutsModelPlugin.getDefault().getPluginPreferences().setDefault(LAST_CREATE_FILE_PREFERENCE, lastCreateFileValue);
+ StrutsModelPlugin.getDefault().getPreferenceStore().setDefault(LAST_CREATE_FILE_PREFERENCE, lastCreateFileValue);
+// StrutsModelPlugin.getDefault().getPluginPreferences().setDefault(LAST_CREATE_FILE_PREFERENCE, lastCreateFileValue);
if(!"true".equals(lastCreateFileValue)) return;
File templateFile = null;
15 years, 1 month
JBoss Tools SVN: r18679 - in trunk/esb/plugins/org.jboss.tools.esb.core: resources/meta and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2009-11-13 06:14:51 -0500 (Fri, 13 Nov 2009)
New Revision: 18679
Added:
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/OpenSmooksConfigHandler.java
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-5191
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2009-11-13 11:10:41 UTC (rev 18678)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2009-11-13 11:14:51 UTC (rev 18679)
@@ -34,6 +34,8 @@
class="org.jboss.tools.esb.core.model.handlers.AddProviderSupport"/>
<xclass id="org.jboss.tools.esb.core.model.handlers.AddGenericActionSupport"
class="org.jboss.tools.esb.core.model.handlers.AddGenericActionSupport"/>
+ <xclass id="org.jboss.tools.esb.core.model.handlers.OpenSmooksConfigHandler"
+ class="org.jboss.tools.esb.core.model.handlers.OpenSmooksConfigHandler"/>
</extension>
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2009-11-13 11:10:41 UTC (rev 18678)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2009-11-13 11:14:51 UTC (rev 18679)
@@ -735,6 +735,7 @@
<Constraint loader="Tree">
<value name="ESBResourceTree"/>
<value name="extensions=xml"/>
+ <value name="linkAction=OpenConfig"/>
</Constraint>
<Editor name="TreeChooser"/>
</XModelAttribute>
@@ -776,6 +777,10 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
+ <XActionItem
+ HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenSmooksConfigHandler"
+ ICON="action.empty" PROPERTIES="actionpath=Open"
+ displayName="Open Config" kind="action" name="OpenConfig"/>
<XActionItem kind="list" name="CreateActions"/>
<XActionItemReference entity="ESBProperty" name="CopyActions"/>
<XActionItemReference entity="ESBProperty" name="DeleteActions"/>
Added: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/OpenSmooksConfigHandler.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/OpenSmooksConfigHandler.java (rev 0)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/OpenSmooksConfigHandler.java 2009-11-13 11:14:51 UTC (rev 18679)
@@ -0,0 +1,20 @@
+package org.jboss.tools.esb.core.model.handlers;
+
+import org.jboss.tools.common.meta.action.impl.handlers.DefaultRedirectHandler;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
+
+public class OpenSmooksConfigHandler extends DefaultRedirectHandler {
+ static String ATTR_SMOOKS_CONFIG = "smooks config";
+
+ protected XModelObject getTrueSource(XModelObject source) {
+ String path = source.getAttributeValue(ATTR_SMOOKS_CONFIG);
+ if(path == null || path.length() == 0) return null;
+ XModelObject o = source.getModel().getByPath(path);
+ if(o != null) return o;
+ XModelObject r = FileSystemsHelper.getWebRoot(source.getModel());
+ if(r == null) return null;
+ return r.getChildByPath(path);
+ }
+
+}
Property changes on: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/OpenSmooksConfigHandler.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 1 month