Author: scabanovich Date: 2013-01-24 12:56:15 -0500 (Thu, 24 Jan 2013) New Revision: 44663 Added: branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.3/jboss-esb-client.xml Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java Log: JBIDE-13381 ESB Editor removes "http-client-property" property Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta =================================================================== --- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2013-01-21 13:32:52 UTC (rev 44662) +++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2013-01-24 17:56:15 UTC (rev 44663) @@ -1953,6 +1953,7 @@ XMLSUBPATH="action" name="ESBPreActionSOAPClient120"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> + <XChildEntity name="ESBPreClientProp"/> </XChildrenEntities> <XEntityRenderer> <ICONS> @@ -1986,9 +1987,16 @@ name="params location" xmlname="paramsLocation"/> <XModelAttribute PROPERTIES="pre=true;category=advanced" name="response location" xmlname="responseLocation"/> + <XModelAttribute PROPERTIES="category=advanced" name="endpoint url" xmlname="endpointUrl"/> + <XModelAttribute PROPERTIES="category=general" 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=advanced;pre=true" - name="endpoint url" xmlname="endpointUrl"/> - <XModelAttribute PROPERTIES="category=advanced;pre=true" name="response as ognl map" xmlname="responseAsOgnlMap"> <Constraint loader="ListString"> <value/> @@ -2019,6 +2027,14 @@ <AttributeData AttributeName="value" Mandatory="no"/> </EntityData> </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add HTTP Client Property..." kind="action" name="AddClientProp"> + <EntityData EntityName="ESBPreClientProp"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="value" Mandatory="no"/> + </EntityData> + </XActionItem> </XActionItem> <XActionItemReference entity="ESBProperty" name="CopyActions"/> <XActionItemReference entity="ESBProperty" name="DeleteActions"/> Added: branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.3/jboss-esb-client.xml =================================================================== --- branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.3/jboss-esb-client.xml (rev 0) +++ branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.3/jboss-esb-client.xml 2013-01-24 17:56:15 UTC (rev 44663) @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<jbossesb parameterReloadSecs="5" + xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc... + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://anonsvn.labs.jboss.com/labs/jbossesb/trun... http://anonsvn.jboss.org/repos/labs/labs/jbossesb/trunk/product/etc/schem... + <services> + <service category="c1" description="d1" name="s1"> + <actions> + <action class="org.jboss.soa.esb.actions.soap.SOAPClient" name="client"> + <property name="wsdl" value="someWsdl"/> + <property name="SOAPAction" value="noAction"/> + <property name="endpointUrl" value="http://host/servername"> + <http-client-property name="file" value="httpclient.properties"/> + </property> + </action> + </actions> + </service> + </services> +</jbossesb> Property changes on: branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.3/jboss-esb-client.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java =================================================================== --- branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java 2013-01-21 13:32:52 UTC (rev 44662) +++ branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java 2013-01-24 17:56:15 UTC (rev 44663) @@ -516,6 +516,22 @@ assertTrue(errorList.toString(), errorList.length() == 0); } + public void testSoapClient() { + XModelObject object = getFileObject("esb-1.3", "jboss-esb-client.xml", ESBConstants.ENT_ESB_FILE_131); + + StringBuffer errorList = new StringBuffer(); + + String cbrWiretapPath = "Services/s1/Actions/client"; + + String[][] clientAttrValues = { + {"endpoint url", "http://host/servername"}, + {"file", "httpclient.properties"}, + }; + checkAttributes(object, cbrWiretapPath, clientAttrValues, errorList); + + assertTrue(errorList.toString(), errorList.length() == 0); + } + XModelObject getFileObject(String parentPath, String xmlname) { return getFileObject(parentPath, xmlname, ESBConstants.ENT_ESB_FILE_101); }