JBoss Tools SVN: r19737 - trunk/bpel/docs/reference/en.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2010-01-13 11:45:43 -0500 (Wed, 13 Jan 2010)
New Revision: 19737
Modified:
trunk/bpel/docs/reference/en/master.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-1052 updated the versions and copyright info
Modified: trunk/bpel/docs/reference/en/master.xml
===================================================================
--- trunk/bpel/docs/reference/en/master.xml 2010-01-13 16:17:00 UTC (rev 19736)
+++ trunk/bpel/docs/reference/en/master.xml 2010-01-13 16:45:43 UTC (rev 19737)
@@ -27,9 +27,9 @@
</corpauthor>
<author><firstname>Denny</firstname><surname>Xu</surname><email>dxu(a)redhat.com</email></author>
<author><firstname>Grid</firstname><surname>Qian</surname><email>fqian(a)redhat.com</email></author>
- <pubdate>August 2009</pubdate>
- <copyright>
- <year>2009</year>
+ <copyright>
+ <year>2009</year>
+ <year>2010</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
14 years, 4 months
JBoss Tools SVN: r19736 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-01-13 11:17:00 -0500 (Wed, 13 Jan 2010)
New Revision: 19736
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/tags/facelets.taglib.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java
trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-4638 , open on for axis /facelet-taglib/tag/handler-class has been added
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/tags/facelets.taglib.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/tags/facelets.taglib.xml 2010-01-13 15:58:54 UTC (rev 19735)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/tags/facelets.taglib.xml 2010-01-13 16:17:00 UTC (rev 19736)
@@ -31,4 +31,8 @@
<function-class>demo.FaceletFunctions</function-class>
<function-signature>java.lang.String getStringForDisplay(java.lang.String)</function-signature>
</function>
-</facelet-taglib>
\ No newline at end of file
+ <tag>
+ <tag-name>actionMapper</tag-name>
+ <handler-class>demo.IfHandler</handler-class>
+ </tag>
+</facelet-taglib>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java 2010-01-13 15:58:54 UTC (rev 19735)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java 2010-01-13 16:17:00 UTC (rev 19736)
@@ -101,6 +101,14 @@
IEditorInput editorInput = new FileEditorInput(file);
JBIDE4509Test.checkOpenOnInEditor(editorInput, getEditorId(file.getName()), 22, 23, "IfHandler.java"); //$NON-NLS-1$
}
+ //test for <handler-class> in tag
+ public void testJBIDE4638OpenOnForHandlerClassWithTagAxis() throws Throwable{
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
+ JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT);
+ IFile file = (IFile) project.findMember("WebContent/tags/facelets.taglib.xml"); //$NON-NLS-1$
+ IEditorInput editorInput = new FileEditorInput(file);
+ JBIDE4509Test.checkOpenOnInEditor(editorInput, getEditorId(file.getName()), 36, 29, "IfHandler.java"); //$NON-NLS-1$
+ }
//test for https://jira.jboss.org/jira/browse/JBIDE-4635
public void testJBIDE4635OpenOn() throws Throwable{
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME);
Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml 2010-01-13 15:58:54 UTC (rev 19735)
+++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml 2010-01-13 16:17:00 UTC (rev 19736)
@@ -43,7 +43,9 @@
<axis path="/facelet-taglib/function/function-class">
</axis>
<axis path="/facelet-taglib/tag/component/handler-class">
- </axis>
+ </axis>
+ <axis path="/facelet-taglib/tag/handler-class">
+ </axis>
<axis path="/facelet-taglib/library-class">
</axis>
</partitionType>
14 years, 4 months
JBoss Tools SVN: r19735 - trunk/jst/plugins/org.jboss.tools.jst.web.verification/src/org/jboss/tools/jst/web/verification/vrules.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-13 10:58:54 -0500 (Wed, 13 Jan 2010)
New Revision: 19735
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.verification/src/org/jboss/tools/jst/web/verification/vrules/CheckResource.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5660
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.verification/src/org/jboss/tools/jst/web/verification/vrules/CheckResource.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.verification/src/org/jboss/tools/jst/web/verification/vrules/CheckResource.java 2010-01-13 15:58:24 UTC (rev 19734)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.verification/src/org/jboss/tools/jst/web/verification/vrules/CheckResource.java 2010-01-13 15:58:54 UTC (rev 19735)
@@ -31,6 +31,12 @@
XModel model = getXModel(object);
XModelObject webRoot = model == null ? null : model.getByPath("FileSystems/WEB-ROOT"); //$NON-NLS-1$
if(webRoot == null) return null;
+
+ if(object.getEntity().getName().startsWith("WebAppErrorPage")) {
+ if(value != null && value.indexOf("?") > 0) {
+ value = value.substring(0, value.indexOf("?"));
+ }
+ }
List list = WebPromptingProvider.getInstance().getList(model, IWebPromptingProvider.JSF_CONVERT_URL_TO_PATH, value, null);
if(list != null && list.size() > 0) {
14 years, 4 months
JBoss Tools SVN: r19734 - in trunk: jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-01-13 10:58:24 -0500 (Wed, 13 Jan 2010)
New Revision: 19734
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/RefactorSearcher.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5289
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/RefactorSearcher.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/RefactorSearcher.java 2010-01-13 15:52:04 UTC (rev 19733)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/RefactorSearcher.java 2010-01-13 15:58:24 UTC (rev 19734)
@@ -165,8 +165,11 @@
private void scanForJava(IFile file){
if(isFileCorrect(file)) {
if(PROPERTIES_EXT.equalsIgnoreCase(file.getFileExtension())){
- String content = getFileContent(file);
- scanProperties(file, content);
+ if(file.getName().equals(SEAM_PROPERTIES_FILE)){
+ String content = getFileContent(file);
+ scanProperties(file, content);
+ }else
+ searchInCach(file);
} else if (JAVA_EXT.equalsIgnoreCase(file.getFileExtension())
|| JSP_EXT.equalsIgnoreCase(file.getFileExtension())
|| XHTML_EXT.equalsIgnoreCase(file.getFileExtension())
@@ -200,12 +203,14 @@
for(ELReference reference : references){
int offset = reference.getStartPosition();
for(ELExpression operand : reference.getEl()){
-
for (ELResolver resolver : resolvers) {
if (!(resolver instanceof ELCompletionEngine))
continue;
-
+
ELResolution resolution = resolver.resolve(context, operand, offset);
+
+ if(resolution == null)
+ continue;
List<ELSegment> segments = resolution.findSegmentsByJavaElement(javaElement);
@@ -283,7 +288,7 @@
}
private void scanProperties(IFile file, String content){
- scanString(file, content, 0);
+ //scanString(file, content, 0);
if(!file.getName().equals(SEAM_PROPERTIES_FILE))
return;
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 2010-01-13 15:52:04 UTC (rev 19733)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2010-01-13 15:58:24 UTC (rev 19734)
@@ -256,7 +256,7 @@
elReference.setResource(file);
elReference.setEl(new ELExpression[]{ie});
elReference.setLength(ie.getLength());
- elReference.setStartPosition(ie.getStartPosition());
+ elReference.setStartPosition(0);
List<SyntaxError> elErrors = new ArrayList<SyntaxError>();
for (SyntaxError error : errors) {
if(error.getPosition()>=ie.getStartPosition() && error.getPosition()<=ie.getEndPosition()) {
14 years, 4 months
JBoss Tools SVN: r19733 - trunk/as/docs/reference/en.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2010-01-13 10:52:04 -0500 (Wed, 13 Jan 2010)
New Revision: 19733
Modified:
trunk/as/docs/reference/en/master.xml
Log:
updated the versions and copyright info
Modified: trunk/as/docs/reference/en/master.xml
===================================================================
--- trunk/as/docs/reference/en/master.xml 2010-01-13 14:32:17 UTC (rev 19732)
+++ trunk/as/docs/reference/en/master.xml 2010-01-13 15:52:04 UTC (rev 19733)
@@ -44,10 +44,11 @@
<author><firstname>Rob</firstname><surname>Stryker</surname><email>rob.stryker(a)jboss.com</email></author>
<author><firstname>Svetlana</firstname><surname>Mukhina</surname><email>smukhina(a)exadel.com</email></author>
- <pubdate>April 2008</pubdate>
- <copyright>
- <year>2007</year>
- <year>2009</year>
+ <copyright>
+ <year>2007</year>
+ <year>2008</year>
+ <year>2009</year>
+ <year>2010</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
14 years, 4 months
JBoss Tools SVN: r19732 - workspace/yradtsevich/DnD/trunk/DndJsPrototype/WebContent.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2010-01-13 09:32:17 -0500 (Wed, 13 Jan 2010)
New Revision: 19732
Modified:
workspace/yradtsevich/DnD/trunk/DndJsPrototype/WebContent/index.html
Log:
Test commit.
Modified: workspace/yradtsevich/DnD/trunk/DndJsPrototype/WebContent/index.html
===================================================================
--- workspace/yradtsevich/DnD/trunk/DndJsPrototype/WebContent/index.html 2010-01-13 14:32:13 UTC (rev 19731)
+++ workspace/yradtsevich/DnD/trunk/DndJsPrototype/WebContent/index.html 2010-01-13 14:32:17 UTC (rev 19732)
@@ -60,8 +60,8 @@
<input id="draggableInputText" type="text" value="DRAG ME!"/>
<p/>
<div id="dropableArea" style="width:200px; height:100px; border-color: black;
- border-width: 1px;
- border-style: solid;">
+ border-width: 1px;
+ border-style: solid;">
<center>DROPABLE AREA<br/> Drag over me!</center>
</div>
<div id="statusLine"></div>
14 years, 4 months
JBoss Tools SVN: r19731 - trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-13 09:32:13 -0500 (Wed, 13 Jan 2010)
New Revision: 19731
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-5653
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-13 13:30:34 UTC (rev 19730)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-13 14:32:13 UTC (rev 19731)
@@ -473,7 +473,7 @@
displayName="Add Route To..." kind="action" name="AddRouteTo">
<EntityData EntityName="ESBPreRouteTo">
<AttributeData AttributeName="destination name"/>
- <AttributeData AttributeName="service category" Mandatory="no"/>
+ <AttributeData AttributeName="service category"/>
<AttributeData AttributeName="service name" Mandatory="no"/>
</EntityData>
</XActionItem>
@@ -574,7 +574,7 @@
displayName="Add Route To..." kind="action" name="AddRouteTo">
<EntityData EntityName="ESBPreRouteTo">
<AttributeData AttributeName="destination name"/>
- <AttributeData AttributeName="service category" Mandatory="no"/>
+ <AttributeData AttributeName="service category"/>
<AttributeData AttributeName="service name" Mandatory="no"/>
</EntityData>
</XActionItem>
@@ -2065,7 +2065,7 @@
displayName="Add Route To..." kind="action" name="AddRouteTo">
<EntityData EntityName="ESBPreRouteTo">
<AttributeData AttributeName="destination name"/>
- <AttributeData AttributeName="service category" Mandatory="no"/>
+ <AttributeData AttributeName="service category"/>
<AttributeData AttributeName="service name"/>
</EntityData>
</XActionItem>
@@ -2116,7 +2116,7 @@
displayName="Add Route To..." kind="action" name="AddRouteTo">
<EntityData EntityName="ESBPreRouteTo">
<AttributeData AttributeName="destination name"/>
- <AttributeData AttributeName="service category" Mandatory="no"/>
+ <AttributeData AttributeName="service category"/>
<AttributeData AttributeName="service name"/>
</EntityData>
</XActionItem>
14 years, 4 months
JBoss Tools SVN: r19730 - in trunk/esb/plugins/org.jboss.tools.esb.core: resources/meta and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-13 08:30:34 -0500 (Wed, 13 Jan 2010)
New Revision: 19730
Added:
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/impl/ContentBasedRouter.java
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-5627
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2010-01-13 11:43:18 UTC (rev 19729)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2010-01-13 13:30:34 UTC (rev 19730)
@@ -38,6 +38,8 @@
class="org.jboss.tools.esb.core.model.impl.FTPListenerSpecificPropertiesImpl"/>
<xclass id="org.jboss.tools.esb.core.model.impl.FTPMessageFilterImpl"
class="org.jboss.tools.esb.core.model.impl.FTPMessageFilterImpl"/>
+ <xclass id="org.jboss.tools.esb.core.model.impl.ContentBasedRouter"
+ class="org.jboss.tools.esb.core.model.impl.ContentBasedRouter"/>
<xclass id="org.jboss.tools.esb.core.model.handlers.AddProviderSupport"
class="org.jboss.tools.esb.core.model.handlers.AddProviderSupport"/>
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-13 11:43:18 UTC (rev 19729)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-13 13:30:34 UTC (rev 19730)
@@ -485,7 +485,8 @@
</XActionItem>
<XDependencies/>
</XModelEntity>
- <XModelEntity ImplementingClass="%ESB%"
+ <XModelEntity
+ ImplementingClass="org.jboss.tools.esb.core.model.impl.ContentBasedRouter"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%"
XMLSUBPATH="action" name="ESBPreActionContentBasedRouter120">
<XChildrenEntities>
@@ -529,7 +530,14 @@
<Editor name="TreeChooser"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;pre=true;save=always"
- name="rule language" xmlname="ruleLanguage"/>
+ name="rule language" xmlname="ruleLanguage">
+ <Constraint loader="Tree">
+ <value name="ESBResourceTree"/>
+ <value name="extensions=dsl"/>
+ <value name="linkAction=OpenRuleLanguage"/>
+ </Constraint>
+ <Editor name="TreeChooser"/>
+ </XModelAttribute>
<XModelAttribute PROPERTIES="pre=true;category=general"
default="Default(false)" name="rule reload" xmlname="ruleReload">
<Constraint loader="ListString">
@@ -555,6 +563,11 @@
HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler"
ICON="action.empty" PROPERTIES="actionpath=Open;attribute=rule set"
displayName="Open Rule Set" kind="action" name="OpenRuleSet"/>
+ <XActionItem
+ HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler"
+ ICON="action.empty"
+ PROPERTIES="actionpath=Open;attribute=rule language"
+ displayName="Open Rule Language" kind="action" name="OpenRuleLanguage"/>
<XActionItem kind="list" name="CreateActions">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
@@ -3041,7 +3054,13 @@
<Editor name="TreeChooser"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;pre=true;save=always"
- name="rule language" xmlname="ruleLanguage"/>
+ name="rule language" xmlname="ruleLanguage">
+ <Constraint loader="Tree">
+ <value name="ESBResourceTree"/>
+ <value name="extensions=dsl"/>
+ </Constraint>
+ <Editor name="TreeChooser"/>
+ </XModelAttribute>
<XModelAttribute PROPERTIES="pre=true;category=general"
default="Default(false)" name="rule reload" xmlname="ruleReload">
<Constraint loader="ListString">
@@ -3535,7 +3554,7 @@
</XActionItem>
<XActionItem HandlerClassName="%SpecialWizard%"
ICON="action.empty"
- PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddContentBasedRouterSupport;cbrAlias=XPath;entity=ESBPreActionContentBasedRouter120"
+ PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddContentBasedRouterSupport;cbrAlias=Xpath;entity=ESBPreActionContentBasedRouter120"
displayName="Content Based Router (XPath)..." kind="action" name="AddContentBasedRouterXPath">
<EntityData EntityName="ESBWizardXPathRouter">
<AttributeData AttributeName="name"/>
Added: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/impl/ContentBasedRouter.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/impl/ContentBasedRouter.java (rev 0)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/impl/ContentBasedRouter.java 2010-01-13 13:30:34 UTC (rev 19730)
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.esb.core.model.impl;
+
+import org.jboss.tools.common.model.XModelException;
+import org.jboss.tools.esb.core.model.ESBCustomizedObjectImpl;
+
+/**
+ * @author Viacheslav Kabanovich
+ */
+public class ContentBasedRouter extends ESBCustomizedObjectImpl {
+ private static final long serialVersionUID = 1L;
+ static String ATTR_CBR_ALIAS = "cbr alias";
+ static String ATTR_RULE_LANGUAGE = "rule language";
+
+ public ContentBasedRouter() {}
+
+ @Override
+ public boolean isAttributeEditable(String name) {
+ if(ATTR_RULE_LANGUAGE.equals(name)) {
+ String alias = getAttributeValue(ATTR_CBR_ALIAS);
+ if(isRegexOrXPath(alias)) {
+ return false;
+ }
+ }
+ return super.isAttributeEditable(name);
+ }
+
+ private boolean isRegexOrXPath(String alias) {
+ return ("Regex".equalsIgnoreCase(alias) || "Xpath".equalsIgnoreCase(alias));
+ }
+
+ @Override
+ protected void onAttributeValueEdit(String name, String oldValue,
+ String newValue) throws XModelException {
+ if(ATTR_CBR_ALIAS.equals(name)) {
+ if(isRegexOrXPath(newValue)) {
+ setAttributeValue(ATTR_RULE_LANGUAGE, "");
+ }
+ }
+ }
+
+
+}
Property changes on: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/impl/ContentBasedRouter.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 4 months
JBoss Tools SVN: r19729 - in trunk/esb/plugins/org.jboss.tools.esb.core/resources: meta and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-13 06:43:18 -0500 (Wed, 13 Jan 2010)
New Revision: 19729
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-5654
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties 2010-01-13 10:01:09 UTC (rev 19728)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties 2010-01-13 11:43:18 UTC (rev 19729)
@@ -2,6 +2,7 @@
ESB.name=Name
ESB.class=Class
ESB.timeout_in_millies=Timeout (Milliseconds)
+ESB.timeout_in_millis=Timeout (Milliseconds)
ESB.process=Process
ESB.encoding=Encoding
ESB.rule_set=Rule Set
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties 2010-01-13 10:01:09 UTC (rev 19728)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties 2010-01-13 11:43:18 UTC (rev 19729)
@@ -43,7 +43,6 @@
ESB.AddAggregator.menu=Aggregator...
ESB.AddContentBasedRouter.menu=Content Based Router (Generic)...
ESB.AddContentBasedRouterDrools.menu=Content Based Router (Drools)...
-ESB.AddContentBasedRouterDroolsXPath.menu=Content Based Router (Drools XPath)...
ESB.AddContentBasedRouterRegex.menu=Content Based Router (Regex)...
ESB.AddContentBasedRouterXPath.menu=Content Based Router (XPath)...
ESB.AddStaticRouter.menu=Static Router...
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2010-01-13 10:01:09 UTC (rev 19728)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2010-01-13 11:43:18 UTC (rev 19729)
@@ -501,9 +501,6 @@
ESB.AddContentBasedRouterDrools.WindowTitle=Add Drools Router
ESB.AddContentBasedRouterDrools.Title=ESB Drools Router
-ESB.AddContentBasedRouterDroolsXPath.WindowTitle=Add Drools XPath Router
-ESB.AddContentBasedRouterDroolsXPath.Title=ESB Drools XPath Router
-
ESB.AddContentBasedRouterRegex.WindowTitle=Add Regex Router
ESB.AddContentBasedRouterRegex.Title=ESB Regex Router
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-13 10:01:09 UTC (rev 19728)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-13 11:43:18 UTC (rev 19729)
@@ -125,6 +125,45 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="action" name="ESBPreActionAggregator120">
+ <XChildrenEntities>
+ <XChildEntity name="ESBProperty"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.action" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="aggregator action" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="name" xmlname="name"/>
+ <XModelAttribute PROPERTIES="category=general;save=always"
+ default="org.jboss.soa.esb.actions.Aggregator" name="class" xmlname="class">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="pre=true;category=general"
+ name="timeout in millis" xmlname="timeoutInMillis"/>
+ <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions"/>
+ <XActionItemReference entity="ESBProperty" name="CopyActions"/>
+ <XActionItemReference entity="ESBProperty" name="DeleteActions"/>
+ <XActionItemReference entity="ESBProperty" name="Properties"/>
+ <XActionItemReference entity="ESBProperty" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%"
XMLSUBPATH="action" name="ESBPreActionBpmProcessor120">
<XChildrenEntities>
@@ -2964,6 +3003,128 @@
</XActionItem>
<XDependencies/>
</XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%"
+ XMLSUBPATH="action" name="ESBWizardDroolsRouter">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.action" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="drools router action" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="name" xmlname="name"/>
+ <XModelAttribute PROPERTIES="category=general;save=always"
+ default="org.jboss.soa.esb.actions.ContentBasedRouter" name="class" xmlname="class">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="pre=true;category=general"
+ name="cbr alias" xmlname="cbrAlias">
+ <Constraint loader="ListString">
+ <value/>
+ <value name="Drools"/>
+ <value name="Xpath"/>
+ <value name="Regex"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="pre=true;category=general"
+ name="rule set" xmlname="ruleSet">
+ <Constraint loader="Tree">
+ <value name="ESBResourceTree"/>
+ <value name="extensions=drl"/>
+ </Constraint>
+ <Editor name="TreeChooser"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;pre=true;save=always"
+ name="rule language" xmlname="ruleLanguage"/>
+ <XModelAttribute PROPERTIES="pre=true;category=general"
+ default="Default(false)" name="rule reload" xmlname="ruleReload">
+ <Constraint loader="ListString">
+ <value name="Default(false)"/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process">
+ <Constraint loader="ListString">
+ <value name="process"/>
+ <value name="split"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list"/>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%"
+ XMLSUBPATH="action" name="ESBWizardXPathRouter">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.action" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="xpath router action" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="name" xmlname="name"/>
+ <XModelAttribute PROPERTIES="category=general;save=always"
+ default="org.jboss.soa.esb.actions.ContentBasedRouter" name="class" xmlname="class">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="pre=true;category=general"
+ name="cbr alias" xmlname="cbrAlias">
+ <Constraint loader="ListString">
+ <value/>
+ <value name="Drools"/>
+ <value name="Xpath"/>
+ <value name="Regex"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="pre=true;category=general"
+ name="rule set" xmlname="ruleSet">
+ <Constraint loader="Tree">
+ <value name="ESBResourceTree"/>
+ <value name="extensions=properties"/>
+ </Constraint>
+ <Editor name="TreeChooser"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="pre=true;category=general"
+ default="Default(false)" name="rule reload" xmlname="ruleReload">
+ <Constraint loader="ListString">
+ <value name="Default(false)"/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process">
+ <Constraint loader="ListString">
+ <value name="process"/>
+ <value name="split"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list"/>
+ <XDependencies/>
+ </XModelEntity>
<XEntityExtension name="ESBActions101">
<XChildrenEntities>
<XChildEntity name="ESBPreActionByteArrayToString101"/>
@@ -3238,7 +3399,7 @@
<XChildEntity name="ESBPreActionScripting120"/>
<XChildEntity name="ESBPreActionGroovyProcessor101"/>
<XChildEntity name="ESBPreActionEJBProcessor120"/>
- <XChildEntity name="ESBPreActionAggregator101"/>
+ <XChildEntity name="ESBPreActionAggregator120"/>
<XChildEntity name="ESBPreActionContentBasedRouter120"/>
<XChildEntity name="ESBPreActionStaticRouter101"/>
<XChildEntity name="ESBPreActionStaticWiretap101"/>
@@ -3332,36 +3493,23 @@
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
displayName="Aggregator..." kind="action" name="AddAggregator">
- <EntityData EntityName="ESBPreActionAggregator101">
+ <EntityData EntityName="ESBPreActionAggregator120">
<AttributeData AttributeName="name"/>
- <AttributeData AttributeName="timeout in millies" Mandatory="no"/>
+ <AttributeData AttributeName="timeout in millis" Mandatory="no"/>
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%SpecialWizard%"
ICON="action.empty"
- PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddContentBasedRouterSupport;cbrAlias=Drools"
+ PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddContentBasedRouterSupport;cbrAlias=Drools;entity=ESBPreActionContentBasedRouter120"
displayName="Content Based Router (Drools)..." kind="action" name="AddContentBasedRouterDrools">
- <EntityData EntityName="ESBPreActionContentBasedRouter120">
+ <EntityData EntityName="ESBWizardDroolsRouter">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="process" Mandatory="no"/>
- <AttributeData AttributeName="rule set" Mandatory="no"/>
+ <AttributeData AttributeName="rule set"/>
<AttributeData AttributeName="rule language" Mandatory="no"/>
<AttributeData AttributeName="rule reload" Mandatory="no"/>
</EntityData>
</XActionItem>
- <XActionItem HandlerClassName="%SpecialWizard%"
- ICON="action.empty"
- PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddContentBasedRouterSupport;cbrAlias=Drools"
- displayName="Content Based Router (Drools XPath)..."
- kind="action" name="AddContentBasedRouterDroolsXPath">
- <EntityData EntityName="ESBPreActionContentBasedRouter120">
- <AttributeData AttributeName="name"/>
- <AttributeData AttributeName="process" Mandatory="no"/>
- <AttributeData AttributeName="rule set" Mandatory="no"/>
- <AttributeData AttributeName="rule language" Mandatory="no"/>
- <AttributeData AttributeName="rule reload" Mandatory="no"/>
- </EntityData>
- </XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
displayName="Content Based Router (Generic)..." kind="action" name="AddContentBasedRouter">
@@ -3376,25 +3524,23 @@
</XActionItem>
<XActionItem HandlerClassName="%SpecialWizard%"
ICON="action.empty"
- PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddContentBasedRouterSupport;cbrAlias=Regex"
+ PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddContentBasedRouterSupport;cbrAlias=Regex;entity=ESBPreActionContentBasedRouter120"
displayName="Content Based Router (Regex)..." kind="action" name="AddContentBasedRouterRegex">
- <EntityData EntityName="ESBPreActionContentBasedRouter120">
+ <EntityData EntityName="ESBWizardXPathRouter">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="process" Mandatory="no"/>
<AttributeData AttributeName="rule set" Mandatory="no"/>
- <AttributeData AttributeName="rule language" Mandatory="no"/>
<AttributeData AttributeName="rule reload" Mandatory="no"/>
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%SpecialWizard%"
ICON="action.empty"
- PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddContentBasedRouterSupport;cbrAlias=XPath"
+ PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddContentBasedRouterSupport;cbrAlias=XPath;entity=ESBPreActionContentBasedRouter120"
displayName="Content Based Router (XPath)..." kind="action" name="AddContentBasedRouterXPath">
- <EntityData EntityName="ESBPreActionContentBasedRouter120">
+ <EntityData EntityName="ESBWizardXPathRouter">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="process" Mandatory="no"/>
<AttributeData AttributeName="rule set" Mandatory="no"/>
- <AttributeData AttributeName="rule language" Mandatory="no"/>
<AttributeData AttributeName="rule reload" Mandatory="no"/>
</EntityData>
</XActionItem>
14 years, 4 months
JBoss Tools SVN: r19728 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-01-13 05:01:09 -0500 (Wed, 13 Jan 2010)
New Revision: 19728
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5582 Support for server runtime JBossAS 6.0
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2010-01-13 08:57:24 UTC (rev 19727)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2010-01-13 10:01:09 UTC (rev 19728)
@@ -99,10 +99,14 @@
String insideServer = JBossServer.getDeployFolder(ds, JBossServer.DEPLOY_SERVER);
String metadata = JBossServer.getDeployFolder(ds, JBossServer.DEPLOY_METADATA);
String custom = JBossServer.getDeployFolder(ds, JBossServer.DEPLOY_CUSTOM);
+ String serverHome = null;
+ if (server != null && server.getRuntime()!= null && server.getRuntime().getLocation() != null) {
+ serverHome = server.getRuntime().getLocation().toString();
+ }
folders.add(insideServer);
if( !folders.contains(metadata))
folders.add(metadata);
- if( !folders.contains(custom))
+ if( !folders.contains(custom) && !custom.equals(serverHome))
folders.add(custom);
IModule[] modules2 = org.eclipse.wst.server.core.ServerUtil.getModules(server.getServerType().getRuntimeType().getModuleTypes());
14 years, 4 months