[jbosstools-commits] JBoss Tools SVN: r18715 - in trunk/esb/plugins/org.jboss.tools.esb.core: src/org/jboss/tools/esb/core/model and 1 other directories.

Tuesday, 17 November 2009

Author: scabanovich
Date: 2009-11-17 11:48:54 -0500 (Tue, 17 Nov 2009)
New Revision: 18715

Modified:
   trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
  
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java
  
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java
  
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5199

Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================

--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta	2009-11-17
15:51:19 UTC (rev 18714)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta	2009-11-17
16:48:54 UTC (rev 18715)
@@ -711,6 +711,60 @@
  </XModelEntity>
  <XModelEntity ImplementingClass="%ESB%"
  
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+  XMLSUBPATH="action" name="ESBPreActionSOAPProxy120">
+  <XChildrenEntities>
+   <XChildEntity name="ESBProperty"/>
+  </XChildrenEntities>
+  <XEntityRenderer>
+   <ICONS>
+    <ICON info="main.esb.action" type="main"/>
+   </ICONS>
+  </XEntityRenderer>
+  <XModelAttributes>
+   <XModelAttribute default="SOAP proxy 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.soap.proxy.SOAPProxy"
+    name="class" xmlname="class">
+    <Editor name="Uneditable"/>
+   </XModelAttribute>
+   <XModelAttribute PROPERTIES="category=general;pre=true;save=always"
+    name="wsdl" xmlname="wsdl"/>
+   <XModelAttribute PROPERTIES="category=general;pre=true"
+    name="endpoint url" xmlname="endpointUrl"/>
+   <XModelAttribute PROPERTIES="category=general;pre=true"
name="file" xmlname="file">
+    <Constraint loader="Tree">
+     <value name="ESBResourceTree"/>
+     <value name="extensions=properties"/>
+     <value name="linkAction=OpenConfig"/>
+    </Constraint>
+    <Editor name="TreeChooser"/>
+   </XModelAttribute>
+   <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
+   
HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler"
+    ICON="action.empty" PROPERTIES="actionpath=Open;attribute=file"
+    displayName="Open File" kind="action"
name="OpenConfig"/>
+   <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"
   XMLSUBPATH="action" name="ESBPreActionSmooksAction101">
   <XChildrenEntities>
    <XChildEntity name="ESBProperty"/>
@@ -1575,6 +1629,7 @@
    <XChildEntity name="ESBPreActionStaticWiretap101"/>
    <XChildEntity name="ESBPreActionSOAPProcessor101"/>
    <XChildEntity name="ESBPreActionSOAPClient101"/>
+   <XChildEntity name="ESBPreActionSOAPProxy120"/>
    <XChildEntity name="ESBPreActionSystemPrintln101"/>
    <XChildEntity name="ESBPreActionNotifier101"/>
    <XChildEntity name="ESBPreActionBusinessRulesProcessor101"/>
@@ -1588,7 +1643,35 @@
      <XActionItemReference entity="ESBActions101"
name="AddCommandInterpreter"/>
      <XActionItemReference entity="ESBActions101"
name="AddGroovyProcessor"/>
      <XActionItemReference entity="ESBActions101"
name="Routers"/>
-     <XActionItemReference entity="ESBActions101"
name="SOAP"/>
+     <XActionItem displayName="SOAP" kind="list"
name="SOAP">
+      <XActionItem HandlerClassName="%Create%"
ICON="action.empty"
+       PROPERTIES="validator.add=true" WizardClassName="%Default%"
+       displayName="SOAP Processor..." kind="action"
name="AddSOAPProcessor">
+       <EntityData EntityName="ESBPreActionSOAPProcessor101">
+        <AttributeData AttributeName="name"/>
+        <AttributeData AttributeName="jbossws endpoint"/>
+       </EntityData>
+      </XActionItem>
+      <XActionItem HandlerClassName="%Create%"
ICON="action.empty"
+       PROPERTIES="validator.add=true" WizardClassName="%Default%"
+       displayName="SOAP Client..." kind="action"
name="AddSOAPClient">
+       <EntityData EntityName="ESBPreActionSOAPClient101">
+        <AttributeData AttributeName="name"/>
+        <AttributeData AttributeName="wsdl"/>
+        <AttributeData AttributeName="operation"/>
+       </EntityData>
+      </XActionItem>
+      <XActionItem HandlerClassName="%Create%"
ICON="action.empty"
+       PROPERTIES="validator.add=true" WizardClassName="%Default%"
+       displayName="SOAP Proxy..." kind="action"
name="AddSOAPProxy">
+       <EntityData EntityName="ESBPreActionSOAPProxy120">
+        <AttributeData AttributeName="name"/>
+        <AttributeData AttributeName="wsdl"/>
+        <AttributeData AttributeName="endpoint url"
Mandatory="no"/>
+        <AttributeData AttributeName="file" Mandatory="no"/>
+       </EntityData>
+      </XActionItem>
+     </XActionItem>
      <XActionItemReference entity="ESBActions101"
name="AddSystemPrintln"/>
      <XActionItemReference entity="ESBActions101"
name="AddBusinessRulesProcessor"/>
     </XActionItem>

Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java
===================================================================
---
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java	2009-11-17
15:51:19 UTC (rev 18714)
+++
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java	2009-11-17
16:48:54 UTC (rev 18715)
@@ -124,20 +124,22 @@
 
 	protected Set<String> getAllowedChildren(XModelEntity entity) {
 		Set<String> children = super.getAllowedChildren(entity);
-
+		if(entity.getName().equals(ESBConstants.ENT_ESB_HTTP_BUS_120)) {
+			children.add(ESBConstants.XML_ATTR_PROTECTED_METHODS);
+		}
 		return children;
 	}
 
     public boolean saveChildren(Element element, XModelObject o) {
     	boolean b = super.saveChildren(element, o);
-    	if(o.getModelEntity().getName().equals("ESBHTTPBus120")) {
+    	if(o.getModelEntity().getName().equals(ESBConstants.ENT_ESB_HTTP_BUS_120)) {
     		checkHTTPBusDTD(element);
     	}
     	return b;
     }
 
     private void checkHTTPBusDTD(Element element) {
-    	Element pm = XMLUtilities.getUniqueChild(element, "protected-methods");
+    	Element pm = XMLUtilities.getUniqueChild(element,
ESBConstants.XML_ATTR_PROTECTED_METHODS);
     	if(pm == null) return;
     	NodeList list = element.getChildNodes();
     	Element reference = null;

Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java
===================================================================
---
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java	2009-11-17
15:51:19 UTC (rev 18714)
+++
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java	2009-11-17
16:48:54 UTC (rev 18715)
@@ -78,6 +78,8 @@
 			//message, printfull, outputstream
 		{"org.jboss.soa.esb.actions.BusinessRulesProcessor",
"ESBPreActionBusinessRulesProcessor"},
 			//ruleSet, ruleLanguage, ruleReload, object-paths!
+		{"org.jboss.soa.esb.actions.soap.proxy.SOAPProxy",
"ESBPreActionSOAPProxy"},
+			//wsdl, file, endpointUrl
 	};
 
 	public static final SpecificActionLoader instance = new SpecificActionLoader();

Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java
===================================================================
---
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java	2009-11-17
15:51:19 UTC (rev 18714)
+++
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java	2009-11-17
16:48:54 UTC (rev 18715)
@@ -58,7 +58,7 @@
 		basicAction.addChild(p);
 	}
 
-	protected XModelObject fromAnyElement(XModelObject any, String toEntity) {
+	public static XModelObject fromAnyElement(XModelObject any, String toEntity) {
 		String tag = any.getAttributeValue("tag");
 		Map<String, String> attr = toMap(((AnyElementObjectImpl)any).getAttributes());
 
@@ -101,7 +101,7 @@
 		return a;
 	}
 
-	protected XModelObject toAnyElement(XModelObject specific, int index) {
+	public static XModelObject toAnyElement(XModelObject specific, int index) {
 		XModelObject t = specific.getModel().createModelObject("AnyElement", null);
 		t.setAttributeValue("tag", specific.getModelEntity().getXMLSubPath());
 		StringBuffer sb = new StringBuffer();


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[jbosstools-commits] JBoss Tools SVN: r18715 - in trunk/esb/plugins/org.jboss.tools.esb.core: src/org/jboss/tools/esb/core/model and 1 other directories.