[jboss-svn-commits] JBL Code SVN: r24835 - in labs/jbossesb/branches/JBESB_4_4_GA_CP: product/etc/schemas/xml and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jan 20 14:38:30 EST 2009
Author: kevin.conner at jboss.com
Date: 2009-01-20 14:38:30 -0500 (Tue, 20 Jan 2009)
New Revision: 24835
Removed:
labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/resources/server/ebws/
labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/src/org/jboss/soa/esb/server/ebws/
Modified:
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/docs/ProgrammersGuide.odt
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/etc/schemas/xml/jbossesb-1.0.1.xsd
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceEndpointInfo.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGenerator.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/OneWayBaseWebService.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/RequestResponseBaseWebService.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/ActionMapper.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/message/MessagePayloadProxy.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/build.xml
Log:
Remove modifications for JBESB-1984
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/docs/ProgrammersGuide.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/etc/schemas/xml/jbossesb-1.0.1.xsd
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/etc/schemas/xml/jbossesb-1.0.1.xsd 2009-01-20 18:42:02 UTC (rev 24834)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/etc/schemas/xml/jbossesb-1.0.1.xsd 2009-01-20 19:38:30 UTC (rev 24835)
@@ -366,8 +366,6 @@
<xsd:attribute name="mep" type="jesb:mepType" />
<xsd:attribute name="inXsd" type="xsd:string" />
<xsd:attribute name="outXsd" type="xsd:string" />
- <xsd:attribute name="requestLocation" type="xsd:string"/>
- <xsd:attribute name="responseLocation" type="xsd:string"/>
<xsd:attribute name="faultXsd" type="xsd:string" />
<xsd:attribute name="webservice" type="xsd:boolean" default="true"/>
<xsd:attribute name="validate" type="xsd:boolean" default="false"/>
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java 2009-01-20 18:42:02 UTC (rev 24834)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java 2009-01-20 19:38:30 UTC (rev 24835)
@@ -49,7 +49,6 @@
import org.jboss.soa.esb.message.Body;
import org.jboss.soa.esb.message.Fault;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.MessagePayloadProxy;
import org.jboss.soa.esb.message.format.MessageFactory;
import org.w3c.dom.Document;
@@ -68,15 +67,11 @@
private static final Logger LOGGER = Logger.getLogger(BaseWebService.class);
protected final ServiceInvoker serviceInvoker ;
- protected MessagePayloadProxy requestProxy ;
- protected MessagePayloadProxy responseProxy ;
- protected BaseWebService(final String category, final String name, final String requestLocation, final String responseLocation)
+ protected BaseWebService(final String category, final String name)
throws MessageDeliverException
{
serviceInvoker = new ServiceInvoker(category, name) ;
- requestProxy = new MessagePayloadProxy(null, requestLocation) ;
- responseProxy = new MessagePayloadProxy(responseLocation, null) ;
}
public SOAPMessage invoke(final SOAPMessage request)
@@ -104,7 +99,7 @@
final ByteArrayOutputStream byteStream = new ByteArrayOutputStream() ;
YADOMUtil.serialize(node, new StreamResult(byteStream), true);
byteStream.close();
- requestProxy.setPayload(esbReq, byteStream.toString()) ;
+ esbReq.getBody().add(byteStream.toString()) ;
found = true ;
}
}
@@ -117,7 +112,7 @@
final Message esbRes = deliverMessage(esbReq) ;
if (esbRes != null)
{
- final Object input = responseProxy.getPayload(esbRes) ;
+ final Object input = esbRes.getBody().get() ;
if (input == null)
{
throw new SOAPException("Null response from service") ;
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceEndpointInfo.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceEndpointInfo.java 2009-01-20 18:42:02 UTC (rev 24834)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceEndpointInfo.java 2009-01-20 19:38:30 UTC (rev 24835)
@@ -49,8 +49,6 @@
private final String namespace ;
private final boolean isOneWay ;
private final String action ;
- private final String requestLocation ;
- private final String responseLocation ;
public ESBServiceEndpointInfo(final Service service)
throws UnsupportedEncodingException {
@@ -87,14 +85,10 @@
LOGGER.warn("No response specified for RequestResponse service " + serviceCategory + ":" + serviceName) ;
}
}
- requestLocation = actions.getRequestLocation() ;
- responseLocation = actions.getResponseLocation() ;
}
else
{
isOneWay = false ;
- requestLocation = null ;
- responseLocation = null ;
}
}
@@ -158,14 +152,6 @@
return isOneWay ;
}
- public String getRequestLocation() {
- return requestLocation ;
- }
-
- public String getResponseLocation() {
- return responseLocation ;
- }
-
static
{
DEFAULT_ENCODING = AccessController.doPrivileged(new PrivilegedAction<String>() {
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGenerator.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGenerator.java 2009-01-20 18:42:02 UTC (rev 24834)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGenerator.java 2009-01-20 19:38:30 UTC (rev 24835)
@@ -102,8 +102,7 @@
seiClass.getClassFile().addAttribute(attribute);
- final String constructorStr = "super(\"" +category + "\",\"" + service + "\"," +
- getParamValue(epInfo.getRequestLocation()) + "," + getParamValue(epInfo.getResponseLocation()) + ");" ;
+ final String constructorStr = "super(\"" + category + "\"," + "\"" + service + "\");";
CtConstructor defaultConstructor = new CtConstructor(null, seiClass) ;
defaultConstructor.setBody(constructorStr) ;
seiClass.addConstructor(defaultConstructor) ;
@@ -116,12 +115,4 @@
e);
}
}
-
- private String getParamValue(final String value) {
- if (value == null) {
- return "null" ;
- } else {
- return '"' + value + '"' ;
- }
- }
}
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/OneWayBaseWebService.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/OneWayBaseWebService.java 2009-01-20 18:42:02 UTC (rev 24834)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/OneWayBaseWebService.java 2009-01-20 19:38:30 UTC (rev 24835)
@@ -30,10 +30,10 @@
*/
public class OneWayBaseWebService extends BaseWebService
{
- protected OneWayBaseWebService(final String category, final String name, final String requestLocation, final String responseLocation)
+ protected OneWayBaseWebService(final String category, final String name)
throws MessageDeliverException
{
- super(category, name, requestLocation, responseLocation) ;
+ super(category, name) ;
}
@Override
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/RequestResponseBaseWebService.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/RequestResponseBaseWebService.java 2009-01-20 18:42:02 UTC (rev 24834)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/RequestResponseBaseWebService.java 2009-01-20 19:38:30 UTC (rev 24835)
@@ -40,10 +40,10 @@
private static final long TIMEOUT ;
private static final Logger LOGGER = Logger.getLogger(RequestResponseBaseWebService.class) ;
- protected RequestResponseBaseWebService(final String category, final String name, final String requestLocation, final String responseLocation)
+ protected RequestResponseBaseWebService(final String category, final String name)
throws MessageDeliverException
{
- super(category, name, requestLocation, responseLocation) ;
+ super(category, name) ;
}
@Override
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java 2009-01-20 18:42:02 UTC (rev 24834)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java 2009-01-20 19:38:30 UTC (rev 24835)
@@ -26,6 +26,8 @@
package org.jboss.soa.esb.listeners;
import org.jboss.soa.esb.addressing.eprs.JDBCEpr;
+import org.jboss.soa.esb.listeners.config.ScheduleProviderFactory;
+import org.jboss.soa.esb.schedule.ScheduleProvider;
public class ListenerTagNames
{
@@ -70,8 +72,6 @@
public static final String IN_XSD_ATTRIBUTE_TAG = "inXsd";
public static final String OUT_XSD_ATTRIBUTE_TAG = "outXsd";
public static final String FAULT_XSD_ATTRIBUTE_TAG = "faultXsd";
- public static final String REQUEST_LOCATION_TAG = "requestLocation";
- public static final String RESPONSE_LOCATION_TAG = "responseLocation";
public static final String VALIDATE_ATTRIBUTE_TAG = "validate";
public static final String WEBSERVICE_ATTRIBUTE_TAG = "webservice";
public static final String ACTION_ELEMENT_TAG = "action";
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/ActionMapper.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/ActionMapper.java 2009-01-20 18:42:02 UTC (rev 24834)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/ActionMapper.java 2009-01-20 19:38:30 UTC (rev 24835)
@@ -83,18 +83,6 @@
{
listenerConfigTree.setAttribute(ListenerTagNames.VALIDATE_ATTRIBUTE_TAG, Boolean.toString(actions.getValidate())) ;
}
-
- final String requestLocation = actions.getRequestLocation() ;
- if (requestLocation != null)
- {
- listenerConfigTree.setAttribute(ListenerTagNames.REQUEST_LOCATION_TAG, requestLocation) ;
- }
-
- final String responseLocation = actions.getResponseLocation() ;
- if (responseLocation != null)
- {
- listenerConfigTree.setAttribute(ListenerTagNames.RESPONSE_LOCATION_TAG, responseLocation) ;
- }
SecurityMapper.map(listenerConfigTree, listenerService);
List<Action> actionList = actions.getActionList();
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java 2009-01-20 18:42:02 UTC (rev 24834)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java 2009-01-20 19:38:30 UTC (rev 24835)
@@ -57,7 +57,6 @@
import org.jboss.soa.esb.listeners.ListenerTagNames;
import org.jboss.soa.esb.listeners.message.errors.Factory;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.MessagePayloadProxy;
import org.jboss.soa.esb.message.Properties;
import org.jboss.soa.esb.services.persistence.MessageStore;
import org.jboss.soa.esb.services.security.PublicCryptoUtil;
@@ -106,14 +105,6 @@
* The response XSD.
*/
private final Schema responseSchema ;
- /**
- * The request payload proxy.
- */
- private MessagePayloadProxy requestPayloadProxy ;
- /**
- * The response payload proxy.
- */
- private MessagePayloadProxy responsePayloadProxy ;
/**
*
@@ -205,8 +196,6 @@
{
throw new ConfigurationException("Failed to parse the response schema: " + outXsd, saxe) ;
}
- requestPayloadProxy = new MessagePayloadProxy(config.getAttribute(ListenerTagNames.REQUEST_LOCATION_TAG), null) ;
- responsePayloadProxy = new MessagePayloadProxy(config.getAttribute(ListenerTagNames.RESPONSE_LOCATION_TAG), null) ;
}
else
{
@@ -600,18 +589,11 @@
String validationFailure = null ;
if (requestSchema != null)
{
- try
+ final Object input = message.getBody().get() ;
+ if ((input == null) || !XMLHelper.validate(requestSchema, input.toString()))
{
- final Object input = requestPayloadProxy.getPayload(message) ;
- if ((input == null) || !XMLHelper.validate(requestSchema, input.toString()))
- {
- validationFailure = "Request validation failure: " + input ;
- }
+ validationFailure = "Request validation failure: " + input ;
}
- catch (final MessageDeliverException mde)
- {
- validationFailure = mde.getMessage() ;
- }
}
if (validationFailure == null)
{
@@ -694,18 +676,11 @@
{
if (responseSchema != null)
{
- try
+ final Object output = message.getBody().get() ;
+ if ((output == null) || !XMLHelper.validate(responseSchema, output.toString()))
{
- final Object output = responsePayloadProxy.getPayload(message) ;
- if ((output == null) || !XMLHelper.validate(responseSchema, output.toString()))
- {
- validationFailure = "Response validation failure: " + output ;
- }
+ validationFailure = "Response validation failure: " + output ;
}
- catch (final MessageDeliverException mde)
- {
- validationFailure = mde.getMessage() ;
- }
}
if (validationFailure == null)
{
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/message/MessagePayloadProxy.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/message/MessagePayloadProxy.java 2009-01-20 18:42:02 UTC (rev 24834)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/message/MessagePayloadProxy.java 2009-01-20 19:38:30 UTC (rev 24835)
@@ -126,24 +126,6 @@
new String[] {config.getAttribute(SET_PAYLOAD_LOCATION, Body.DEFAULT_LOCATION)});
}
- /**
- * Public constructor.
- *
- * @param config The component configuration.
- */
- public MessagePayloadProxy(String getPayloadLocation, String setPayloadLocation) {
- if (getPayloadLocation == null)
- {
- getPayloadLocation = Body.DEFAULT_LOCATION ;
- }
- if (setPayloadLocation == null)
- {
- setPayloadLocation = Body.DEFAULT_LOCATION ;
- }
-
- setDataLocations(new String[] {getPayloadLocation}, new String[] {setPayloadLocation}) ;
- }
-
private void setDataLocations(String[] getPayloadLocations, String[] setPayloadLocations) {
this.getPayloadLocations = Arrays.asList(getPayloadLocations);
this.setPayloadLocations = Arrays.asList(setPayloadLocations);
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/build.xml 2009-01-20 18:42:02 UTC (rev 24834)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/build.xml 2009-01-20 19:38:30 UTC (rev 24835)
@@ -167,17 +167,6 @@
</fileset>
<fileset dir="${qa.junit.resources}/server/aop"/>
</jar>
- <jar jarfile="${qa.build.lib}/ebws-test.esb">
- <fileset dir="${qa.junit.classes}">
- <include name="org/jboss/soa/esb/server/ebws/*.class"/>
- </fileset>
- <fileset dir="${qa.junit.resources}/server/ebws">
- <include name="test*.xml"/>
- <include name="*.xsd"/>
- <include name="esb-${org.jboss.soa.esb.qa.jmsprovider}-service.xml"/>
- <include name="META-INF/*.xml"/>
- </fileset>
- </jar>
</target>
<target name="one-test" if="test" depends="jars"
More information about the jboss-svn-commits
mailing list