You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ms...@apache.org on 2007/09/04 03:52:32 UTC
svn commit: r572489 [1/2] - in /ode/branches/bart:
axis2-war/src/main/webapp/WEB-INF/ axis2-war/src/main/webapp/WEB-INF/conf/
bpel-compiler/src/ bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/
bpel-compiler/src/test/java/org/apache/ode/bpel/c...
Author: mszefler
Date: Mon Sep 3 18:52:29 2007
New Revision: 572489
URL: http://svn.apache.org/viewvc?rev=572489&view=rev
Log:
Merged with 571350
Added:
ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/xsd-import/
- copied from r571350, ode/trunk/bpel-scripts/src/main/resources/2.0/good/xsd-import/
ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/xsd-import/helloworld-Server.bpel
- copied unchanged from r571350, ode/trunk/bpel-scripts/src/main/resources/2.0/good/xsd-import/helloworld-Server.bpel
ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/xsd-import/helloworld-Server.wsdl
- copied unchanged from r571350, ode/trunk/bpel-scripts/src/main/resources/2.0/good/xsd-import/helloworld-Server.wsdl
ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/xsd-import/helloworld.wsdl
- copied unchanged from r571350, ode/trunk/bpel-scripts/src/main/resources/2.0/good/xsd-import/helloworld.wsdl
ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/xsd-import/message.xsd
- copied unchanged from r571350, ode/trunk/bpel-scripts/src/main/resources/2.0/good/xsd-import/message.xsd
Removed:
ode/branches/bart/bpel-compiler/src/.cvsignore
ode/branches/bart/bpel-obj/src/.cvsignore
ode/branches/bart/bpel-scripts/src/.cvsignore
ode/branches/bart/jca-ra/src/.cvsignore
ode/branches/bart/tools-bin/
ode/branches/bart/utils/src/.cvsignore
ode/branches/bart/utils/src/test/java/common/
Modified:
ode/branches/bart/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml
ode/branches/bart/axis2-war/src/main/webapp/WEB-INF/web.xml
ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java
ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java
ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultResourceFinder.java
ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLRegistry.java
ode/branches/bart/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/WSDLRegistryTest.java
ode/branches/bart/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java
ode/branches/bart/bpel-obj/src/main/java/org/apache/ode/bpel/o/OMessageVarType.java
ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/AsyncProcess/AsyncProcess2.bpel
ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/if/If1-2.0.bpel
ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/if/If2-2.0.bpel
ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/if/If3-2.0.bpel
ode/branches/bart/jacob-ap/ (props changed)
ode/branches/bart/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java
ode/branches/bart/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java
ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/Messages.java
ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/OdeConsumer.java
ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java
ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
ode/branches/bart/jbi/src/main/jbi/ode-jbi.properties
ode/branches/bart/utils/src/main/java/org/apache/ode/utils/Namespaces.java
ode/branches/bart/utils/src/main/java/org/apache/ode/utils/xsd/CapturingXMLEntityResolver.java
ode/branches/bart/utils/src/main/java/org/apache/ode/utils/xsd/XSUtils.java
ode/branches/bart/utils/src/test/java/org/apache/ode/utils/TestResources.java
Modified: ode/branches/bart/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml
URL: http://svn.apache.org/viewvc/ode/branches/bart/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml (original)
+++ ode/branches/bart/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml Mon Sep 3 18:52:29 2007
@@ -16,296 +16,295 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<axisconfig name="AxisJava2.0">
- <!-- ================================================= -->
- <!-- Parameters -->
- <!-- ================================================= -->
- <parameter name="hotdeployment" locked="false">true</parameter>
- <parameter name="hotupdate" locked="false">false</parameter>
- <parameter name="enableMTOM" locked="false">false</parameter>
- <parameter name="enableSwA" locked="false">false</parameter>
-
- <!--Uncomment if you want to enable file caching for attachments -->
- <!--parameter name="cacheAttachments" locked="false">true</parameter>
- <parameter name="attachmentDIR" locked="false"></parameter>
- <parameter name="sizeThreshold" locked="false">4000</parameter-->
-
- <!--This will give out the timout of the configuration contexts, in seconds-->
- <parameter name="ConfigContextTimeoutInterval" locked="false">30</parameter>
-
- <!--During a fault, stacktrace can be sent with the fault message. The following flag will control -->
- <!--that behaviour.-->
- <parameter name="sendStacktraceDetailsWithFaults" locked="false">false</parameter>
-
- <!--If there aren't any information available to find out the fault reason, we set the message of the expcetion-->
- <!--as the faultreason/Reason. But when a fault is thrown from a service or some where, it will be -->
- <!--wrapped by different levels. Due to this the initial exception message can be lost. If this flag-->
- <!--is set then, Axis2 tries to get the first exception and set its message as the faultreason/Reason.-->
- <parameter name="DrillDownToRootCauseForFaultReason" locked="false">false</parameter>
-
- <parameter name="userName" locked="false">admin</parameter>
- <parameter name="password" locked="false">axis2</parameter>
-
- <!--To override repository/services you need to uncomment following parameter and value SHOULD be absolute file path.-->
- <!--<parameter name="ServicesDirectory" locked="false">service</parameter>-->
- <!--To override repository/modules you need to uncomment following parameter and value SHOULD be absolute file path-->
- <!--<parameter name="ModulesDirectory" locked="false">modules</parameter>-->
-
-
-
- <!--Following params will set the proper context paths for invocations. All the endpoints will have a commons context-->
- <!--root which can configured using the following contextRoot parameter-->
- <!--<parameter name="contextRoot" locked="false">axis2</parameter>-->
-
- <!--Our HTTP endpoints can handle both REST and SOAP. Following parameters can be used to distingiush those endpoints-->
- <!--In case of a servlet, if you change this you have to manually change the settings of your servlet container to map this -->
- <!--context path to proper Axis2 servlets-->
- <!--<parameter name="servicePath" locked="false">services</parameter>-->
- <!--<parameter name="restPath" locked="false">rest</parameter>-->
-
-
- <!--Set the flag to true if you want to enable transport level session mangment-->
- <parameter name="manageTransportSession" locked="false">false</parameter>
-
- <!--Following two parameters will be used to handle REST in Axis2. The default settings will make Axis2 to have two-->
- <!--different endpoints, one for REST (AxisRESTServlet) one for SOAP message handling (AxisServlet). But following-->
- <!--parameters help to tweak the message handling of two main servlets. -->
-
- <!-- If the enableRESTInAxis2MainServlet is true, then Axis2MainServlet will handle both SOAP and REST messages -->
- <parameter name="enableRESTInAxis2MainServlet" locked="true">false</parameter>
-
- <!-- Following parameter will completely disable REST handling in both the servlets-->
- <parameter name="disableREST" locked="true">false</parameter>
-
- <!-- This will disable the separate servlet we have for REST handling. -->
- <parameter name="disableSeparateEndpointForREST" locked="true">false</parameter>
-
- <!-- If you have a frontend host which exposes this webservice using a different public URL -->
- <!-- use this parameter to override autodetected url -->
- <!--<parameter name="httpFrontendHostUrl" locked="false">https://someotherhost/context</parameter>-->
-
-
- <!-- The way of adding listener to the system-->
- <!-- <listener class="org.apache.axis2.ObserverIMPL">-->
- <!-- <parameter name="RSS_URL" locked="false">http://127.0.0.1/rss</parameter>-->
- <!-- </listener>-->
-
- <!-- ================================================= -->
- <!-- Message Receivers -->
- <!-- ================================================= -->
- <!--This is the Deafult Message Receiver for the system , if you want to have MessageReceivers for -->
- <!--all the other MEP implement it and add the correct entry to here , so that you can refer from-->
- <!--any operation -->
- <!--Note : You can ovride this for particular service by adding the same element with your requirement-->
- <messageReceivers>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
- class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
- class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
- </messageReceivers>
- <!-- ================================================= -->
- <!-- Transport Ins -->
- <!-- ================================================= -->
- <transportReceiver name="http"
- class="org.apache.axis2.transport.http.SimpleHTTPServer">
- <parameter name="port" locked="false">8080</parameter>
- <!-- Here is the complete list of supported parameters (see example settings further below):
- port: the port to listen on (default 6060)
- hostname: if non-null, url prefix used in reply-to endpoint references (default null)
- originServer: value of http Server header in outgoing messages (default "Simple-Server/1.1")
- requestTimeout: value in millis of time that requests can wait for data (default 20000)
- requestTcpNoDelay: true to maximize performance and minimize latency (default true)
- false to minimize bandwidth consumption by combining segments
- requestCoreThreadPoolSize: number of threads available for request processing (unless queue fills up) (default 25)
- requestMaxThreadPoolSize: number of threads available for request processing if queue fills us (default 150)
- note that default queue never fills up: see HttpFactory
- threadKeepAliveTime: time to keep threads in excess of core size alive while inactive (default 180)
- note that no such threads can exist with default unbounded request queue
- threadKeepAliveTimeUnit: TimeUnit of value in threadKeepAliveTime (default SECONDS) (default SECONDS)
- -->
- <!-- <parameter name="hostname" locked="false">http://www.myApp.com/ws</parameter> -->
- <!-- <parameter name="originServer" locked="false">My-Server/1.1</parameter> -->
- <!-- <parameter name="requestTimeout" locked="false">10000</parameter> -->
- <!-- <parameter name="requestTcpNoDelay" locked="false">false</parameter> -->
- <!-- <parameter name="requestCoreThreadPoolSize" locked="false">50</parameter> -->
- <!-- <parameter name="RequestMaxThreadPoolSize" locked="false">100</parameter> -->
- <!-- <parameter name="threadKeepAliveTime" locked="false">240000</parameter> -->
- <!-- <parameter name="threadKeepAliveTimeUnit" locked="false">MILLISECONDS</parameter> -->
- </transportReceiver>
-
- <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
- <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
- <parameter name="myTopicConnectionFactory" locked="false">
- <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
- <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter>
- </parameter>
-
- <parameter name="myQueueConnectionFactory" locked="false">
- <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
- <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
- </parameter>
-
- <parameter name="default" locked="false">
- <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
- <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
- </parameter>
- </transportReceiver>-->
-
- <!--Uncomment if you want to have SMTP transport support-->
- <!--<transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">-->
- <!--<parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>-->
- <!--<parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>-->
- <!--<parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>-->
- <!--<parameter name="transport.mail.pop3.port" locked="false">110</parameter>-->
- <!--<parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>-->
- <!--</transportReceiver>-->
-
- <!--Uncomment if you want to have TCP transport support-->
- <!--transportReceiver name="tcp"
- class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">6060</parameter-->>
- <!--If you want to give your own host address for EPR generation-->
- <!--uncommet following paramter , and set as you required.-->
- <!--<parameter name="hostname" locked="false">tcp://myApp.com/ws</parameter>-->
- <!-- /transportReceiver -->
-
- <!-- ================================================= -->
- <!-- Transport Outs -->
- <!-- ================================================= -->
-
- <transportSender name="tcp"
- class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
- <transportSender name="local"
- class="org.apache.axis2.transport.local.LocalTransportSender"/>
- <transportSender name="http"
- class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
- <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
- <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
- </transportSender>
- <transportSender name="https"
- class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
- <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
- <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
- </transportSender>
- <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
- <transportSender name="jms"
- class="org.apache.axis2.transport.jms.JMSSender"/>
- -->
-
- <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
- <transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
- <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
- <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
- <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
- <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
- </transportSender>
- -->
-
- <!-- ================================================= -->
- <!-- Global Modules -->
- <!-- ================================================= -->
- <!-- Uncomment this to enable Addressing -->
- <!-- module ref="addressing"/-->
-
- <!--Configuring module , providing parameters for modules whether they refer or not-->
- <!--<moduleConfig name="addressing">-->
- <!--<parameter name="addressingPara" locked="false">N/A</parameter>-->
- <!--</moduleConfig>-->
-
- <!-- ================================================= -->
- <!-- Phases -->
- <!-- ================================================= -->
- <phaseOrder type="InFlow">
- <!-- System pre defined phases -->
- <phase name="Transport">
- <handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Transport"/>
- </handler>
- <handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Transport"/>
- </handler>
- </phase>
- <phase name="Security"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
- <handler name="ODEAxisDispatcher"
- class="org.apache.ode.axis2.hooks.ODEAxisDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="Dispatch"/>
- </handler>
- </phase>
- <!-- System pre defined phases -->
- <!-- After Postdispatch phase module author or or service author can add any phase he want -->
- <phase name="ProcessHeader">
- <handler name="SessionInHandler"
- class="org.apache.ode.axis2.hooks.SessionInHandler">
- <order phase="PostDispatch"/>
- </handler>
- </phase>
- <phase name="OperationInPhase"/>
- <phase name="soapmonitorPhase"/>
- </phaseOrder>
- <phaseOrder type="OutFlow">
- <!-- user can add his own phases to this area -->
- <phase name="ProcessHeader">
- <handler name="SessionOutHandler"
- class="org.apache.ode.axis2.hooks.SessionOutHandler">
- <order phase="PreDispatch"/>
- </handler>
- </phase>
- <phase name="soapmonitorPhase"/>
- <phase name="OperationOutPhase"/>
- <!--system predefined phase-->
- <!--these phase will run irrespective of the service-->
- <phase name="PolicyDetermination"/>
- <phase name="MessageOut"/>
- <phase name="Security"/>
- </phaseOrder>
- <phaseOrder type="InFaultFlow">
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
- <handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
- <handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
- <handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
- <handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
- </phase>
- <!-- user can add his own phases to this area -->
- <phase name="OperationInFaultPhase"/>
- <phase name="soapmonitorPhase"/>
- </phaseOrder>
- <phaseOrder type="OutFaultFlow">
- <!-- user can add his own phases to this area -->
- <phase name="soapmonitorPhase"/>
- <phase name="OperationOutFaultPhase"/>
- <phase name="PolicyDetermination"/>
- <phase name="MessageOut"/>
- </phaseOrder>
-</axisconfig>
-
+<axisconfig name="AxisJava2.0">
+ <!-- ================================================= -->
+ <!-- Parameters -->
+ <!-- ================================================= -->
+ <parameter name="hotdeployment" locked="false">true</parameter>
+ <parameter name="hotupdate" locked="false">false</parameter>
+ <parameter name="enableMTOM" locked="false">false</parameter>
+ <parameter name="enableSwA" locked="false">false</parameter>
+
+ <!--Uncomment if you want to enable file caching for attachments -->
+ <!--parameter name="cacheAttachments" locked="false">true</parameter>
+ <parameter name="attachmentDIR" locked="false"></parameter>
+ <parameter name="sizeThreshold" locked="false">4000</parameter-->
+
+ <!--This will give out the timout of the configuration contexts, in seconds-->
+ <parameter name="ConfigContextTimeoutInterval" locked="false">30</parameter>
+
+ <!--During a fault, stacktrace can be sent with the fault message. The following flag will control -->
+ <!--that behaviour.-->
+ <parameter name="sendStacktraceDetailsWithFaults" locked="false">false</parameter>
+
+ <!--If there aren't any information available to find out the fault reason, we set the message of the expcetion-->
+ <!--as the faultreason/Reason. But when a fault is thrown from a service or some where, it will be -->
+ <!--wrapped by different levels. Due to this the initial exception message can be lost. If this flag-->
+ <!--is set then, Axis2 tries to get the first exception and set its message as the faultreason/Reason.-->
+ <parameter name="DrillDownToRootCauseForFaultReason" locked="false">false</parameter>
+
+ <parameter name="userName" locked="false">admin</parameter>
+ <parameter name="password" locked="false">axis2</parameter>
+
+ <!--To override repository/services you need to uncomment following parameter and value SHOULD be absolute file path.-->
+ <!--<parameter name="ServicesDirectory" locked="false">service</parameter>-->
+ <!--To override repository/modules you need to uncomment following parameter and value SHOULD be absolute file path-->
+ <!--<parameter name="ModulesDirectory" locked="false">modules</parameter>-->
+
+
+
+ <!--Following params will set the proper context paths for invocations. All the endpoints will have a commons context-->
+ <!--root which can configured using the following contextRoot parameter-->
+ <!--<parameter name="contextRoot" locked="false">axis2</parameter>-->
+
+ <!--Our HTTP endpoints can handle both REST and SOAP. Following parameters can be used to distingiush those endpoints-->
+ <!--In case of a servlet, if you change this you have to manually change the settings of your servlet container to map this -->
+ <!--context path to proper Axis2 servlets-->
+ <parameter name="servicePath" locked="false">processes</parameter>
+ <!--<parameter name="restPath" locked="false">rest</parameter>-->
+
+
+ <!--Set the flag to true if you want to enable transport level session mangment-->
+ <parameter name="manageTransportSession" locked="false">false</parameter>
+
+ <!--Following two parameters will be used to handle REST in Axis2. The default settings will make Axis2 to have two-->
+ <!--different endpoints, one for REST (AxisRESTServlet) one for SOAP message handling (AxisServlet). But following-->
+ <!--parameters help to tweak the message handling of two main servlets. -->
+
+ <!-- If the enableRESTInAxis2MainServlet is true, then Axis2MainServlet will handle both SOAP and REST messages -->
+ <parameter name="enableRESTInAxis2MainServlet" locked="true">true</parameter>
+
+ <!-- Following parameter will completely disable REST handling in both the servlets-->
+ <parameter name="disableREST" locked="true">false</parameter>
+
+ <!-- This will disable the separate servlet we have for REST handling. -->
+ <parameter name="disableSeparateEndpointForREST" locked="true">true</parameter>
+
+ <!-- If you have a frontend host which exposes this webservice using a different public URL -->
+ <!-- use this parameter to override autodetected url -->
+ <!--<parameter name="httpFrontendHostUrl" locked="false">https://someotherhost/context</parameter>-->
+
+
+ <!-- The way of adding listener to the system-->
+ <!-- <listener class="org.apache.axis2.ObserverIMPL">-->
+ <!-- <parameter name="RSS_URL" locked="false">http://127.0.0.1/rss</parameter>-->
+ <!-- </listener>-->
+
+ <!-- ================================================= -->
+ <!-- Message Receivers -->
+ <!-- ================================================= -->
+ <!--This is the Deafult Message Receiver for the system , if you want to have MessageReceivers for -->
+ <!--all the other MEP implement it and add the correct entry to here , so that you can refer from-->
+ <!--any operation -->
+ <!--Note : You can ovride this for particular service by adding the same element with your requirement-->
+ <messageReceivers>
+ <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
+ class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
+ <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+ class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+ </messageReceivers>
+ <!-- ================================================= -->
+ <!-- Transport Ins -->
+ <!-- ================================================= -->
+ <transportReceiver name="http"
+ class="org.apache.axis2.transport.http.SimpleHTTPServer">
+ <parameter name="port" locked="false">8080</parameter>
+ <!-- Here is the complete list of supported parameters (see example settings further below):
+ port: the port to listen on (default 6060)
+ hostname: if non-null, url prefix used in reply-to endpoint references (default null)
+ originServer: value of http Server header in outgoing messages (default "Simple-Server/1.1")
+ requestTimeout: value in millis of time that requests can wait for data (default 20000)
+ requestTcpNoDelay: true to maximize performance and minimize latency (default true)
+ false to minimize bandwidth consumption by combining segments
+ requestCoreThreadPoolSize: number of threads available for request processing (unless queue fills up) (default 25)
+ requestMaxThreadPoolSize: number of threads available for request processing if queue fills us (default 150)
+ note that default queue never fills up: see HttpFactory
+ threadKeepAliveTime: time to keep threads in excess of core size alive while inactive (default 180)
+ note that no such threads can exist with default unbounded request queue
+ threadKeepAliveTimeUnit: TimeUnit of value in threadKeepAliveTime (default SECONDS) (default SECONDS)
+ -->
+ <!-- <parameter name="hostname" locked="false">http://www.myApp.com/ws</parameter> -->
+ <!-- <parameter name="originServer" locked="false">My-Server/1.1</parameter> -->
+ <!-- <parameter name="requestTimeout" locked="false">10000</parameter> -->
+ <!-- <parameter name="requestTcpNoDelay" locked="false">false</parameter> -->
+ <!-- <parameter name="requestCoreThreadPoolSize" locked="false">50</parameter> -->
+ <!-- <parameter name="RequestMaxThreadPoolSize" locked="false">100</parameter> -->
+ <!-- <parameter name="threadKeepAliveTime" locked="false">240000</parameter> -->
+ <!-- <parameter name="threadKeepAliveTimeUnit" locked="false">MILLISECONDS</parameter> -->
+ </transportReceiver>
+
+ <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
+ <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
+ <parameter name="myTopicConnectionFactory" locked="false">
+ <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter>
+ </parameter>
+
+ <parameter name="myQueueConnectionFactory" locked="false">
+ <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
+ </parameter>
+
+ <parameter name="default" locked="false">
+ <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
+ </parameter>
+ </transportReceiver>-->
+
+ <!--Uncomment if you want to have SMTP transport support-->
+ <!--<transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">-->
+ <!--<parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>-->
+ <!--<parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>-->
+ <!--<parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>-->
+ <!--<parameter name="transport.mail.pop3.port" locked="false">110</parameter>-->
+ <!--<parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>-->
+ <!--</transportReceiver>-->
+
+ <!--Uncomment if you want to have TCP transport support-->
+ <!--transportReceiver name="tcp"
+ class="org.apache.axis2.transport.tcp.TCPServer">
+ <parameter name="port" locked="false">6060</parameter-->>
+ <!--If you want to give your own host address for EPR generation-->
+ <!--uncommet following paramter , and set as you required.-->
+ <!--<parameter name="hostname" locked="false">tcp://myApp.com/ws</parameter>-->
+ <!-- /transportReceiver -->
+
+ <!-- ================================================= -->
+ <!-- Transport Outs -->
+ <!-- ================================================= -->
+
+ <transportSender name="tcp"
+ class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+ <transportSender name="local"
+ class="org.apache.axis2.transport.local.LocalTransportSender"/>
+ <transportSender name="http"
+ class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+ <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+ </transportSender>
+ <transportSender name="https"
+ class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+ <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+ </transportSender>
+ <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
+ <transportSender name="jms"
+ class="org.apache.axis2.transport.jms.JMSSender"/>
+ -->
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
+ <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
+ <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
+ <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
+ <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
+ </transportSender>
+ -->
+
+ <!-- ================================================= -->
+ <!-- Global Modules -->
+ <!-- ================================================= -->
+ <!-- Uncomment this to enable Addressing -->
+ <!-- module ref="addressing"/-->
+
+ <!--Configuring module , providing parameters for modules whether they refer or not-->
+ <!--<moduleConfig name="addressing">-->
+ <!--<parameter name="addressingPara" locked="false">N/A</parameter>-->
+ <!--</moduleConfig>-->
+
+ <!-- ================================================= -->
+ <!-- Phases -->
+ <!-- ================================================= -->
+ <phaseOrder type="InFlow">
+ <!-- System pre defined phases -->
+ <phase name="Transport">
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
+ <order phase="Transport"/>
+ </handler>
+ <handler name="SOAPActionBasedDispatcher"
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
+ <order phase="Transport"/>
+ </handler>
+ </phase>
+ <phase name="Security"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+ class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
+ <handler name="HTTPLocationBasedDispatcher"
+ class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
+
+ <handler name="ODEAxisDispatcher"
+ class="org.apache.ode.axis2.hooks.ODEAxisDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+ </phase>
+ <!-- System pre defined phases -->
+ <!-- After Postdispatch phase module author or or service author can add any phase he want -->
+ <phase name="ProcessHeader">
+ <handler name="SessionInHandler"
+ class="org.apache.ode.axis2.hooks.SessionInHandler">
+ <order phase="PostDispatch"/>
+ </handler>
+ </phase>
+ <phase name="OperationInPhase"/>
+ <phase name="soapmonitorPhase"/>
+ </phaseOrder>
+ <phaseOrder type="OutFlow">
+ <!-- user can add his own phases to this area -->
+ <phase name="ProcessHeader">
+ <handler name="SessionOutHandler"
+ class="org.apache.ode.axis2.hooks.SessionOutHandler">
+ <order phase="PreDispatch"/>
+ </handler>
+ </phase>
+ <phase name="soapmonitorPhase"/>
+ <phase name="OperationOutPhase"/>
+ <!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
+ <phase name="PolicyDetermination"/>
+ <phase name="MessageOut"/>
+ <phase name="Security"/>
+ </phaseOrder>
+ <phaseOrder type="InFaultFlow">
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPActionBasedDispatcher"
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+ </phase>
+ <!-- user can add his own phases to this area -->
+ <phase name="OperationInFaultPhase"/>
+ <phase name="soapmonitorPhase"/>
+ </phaseOrder>
+ <phaseOrder type="OutFaultFlow">
+ <!-- user can add his own phases to this area -->
+ <phase name="soapmonitorPhase"/>
+ <phase name="OperationOutFaultPhase"/>
+ <phase name="PolicyDetermination"/>
+ <phase name="MessageOut"/>
+ </phaseOrder>
+</axisconfig>
+
Modified: ode/branches/bart/axis2-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ode/branches/bart/axis2-war/src/main/webapp/WEB-INF/web.xml?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/axis2-war/src/main/webapp/WEB-INF/web.xml (original)
+++ ode/branches/bart/axis2-war/src/main/webapp/WEB-INF/web.xml Mon Sep 3 18:52:29 2007
@@ -41,22 +41,10 @@
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
- <servlet-name>AxisRESTServlet</servlet-name>
- <display-name>Apache-Axis Servlet (REST)</display-name>
- <servlet-class>
- org.apache.axis2.transport.http.AxisRESTServlet</servlet-class>
- </servlet>
- <servlet>
<servlet-name>AxisAdminServlet</servlet-name>
<display-name>Apache-Axis AxisAdmin Servlet (REST)</display-name>
- <servlet-class>
- org.apache.axis2.transport.http.AxisAdminServlet</servlet-class>
+ <servlet-class>org.apache.axis2.transport.http.AxisAdminServlet</servlet-class>
</servlet>
- <servlet-mapping>
- <servlet-name>AxisRESTServlet</servlet-name>
- <url-pattern>/rest/*</url-pattern>
- </servlet-mapping>
-
<servlet-mapping>
<servlet-name>AxisServlet</servlet-name>
Modified: ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java (original)
+++ ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java Mon Sep 3 18:52:29 2007
@@ -60,6 +60,7 @@
public OutputStream _outputStream = null;
private File _bpelFile;
+ private File _suDir;
private ResourceFinder _wsdlFinder;
private URI _bpel11wsdl;
private Map<String,Object> _compileProperties;
@@ -129,7 +130,7 @@
}
/**
- * Compilation properties ebentually retrieved by the compiler
+ * Compilation properties eventually retrieved by the compiler
* @param compileProperties
*/
public void setCompileProperties(Map<String, Object> compileProperties) {
@@ -157,6 +158,12 @@
}
}
+ public void setBaseDirectory(File baseDir) {
+ if (baseDir == null) throw new IllegalArgumentException("Argument 'baseDir' is null");
+ if (!baseDir.exists()) throw new IllegalArgumentException("Directory "+baseDir+" does not exist");
+ _suDir = baseDir;
+ }
+
/**
* <p>
* Compile a BPEL process from a BOM {@link Process} object.
@@ -183,7 +190,8 @@
if (_wsdlFinder != null) {
wf = _wsdlFinder;
} else {
- wf = new DefaultResourceFinder(_bpelFile.getAbsoluteFile().getParentFile());
+ File suDir = _suDir != null ? _suDir : _bpelFile.getParentFile();
+ wf = new DefaultResourceFinder(_bpelFile.getAbsoluteFile().getParentFile(), suDir.getAbsoluteFile());
}
CompileListener clistener = new CompileListener() {
Modified: ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java (original)
+++ ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java Mon Sep 3 18:52:29 2007
@@ -84,11 +84,14 @@
import org.apache.ode.utils.GUID;
import org.apache.ode.utils.NSContext;
import org.apache.ode.utils.StreamUtils;
+import org.apache.ode.utils.xsd.XSUtils;
+import org.apache.ode.utils.xsd.XsdException;
import org.apache.ode.utils.fs.FileUtils;
import org.apache.ode.utils.msg.MessageBundle;
import org.apache.ode.utils.stl.CollectionsX;
import org.apache.ode.utils.stl.MemberOfFunction;
import org.apache.ode.utils.stl.UnaryFunction;
+import org.apache.xerces.xni.parser.XMLEntityResolver;
import org.w3c.dom.Node;
import javax.wsdl.Definition;
@@ -103,6 +106,7 @@
import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
+import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -171,9 +175,7 @@
}
public void addWsdlImport(URI from, URI wsdlImport, SourceLocation sloc) {
-
Definition4BPEL def;
-
try {
WSDLReader r = _wsdlFactory.newWSDLReader();
WSDLLocatorImpl locator = new WSDLLocatorImpl(_resourceFinder, from.resolve(wsdlImport));
@@ -195,7 +197,32 @@
}
public void addXsdImport(URI from, URI location, SourceLocation sloc) {
- // TODO: implement.
+ URI resFrom = from.resolve(location);
+ if (__log.isDebugEnabled())
+ __log.debug("Adding XSD import from " + resFrom + " location " + location);
+ XMLEntityResolver resolver = new WsdlFinderXMLEntityResolver(_resourceFinder,
+ location, new HashMap<URI,String>(), true);
+ try {
+ Map<URI, byte[]> schemas = XSUtils.captureSchema(resFrom.toString(), resolver);
+ InputStream xsdStream = _resourceFinder.openResource(resFrom);
+ byte[] data;
+ try {
+ data = StreamUtils.read(xsdStream);
+ } finally {
+ xsdStream.close();
+ }
+ schemas.put(resFrom, data);
+ _wsdlRegistry.addSchemas(schemas);
+ } catch (XsdException e) {
+ CompilationException ce = new CompilationException(__cmsgs.errInvalidImport(location.toString()));
+ recoveredFromError(sloc, ce);
+ } catch (MalformedURLException e) {
+ CompilationException ce = new CompilationException(__cmsgs.errInvalidImport(location.toString()));
+ recoveredFromError(sloc, ce);
+ } catch (IOException e) {
+ CompilationException ce = new CompilationException(__cmsgs.errInvalidImport(location.toString()));
+ recoveredFromError(sloc, ce);
+ }
}
public void setResourceFinder(ResourceFinder finder) {
@@ -911,8 +938,12 @@
alias.varType = messageType;
// bpel 2.0 excludes declaration of part;
// bpel 1.1 requires it
- if (src.getPart() != null)
+ if (src.getPart() != null) {
alias.part = messageType.parts.get(src.getPart());
+ if (alias.part == null)
+ throw new CompilationException(__cmsgs.errUnknownPartInAlias(src.getPart(),
+ messageType.messageType.toString()));
+ }
if (src.getQuery() != null)
alias.location = compileExpr(src.getQuery());
property.aliases.add(alias);
Modified: ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java (original)
+++ ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java Mon Sep 3 18:52:29 2007
@@ -454,4 +454,12 @@
return formatCompilationMessage("Missing portType {0} on partnerLinkType {1} for partnerRole {2}", portType, plnkType, partnerRole);
}
+ /**
+ * The part {0} declared in property alias for messageType {1} couldn't be found.
+ */
+ public CompilationMessage errUnknownPartInAlias(String part, String message) {
+ return this.formatCompilationMessage("The part {0} declared in property alias for " +
+ "messageType {1} couldn't be found.", part, message);
+ }
+
}
Modified: ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultResourceFinder.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultResourceFinder.java?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultResourceFinder.java (original)
+++ ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultResourceFinder.java Mon Sep 3 18:52:29 2007
@@ -38,32 +38,43 @@
public class DefaultResourceFinder implements ResourceFinder {
private static final Log __log = LogFactory.getLog(DefaultResourceFinder.class);
- private File _suDir;
+ private File _relativeDir;
+ private File _absoluteDir;
/**
* Default constructor: resolve relative URIs against current working directory.
*/
public DefaultResourceFinder() {
- _suDir = new File("");
+ _absoluteDir = new File("");
+ _relativeDir = _absoluteDir;
}
/**
* Constructor: resolve relative URIs against specified directory.
- * @param suDir base path for relative URIs.
+ * @param relativeDir base path for relative URLs.
+ * @param absoluteDir base path for absolute URLs.
*/
- public DefaultResourceFinder(File suDir) {
- if (suDir == null) {
- throw new IllegalArgumentException("Argument 'suDir' is null");
+ public DefaultResourceFinder(File relativeDir, File absoluteDir) {
+ checkDir("relativeDir", relativeDir);
+ checkDir("absoluteDir", absoluteDir);
+ _relativeDir = relativeDir;
+ _absoluteDir = absoluteDir;
}
- if (!suDir.exists()) {
- throw new IllegalArgumentException("Directory does not exist: " + suDir);
+
+ private void checkDir(String arg, File dir) {
+ if (dir == null) {
+ throw new IllegalArgumentException("Argument '"+arg+"' is null");
+ }
+ if (!dir.exists()) {
+ throw new IllegalArgumentException("Directory does not exist: " + dir);
}
- _suDir = suDir;
}
-
public InputStream openResource(URI uri) throws MalformedURLException, IOException {
- URI suURI = _suDir.toURI();
+ URI absolute = _absoluteDir.toURI();
+ if (__log.isDebugEnabled()) {
+ __log.debug("openResource: uri="+uri+" relativeDir="+_relativeDir+" absoluteDir="+_absoluteDir);
+ }
if (uri.isAbsolute() && uri.getScheme().equals("file")) {
try {
@@ -76,13 +87,13 @@
// Note that if we get an absolute URI, the relativize operation will simply
// return the absolute URI.
- URI relative = suURI.relativize(uri);
+ URI relative = _relativeDir.toURI().relativize(uri);
if (relative.isAbsolute() && !relative.getScheme().equals("urn")) {
__log.fatal("openResource: invalid scheme (should be urn:) " + uri);
return null;
}
- File f = new File(suURI.getPath(),relative.getPath());
+ File f = new File(absolute.getPath(), relative.getPath());
if (!f.exists()) {
__log.debug("fileNotFound: " + f);
return null;
Modified: ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLRegistry.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLRegistry.java?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLRegistry.java (original)
+++ ode/branches/bart/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLRegistry.java Mon Sep 3 18:52:29 2007
@@ -171,7 +171,6 @@
throw ce;
_ctx.recoveredFromError(new SourceLocationImpl(defuri), ce);
-
continue;
}
@@ -181,6 +180,10 @@
}
}
+ public void addSchemas(Map<URI, byte[]> capture) {
+ _schemas.putAll(capture);
+ }
+
@SuppressWarnings("unchecked")
private void captureSchemas(Definition def, ResourceFinder rf, URI defuri) throws CompilationException {
assert def != null;
@@ -195,15 +198,15 @@
((List<ExtensibilityElement>)def.getTypes().getExtensibilityElements()).iterator();
iter.hasNext();) {
ExtensibilityElement ee = iter.next();
-
if (ee instanceof XMLSchemaType) {
String schema = ((XMLSchemaType)ee).getXMLSchema();
- Map<URI, byte[]> capture = null;
+
WsdlFinderXMLEntityResolver resolver = new WsdlFinderXMLEntityResolver(rf, defuri, _internalSchemas, false);
+
try {
- capture = XSUtils.captureSchema(defuri, schema, resolver);
+ Map<URI, byte[]> capture = XSUtils.captureSchema(defuri, schema, resolver);
_schemas.putAll(capture);
try {
Modified: ode/branches/bart/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/WSDLRegistryTest.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/WSDLRegistryTest.java?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/WSDLRegistryTest.java (original)
+++ ode/branches/bart/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/WSDLRegistryTest.java Mon Sep 3 18:52:29 2007
@@ -68,9 +68,12 @@
// load & register wsdl
WSDLFactory4BPEL factory = (WSDLFactory4BPEL)WSDLFactoryBPEL11.newInstance();
WSDLReader reader = factory.newWSDLReader();
-
- //ResourceFinder finder = new DefaultResourceFinder(new File(wsd.getPath()).getParentFile());
- ResourceFinder finder = new DefaultResourceFinder(new File(wsd.toURI().getPath()).getParentFile());
+
+
+ File parent = new File(wsd.toURI().getPath()).getParentFile();
+ ResourceFinder finder = new DefaultResourceFinder(parent, parent);
+
+
WSDLLocatorImpl loc = new WSDLLocatorImpl(finder,wsd.toURI());
Definition4BPEL wsdl = (Definition4BPEL) reader.readWSDL(loc);
_registry.addDefinition(wsdl, finder, wsd.toURI());
Modified: ode/branches/bart/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java (original)
+++ ode/branches/bart/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java Mon Sep 3 18:52:29 2007
@@ -74,6 +74,7 @@
suite.addTest(new GoodCompileTCase("/2.0/good/xpath20-func/GetVariableData3-xp2.0.bpel"));
suite.addTest(new GoodCompileTCase("/2.0/good/xpath20-func/GetVariableData4-xp2.0.bpel"));
suite.addTest(new GoodCompileTCase("/2.0/good/xpath20-func/GetVariableProperty1-xp2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/xsd-import/helloworld-Server.bpel"));
return suite;
}
Modified: ode/branches/bart/bpel-obj/src/main/java/org/apache/ode/bpel/o/OMessageVarType.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-obj/src/main/java/org/apache/ode/bpel/o/OMessageVarType.java?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/bpel-obj/src/main/java/org/apache/ode/bpel/o/OMessageVarType.java (original)
+++ ode/branches/bart/bpel-obj/src/main/java/org/apache/ode/bpel/o/OMessageVarType.java Mon Sep 3 18:52:29 2007
@@ -18,16 +18,17 @@
*/
package org.apache.ode.bpel.o;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import javax.xml.namespace.QName;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.Map;
+import javax.xml.namespace.QName;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
/**
* Message variable type.
*/
@@ -35,7 +36,7 @@
private static final long serialVersionUID = 256680050844726425L;
public QName messageType;
- public final Map<String, Part> parts = new HashMap<String,Part>();
+ public final Map<String, Part> parts = new LinkedHashMap<String,Part>();
/** For doc-lit-like message types , the element type of the only part. */
public final OElementVarType docLitType;
Modified: ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/AsyncProcess/AsyncProcess2.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/AsyncProcess/AsyncProcess2.bpel?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/AsyncProcess/AsyncProcess2.bpel (original)
+++ ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/AsyncProcess/AsyncProcess2.bpel Mon Sep 3 18:52:29 2007
@@ -124,8 +124,7 @@
</copy>
</assign>
<if name="switch">
- <condition>bpws:getVariableData('Request', 'payload', '/typ:AsyncRequest/typ:Order/typ:OrderType/text()') = 'BookOrder'</condition>
- <then>
+ <condition>bpws:getVariableData('Request', 'payload', '/typ:AsyncRequest/typ:Order/typ:OrderType/text()') = 'BookOrder'</condition>
<invoke name="BookOrderInvoke"
operation="BookOrder"
inputVariable="Request"
@@ -136,7 +135,6 @@
<correlation set="OrderCorrelator" initiate="yes" pattern="out" />
</correlations>
</invoke>
- </then>
<else>
<invoke name="PaperOrderInvoke"
operation="PaperOrder"
Modified: ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/if/If1-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/if/If1-2.0.bpel?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/if/If1-2.0.bpel (original)
+++ ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/if/If1-2.0.bpel Mon Sep 3 18:52:29 2007
@@ -52,14 +52,12 @@
<sequence>
<if>
<condition>$var1/TestPart = 'abc'</condition>
- <then>
<assign>
<copy>
<from>'case1'</from>
<to>$var2</to>
</copy>
</assign>
- </then>
<elseif>
<condition>$var1/TestPart = 'def'</condition>
<assign>
Modified: ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/if/If2-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/if/If2-2.0.bpel?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/if/If2-2.0.bpel (original)
+++ ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/if/If2-2.0.bpel Mon Sep 3 18:52:29 2007
@@ -19,22 +19,22 @@
-->
<process name="if2-2.0"
- targetNamespace="http://ode/bpel/unit-test"
- xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
- xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
- xmlns:tns="http://ode/bpel/unit-test"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:test="http://ode/bpel/unit-test.wsdl"
- suppressJoinFailure="yes">
+ targetNamespace="http://ode/bpel/unit-test"
+ xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+ xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+ xmlns:tns="http://ode/bpel/unit-test"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:test="http://ode/bpel/unit-test.wsdl"
+ suppressJoinFailure="yes">
<import namespace="http://ode/bpel/unit-test"
- importType="http://schemas.xmlsoap.org/wsdl/"
- location="./test.wsdl" />
+ importType="http://schemas.xmlsoap.org/wsdl/"
+ location="./test.wsdl" />
<partnerLinks>
<partnerLink name="testPartnerLink"
- partnerLinkType="test:TestPartnerLinkType"
- myRole="me" />
+ partnerLinkType="test:TestPartnerLinkType"
+ myRole="me" />
</partnerLinks>
<variables>
@@ -44,52 +44,50 @@
<sequence>
<receive name="startReceive"
- createInstance="yes"
- partnerLink="testPartnerLink"
- portType="test:TestPortType"
- operation="testOperation"
- variable="var1"/>
+ createInstance="yes"
+ partnerLink="testPartnerLink"
+ portType="test:TestPortType"
+ operation="testOperation"
+ variable="var1"/>
<sequence>
<if>
- <condition>$var1/TestPart = 'def'</condition>
- <then>
- <assign>
- <copy>
- <from>'case1'</from>
- <to>$var2</to>
- </copy>
- </assign>
- </then>
- <elseif>
- <condition>$var1/TestPart = 'abc'</condition>
- <assign>
- <copy>
- <from>'case2'</from>
- <to>$var2</to>
- </copy>
- </assign>
- </elseif>
- <else>
- <assign>
- <copy>
- <from>'otherwise'</from>
- <to>$var2</to>
- </copy>
- </assign>
- </else>
+ <condition>$var1/TestPart = 'def'</condition>
+ <assign>
+ <copy>
+ <from>'case1'</from>
+ <to>$var2</to>
+ </copy>
+ </assign>
+ <elseif>
+ <condition>$var1/TestPart = 'abc'</condition>
+ <assign>
+ <copy>
+ <from>'case2'</from>
+ <to>$var2</to>
+ </copy>
+ </assign>
+ </elseif>
+ <else>
+ <assign>
+ <copy>
+ <from>'otherwise'</from>
+ <to>$var2</to>
+ </copy>
+ </assign>
+ </else>
</if>
<assign name="b">
- <copy>
- <from>$var2</from>
- <to>$var1/TestPart</to>
- </copy>
+ <copy>
+ <from>$var2</from>
+ <to>$var1/TestPart</to>
+ </copy>
</assign>
</sequence>
<reply name="endReply"
- operation="testOperation"
- partnerLink="testPartnerLink"
- portType="test:TestPortType"
- variable="var1"/>
+ operation="testOperation"
+ partnerLink="testPartnerLink"
+ portType="test:TestPortType"
+ variable="var1"/>
</sequence>
</process>
Modified: ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/if/If3-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/if/If3-2.0.bpel?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/if/If3-2.0.bpel (original)
+++ ode/branches/bart/bpel-scripts/src/main/resources/2.0/good/if/If3-2.0.bpel Mon Sep 3 18:52:29 2007
@@ -52,14 +52,12 @@
<sequence>
<if>
<condition>$var1/TestPart = 'foo'</condition>
- <then>
<assign>
<copy>
<from>'case1'</from>
<to>$var2</to>
</copy>
</assign>
- </then>
<elseif>
<condition>$var1/TestPart = 'bar'</condition>
<assign>
Propchange: ode/branches/bart/jacob-ap/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Sep 3 18:52:29 2007
@@ -1,3 +1,5 @@
-.classpath
-
-.project
+target
+.classpath
+.project
+~*
+*~
Modified: ode/branches/bart/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java (original)
+++ ode/branches/bart/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java Mon Sep 3 18:52:29 2007
@@ -38,9 +38,8 @@
private transient CT _channel;
protected ChannelListener(CT channel) throws IllegalStateException {
- if (this.getClass().getSuperclass().getSuperclass() != ChannelListener.class) {
- throw new IllegalStateException("Inheritence in ChannelListener classes not allowed!");
- }
+ assert getClass().getSuperclass().getSuperclass() == ChannelListener.class :
+ "Inheritance in ChannelListener classes not allowed!";
if (channel == null) {
throw new IllegalArgumentException("Null channel!");
}
Modified: ode/branches/bart/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java (original)
+++ ode/branches/bart/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java Mon Sep 3 18:52:29 2007
@@ -35,15 +35,7 @@
* Get the unadorned (no package) name of this class.
*/
protected String getClassName() {
- return getClassName(getClass());
- }
-
- /**
- * Get the unadorned (no package) name of a class.
- */
- protected static String getClassName(Class clazz) {
- String className = clazz.getName();
- return (className.indexOf('.') == -1) ? className : className.substring(clazz.getPackage().getName().length() + 1);
+ return getClass().getSimpleName();
}
protected static Object getExtension(Class extensionClass) {
@@ -79,7 +71,7 @@
protected <T extends Channel> T newChannel(Class<T> channelType, String description)
throws IllegalArgumentException
{
- return (T) JacobVPU.activeJacobThread().newChannel(channelType, toString(), description);
+ return (T) JacobVPU.activeJacobThread().newChannel(channelType, getClassName(), description);
}
/**
Modified: ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/Messages.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/Messages.java?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/Messages.java (original)
+++ ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/Messages.java Mon Sep 3 18:52:29 2007
@@ -149,5 +149,8 @@
return format("Registered custom BPEL event listener: {0}", listenerCN);
}
+ public String msgMessageExchangeInterceptorRegistered(String interceptorCN) {
+ return format("Registered message exchange interceptor: {0}", interceptorCN);
+ }
}
Modified: ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/OdeConsumer.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/OdeConsumer.java?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/OdeConsumer.java (original)
+++ ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/OdeConsumer.java Mon Sep 3 18:52:29 2007
@@ -119,6 +119,8 @@
}
+
+
public void onJbiMessageExchange(MessageExchange jbiMex) throws MessagingException {
if (!jbiMex.getPattern().equals(MessageExchangePattern.IN_ONLY)
&& !jbiMex.getPattern().equals(MessageExchangePattern.IN_OUT)) {
Modified: ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java (original)
+++ ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java Mon Sep 3 18:52:29 2007
@@ -81,6 +81,7 @@
MessageExchangeContextImpl _mexContext;
+ SimpleScheduler _scheduler;
ExecutorService _executorService;
@@ -95,7 +96,6 @@
/** Mapping of Endpoint to OdeService */
private Map<Endpoint, OdeService> _activeOdeServices = new ConcurrentHashMap<Endpoint, OdeService>();
- public SimpleScheduler _scheduler;
/**
* Gets the delivery channel.
Modified: ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java (original)
+++ ode/branches/bart/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java Mon Sep 3 18:52:29 2007
@@ -38,6 +38,7 @@
import org.apache.ode.bpel.dao.BpelDAOConnectionFactoryJDBC;
import org.apache.ode.bpel.engine.BpelServerImpl;
import org.apache.ode.bpel.iapi.BpelEventListener;
+import org.apache.ode.bpel.intercept.MessageExchangeInterceptor;
import org.apache.ode.il.dbutil.Database;
import org.apache.ode.il.dbutil.DatabaseConfigException;
import org.apache.ode.jbi.msgmap.Mapper;
@@ -112,6 +113,8 @@
// Register BPEL event listeners configured in ode-jbi.properties.
registerEventListeners();
+ registerMexInterceptors();
+
__log.debug("Starting JCA connector.");
initConnector();
@@ -159,19 +162,19 @@
__log.error(errmsg, ex);
throw new JBIException(errmsg, ex);
}
-
+
_ode._dataSource = _db.getDataSource();
}
/**
* Load the "ode-jbi.properties" file from the install directory.
- *
+ *
* @throws JBIException
*/
private void initProperties() throws JBIException {
OdeConfigProperties config = new OdeConfigProperties(new File(_ode.getContext().getInstallRoot(),
OdeConfigProperties.CONFIG_FILE_NAME));
-
+
try {
config.load();
} catch (FileNotFoundException fnf) {
@@ -198,7 +201,9 @@
else
_ode._executorService = Executors.newFixedThreadPool(_ode._config.getThreadPoolMaxSize());
_ode._scheduler = new SimpleScheduler(new GUID().toString(), new JdbcDelegate(_ode._dataSource));
+
_ode._scheduler.setJobProcessor(_ode._server);
+
_ode._scheduler.setTransactionManager((TransactionManager) _ode.getContext().getTransactionManager());
_ode._store = new ProcessStoreImpl(_ode._dataSource, _ode._config.getDAOConnectionFactory(), false);
@@ -209,7 +214,7 @@
_ode._server.setMessageExchangeContext(_ode._mexContext);
_ode._server.setBindingContext(new BindingContextImpl(_ode));
_ode._server.setScheduler(_ode._scheduler);
- _ode._server.setConfigProperties(_ode._config.getProperties());
+ _ode._server.setConfigProperties(_ode._config.getProperties());
_ode._server.init();
@@ -217,7 +222,7 @@
/**
* Initialize the data store.
- *
+ *
* @throws JBIException
*/
private void initDao() throws JBIException {
@@ -268,6 +273,21 @@
}
}
+ private void registerMexInterceptors() {
+ String listenersStr = _ode._config.getMessageExchangeInterceptors();
+ if (listenersStr != null) {
+ for (StringTokenizer tokenizer = new StringTokenizer(listenersStr, ",;"); tokenizer.hasMoreTokens();) {
+ String interceptorCN = tokenizer.nextToken();
+ try {
+ _ode._server.registerMessageExchangeInterceptor((MessageExchangeInterceptor) Class.forName(interceptorCN).newInstance());
+ __log.info(__msgs.msgMessageExchangeInterceptorRegistered(interceptorCN));
+ } catch (Exception e) {
+ __log.warn("Couldn't register the event listener " + interceptorCN + ", the class couldn't be "
+ + "loaded properly: " + e);
+ }
+ }
+ }
+ }
public synchronized void start() throws JBIException {
if (_started)
@@ -344,7 +364,7 @@
/**
* Shutdown the service engine. This performs cleanup before the BPE is terminated. Once this method has been called, init()
* must be called before the transformation engine can be started again with a call to start().
- *
+ *
* @throws javax.jbi.JBIException
* if the transformation engine is unable to shut down.
*/
Modified: ode/branches/bart/jbi/src/main/jbi/ode-jbi.properties
URL: http://svn.apache.org/viewvc/ode/branches/bart/jbi/src/main/jbi/ode-jbi.properties?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/jbi/src/main/jbi/ode-jbi.properties (original)
+++ ode/branches/bart/jbi/src/main/jbi/ode-jbi.properties Mon Sep 3 18:52:29 2007
@@ -20,7 +20,7 @@
# ODE-JBI Configuraiton Properties
# Process Identifier Namespace [QNAME]
-# Namespace for processes created using the JBI integartion.
+# Namespace for processes created using the JBI integration.
# This will be the namespace of the process identifiers (PIDs)
ode-jbi.pidNamespace=urn:ode-jbi
@@ -66,7 +66,13 @@
# Class name of the message mapper that should be used to convert message
# between ODE / NMS.
-# org.apache.ode.jbi.msgmap.JbiWsdl11WrapperMapper - use JBI WSDL 1.1 "warapped"
+# org.apache.ode.jbi.msgmap.JbiWsdl11WrapperMapper - use JBI WSDL 1.1 "wrapped"
# org.apache.ode.jbi.msgmap.ServiceMixMapper
# org.apache.ode.jbi.msgmap.DocLitMapper
ode-jbi.messageMapper=org.apache.ode.jbi.msgmap.ServiceMixMapper
+
+# BPEL Event Listener
+# Uncomment the following for a debug output of BPEL navigation events.
+#ode-jbi.event.listeners=org.apache.ode.bpel.common.evt.DebugBpelEventListener
+#debugeventlistener.dumpToStdOut=on/off
+
Modified: ode/branches/bart/utils/src/main/java/org/apache/ode/utils/Namespaces.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/utils/src/main/java/org/apache/ode/utils/Namespaces.java?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/utils/src/main/java/org/apache/ode/utils/Namespaces.java (original)
+++ ode/branches/bart/utils/src/main/java/org/apache/ode/utils/Namespaces.java Mon Sep 3 18:52:29 2007
@@ -42,14 +42,16 @@
/** Diverse WS-* stuff */
public static final String WS_ADDRESSING_NS = "http://www.w3.org/2005/08/addressing";
public static final String WS_ADDRESSING_WSDL_NS = "http://www.w3.org/2006/05/addressing/wsdl";
+ public static final String WS_ADDRESSING_ANON_URI = "http://www.w3.org/2005/08/addressing/anonymous";
public static final String SOAP_NS = "http://schemas.xmlsoap.org/wsdl/soap/";
public static final String WSDL_11 = "http://schemas.xmlsoap.org/wsdl/";
public static final String WSDL_20 = "http://www.w3.org/2006/01/wsdl";
public static final String XML_SCHEMA = "http://www.w3.org/2001/XMLSchema";
public static final String JBI_END_POINT_REFERENCE = "http://java.sun.com/jbi/end-point-reference";
public static final QName WS_ADDRESSING_ENDPOINT = new QName(WS_ADDRESSING_NS, "EndpointReference");
+ public static final QName WS_ADDRESSING_USINGADDRESSING = new QName(WS_ADDRESSING_WSDL_NS, "UsingAddressing");
-/** ODE stuff */
+ /** ODE stuff */
public static final String ODE_PMAPI = "http://www.apache.org/ode/pmapi/types/2006/08/02/";
public static final String ODE_EXTENSION_NS = "http://www.apache.org/ode/type/extension";
public static final String INTALIO_SESSION_NS = "http://www.intalio.com/type/session";
Modified: ode/branches/bart/utils/src/main/java/org/apache/ode/utils/xsd/CapturingXMLEntityResolver.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/utils/src/main/java/org/apache/ode/utils/xsd/CapturingXMLEntityResolver.java?rev=572489&r1=572488&r2=572489&view=diff
==============================================================================
--- ode/branches/bart/utils/src/main/java/org/apache/ode/utils/xsd/CapturingXMLEntityResolver.java (original)
+++ ode/branches/bart/utils/src/main/java/org/apache/ode/utils/xsd/CapturingXMLEntityResolver.java Mon Sep 3 18:52:29 2007
@@ -55,7 +55,7 @@
public XMLInputSource resolveEntity(XMLResourceIdentifier resourceIdentifier)
throws XNIException, IOException {
- if (__log.isTraceEnabled()) {
+ if (__log.isDebugEnabled()) {
StringBuffer buf = new StringBuffer("resolveEntity: base=");
buf.append(resourceIdentifier.getBaseSystemId());
buf.append(", literal=");
@@ -66,7 +66,7 @@
buf.append(resourceIdentifier.getNamespace());
buf.append(", publicId=");
buf.append(resourceIdentifier.getPublicId());
- __log.trace(buf.toString());
+ __log.debug(buf.toString());
}
XMLInputSource src = _resolver.resolveEntity(resourceIdentifier);
@@ -89,6 +89,7 @@
FileUtils.encodePath(resourceIdentifier.getLiteralSystemId() == null ? resourceIdentifier
.getNamespace() : resourceIdentifier.getLiteralSystemId()));
+ __log.debug("Captured: "+systemId);
_capture.put(systemId, data);
} catch (URISyntaxException use) {
__log.error("Invalid URI: " + resourceIdentifier.getLiteralSystemId());