JBoss Tools SVN: r18883 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker.
by jbosstools-commits＠lists.jboss.org
Author: tfennelly
Date: 2009-11-27 10:10:44 -0500 (Fri, 27 Nov 2009)
New Revision: 18883
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVContentGenerator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVNodeGraphicalModel.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5281
Extra whitespace being added around freemarker templates
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVContentGenerator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVContentGenerator.java 2009-11-27 14:52:00 UTC (rev 18882)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVContentGenerator.java 2009-11-27 15:10:44 UTC (rev 18883)
@@ -15,8 +15,8 @@
import java.util.List;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.jboss.template.csv.CSVFreeMarkerTemplateBuilder;
import org.jboss.template.csv.CSVModelBuilder;
-import org.jboss.template.csv.CSVToFreemarkerTemplateBuilder;
import org.jboss.template.exception.InvalidMappingException;
import org.jboss.template.exception.TemplateBuilderException;
import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject;
@@ -95,9 +95,9 @@
CSVModelBuilder modelBuilder = new CSVModelBuilder(fieldsName.toArray(new String[] {}));
Document model = modelBuilder.buildModel();
- CSVToFreemarkerTemplateBuilder builder;
+ CSVFreeMarkerTemplateBuilder builder;
- builder = new CSVToFreemarkerTemplateBuilder(model, sperator, quote);
+ builder = new CSVFreeMarkerTemplateBuilder(model, sperator, quote);
List<TreeNodeConnection> connections = csvRecordGraphicalModel.getTargetConnections();
if (!connections.isEmpty() && connections.size() == 1) {
@@ -129,7 +129,7 @@
return builder.buildTemplate();
}
- protected void addValueMapping(CSVToFreemarkerTemplateBuilder builder, FreemarkerCSVNodeGraphicalModel filedNode,
+ protected void addValueMapping(CSVFreeMarkerTemplateBuilder builder, FreemarkerCSVNodeGraphicalModel filedNode,
Document model, String recordName, JavaBeanGraphModel recordRootNode) throws InvalidMappingException {
CSVNodeModel csvFieldNode = (CSVNodeModel) filedNode.getData();
String elementName = csvFieldNode.getName();
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVNodeGraphicalModel.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVNodeGraphicalModel.java 2009-11-27 14:52:00 UTC (rev 18882)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVNodeGraphicalModel.java 2009-11-27 15:10:44 UTC (rev 18883)
@@ -174,17 +174,7 @@
if (this.domainProvider instanceof ISmooksModelProvider) {
version = ((ISmooksModelProvider) domainProvider).getPlatformVersion();
}
- // if (content != null) {
- if (SmooksConstants.VERSION_1_1.equals(version)) {
- // CDATA
- SmooksModelUtils.setCDATAToSmooksType(domainProvider.getEditingDomain(), template, content);
- }
-
- if (SmooksConstants.VERSION_1_2.equals(version)) {
- // Comment
- SmooksModelUtils.setCommentToSmooksType(domainProvider.getEditingDomain(), template, content);
- }
- // }
+ SmooksModelUtils.setCDATAToSmooksType(domainProvider.getEditingDomain(), template, content);
}
/*
15 years
- 1
- 0
JBoss Tools SVN: r18882 - trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2009-11-27 09:52:00 -0500 (Fri, 27 Nov 2009)
New Revision: 18882
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/border.gif
trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/bundle-as-el.gif
trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/non-visusal-tags.gif
trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/point_to_css.gif
trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/preference.gif
trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/refresh.gif
trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/selbar.gif
trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/text-formatting.gif
Log:
https://jira.jboss.org/jira/browse/JBIDE-5065
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/border.gif
===================================================================
(Binary files differ)
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/bundle-as-el.gif
===================================================================
(Binary files differ)
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/non-visusal-tags.gif
===================================================================
(Binary files differ)
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/point_to_css.gif
===================================================================
(Binary files differ)
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/preference.gif
===================================================================
(Binary files differ)
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/refresh.gif
===================================================================
(Binary files differ)
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/selbar.gif
===================================================================
(Binary files differ)
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons/text-formatting.gif
===================================================================
(Binary files differ)
15 years
- 1
- 0
JBoss Tools SVN: r18881 - trunk/hibernatetools/docs/reference/en/images/plugins.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2009-11-27 09:44:32 -0500 (Fri, 27 Nov 2009)
New Revision: 18881
Modified:
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_0.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_0_a.png
Log:
https://jira.jboss.org/jira/browse/JBDS-959 hbm.xml wizard screens updated
Modified: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_0.png
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_0_a.png
===================================================================
(Binary files differ)
15 years
- 1
- 0
JBoss Tools SVN: r18880 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb: internal and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-11-27 09:19:13 -0500 (Fri, 27 Nov 2009)
New Revision: 18880
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilder.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5120
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-11-27 14:05:27 UTC (rev 18879)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-11-27 14:19:13 UTC (rev 18880)
@@ -98,7 +98,7 @@
public static final String JSP_PAGE_CONTEXT_TYPE = "JSP_PAGE_CONTEXT_TYPE"; //$NON-NLS-1$
public static final String FACELETS_PAGE_CONTEXT_TYPE = "FACELETS_PAGE_CONTEXT_TYPE"; //$NON-NLS-1$
- private static final PageContextFactory getInstance() {
+ public static final PageContextFactory getInstance() {
if (fInstance != null)
return fInstance;
return (fInstance = new PageContextFactory());
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilder.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilder.java 2009-11-27 14:05:27 UTC (rev 18879)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilder.java 2009-11-27 14:19:13 UTC (rev 18880)
@@ -24,6 +24,7 @@
import org.jboss.tools.common.el.core.resolver.TypeInfoCollector;
import org.jboss.tools.jst.web.WebModelPlugin;
import org.jboss.tools.jst.web.kb.KbProjectFactory;
+import org.jboss.tools.jst.web.kb.PageContextFactory;
import org.jboss.tools.jst.web.kb.WebKbPlugin;
import org.jboss.tools.jst.web.kb.internal.scanner.IFileScanner;
import org.jboss.tools.jst.web.kb.internal.scanner.LibraryScanner;
@@ -132,6 +133,7 @@
protected void fullBuild(final IProgressMonitor monitor)
throws CoreException {
try {
+ PageContextFactory.getInstance().cleanUp(getProject());
getProject().accept(getResourceVisitor().getVisitor());
} catch (CoreException e) {
WebModelPlugin.getPluginLog().logError(e);
@@ -140,6 +142,7 @@
protected void incrementalBuild(IResourceDelta delta,
IProgressMonitor monitor) throws CoreException {
+ PageContextFactory.getInstance().cleanUp(delta);
// the visitor does the work.
delta.accept(new SampleDeltaVisitor());
}
@@ -163,6 +166,7 @@
protected void clean(IProgressMonitor monitor) throws CoreException {
KbProject sp = getKbProject();
if(sp != null) sp.clean();
+ PageContextFactory.getInstance().cleanUp(getProject());
}
}
15 years
- 1
- 0
JBoss Tools SVN: r18879 - trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-11-27 09:05:27 -0500 (Fri, 27 Nov 2009)
New Revision: 18879
Modified:
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/ds.meta
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-27 13:56:32 UTC (rev 18878)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/ds.meta 2009-11-27 14:05:27 UTC (rev 18879)
@@ -49,10 +49,142 @@
</GROUP>
</ICONS>
<GlobalActions kind="list"/>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData"
+ XMLSUBPATH="config-property" name="DSConfigProperty">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.seam.event" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="config-property" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true;category=general;save=always"
+ name="name" xmlname="name"/>
+ <XModelAttribute PROPERTIES="category=general;save=always"
+ name="type" xmlname="type"/>
+ <XModelAttribute PROPERTIES="category=general" name="value" xmlname="#text"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
+ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
+ ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ </XActionItem>
+ <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
+ <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
+ ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
+ </XActionItem>
+ <XActionItem ICON="action.empty" kind="list" name="Properties">
+ <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
+ displayName="Properties..." kind="action" name="Properties"/>
+ </XActionItem>
+ <XActionItem displayName="move" kind="list" name="MoveActions">
+ <XActionItem HIDE="always" HandlerClassName="%Move%"
+ ICON="action.move" displayName="Move" kind="action" name="Move"/>
+ </XActionItem>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData"
+ XMLSUBPATH="connection-property" name="DSConnectionProperty">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.seam.event" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="connection-property" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true;category=general;save=always"
+ name="name" xmlname="name"/>
+ <XModelAttribute PROPERTIES="category=general" name="value" xmlname="#text"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
+ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
+ ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ </XActionItem>
+ <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
+ <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
+ ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
+ </XActionItem>
+ <XActionItem ICON="action.empty" kind="list" name="Properties">
+ <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
+ displayName="Properties..." kind="action" name="Properties"/>
+ </XActionItem>
+ <XActionItem displayName="move" kind="list" name="MoveActions">
+ <XActionItem HIDE="always" HandlerClassName="%Move%"
+ ICON="action.move" displayName="Move" kind="action" name="Move"/>
+ </XActionItem>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData"
+ XMLSUBPATH="depends" name="DSDepends">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.seam.event" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="depends" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true;category=general" name="value" xmlname="#text"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
+ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
+ ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ </XActionItem>
+ <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
+ <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
+ ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
+ </XActionItem>
+ <XActionItem ICON="action.empty" kind="list" name="Properties">
+ <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
+ displayName="Properties..." kind="action" name="Properties"/>
+ </XActionItem>
+ <XActionItem displayName="move" kind="list" name="MoveActions">
+ <XActionItem HIDE="always" HandlerClassName="%Move%"
+ ICON="action.move" displayName="Move" kind="action" name="Move"/>
+ </XActionItem>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
<XModelEntity ImplementingClass="%DS_Datasource%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData"
XMLSUBPATH="ha-local-tx-datasource" name="DSHALocalTXDatasource">
- <XChildrenEntities/>
+ <XChildrenEntities>
+ <XChildEntity name="DSConnectionProperty"/>
+ <XChildEntity name="DSDepends"/>
+ </XChildrenEntities>
<XEntityRenderer>
<ICONS>
<ICON info="main.ds.datasource" type="main"/>
@@ -121,6 +253,50 @@
</Constraint>
<Editor name="List"/>
</XModelAttribute>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="new-connection-sql" xmlname="new-connection-sql.#text"/>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="check-valid-connection-sql" xmlname="check-valid-connection-sql.#text"/>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="valid-connection-checker-class-name" xmlname="valid-connection-checker-class-name.#text">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="exception-sorter-class-name" xmlname="exception-sorter-class-name.#text">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="track-statements" xmlname="track-statements.#text">
+ <Constraint loader="List">
+ <value/>
+ <value name="false"/>
+ <value name="true"/>
+ <value name="nowarn"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="prepared-statement-cache-size" xmlname="prepared-statement-cache-size.#text"/>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="share-prepared-statements" xmlname="share-prepared-statements.#text">
+ <Constraint loader="List">
+ <value/>
+ <value name="false"/>
+ <value name="true"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="set-tx-query-timeout" xmlname="set-tx-query-timeout.#text">
+ <Constraint loader="List">
+ <value/>
+ <value name="false"/>
+ <value name="true"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=advanced" name="query-timeout" xmlname="query-timeout.#text"/>
+ <XModelAttribute PROPERTIES="category=advanced" name="use-try-lock" xmlname="use-try-lock.#text"/>
<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">
@@ -129,20 +305,44 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions">
- <XActionItemReference entity="ESBAction101" name="AddProperty" path="CreateActions/AddProperty"/>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Add Depends..." kind="action" name="AddDepends">
+ <EntityData EntityName="DSDepends">
+ <AttributeData AttributeName="value"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Add Connection Property..." kind="action" name="AddConnectionProperty">
+ <EntityData EntityName="DSConnectionProperty">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="value"/>
+ </EntityData>
+ </XActionItem>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBProperty" name="CopyActions"/>
- <XActionItemReference entity="ESBProperty" name="DeleteActions"/>
- <XActionItemReference entity="ESBProperty" name="Properties"/>
- <XActionItemReference entity="ESBProperty" name="MoveActions"/>
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
+ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
+ ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
+ ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
+ </XActionItem>
+ <XActionItemReference entity="DSDepends" name="DeleteActions"/>
+ <XActionItemReference entity="DSDepends" name="Properties"/>
+ <XActionItemReference entity="DSDepends" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%DS_Datasource%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData"
XMLSUBPATH="ha-local-tx-datasource" name="DSHALocalTXDatasource50">
- <XChildrenEntities/>
+ <XChildrenEntities>
+ <XChildEntity name="DSConnectionProperty"/>
+ <XChildEntity name="DSDepends"/>
+ </XChildrenEntities>
<XEntityRenderer>
<ICONS>
<ICON info="main.ds.datasource" type="main"/>
@@ -192,6 +392,14 @@
<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="new-connection-sql,check-valid-connection-sql,valid-connection-checker-class-name,exception-sorter-class-name,track-statements"
+ entity="DSHALocalTXDatasource" name="new-connection-sql"/>
+ <XModelAttributeReference
+ attributes="prepared-statement-cache-size,share-prepared-statements,set-tx-query-timeout,query-timeout,use-try-lock"
+ entity="DSHALocalTXDatasource" name="statement"/>
<XModelAttributeReference attributes="metadata,type-mapping"
entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
@@ -200,20 +408,24 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions">
- <XActionItemReference entity="ESBAction101" name="AddProperty" path="CreateActions/AddProperty"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="AddDepends"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="AddConnectionProperty"/>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBProperty" name="CopyActions"/>
- <XActionItemReference entity="ESBProperty" name="DeleteActions"/>
- <XActionItemReference entity="ESBProperty" name="Properties"/>
- <XActionItemReference entity="ESBProperty" name="MoveActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="CopyActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="DeleteActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="Properties"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%DS_Datasource%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData"
XMLSUBPATH="ha-xa-datasource" name="DSHAXADatasource">
- <XChildrenEntities/>
+ <XChildrenEntities>
+ <XChildEntity name="DSXAProperty"/>
+ <XChildEntity name="DSDepends"/>
+ </XChildrenEntities>
<XEntityRenderer>
<ICONS>
<ICON info="main.ds.datasource" type="main"/>
@@ -271,6 +483,14 @@
entity="DSHALocalTXDatasource" name="timeout"/>
<XModelAttributeReference attributes="no-tx-separate-pools"
entity="DSHALocalTXDatasource" name="no-tx-separate-pools"/>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="xa-resource-timeout" xmlname="xa-resource-timeout.#text"/>
+ <XModelAttributeReference
+ attributes="new-connection-sql,check-valid-connection-sql,valid-connection-checker-class-name,exception-sorter-class-name,track-statements"
+ entity="DSHALocalTXDatasource" name="new-connection-sql"/>
+ <XModelAttributeReference
+ attributes="prepared-statement-cache-size,share-prepared-statements,set-tx-query-timeout,query-timeout,use-try-lock"
+ entity="DSHALocalTXDatasource" name="statement"/>
<XModelAttributeReference attributes="type-mapping"
entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
@@ -279,20 +499,31 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions">
- <XActionItemReference entity="ESBAction101" name="AddProperty" path="CreateActions/AddProperty"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="AddDepends"/>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Add Property..." kind="action" name="AddProperty">
+ <EntityData EntityName="DSXAProperty">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="value"/>
+ </EntityData>
+ </XActionItem>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBProperty" name="CopyActions"/>
- <XActionItemReference entity="ESBProperty" name="DeleteActions"/>
- <XActionItemReference entity="ESBProperty" name="Properties"/>
- <XActionItemReference entity="ESBProperty" name="MoveActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="CopyActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="DeleteActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="Properties"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%DS_Datasource%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData"
XMLSUBPATH="ha-xa-datasource" name="DSHAXADatasource50">
- <XChildrenEntities/>
+ <XChildrenEntities>
+ <XChildEntity name="DSXAProperty"/>
+ <XChildEntity name="DSDepends"/>
+ </XChildrenEntities>
<XEntityRenderer>
<ICONS>
<ICON info="main.ds.datasource" type="main"/>
@@ -350,6 +581,14 @@
entity="DSHALocalTXDatasource" name="timeout"/>
<XModelAttributeReference attributes="no-tx-separate-pools"
entity="DSHALocalTXDatasource" name="no-tx-separate-pools"/>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="xa-resource-timeout" xmlname="xa-resource-timeout.#text"/>
+ <XModelAttributeReference
+ attributes="new-connection-sql,check-valid-connection-sql,valid-connection-checker-class-name,exception-sorter-class-name,track-statements"
+ entity="DSHALocalTXDatasource" name="new-connection-sql"/>
+ <XModelAttributeReference
+ attributes="prepared-statement-cache-size,share-prepared-statements,set-tx-query-timeout,query-timeout,use-try-lock"
+ entity="DSHALocalTXDatasource" name="statement"/>
<XModelAttributeReference attributes="type-mapping"
entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
@@ -358,13 +597,14 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions">
- <XActionItemReference entity="ESBAction101" name="AddProperty" path="CreateActions/AddProperty"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="AddDepends"/>
+ <XActionItemReference entity="DSHAXADatasource" name="AddProperty"/>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBProperty" name="CopyActions"/>
- <XActionItemReference entity="ESBProperty" name="DeleteActions"/>
- <XActionItemReference entity="ESBProperty" name="Properties"/>
- <XActionItemReference entity="ESBProperty" name="MoveActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="CopyActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="DeleteActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="Properties"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -424,7 +664,10 @@
<XModelEntity ImplementingClass="%DS_Datasource%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData"
XMLSUBPATH="local-tx-datasource" name="DSLocalTXDatasource">
- <XChildrenEntities/>
+ <XChildrenEntities>
+ <XChildEntity name="DSConnectionProperty"/>
+ <XChildEntity name="DSDepends"/>
+ </XChildrenEntities>
<XEntityRenderer>
<ICONS>
<ICON info="main.ds.datasource" type="main"/>
@@ -475,10 +718,39 @@
entity="DSHALocalTXDatasource" name="pool-size"/>
<XModelAttributeReference attributes="blocking-timeout-millis"
entity="DSHALocalTXDatasource" name="blocking-timeout"/>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="background-validation" xmlname="background-validation.#text">
+ <Constraint loader="List">
+ <value/>
+ <value name="false"/>
+ <value name="true"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="background-validation-minutes" xmlname="background-validation-minutes.#text"/>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="validate-on-match" xmlname="validate-on-match.#text">
+ <Constraint loader="List">
+ <value/>
+ <value name="false"/>
+ <value name="true"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
<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="new-connection-sql,check-valid-connection-sql,valid-connection-checker-class-name,exception-sorter-class-name"
+ entity="DSHALocalTXDatasource" name="new-connection-sql"/>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="stale-connection-checker-class-name" xmlname="stale-connection-checker-class-name.#text">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttributeReference attributes="track-statements"
+ entity="DSHALocalTXDatasource" name="track-statements"/>
<XModelAttribute PROPERTIES="category=advanced" name="prefill" xmlname="prefill.#text">
<Constraint loader="ListString">
<value/>
@@ -495,6 +767,9 @@
</Constraint>
<Editor name="ListString"/>
</XModelAttribute>
+ <XModelAttributeReference
+ attributes="prepared-statement-cache-size,share-prepared-statements,set-tx-query-timeout,query-timeout,use-try-lock"
+ entity="DSHALocalTXDatasource" name="statement"/>
<XModelAttributeReference attributes="metadata,type-mapping"
entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
@@ -503,20 +778,24 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions">
- <XActionItemReference entity="ESBAction101" name="AddProperty" path="CreateActions/AddProperty"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="AddDepends"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="AddConnectionProperty"/>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBProperty" name="CopyActions"/>
- <XActionItemReference entity="ESBProperty" name="DeleteActions"/>
- <XActionItemReference entity="ESBProperty" name="Properties"/>
- <XActionItemReference entity="ESBProperty" name="MoveActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="CopyActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="DeleteActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="Properties"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%DS_Datasource%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData"
XMLSUBPATH="local-tx-datasource" name="DSLocalTXDatasource50">
- <XChildrenEntities/>
+ <XChildrenEntities>
+ <XChildEntity name="DSConnectionProperty"/>
+ <XChildEntity name="DSDepends"/>
+ </XChildrenEntities>
<XEntityRenderer>
<ICONS>
<ICON info="main.ds.datasource" type="main"/>
@@ -565,12 +844,31 @@
entity="DSHALocalTXDatasource" name="pool-size"/>
<XModelAttributeReference attributes="blocking-timeout-millis"
entity="DSHALocalTXDatasource" name="blocking-timeout"/>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="background-validation" xmlname="background-validation.#text">
+ <Constraint loader="List">
+ <value/>
+ <value name="false"/>
+ <value name="true"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="background-validation-millis" xmlname="background-validation-millis.#text"/>
+ <XModelAttributeReference attributes="validate-on-match"
+ entity="DSHALocalTXDatasource" name="validate-on-match"/>
<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="new-connection-sql,check-valid-connection-sql,valid-connection-checker-class-name,exception-sorter-class-name,stale-connection-checker-class-name,track-statements"
+ entity="DSLocalTXDatasource" name="new-connection-sql"/>
<XModelAttributeReference attributes="prefill,use-fast-fail"
entity="DSLocalTXDatasource" name="prefill"/>
+ <XModelAttributeReference
+ attributes="prepared-statement-cache-size,share-prepared-statements,set-tx-query-timeout,query-timeout,use-try-lock"
+ entity="DSHALocalTXDatasource" name="statement"/>
<XModelAttributeReference attributes="metadata,type-mapping"
entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
@@ -579,13 +877,14 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions">
- <XActionItemReference entity="ESBAction101" name="AddProperty" path="CreateActions/AddProperty"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="AddDepends"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="AddConnectionProperty"/>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBProperty" name="CopyActions"/>
- <XActionItemReference entity="ESBProperty" name="DeleteActions"/>
- <XActionItemReference entity="ESBProperty" name="Properties"/>
- <XActionItemReference entity="ESBProperty" name="MoveActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="CopyActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="DeleteActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="Properties"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -645,7 +944,10 @@
<XModelEntity ImplementingClass="%DS_Datasource%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData"
XMLSUBPATH="no-tx-connection-factory" name="DSNoTXConnectionFactory">
- <XChildrenEntities/>
+ <XChildrenEntities>
+ <XChildEntity name="DSConfigProperty"/>
+ <XChildEntity name="DSDepends"/>
+ </XChildrenEntities>
<XEntityRenderer>
<ICONS>
<ICON info="main.ds.factory" type="main"/>
@@ -676,6 +978,9 @@
entity="DSHALocalTXDatasource" name="pool-size"/>
<XModelAttributeReference attributes="blocking-timeout-millis"
entity="DSHALocalTXDatasource" name="blocking-timeout"/>
+ <XModelAttributeReference
+ attributes="background-validation,background-validation-minutes"
+ entity="DSLocalTXDatasource" name="background"/>
<XModelAttributeReference attributes="idle-timeout-minutes"
entity="DSHALocalTXDatasource" name="idle-timeout"/>
<XModelAttributeReference attributes="prefill,use-fast-fail"
@@ -688,20 +993,32 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions">
- <XActionItemReference entity="ESBAction101" name="AddProperty" path="CreateActions/AddProperty"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="AddDepends"/>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Add Config Property..." kind="action" name="AddConfigProperty">
+ <EntityData EntityName="DSConfigProperty">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="type"/>
+ <AttributeData AttributeName="value"/>
+ </EntityData>
+ </XActionItem>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBProperty" name="CopyActions"/>
- <XActionItemReference entity="ESBProperty" name="DeleteActions"/>
- <XActionItemReference entity="ESBProperty" name="Properties"/>
- <XActionItemReference entity="ESBProperty" name="MoveActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="CopyActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="DeleteActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="Properties"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%DS_Datasource%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData"
XMLSUBPATH="no-tx-connection-factory" name="DSNoTXConnectionFactory50">
- <XChildrenEntities/>
+ <XChildrenEntities>
+ <XChildEntity name="DSConfigProperty"/>
+ <XChildEntity name="DSDepends"/>
+ </XChildrenEntities>
<XEntityRenderer>
<ICONS>
<ICON info="main.ds.factory" type="main"/>
@@ -731,6 +1048,9 @@
entity="DSHALocalTXDatasource" name="pool-size"/>
<XModelAttributeReference attributes="blocking-timeout-millis"
entity="DSHALocalTXDatasource" name="blocking-timeout"/>
+ <XModelAttributeReference
+ attributes="background-validation,background-validation-millis"
+ entity="DSLocalTXDatasource50" name="background"/>
<XModelAttributeReference attributes="idle-timeout-minutes"
entity="DSHALocalTXDatasource" name="idle-timeout"/>
<XModelAttributeReference attributes="prefill,use-fast-fail"
@@ -743,20 +1063,32 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions">
- <XActionItemReference entity="ESBAction101" name="AddProperty" path="CreateActions/AddProperty"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="AddDepends"/>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Add Config Property..." kind="action" name="AddConfigProperty">
+ <EntityData EntityName="DSConfigProperty">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="type"/>
+ <AttributeData AttributeName="value"/>
+ </EntityData>
+ </XActionItem>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBProperty" name="CopyActions"/>
- <XActionItemReference entity="ESBProperty" name="DeleteActions"/>
- <XActionItemReference entity="ESBProperty" name="Properties"/>
- <XActionItemReference entity="ESBProperty" name="MoveActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="CopyActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="DeleteActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="Properties"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%DS_Datasource%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData"
XMLSUBPATH="no-tx-datasource" name="DSNoTXDatasource">
- <XChildrenEntities/>
+ <XChildrenEntities>
+ <XChildEntity name="DSConnectionProperty"/>
+ <XChildEntity name="DSDepends"/>
+ </XChildrenEntities>
<XEntityRenderer>
<ICONS>
<ICON info="main.ds.datasource" type="main"/>
@@ -803,10 +1135,21 @@
entity="DSHALocalTXDatasource" name="pool-size"/>
<XModelAttributeReference attributes="blocking-timeout-millis"
entity="DSHALocalTXDatasource" name="blocking-timeout"/>
+ <XModelAttributeReference
+ attributes="background-validation,background-validation-minutes"
+ entity="DSLocalTXDatasource" name="background"/>
<XModelAttributeReference attributes="idle-timeout-minutes"
entity="DSHALocalTXDatasource" name="idle-timeout"/>
+ <XModelAttributeReference attributes="validate-on-match"
+ entity="DSLocalTXDatasource" name="validate-on-match"/>
+ <XModelAttributeReference
+ attributes="new-connection-sql,check-valid-connection-sql,valid-connection-checker-class-name,exception-sorter-class-name,stale-connection-checker-class-name,track-statements"
+ entity="DSLocalTXDatasource" name="new-connection-sql"/>
<XModelAttributeReference attributes="prefill,use-fast-fail"
entity="DSLocalTXDatasource" name="prefill"/>
+ <XModelAttributeReference
+ attributes="prepared-statement-cache-size,share-prepared-statements,set-tx-query-timeout,query-timeout,use-try-lock"
+ entity="DSHALocalTXDatasource" name="statement"/>
<XModelAttributeReference attributes="metadata,type-mapping"
entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
@@ -815,13 +1158,14 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions">
- <XActionItemReference entity="ESBAction101" name="AddProperty" path="CreateActions/AddProperty"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="AddDepends"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="AddConnectionProperty"/>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBProperty" name="CopyActions"/>
- <XActionItemReference entity="ESBProperty" name="DeleteActions"/>
- <XActionItemReference entity="ESBProperty" name="Properties"/>
- <XActionItemReference entity="ESBProperty" name="MoveActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="CopyActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="DeleteActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="Properties"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -829,11 +1173,12 @@
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData"
XMLSUBPATH="no-tx-datasource" name="DSNoTXDatasource50">
<XChildrenEntities>
- <XChildEntity name="ESBProperty"/>
+ <XChildEntity name="DSConnectionProperty"/>
+ <XChildEntity name="DSDepends"/>
</XChildrenEntities>
<XEntityRenderer>
<ICONS>
- <ICON info="main.esb.bus" type="main"/>
+ <ICON info="main.ds.datasource" type="main"/>
</ICONS>
</XEntityRenderer>
<XModelAttributes>
@@ -877,10 +1222,21 @@
entity="DSHALocalTXDatasource" name="pool-size"/>
<XModelAttributeReference attributes="blocking-timeout-millis"
entity="DSHALocalTXDatasource" name="blocking-timeout"/>
+ <XModelAttributeReference
+ attributes="background-validation,background-validation-millis"
+ entity="DSLocalTXDatasource50" name="background"/>
<XModelAttributeReference attributes="idle-timeout-minutes"
entity="DSHALocalTXDatasource" name="idle-timeout"/>
+ <XModelAttributeReference attributes="validate-on-match"
+ entity="DSHALocalTXDatasource" name="validate-on-match"/>
+ <XModelAttributeReference
+ attributes="new-connection-sql,check-valid-connection-sql,valid-connection-checker-class-name,exception-sorter-class-name,stale-connection-checker-class-name,track-statements"
+ entity="DSLocalTXDatasource" name="new-connection-sql"/>
<XModelAttributeReference attributes="prefill,use-fast-fail"
entity="DSLocalTXDatasource" name="prefill"/>
+ <XModelAttributeReference
+ attributes="prepared-statement-cache-size,share-prepared-statements,set-tx-query-timeout,query-timeout,use-try-lock"
+ entity="DSHALocalTXDatasource" name="statement"/>
<XModelAttributeReference attributes="metadata,type-mapping"
entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
@@ -889,20 +1245,24 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions">
- <XActionItemReference entity="ESBAction101" name="AddProperty" path="CreateActions/AddProperty"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="AddDepends"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="AddConnectionProperty"/>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBProperty" name="CopyActions"/>
- <XActionItemReference entity="ESBProperty" name="DeleteActions"/>
- <XActionItemReference entity="ESBProperty" name="Properties"/>
- <XActionItemReference entity="ESBProperty" name="MoveActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="CopyActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="DeleteActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="Properties"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%DS_Datasource%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData"
XMLSUBPATH="tx-connection-factory" name="DSTXConnectionFactory">
- <XChildrenEntities/>
+ <XChildrenEntities>
+ <XChildEntity name="DSConfigProperty"/>
+ <XChildEntity name="DSDepends"/>
+ </XChildrenEntities>
<XEntityRenderer>
<ICONS>
<ICON info="main.ds.factory" type="main"/>
@@ -947,12 +1307,17 @@
entity="DSHALocalTXDatasource" name="pool-size"/>
<XModelAttributeReference attributes="blocking-timeout-millis"
entity="DSHALocalTXDatasource" name="blocking-timeout"/>
+ <XModelAttributeReference
+ attributes="background-validation,background-validation-minutes"
+ entity="DSLocalTXDatasource" name="background"/>
<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"/>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="xa-resource-timeout" xmlname="xa-resource-timeout.#text"/>
<XModelAttributeReference attributes="metadata,type-mapping"
entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
@@ -961,20 +1326,32 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions">
- <XActionItemReference entity="ESBAction101" name="AddProperty" path="CreateActions/AddProperty"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="AddDepends"/>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Add Config Property..." kind="action" name="AddConfigProperty">
+ <EntityData EntityName="DSConfigProperty">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="type"/>
+ <AttributeData AttributeName="value"/>
+ </EntityData>
+ </XActionItem>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBProperty" name="CopyActions"/>
- <XActionItemReference entity="ESBProperty" name="DeleteActions"/>
- <XActionItemReference entity="ESBProperty" name="Properties"/>
- <XActionItemReference entity="ESBProperty" name="MoveActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="CopyActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="DeleteActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="Properties"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%DS_Datasource%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData"
XMLSUBPATH="tx-connection-factory" name="DSTXConnectionFactory50">
- <XChildrenEntities/>
+ <XChildrenEntities>
+ <XChildEntity name="DSConfigProperty"/>
+ <XChildEntity name="DSDepends"/>
+ </XChildrenEntities>
<XEntityRenderer>
<ICONS>
<ICON info="main.ds.factory" type="main"/>
@@ -1019,12 +1396,17 @@
entity="DSHALocalTXDatasource" name="pool-size"/>
<XModelAttributeReference attributes="blocking-timeout-millis"
entity="DSHALocalTXDatasource" name="blocking-timeout"/>
+ <XModelAttributeReference
+ attributes="background-validation,background-validation-millis"
+ entity="DSLocalTXDatasource50" name="background"/>
<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"/>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="xa-resource-timeout" xmlname="xa-resource-timeout.#text"/>
<XModelAttributeReference attributes="metadata,type-mapping"
entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
@@ -1033,20 +1415,32 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions">
- <XActionItemReference entity="ESBAction101" name="AddProperty" path="CreateActions/AddProperty"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="AddDepends"/>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Add Config Property..." kind="action" name="AddConfigProperty">
+ <EntityData EntityName="DSConfigProperty">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="type"/>
+ <AttributeData AttributeName="value"/>
+ </EntityData>
+ </XActionItem>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBProperty" name="CopyActions"/>
- <XActionItemReference entity="ESBProperty" name="DeleteActions"/>
- <XActionItemReference entity="ESBProperty" name="Properties"/>
- <XActionItemReference entity="ESBProperty" name="MoveActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="CopyActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="DeleteActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="Properties"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%DS_Datasource%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData"
XMLSUBPATH="xa-datasource" name="DSXADatasource">
- <XChildrenEntities/>
+ <XChildrenEntities>
+ <XChildEntity name="DSXAProperty"/>
+ <XChildEntity name="DSDepends"/>
+ </XChildrenEntities>
<XEntityRenderer>
<ICONS>
<ICON info="main.ds.datasource" type="main"/>
@@ -1102,12 +1496,25 @@
entity="DSHALocalTXDatasource" name="pool-size"/>
<XModelAttributeReference attributes="blocking-timeout-millis"
entity="DSHALocalTXDatasource" name="blocking-timeout"/>
+ <XModelAttributeReference
+ attributes="background-validation,background-validation-minutes"
+ entity="DSLocalTXDatasource" name="background"/>
<XModelAttributeReference attributes="idle-timeout-minutes"
entity="DSHALocalTXDatasource" name="idle-timeout"/>
+ <XModelAttributeReference attributes="validate-on-match"
+ entity="DSLocalTXDatasource" name="validate-on-match"/>
<XModelAttributeReference attributes="no-tx-separate-pools"
entity="DSHALocalTXDatasource" name="no-tx-separate-pools"/>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="xa-resource-timeout" xmlname="xa-resource-timeout.#text"/>
+ <XModelAttributeReference
+ attributes="new-connection-sql,check-valid-connection-sql,valid-connection-checker-class-name,exception-sorter-class-name,stale-connection-checker-class-name,track-statements"
+ entity="DSLocalTXDatasource" name="new-connection-sql"/>
<XModelAttributeReference attributes="prefill,use-fast-fail"
entity="DSLocalTXDatasource" name="prefill"/>
+ <XModelAttributeReference
+ attributes="prepared-statement-cache-size,share-prepared-statements,set-tx-query-timeout,query-timeout,use-try-lock"
+ entity="DSHALocalTXDatasource" name="statement"/>
<XModelAttributeReference attributes="metadata,type-mapping"
entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
@@ -1116,20 +1523,24 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions">
- <XActionItemReference entity="ESBAction101" name="AddProperty" path="CreateActions/AddProperty"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="AddDepends"/>
+ <XActionItemReference entity="DSHAXADatasource" name="AddProperty"/>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBProperty" name="CopyActions"/>
- <XActionItemReference entity="ESBProperty" name="DeleteActions"/>
- <XActionItemReference entity="ESBProperty" name="Properties"/>
- <XActionItemReference entity="ESBProperty" name="MoveActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="CopyActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="DeleteActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="Properties"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%DS_Datasource%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData"
XMLSUBPATH="xa-datasource" name="DSXADatasource50">
- <XChildrenEntities/>
+ <XChildrenEntities>
+ <XChildEntity name="DSXAProperty"/>
+ <XChildEntity name="DSDepends"/>
+ </XChildrenEntities>
<XEntityRenderer>
<ICONS>
<ICON info="main.ds.datasource" type="main"/>
@@ -1185,12 +1596,25 @@
entity="DSHALocalTXDatasource" name="pool-size"/>
<XModelAttributeReference attributes="blocking-timeout-millis"
entity="DSHALocalTXDatasource" name="blocking-timeout"/>
+ <XModelAttributeReference
+ attributes="background-validation,background-validation-millis"
+ entity="DSLocalTXDatasource50" name="background"/>
<XModelAttributeReference attributes="idle-timeout-minutes"
entity="DSHALocalTXDatasource" name="idle-timeout"/>
+ <XModelAttributeReference attributes="validate-on-match"
+ entity="DSHALocalTXDatasource" name="validate-on-match"/>
<XModelAttributeReference attributes="no-tx-separate-pools"
entity="DSHALocalTXDatasource" name="no-tx-separate-pools"/>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="xa-resource-timeout" xmlname="xa-resource-timeout.#text"/>
+ <XModelAttributeReference
+ attributes="new-connection-sql,check-valid-connection-sql,valid-connection-checker-class-name,exception-sorter-class-name,stale-connection-checker-class-name,track-statements"
+ entity="DSLocalTXDatasource" name="new-connection-sql"/>
<XModelAttributeReference attributes="prefill,use-fast-fail"
entity="DSLocalTXDatasource" name="prefill"/>
+ <XModelAttributeReference
+ attributes="prepared-statement-cache-size,share-prepared-statements,set-tx-query-timeout,query-timeout,use-try-lock"
+ entity="DSHALocalTXDatasource" name="statement"/>
<XModelAttributeReference attributes="metadata,type-mapping"
entity="DSHALocalTXDatasource" name="type-mapping"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
@@ -1199,16 +1623,61 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions">
- <XActionItemReference entity="ESBAction101" name="AddProperty" path="CreateActions/AddProperty"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="AddDepends"/>
+ <XActionItemReference entity="DSHAXADatasource" name="AddProperty"/>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBProperty" name="CopyActions"/>
- <XActionItemReference entity="ESBProperty" name="DeleteActions"/>
- <XActionItemReference entity="ESBProperty" name="Properties"/>
- <XActionItemReference entity="ESBProperty" name="MoveActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="CopyActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="DeleteActions"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="Properties"/>
+ <XActionItemReference entity="DSHALocalTXDatasource" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData"
+ XMLSUBPATH="xa-datasource-property" name="DSXAProperty">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.seam.event" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="xa-datasource-property"
+ loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true;category=general;save=always"
+ name="name" xmlname="name"/>
+ <XModelAttribute PROPERTIES="category=general" name="value" xmlname="#text"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
+ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
+ ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ </XActionItem>
+ <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
+ <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
+ ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
+ </XActionItem>
+ <XActionItem ICON="action.empty" kind="list" name="Properties">
+ <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
+ displayName="Properties..." kind="action" name="Properties"/>
+ </XActionItem>
+ <XActionItem displayName="move" kind="list" name="MoveActions">
+ <XActionItem HIDE="always" HandlerClassName="%Move%"
+ ICON="action.move" displayName="Move" kind="action" name="Move"/>
+ </XActionItem>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
<XModelEntity
ImplementationLoadingClass="org.jboss.tools.seam.xml.ds.model.DSFileLoader"
ImplementingClass="org.jboss.tools.common.model.filesystems.impl.SimpleFileImpl"
15 years
- 1
- 0
JBoss Tools SVN: r18878 - in trunk/smooks/plugins: org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: tfennelly
Date: 2009-11-27 08:56:32 -0500 (Fri, 27 Nov 2009)
New Revision: 18878
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/core/SmooksInputType.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/ProcessNodeType.java
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/.classpath
trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF
trunk/smooks/plugins/org.jboss.tools.smooks.ui/build.properties
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchMetadata.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchTabGroup.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLauncher.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksRunTab.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5259
Implement rudimentary Test facility for Smooks Config
Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/core/SmooksInputType.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/core/SmooksInputType.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/core/SmooksInputType.java 2009-11-27 13:56:32 UTC (rev 18878)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006, JBoss Inc.
+ */
+package org.jboss.tools.smooks.core;
+
+/**
+ * Smooks Input Type Enumeration.
+ * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly(a)jboss.com</a>
+ */
+public class SmooksInputType {
+
+ public static final String INPUT_TYPE_JAVA = "input.java";
+
+ public static final String INPUT_TYPE_CUSTOM = "input.custom";
+
+ public static final String INPUT_TYPE_JSON = "input.json";
+
+ public static final String INPUT_TYPE_CSV = "input.csv";
+
+ public static final String INPUT_TYPE_XML = "input.xml";
+
+ public static final String INPUT_TYPE_XSD = "input.xsd";
+
+ public static final String INPUT_TYPE_EDI = "input.edi";
+}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java 2009-11-27 13:06:45 UTC (rev 18877)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java 2009-11-27 13:56:32 UTC (rev 18878)
@@ -29,6 +29,7 @@
import org.eclipse.emf.edit.command.CommandParameter;
import org.eclipse.emf.edit.command.RemoveCommand;
import org.eclipse.emf.edit.domain.EditingDomain;
+import org.jboss.tools.smooks.core.SmooksInputType;
import org.jboss.tools.smooks.model.freemarker.Freemarker;
import org.jboss.tools.smooks.model.freemarker.Template;
import org.jboss.tools.smooks.model.smooks.AbstractResourceConfig;
@@ -62,21 +63,21 @@
public static final String KEY_CSV_QUOTE = "quote";
- public static final String INPUT_TYPE_JAVA = "input.java";
+ public static final String INPUT_TYPE_JAVA = SmooksInputType.INPUT_TYPE_JAVA;
public static final String INPUT_TYPE = "inputType";
- public static final String INPUT_TYPE_CUSTOME = "input.custom";
+ public static final String INPUT_TYPE_CUSTOME = SmooksInputType.INPUT_TYPE_CUSTOM;
- public static final String INPUT_TYPE_JSON_1_1 = "input.json";
+ public static final String INPUT_TYPE_JSON_1_1 = SmooksInputType.INPUT_TYPE_JSON;
- public static final String INPUT_TYPE_CSV = "input.csv";
+ public static final String INPUT_TYPE_CSV = SmooksInputType.INPUT_TYPE_CSV;
public static final String INPUT_ACTIVE_TYPE = "input.type.actived";
public static final String INPUT_DEACTIVE_TYPE = "input.type.deactived";
- public static final String INPUT_TYPE_CSV_1_2 = "input.csv";
+ public static final String INPUT_TYPE_CSV_1_2 = SmooksInputType.INPUT_TYPE_CSV;
public static final String PARAM_NAME_CLASS = "class";
@@ -84,9 +85,9 @@
public static final String PARAM_NAME_ACTIVED = "actived";
- public static final String INPUT_TYPE_XML = "input.xml";
+ public static final String INPUT_TYPE_XML = SmooksInputType.INPUT_TYPE_XML;
- public static final String INPUT_TYPE_XSD = "input.xsd";
+ public static final String INPUT_TYPE_XSD = SmooksInputType.INPUT_TYPE_XSD;
public static final String TYPE_XSL = "xsl";
@@ -98,11 +99,11 @@
public static final String BINDINGS = "bindings";
- public static final String INPUT_TYPE_EDI_1_1 = "input.edi";
+ public static final String INPUT_TYPE_EDI_1_1 = SmooksInputType.INPUT_TYPE_EDI;
- public static final String INPUT_TYPE_EDI_1_2 = "input.edi";
+ public static final String INPUT_TYPE_EDI_1_2 = SmooksInputType.INPUT_TYPE_EDI;
- public static final String INPUT_TYPE_JSON_1_2 = "input.json";
+ public static final String INPUT_TYPE_JSON_1_2 = SmooksInputType.INPUT_TYPE_EDI;
public static EStructuralFeature ATTRIBUTE_PROPERTY = ExtendedMetaData.INSTANCE.demandFeature(null, "property",
false);
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/.classpath
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/.classpath 2009-11-27 13:06:45 UTC (rev 18877)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/.classpath 2009-11-27 13:56:32 UTC (rev 18878)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="libs/xstream-1.2.2.jar"/>
- <classpathentry exported="true" kind="lib" path="bin/"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2009-11-27 13:06:45 UTC (rev 18877)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2009-11-27 13:56:32 UTC (rev 18878)
@@ -41,8 +41,7 @@
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %providerName
-Bundle-ClassPath: bin/,
- libs/dom4j-1.6.1.jar,
+Bundle-ClassPath: libs/dom4j-1.6.1.jar,
.,
libs/xstream-1.2.2.jar
Export-Package: org.jboss.template,
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/build.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/build.properties 2009-11-27 13:06:45 UTC (rev 18877)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/build.properties 2009-11-27 13:56:32 UTC (rev 18878)
@@ -12,5 +12,4 @@
jboss_about.png,\
plugin.properties,\
schema/,\
- bin/,\
libs/xstream-1.2.2.jar
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/ProcessNodeType.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/ProcessNodeType.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/ProcessNodeType.java 2009-11-27 13:56:32 UTC (rev 18878)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006, JBoss Inc.
+ */
+package org.jboss.tools.smooks.launch;
+
+/**
+ * Configuration process node type enumeration.
+ *
+ * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly(a)jboss.com</a>
+ */
+public enum ProcessNodeType {
+ TEMPLATING,
+ JAVA_BINDING
+}
\ No newline at end of file
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java 2009-11-27 13:06:45 UTC (rev 18877)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java 2009-11-27 13:56:32 UTC (rev 18878)
@@ -20,29 +20,34 @@
package org.jboss.tools.smooks.launch;
import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.jdt.junit.launcher.JUnitLaunchConfigurationDelegate;
import org.eclipse.jdt.launching.ExecutionArguments;
import org.eclipse.jdt.launching.IVMRunner;
import org.eclipse.jdt.launching.VMRunnerConfiguration;
-import org.eclipse.osgi.baseadaptor.loader.BaseClassLoader;
-import org.eclipse.osgi.baseadaptor.loader.ClasspathEntry;
-import org.eclipse.osgi.baseadaptor.loader.ClasspathManager;
-import org.osgi.framework.BundleException;
+import org.jboss.tools.smooks.core.SmooksInputType;
/**
* @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly(a)jboss.com</a>
*/
public class SmooksLaunchConfigurationDelegate extends JUnitLaunchConfigurationDelegate {
+ private static final String PLUGIN_ID = "org.jboss.tools.smooks.ui.smooksLauncher";
public static final String SMOOKS_INPUT = "SmooksInput";
public static final String SMOOKS_INPUT_TYPE = "SmooksInputType";
public static final String SMOOKS_PROCESS_TYPES = "SmooksProcessTypes";
@@ -74,35 +79,16 @@
private VMRunnerConfiguration buildRunnerConfig(ILaunchConfiguration launchConfig) throws CoreException {
List<String> classpath = new ArrayList<String>(Arrays.asList(getClasspath(launchConfig)));
- // ====================================================================================================================
- // TODO Total Hack... Fixme: We're using classes here that we shouldn't, as well as adding bundle paths that we
- // probably shouldn't, but how do I get the SmooksLauncher class on the launcher classpath?
- // I added the "bin" folder to the bundle classpath as a workaround (with the following code) for getting
- // the SmooksLauncher class onto the classpath. Need to fix this properly!!!!
- //
- ClassLoader classloader = getClass().getClassLoader();
- if(classloader instanceof BaseClassLoader) {
- ClasspathManager cpManager = ((BaseClassLoader)classloader).getClasspathManager();
- ClasspathEntry[] entries = cpManager.getHostClasspathEntries();
-
- for(ClasspathEntry entry : entries) {
- File baseFile = entry.getBundleFile().getBaseFile();
- try {
- String[] bundleEntries = entry.getBaseData().getClassPath();
- for(String bundleEntry : bundleEntries) {
- String path = baseFile.getAbsolutePath() + "/" + bundleEntry;
- if(!classpath.contains(path)) {
- classpath.add(path);
- }
- }
- } catch (BundleException e) {
- e.printStackTrace();
- }
- }
- }
- //
- // ====================================================================================================================
+ File wsRootDir = ResourcesPlugin.getWorkspace().getRoot().getRawLocation().toFile();
+ File wsTempClasses = new File(wsRootDir, "temp/classes");
+ // We need to add the SmooksLauncher to the launch classpath because it will not be part of the projects
+ // classpath. Bit of a hack... there's probably a nicer way of doing this!!!
+ addToCP(wsTempClasses, SmooksLauncher.class);
+ addToCP(wsTempClasses, SmooksInputType.class);
+ addToCP(wsTempClasses, ProcessNodeType.class);
+ classpath.add(wsTempClasses.getAbsolutePath());
+
VMRunnerConfiguration runConfig= new VMRunnerConfiguration(SmooksLauncher.class.getName(), classpath.toArray(new String[classpath.size()]));
String[] envp= getEnvironment(launchConfig);
ArrayList<String> vmArguments= new ArrayList<String>();
@@ -121,4 +107,49 @@
return runConfig;
}
+
+ private void addToCP(File wsTempClasses, Class<?> theClass) throws CoreException {
+ String className = theClass.getName().replace(".", "/") + ".class";
+ URL classURI = getClass().getResource("/" + className);
+
+ if(classURI != null) {
+ try {
+ InputStream classStream = classURI.openStream();
+
+ if(classStream != null) {
+ try {
+ File classOutFile = new File(wsTempClasses, className);
+ File classPackage = classOutFile.getParentFile();
+
+ classPackage.mkdirs();
+ if(classPackage.exists()) {
+ FileOutputStream classOutStream = new FileOutputStream(classOutFile);
+
+ try {
+ byte[] readBuf = new byte[100];
+ int readCount = 0;
+
+ while(readCount != -1) {
+ readCount = classStream.read(readBuf);
+ if(readCount != -1) {
+ classOutStream.write(readBuf, 0, readCount);
+ }
+ }
+ } finally {
+ try {
+ classOutStream.flush();
+ } finally {
+ classOutStream.close();
+ }
+ }
+ }
+ } finally {
+ classStream.close();
+ }
+ }
+ } catch (IOException e) {
+ new CoreException(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, "Error copying SmooksLauncher to classpath.", e));
+ }
+ }
+ }
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchMetadata.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchMetadata.java 2009-11-27 13:06:45 UTC (rev 18877)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchMetadata.java 2009-11-27 13:56:32 UTC (rev 18878)
@@ -48,11 +48,6 @@
*/
public class SmooksLaunchMetadata {
- public static enum ProcessNodeType {
- TEMPLATING,
- JAVA_BINDING
- }
-
private Smooks inputParamExtractor;
private boolean isValidSmooksConfig;
private File configFile;
@@ -71,6 +66,28 @@
return isValidSmooksConfig;
}
+ public String getErrorMessage() {
+ if(isValidSmooksConfig) {
+ throw new IllegalStateException("Invalid call to 'getErrorMessage()'. Smooks configuration is NOT invalid.");
+ }
+
+ if(configFile == null) {
+ return "Smooks configuration file not configured.";
+ } else if(!configFile.exists()) {
+ return "Specified Smooks configuration file not found.";
+ } else if(!configFile.isFile()) {
+ return "Specified Smooks configuration file is not a readable file.";
+ } else if(inputFile == null) {
+ return "Specified Smooks configuration file 'Input' task is not configured with a sample input file. Please configure the 'Input' task in the Process flow.";
+ } else if(!inputFile.exists()) {
+ return "Specified Smooks configuration file 'Input' task is configured with a sample input file, but the file cannot be found. Please reconfigure the 'Input' task in the Process flow.";
+ } else if(!inputFile.isFile()) {
+ return "Specified Smooks configuration file 'Input' task is configured with a sample input file, but the file cannot be read. Please reconfigure the 'Input' task in the Process flow.";
+ }
+
+ return "";
+ }
+
public File getConfigFile() {
return configFile;
}
@@ -98,22 +115,11 @@
return builder.toString();
}
- public static Set<ProcessNodeType> fromNodeTypeString(String nodeTypeString) {
- String[] tokens = nodeTypeString.split(",");
- Set<ProcessNodeType> nodeTypes = new HashSet<ProcessNodeType>();
-
- for(String token : tokens) {
- nodeTypes.add(ProcessNodeType.valueOf(token));
- }
-
- return nodeTypes;
- }
-
public void setSmooksConfig(IResource smooksConfig) {
reset();
if(smooksConfig != null) {
- configFile = new File(smooksConfig.getRawLocation().toOSString());
+ configFile = new File(smooksConfig.getRawLocation().toOSString().trim());
if(configFile.exists() && configFile.isFile()) {
ExecutionContext execContext = inputParamExtractor.createExecutionContext();
Properties inputParams = new Properties();
@@ -125,15 +131,21 @@
inputParamExtractor.filterSource(execContext, new StreamSource(new FileInputStream(configFile)));
- String inputType = inputParams.getProperty(SmooksModelUtils.INPUT_TYPE);
+ inputType = inputParams.getProperty(SmooksModelUtils.INPUT_TYPE);
if(inputType != null) {
String inputPath = inputParams.getProperty(inputType);
if(inputPath != null) {
- File inputFile = new File(SmooksUIUtils.parseFilePath(inputPath));
+ String resolvedFilePath;
+ try {
+ resolvedFilePath = SmooksUIUtils.parseFilePath(inputPath.trim());
+ } catch(Exception e) {
+ // It's not a valid config...
+ inputFile = new File(inputPath.trim());
+ return;
+ }
+ inputFile = new File(resolvedFilePath);
if(inputFile.exists() && inputFile.isFile()) {
- this.inputType = inputType;
- this.inputFile = inputFile;
isValidSmooksConfig = true;
}
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchTabGroup.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchTabGroup.java 2009-11-27 13:06:45 UTC (rev 18877)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchTabGroup.java 2009-11-27 13:56:32 UTC (rev 18878)
@@ -28,6 +28,7 @@
import org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab;
/**
+ * Smooks Launcher Tab Group.
* @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly(a)jboss.com</a>
*/
public class SmooksLaunchTabGroup extends AbstractLaunchConfigurationTabGroup {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLauncher.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLauncher.java 2009-11-27 13:06:45 UTC (rev 18877)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLauncher.java 2009-11-27 13:56:32 UTC (rev 18878)
@@ -22,14 +22,14 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.util.HashSet;
import java.util.Set;
import java.util.Map.Entry;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import org.jboss.tools.smooks.launch.SmooksLaunchMetadata.ProcessNodeType;
-import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils;
+import org.jboss.tools.smooks.core.SmooksInputType;
import org.milyn.Smooks;
import org.milyn.payload.JavaResult;
import org.xml.sax.SAXException;
@@ -52,7 +52,7 @@
throw new RuntimeException("Expected 4 Launch arguments: <Smooks Config> <Input Type> <Input Path> <Node Types>");
}
- if(args[1].equals(SmooksModelUtils.INPUT_TYPE_JAVA)) {
+ if(args[1].equals(SmooksInputType.INPUT_TYPE_JAVA)) {
System.out.println("Sorry... we don't support Java Inputs yet.");
} else {
File smooksConfig = new File(args[0]);
@@ -63,7 +63,7 @@
Smooks smooks = new Smooks(smooksConfig.getAbsolutePath());
try {
- Set<ProcessNodeType> processNodeTypes = SmooksLaunchMetadata.fromNodeTypeString(args[3]);
+ Set<ProcessNodeType> processNodeTypes = SmooksLauncher.fromNodeTypeString(args[3]);
JavaResult javaResult = new JavaResult();
if(processNodeTypes.contains(ProcessNodeType.TEMPLATING)) {
@@ -96,4 +96,15 @@
throw new RuntimeException("Specified '" + name + "' File '" + file.getAbsolutePath() + "' is a Directory.");
}
}
+
+ public static Set<ProcessNodeType> fromNodeTypeString(String nodeTypeString) {
+ String[] tokens = nodeTypeString.split(",");
+ Set<ProcessNodeType> nodeTypes = new HashSet<ProcessNodeType>();
+
+ for(String token : tokens) {
+ nodeTypes.add(ProcessNodeType.valueOf(token));
+ }
+
+ return nodeTypes;
+ }
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksRunTab.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksRunTab.java 2009-11-27 13:06:45 UTC (rev 18877)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksRunTab.java 2009-11-27 13:56:32 UTC (rev 18878)
@@ -66,13 +66,13 @@
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.junit.ui.JUnitMessages;
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.jdt.ui.JavaElementLabelProvider;
import org.jboss.tools.smooks.editor.AbstractSmooksFormEditor;
/**
+ * Smooks Run Tab.
* @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly(a)jboss.com</a>
*/
public class SmooksRunTab extends AbstractLaunchConfigurationTab {
@@ -290,8 +290,8 @@
ILabelProvider labelProvider= new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);
ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), labelProvider);
- dialog.setTitle(JUnitMessages.JUnitLaunchConfigurationTab_projectdialog_title);
- dialog.setMessage(JUnitMessages.JUnitLaunchConfigurationTab_projectdialog_message);
+ dialog.setTitle("Select Smooks Configuration");
+ dialog.setMessage("Type Project name to narrow selection:");
dialog.setElements(projects);
IJavaProject javaProject = getJavaProject();
@@ -378,7 +378,7 @@
}
if(!launchMetaData.isValidSmooksConfig()) {
- setErrorMessage("The selected Smooks configuration is not valid. Must be a valid Smooks configuration, with a valid configured input.");
+ setErrorMessage(launchMetaData.getErrorMessage());
}
}
15 years
- 1
- 0
JBoss Tools SVN: r18877 - trunk/struts/plugins/org.jboss.tools.struts.ui.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-11-27 08:06:45 -0500 (Fri, 27 Nov 2009)
New Revision: 18877
Modified:
trunk/struts/plugins/org.jboss.tools.struts.ui/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-5278
Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/plugin.xml
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.ui/plugin.xml 2009-11-27 12:49:46 UTC (rev 18876)
+++ trunk/struts/plugins/org.jboss.tools.struts.ui/plugin.xml 2009-11-27 13:06:45 UTC (rev 18877)
@@ -158,7 +158,66 @@
</perspective>
</extension-->
<extension point="org.eclipse.ui.popupMenus">
- <objectContribution id="RedHatStrutsStudio_IProject" objectClass="org.eclipse.core.resources.IProject">
+ <objectContribution
+ id="org.jboss.tools.seam.ui.project.configure"
+ objectClass="org.eclipse.core.resources.IProject"
+ adaptable="true">
+ <visibility>
+ <and>
+ <objectState
+ name="projectNature"
+ value="org.eclipse.jdt.core.javanature"/>
+ <not>
+ <objectState
+ name="projectNature"
+ value="org.jboss.tools.struts.strutsnature"/>
+ </not>
+ </and>
+ </visibility>
+
+ <action
+ class="org.jboss.tools.struts.ui.internal.action.AddStrutsNatureActionDelegate"
+ enablesFor="1"
+ icon="$nl$/images/xstudio/actions/add_struts_nature.gif"
+ id="org.jboss.tools.struts.ui.action.AddStrutsNatureActionDelegate"
+ label="%popupMenus.action.addStrutsNature"
+ menubarPath="org.eclipse.ui.projectConfigure/additions">
+ </action>
+ </objectContribution>
+ <objectContribution
+ id="org.jboss.tools.seam.ui.project.configure"
+ objectClass="org.eclipse.core.resources.IProject"
+ adaptable="true">
+ <visibility>
+ <and>
+ <objectState
+ name="projectNature"
+ value="org.eclipse.jdt.core.javanature"/>
+ <and>
+ <objectState
+ name="projectNature"
+ value="org.jboss.tools.struts.strutsnature"/>
+ </and>
+ </and>
+ </visibility>
+
+ <action
+ class="org.jboss.tools.struts.ui.internal.action.RemoveStrutsNatureActionDelegate"
+ enablesFor="1"
+ id="org.jboss.tools.common.xstudio.action.RemoveStrutsNatureActionDelegate"
+ label="%popupMenus.action.removeStrutsNature"
+ menubarPath="org.eclipse.ui.projectConfigure/additions">
+ </action>
+ <action
+ class="org.jboss.tools.struts.ui.internal.action.ModulesConfigurationActionDelegate"
+ enablesFor="1"
+ id="org.jboss.tools.common.xstudio.action.ModulesConfigurationActionDelegate"
+ label="%popupMenus.action.modulesConfiguration"
+ menubarPath="org.eclipse.ui.projectConfigure/additions">
+ </action>
+
+ </objectContribution>
+ <!--objectContribution id="RedHatStrutsStudio_IProject" objectClass="org.eclipse.core.resources.IProject">
<menu id="RedHat4Web" label="JBoss Tools" path="additions">
<separator name="a">
</separator>
@@ -193,7 +252,7 @@
</action>
<action class="org.jboss.tools.struts.ui.internal.action.ModulesConfigurationActionDelegate" enablesFor="*" id="org.jboss.tools.common.xstudio.action.ModulesConfigurationActionDelegate" label="%popupMenus.action.modulesConfiguration" menubarPath="RedHat4Web/b">
</action>
- </objectContribution>
+ </objectContribution-->
<!--objectContribution id="RedHatStrutsStudio_IFile" objectClass="org.eclipse.core.resources.IFile">
<menu id="RedHat4Web" label="JBoss Tools" path="additions">
<separator name="a">
15 years
- 1
- 0
JBoss Tools SVN: r18876 - trunk/jsf/plugins/org.jboss.tools.jsf.ui.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-11-27 07:49:46 -0500 (Fri, 27 Nov 2009)
New Revision: 18876
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-5277
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2009-11-27 11:57:48 UTC (rev 18875)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2009-11-27 12:49:46 UTC (rev 18876)
@@ -166,8 +166,66 @@
</wizard>
</extension>
<extension point="org.eclipse.ui.popupMenus">
+ <objectContribution
+ id="org.jboss.tools.seam.ui.project.configure"
+ objectClass="org.eclipse.core.resources.IProject"
+ adaptable="true">
+ <visibility>
+ <and>
+ <objectState
+ name="projectNature"
+ value="org.eclipse.jdt.core.javanature"/>
+ <not>
+ <objectState
+ name="projectNature"
+ value="org.jboss.tools.jsf.jsfnature"/>
+ </not>
+ </and>
+ </visibility>
+
+ <action
+ class="org.jboss.tools.jsf.ui.action.AddJSFNatureActionDelegate"
+ enablesFor="1"
+ icon="$nl$/images/xstudio/actions/add_jsf_nature.gif"
+ id="org.jboss.tools.jsf.ui.action.AddJSFNatureActionDelegate"
+ label="%popupMenus.action.addJSFNature"
+ menubarPath="org.eclipse.ui.projectConfigure/additions">
+ </action>
+ </objectContribution>
+ <objectContribution
+ id="org.jboss.tools.seam.ui.project.configure"
+ objectClass="org.eclipse.core.resources.IProject"
+ adaptable="true">
+ <visibility>
+ <and>
+ <objectState
+ name="projectNature"
+ value="org.eclipse.jdt.core.javanature"/>
+ <and>
+ <objectState
+ name="projectNature"
+ value="org.jboss.tools.jsf.jsfnature"/>
+ </and>
+ </and>
+ </visibility>
+
+ <action
+ class="org.jboss.tools.jsf.ui.action.RemoveJSFNatureActionDelegate"
+ enablesFor="1"
+ id="org.jboss.tools.jsf.ui.action.RemoveJSFNatureActionDelegate"
+ label="%popupMenus.action.removeJSFNature"
+ menubarPath="org.eclipse.ui.projectConfigure/additions">
+ </action>
+ <action
+ class="org.jboss.tools.jsf.ui.action.AddCapabilitiesActionDelegate"
+ enablesFor="1"
+ id="org.jboss.tools.jsf.ui.action.AddCapabilitiesActionDelegate"
+ label="%popupMenus.action.addCustomCapabilities"
+ menubarPath="org.eclipse.ui.projectConfigure/additions">
+ </action>
+ </objectContribution>
<!-- IProject -->
- <objectContribution id="JSF_IProject" objectClass="org.eclipse.core.resources.IProject">
+ <!--objectContribution id="JSF_IProject" objectClass="org.eclipse.core.resources.IProject">
<menu id="RedHat4Web" label="JBoss Tools" path="additions">
<separator name="a">
</separator>
@@ -197,9 +255,9 @@
label="%popupMenus.action.addCustomCapabilities"
menubarPath="RedHat4Web/d">
</action>
- </objectContribution>
+ </objectContribution-->
<!-- IJavaProject -->
- <objectContribution id="JSF_IJavaProject" objectClass="org.eclipse.jdt.core.IJavaProject">
+ <!--objectContribution id="JSF_IJavaProject" objectClass="org.eclipse.jdt.core.IJavaProject">
<menu id="RedHat4Web" label="JBoss Tools" path="additions">
<separator name="a">
</separator>
@@ -214,30 +272,24 @@
icon="$nl$/images/xstudio/actions/add_jsf_nature.gif"
id="org.jboss.tools.jsf.ui.action.AddJSFNatureActionDelegate"
label="%popupMenus.action.addJSFNature"
- menubarPath="RedHat4Web/a">
+ menubarPath="org.eclipse.ui.projectConfigure/additions">
</action>
<action
class="org.jboss.tools.jsf.ui.action.RemoveJSFNatureActionDelegate"
enablesFor="*"
id="org.jboss.tools.jsf.ui.action.RemoveJSFNatureActionDelegate"
label="%popupMenus.action.removeJSFNature"
- menubarPath="RedHat4Web/d">
+ menubarPath="org.eclipse.ui.projectConfigure/additions">
</action>
- <!--action
+ <action
class="org.jboss.tools.jst.web.ui.action.adf.AddADFSupportAction"
enablesFor="*"
id="org.jboss.tools.jst.web.ui.action.adf.AddADFSupportAction"
label="Add ADF Support"
menubarPath="RedHat4Web/d">
- </action-->
- <action
- class="org.jboss.tools.jsf.ui.action.AddCapabilitiesActionDelegate"
- enablesFor="*"
- id="org.jboss.tools.jsf.ui.action.AddCapabilitiesActionDelegate"
- label="%popupMenus.action.addCustomCapabilities"
- menubarPath="RedHat4Web/d">
</action>
- </objectContribution>
+
+ </objectContribution-->
<!-- IFile -->
<!--objectContribution id="JSF_IFile" objectClass="org.eclipse.core.resources.IFile">
<menu id="RedHat4Web" label="JBoss Tools" path="additions">
15 years
- 1
- 0
JBoss Tools SVN: r18875 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2009-11-27 06:57:48 -0500 (Fri, 27 Nov 2009)
New Revision: 18875
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java
Log:
Fixing error in junut test for openON
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java 2009-11-27 10:11:36 UTC (rev 18874)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java 2009-11-27 11:57:48 UTC (rev 18875)
@@ -65,7 +65,7 @@
//test openon for taglib from in file
public void testOpenOnForTaglibInJarFile() throws Throwable {
checkOpenOnFromJarFile("WebContent/WEB-INF/lib/mareshkau.jar", //$NON-NLS-1$
- "META-INF/mareshkau.taglib.xml", 12, 25, "components/paginator.xhtml"); //$NON-NLS-1$ //$NON-NLS-2$
+ "META-INF/mareshkau.taglib.xml", 12, 25, "paginator.xhtml"); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testOpenOnForJavaElementFromDeclarationInJar() throws Throwable {
15 years
- 1
- 0
JBoss Tools SVN: r18874 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-11-27 05:11:36 -0500 (Fri, 27 Nov 2009)
New Revision: 18874
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta/hibconfig3.meta
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta/hibernate3.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-3962
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta/hibconfig3.meta
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta/hibconfig3.meta 2009-11-27 10:11:01 UTC (rev 18873)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta/hibconfig3.meta 2009-11-27 10:11:36 UTC (rev 18874)
@@ -15,72 +15,7 @@
</MAPPINGS>
<ICONS>
<GROUP name="action"/>
- <GROUP name="main">
- <GROUP name="hibernate">
- <GROUP name="relation">
- <ICON name="collection" path="images/orm2/collection.gif"/>
- <ICON name="collection-small" path="images/orm2/collection_small.gif"/>
- <ICON name="manytoone" path="images/orm2/manytoone.gif"/>
- <ICON name="onetoone" path="images/orm2/onetoone.gif"/>
- </GROUP>
- <ICON name="any" path="images/orm2/manytoany.gif"/>
- <ICON name="array" path="images/orm2/collection.gif"/>
- <ICON name="bag" path="images/orm2/collection.gif"/>
- <ICON name="cache" path="images/java/attr.gif"/>
- <ICON name="class" path="images/orm2/class.gif"/>
- <ICON name="classes" path="images/file/system_folder.gif"/>
- <ICON name="classpath" path="images/file/system_folder.gif"/>
- <ICON name="collection-id" path="images/orm2/id.gif"/>
- <ICON name="column" path="images/orm2/column.gif"/>
- <ICON name="comment" path="images/orm2/comment.gif"/>
- <ICON name="component" path="images/orm2/component.gif"/>
- <ICON name="composite-element" path="images/orm2/component.gif"/>
- <ICON name="composite-id" path="images/orm2/composite_id.gif"/>
- <ICON name="composite-index" path="images/orm2/composite_id.gif"/>
- <ICON name="discriminator" path="images/orm2/discriminator.gif"/>
- <ICON name="dynamic-component" path="images/orm2/dynacomponent.gif"/>
- <ICON name="element" path="images/orm2/property.gif"/>
- <ICON name="file" path="images/orm2/file.gif"/>
- <ICON name="filter" path="images/orm2/filter.gif"/>
- <ICON name="folder" path="images/java/package.gif"/>
- <ICON name="generator" path="images/java/attr.gif"/>
- <ICON name="id" path="images/orm2/id.gif"/>
- <ICON name="idbag" path="images/orm2/collection.gif"/>
- <ICON name="import" path="images/java/attr.gif"/>
- <ICON name="index" path="images/orm2/index.gif"/>
- <ICON name="index-many-to-any" path="images/orm2/index-manytoany.gif"/>
- <ICON name="index-many-to-many" path="images/orm2/index-manytomany.gif"/>
- <ICON name="java-field" path="images/java/attr.gif"/>
- <ICON name="jcs-cache" path="images/java/attr.gif"/>
- <ICON name="joined-subclass" path="images/orm2/class.gif"/>
- <ICON name="key" path="images/orm2/id.gif"/>
- <ICON name="key-many-to-one" path="images/orm2/key-manytoone.gif"/>
- <ICON name="key-property" path="images/orm2/key-property.gif"/>
- <ICON name="list" path="images/orm2/collection.gif"/>
- <ICON name="many-to-any" path="images/orm2/manytoany.gif"/>
- <ICON name="many-to-many" path="images/orm2/manytomany.gif"/>
- <ICON name="many-to-one" path="images/orm2/manytoone.gif"/>
- <ICON name="map" path="images/orm2/collection.gif"/>
- <ICON name="meta" path="images/java/attr.gif"/>
- <ICON name="meta-value" path="images/java/attr.gif"/>
- <ICON name="nested-composite-element" path="images/orm2/component.gif"/>
- <ICON name="one-to-many" path="images/orm2/onetomany.gif"/>
- <ICON name="one-to-one" path="images/orm2/onetoone.gif"/>
- <ICON name="param" path="images/orm2/parameter.gif"/>
- <ICON name="parent" path="images/jdo/relation/super_table.gif"/>
- <ICON name="primitive-array" path="images/orm2/collection.gif"/>
- <ICON name="property" path="images/orm2/property.gif"/>
- <ICON name="query" path="images/orm2/parameter.gif"/>
- <ICON name="return" path="images/java/attr.gif"/>
- <ICON name="set" path="images/orm2/collection.gif"/>
- <ICON name="sql-query" path="images/orm2/parameter.gif"/>
- <ICON name="subclass" path="images/orm2/class.gif"/>
- <ICON name="subselect" path="images/java/attr.gif"/>
- <ICON name="synchronize" path="images/java/attr.gif"/>
- <ICON name="timestamp" path="images/orm2/timestamp.gif"/>
- <ICON name="version" path="images/orm2/version.gif"/>
- </GROUP>
- </GROUP>
+ <GROUP name="main"/>
</ICONS>
<GlobalActions kind="list"/>
<XModelEntity
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta/hibernate3.meta
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta/hibernate3.meta 2009-11-27 10:11:01 UTC (rev 18873)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta/hibernate3.meta 2009-11-27 10:11:36 UTC (rev 18874)
@@ -49,7 +49,7 @@
<ICON name="discriminator" path="images/orm2/discriminator.gif"/>
<ICON name="dynamic-component" path="images/orm2/dynacomponent.gif"/>
<ICON name="element" path="images/orm2/property.gif"/>
- <ICON name="file" path="images/orm2/file.gif"/>
+ <ICON name="file" path="images/file/hibernate-file.gif"/>
<ICON name="filter" path="images/orm2/filter.gif"/>
<ICON name="folder" path="images/java/package.gif"/>
<ICON name="generator" path="images/java/attr.gif"/>
15 years
- 1
- 0