You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by se...@apache.org on 2009/04/06 23:53:27 UTC
svn commit: r762523 [1/9] - in /ode/trunk: ./
axis2-war/src/main/webapp/WEB-INF/classes/
axis2-war/src/main/webapp/WEB-INF/conf.hib-derby/
axis2-war/src/main/webapp/WEB-INF/conf.jpa-derby/
axis2-war/src/main/webapp/WEB-INF/conf.template/ axis2-war/src/...
Author: seanahn
Date: Mon Apr 6 21:53:20 2009
New Revision: 762523
URL: http://svn.apache.org/viewvc?rev=762523&view=rev
Log:
ODE-414, Merge ODE-404 changes on 1.x branch to trunk(process instance cleanup)
Added:
ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.hib-derby/
ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.hib-derby/axis2.xml
ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.hib-derby/ode-axis2.properties
ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.jpa-derby/
ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.jpa-derby/axis2.xml
ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.jpa-derby/ode-axis2.properties
ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.template/
ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.template/axis2.xml
ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.template/ode-axis2.properties
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/FailureInvokeTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/ODEConfigDirAware.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureHibTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultHibTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessHibTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanTestBase.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/HibDaoConnectionFactoryImpl.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/JpaDaoConnectionFactoryImpl.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProfilingBpelDAOConnection.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/bpel/
ode/trunk/axis2-war/src/test/java/org/apache/ode/bpel/dao/
ode/trunk/axis2-war/src/test/java/org/apache/ode/bpel/dao/ProcessInstanceProfileDAO.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/bpel/dao/ProcessProfileDAO.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/
ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/jpa/
ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessInstanceProfileDAOImpl.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessProfileDAOImpl.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/daohib/
ode/trunk/axis2-war/src/test/java/org/apache/ode/daohib/bpel/
ode/trunk/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessInstanceProfileDaoImpl.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessProfileDaoImpl.java
ode/trunk/axis2-war/src/test/resources/TestCleanCorrelation_None/
ode/trunk/axis2-war/src/test/resources/TestCleanCorrelation_None/TestCorrelation1.bpel
ode/trunk/axis2-war/src/test/resources/TestCleanCorrelation_None/TestCorrelation1.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanCorrelation_None/deploy.xml
ode/trunk/axis2-war/src/test/resources/TestCleanCorrelation_None/test1.properties
ode/trunk/axis2-war/src/test/resources/TestCleanCorrelation_None/test2.properties
ode/trunk/axis2-war/src/test/resources/TestCleanCorrelation_None/test3.properties
ode/trunk/axis2-war/src/test/resources/TestCleanCorrelation_None/testRequest.soap
ode/trunk/axis2-war/src/test/resources/TestCleanFailure/
ode/trunk/axis2-war/src/test/resources/TestCleanFailure/FirstProcess-FirstProcess.bpel
ode/trunk/axis2-war/src/test/resources/TestCleanFailure/FirstProcess-FirstProcess.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanFailure/FirstProcess.svg
ode/trunk/axis2-war/src/test/resources/TestCleanFailure/FirstProcess.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanFailure/GetTime.xsd
ode/trunk/axis2-war/src/test/resources/TestCleanFailure/TimeService.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanFailure/deploy.xml
ode/trunk/axis2-war/src/test/resources/TestCleanFailure/testRequest.soap
ode/trunk/axis2-war/src/test/resources/TestCleanFault_All/
ode/trunk/axis2-war/src/test/resources/TestCleanFault_All/HelloWorld2.bpel
ode/trunk/axis2-war/src/test/resources/TestCleanFault_All/HelloWorld2.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanFault_All/deploy.xml
ode/trunk/axis2-war/src/test/resources/TestCleanFault_All/dummy-service.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanFault_All/testRequest.soap
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Correlations/
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Correlations/HelloWorld2.bpel
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Correlations/HelloWorld2.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Correlations/deploy.xml
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Correlations/dummy-service.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Correlations/testRequest.soap
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Events/
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Events/HelloWorld2.bpel
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Events/HelloWorld2.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Events/deploy.xml
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Events/dummy-service.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Events/testRequest.soap
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Instance/
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Instance/HelloWorld2.bpel
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Instance/HelloWorld2.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Instance/deploy.xml
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Instance/dummy-service.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Instance/testRequest.soap
ode/trunk/axis2-war/src/test/resources/TestCleanFault_MessageCorrEvents/
ode/trunk/axis2-war/src/test/resources/TestCleanFault_MessageCorrEvents/HelloWorld2.bpel
ode/trunk/axis2-war/src/test/resources/TestCleanFault_MessageCorrEvents/HelloWorld2.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanFault_MessageCorrEvents/deploy.xml
ode/trunk/axis2-war/src/test/resources/TestCleanFault_MessageCorrEvents/dummy-service.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanFault_MessageCorrEvents/testRequest.soap
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Messages/
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Messages/HelloWorld2.bpel
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Messages/HelloWorld2.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Messages/deploy.xml
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Messages/dummy-service.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Messages/testRequest.soap
ode/trunk/axis2-war/src/test/resources/TestCleanFault_None/
ode/trunk/axis2-war/src/test/resources/TestCleanFault_None/HelloWorld2.bpel
ode/trunk/axis2-war/src/test/resources/TestCleanFault_None/HelloWorld2.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanFault_None/deploy.xml
ode/trunk/axis2-war/src/test/resources/TestCleanFault_None/dummy-service.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanFault_None/testRequest.soap
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Variables/
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Variables/HelloWorld2.bpel
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Variables/HelloWorld2.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Variables/deploy.xml
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Variables/dummy-service.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanFault_Variables/testRequest.soap
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_All/
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_All/FirstProcess-FirstProcess.bpel
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_All/FirstProcess-FirstProcess.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_All/FirstProcess.svg
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_All/FirstProcess.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_All/GetTime.xsd
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_All/TimeService.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_All/deploy.xml
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_All/testRequest.soap
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Correlations/
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Correlations/FirstProcess-FirstProcess.bpel
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Correlations/FirstProcess-FirstProcess.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Correlations/FirstProcess.svg
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Correlations/FirstProcess.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Correlations/GetTime.xsd
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Correlations/TimeService.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Correlations/deploy.xml
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Correlations/testRequest.soap
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Events/
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Events/FirstProcess-FirstProcess.bpel
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Events/FirstProcess-FirstProcess.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Events/FirstProcess.svg
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Events/FirstProcess.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Events/GetTime.xsd
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Events/TimeService.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Events/deploy.xml
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Events/testRequest.soap
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Fault/
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Fault/deploy.xml
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Fault/test.properties
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Fault/testFaultHandlers.bpel
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Fault/testFaultHandlers.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Instance/
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Instance/deploy.xml
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Instance/test.properties
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Instance/testFaultHandlers.bpel
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Instance/testFaultHandlers.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_MessageCorrEvents/
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_MessageCorrEvents/FirstProcess-FirstProcess.bpel
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_MessageCorrEvents/FirstProcess-FirstProcess.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_MessageCorrEvents/FirstProcess.svg
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_MessageCorrEvents/FirstProcess.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_MessageCorrEvents/GetTime.xsd
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_MessageCorrEvents/TimeService.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_MessageCorrEvents/deploy.xml
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_MessageCorrEvents/testRequest.soap
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Messages/
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Messages/FirstProcess-FirstProcess.bpel
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Messages/FirstProcess-FirstProcess.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Messages/FirstProcess.svg
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Messages/FirstProcess.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Messages/GetTime.xsd
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Messages/TimeService.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Messages/deploy.xml
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Messages/testRequest.soap
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_None/
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_None/FirstProcess-FirstProcess.bpel
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_None/FirstProcess-FirstProcess.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_None/FirstProcess.svg
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_None/FirstProcess.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_None/GetTime.xsd
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_None/TimeService.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_None/deploy.xml
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_None/testRequest.soap
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Variables/
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Variables/FirstProcess-FirstProcess.bpel
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Variables/FirstProcess-FirstProcess.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Variables/FirstProcess.svg
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Variables/FirstProcess.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Variables/GetTime.xsd
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Variables/TimeService.wsdl
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Variables/deploy.xml
ode/trunk/axis2-war/src/test/resources/TestCleanSuccess_Variables/testRequest.soap
ode/trunk/axis2-war/src/test/resources/TestFailureInInvoke/
ode/trunk/axis2-war/src/test/resources/TestFailureInInvoke/FailureInvokeTest.bpel
ode/trunk/axis2-war/src/test/resources/TestFailureInInvoke/FailureInvokeTest.wsdl
ode/trunk/axis2-war/src/test/resources/TestFailureInInvoke/deploy.xml
ode/trunk/axis2-war/src/test/resources/TestFailureInInvoke/dummy-service.wsdl
ode/trunk/axis2-war/src/test/resources/TestFailureInInvoke/testRequest.soap
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessCleanupConfImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessageExchangeProperty.java
Modified:
ode/trunk/Buildfile
ode/trunk/axis2/ (props changed)
ode/trunk/axis2-war/src/main/webapp/WEB-INF/classes/ (props changed)
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/soapbinding/SoapMessageConverter.java
ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/MyRoleMessageExchange.java
ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessConf.java
ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/rapi/IOContext.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageExchangeDAO.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessInstanceDAO.java
ode/trunk/bpel-schemas/src/main/xsd/dd.xsd
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/SessionManager.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HActivityRecovery.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HBpelEvent.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelationProperty.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelationSet.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelator.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorMessage.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorMessageKey.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorSelector.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HFaultData.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HLargeData.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessage.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessageExchange.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HPartnerLink.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HProcess.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HProcessInstance.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HScope.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HVariableProperty.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HXmlData.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrSetProperty.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelationSetDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/EventDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/FaultDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MexProperty.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/OpenJPADAO.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/PartnerLinkDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/XmlDataDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/XmlDataProperty.java
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImpl.java
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/PartnerRoleMessageExchangeImpl.java
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
ode/trunk/engine/src/main/java/org/apache/ode/bpel/engine/UnreliableMyRoleMessageExchangeImpl.java
ode/trunk/engine/src/main/java/org/apache/ode/bpel/memdao/MessageExchangeDAOImpl.java
ode/trunk/engine/src/main/java/org/apache/ode/bpel/memdao/ProcessInstanceDaoImpl.java
ode/trunk/runtimes/ (props changed)
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/INVOKE.java
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OdeInternalInstance.java
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/RuntimeInstanceImpl.java
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/INVOKE.java
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OdeInternalInstance.java
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/RuntimeInstanceImpl.java
ode/trunk/runtimes/src/test/java/org/apache/ode/bpel/rtrep/v1/CoreBpelTest.java
ode/trunk/runtimes/src/test/java/org/apache/ode/bpel/rtrep/v2/CoreBpelTest.java
ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingInterceptor.java
ode/trunk/utils/src/main/java/org/apache/ode/utils/wsdl/WsdlUtils.java
Modified: ode/trunk/Buildfile
URL: http://svn.apache.org/viewvc/ode/trunk/Buildfile?rev=762523&r1=762522&r2=762523&view=diff
==============================================================================
--- ode/trunk/Buildfile (original)
+++ ode/trunk/Buildfile Mon Apr 6 21:53:20 2009
@@ -153,7 +153,7 @@
JENCKS = "org.jencks:jencks:jar:all:1.3"
JIBX = findArtifacts(AXIS2_DEPS, "jibx:jibx-run") #"jibx:jibx-run:jar:1.1-beta3"
LOG4J = findArtifacts(AXIS2_DEPS, "log4j:log4j") #"log4j:log4j:jar:1.2.15"
-OPENJPA = ["org.apache.openjpa:openjpa:jar:1.1.0",
+OPENJPA = ["org.apache.openjpa:openjpa:jar:1.3.0-SNAPSHOT",
"net.sourceforge.serp:serp:jar:1.13.1"]
SAXON = group("saxon", "saxon-xpath", "saxon-dom", "saxon-xqj", :under=>"net.sf.saxon", :version=>"9.x")
@@ -260,7 +260,7 @@
end
test.using :testng
- test.with(projects("tools"), libs, AXIS2_MODULES.mods, AXIS2_ALL, HTTPCORE, JAVAX.servlet, Buildr::Jetty::REQUIRES, file(_("target/test"))).using(:fork => :each)
+ test.with(projects("tools"), libs, AXIS2_MODULES.mods, AXIS2_ALL, HTTPCORE, JAVAX.servlet, Buildr::Jetty::REQUIRES, HIBERNATE, file(_("target/test"))).using(:fork => :each)
webapp_dir = "#{test.compile.target}/webapp"
test.setup task(:prepare_webapp) do |task|
cp_r _("src/main/webapp"), test.compile.target.to_s
@@ -440,8 +440,10 @@
hibernate_schemaexport target do |task, ant|
ant.schemaexport(:properties=>properties.to_s, :quiet=>"yes", :text=>"yes", :delimiter=>";",
:drop=>"no", :create=>"yes", :output=>target) do
- ant.fileset(:dir=>source.to_s) { ant.include :name=>"**/*.hbm.xml" }
- end
+ ant.fileset(:dir=>source.to_s) {
+ ant.include :name=>"**/*.hbm.xml"
+ ant.exclude :name=>"**/HMessageExchangeProperty.hbm.xml"}
+ end
end
end
end
Propchange: ode/trunk/axis2/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Apr 6 21:53:20 2009
@@ -3,3 +3,4 @@
.project
~*
*~
+reports
Propchange: ode/trunk/axis2-war/src/main/webapp/WEB-INF/classes/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Apr 6 21:53:20 2009
@@ -0,0 +1 @@
+log4j.properties.junit
Added: ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.hib-derby/axis2.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.hib-derby/axis2.xml?rev=762523&view=auto
==============================================================================
--- ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.hib-derby/axis2.xml (added)
+++ ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.hib-derby/axis2.xml Mon Apr 6 21:53:20 2009
@@ -0,0 +1,310 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ 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">true</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">true</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>
+
Added: ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.hib-derby/ode-axis2.properties
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.hib-derby/ode-axis2.properties?rev=762523&view=auto
==============================================================================
--- ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.hib-derby/ode-axis2.properties (added)
+++ ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.hib-derby/ode-axis2.properties Mon Apr 6 21:53:20 2009
@@ -0,0 +1,3 @@
+ode-axis2.dao.factory=org.apache.ode.axis2.instancecleanup.HibDaoConnectionFactoryImpl
+ode-axis2.db.emb.name=hibdb
+ode-axis2.db.mode=EMBEDDED
\ No newline at end of file
Added: ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.jpa-derby/axis2.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.jpa-derby/axis2.xml?rev=762523&view=auto
==============================================================================
--- ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.jpa-derby/axis2.xml (added)
+++ ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.jpa-derby/axis2.xml Mon Apr 6 21:53:20 2009
@@ -0,0 +1,310 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ 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">true</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">true</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>
+
Added: ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.jpa-derby/ode-axis2.properties
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.jpa-derby/ode-axis2.properties?rev=762523&view=auto
==============================================================================
--- ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.jpa-derby/ode-axis2.properties (added)
+++ ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.jpa-derby/ode-axis2.properties Mon Apr 6 21:53:20 2009
@@ -0,0 +1 @@
+ode-axis2.dao.factory=org.apache.ode.axis2.instancecleanup.JpaDaoConnectionFactoryImpl
\ No newline at end of file
Added: ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.template/axis2.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.template/axis2.xml?rev=762523&view=auto
==============================================================================
--- ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.template/axis2.xml (added)
+++ ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.template/axis2.xml Mon Apr 6 21:53:20 2009
@@ -0,0 +1,310 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ 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">true</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">true</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>
+
Added: ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.template/ode-axis2.properties
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.template/ode-axis2.properties?rev=762523&view=auto
==============================================================================
--- ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.template/ode-axis2.properties (added)
+++ ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf.template/ode-axis2.properties Mon Apr 6 21:53:20 2009
@@ -0,0 +1,6 @@
+ode-axis2.dao.factory=@connfactory@
+ode-axis2.db.mode=INTERNAL
+ode-axis2.db.int.jdbcurl=@url@
+ode-axis2.db.int.driver=@driver@
+ode-axis2.db.int.username=@userid@
+ode-axis2.db.int.password=@password@
\ No newline at end of file
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java?rev=762523&r1=762522&r2=762523&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java Mon Apr 6 21:53:20 2009
@@ -16,6 +16,7 @@
import org.apache.ode.tools.sendsoap.cline.HttpSoapSender;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.DataProvider;
import javax.servlet.ServletException;
import javax.wsdl.WSDLException;
@@ -29,8 +30,10 @@
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
+import java.util.List;
/**
* @author Matthieu Riou <mr...@apache.org>
@@ -42,6 +45,63 @@
protected ODEAxis2Server server;
+ protected String config;
+
+ protected static final String DO_NOT_OVERRIDE_CONFIG = "<DO_NOT_OVERRIDE_CONFIG>";
+
+ private static String originalOdePersistence = System.getProperty("ode.persistence");
+ private static String originalOdeConfigDir = System.getProperty("org.apache.ode.configDir");
+
+ @DataProvider(name = "configs")
+ protected Iterator<Object[]> createConfigData() {
+ List<String> configDirList = new ArrayList<String>();
+ if( !(this instanceof ODEConfigDirAware) || ((ODEConfigDirAware)this).getODEConfigDir().contains("hib")) {
+ addToConfigDirList(configDirList, "org.apache.ode.hibdbs");
+ }
+ if( !(this instanceof ODEConfigDirAware) || !((ODEConfigDirAware)this).getODEConfigDir().contains("hib")) {
+ addToConfigDirList(configDirList, "org.apache.ode.jpadbs");
+ }
+
+ if( configDirList.isEmpty() ) {
+ // if no system property is set, fall back to default
+ if( this instanceof ODEConfigDirAware ) {
+ configDirList.add(((ODEConfigDirAware)this).getODEConfigDir());
+ } else {
+ configDirList.add(DO_NOT_OVERRIDE_CONFIG);
+ }
+ } else {
+ System.out.println("Java system properties have been set to override ode configuration: " + configDirList);
+ }
+
+ final Iterator<String> itr = configDirList.iterator();
+ return new Iterator<Object[]>() {
+ public boolean hasNext() {
+ return itr.hasNext();
+ }
+
+ public Object[] next() {
+ config = itr.next();
+ return new Object[] {};
+ }
+
+ public void remove() {
+ }
+ };
+ }
+
+ private void addToConfigDirList(List<String> configDirList, String propertyKey) {
+ String dbs = System.getProperty(propertyKey);
+ if( dbs != null ) {
+ String[] configDirs = dbs.split(",");
+ for( String configDir : configDirs ) {
+ String trimmed = configDir.trim();
+ if( trimmed.length() > 0 ) {
+ configDirList.add(trimmed);
+ }
+ }
+ }
+ }
+
// Provide standard constructors to accommodate creation of test suites
public Axis2TestBase(String name) {
}
@@ -65,14 +125,61 @@
server.stop();
}
- @BeforeMethod
+ @BeforeMethod
protected void setUp() throws Exception {
+ /**
+ * 1. If no settings are given from buildr, the test runs with the default config directory.
+ * 2. If no settings are given from buildr and if the test implements ODEConfigDirAware, the test runs with
+ * the config directory from the interface.
+ * 3. If settings are given from buildr and if it's derby and openJPA, test falls back to the above 1 or 2.
+ * 4. If settings are given from buildr and if it's derby and hibernate, test falls back to the above 2 or
+ * uses -Dode.persistence=hibernate.
+ */
+ if( config == null || DO_NOT_OVERRIDE_CONFIG.equals(config) ) {
+ System.out.println("Test config: default.");
+ } else if("<jpa>".equals(config)) {
+ if( this instanceof ODEConfigDirAware ) {
+ config = ((ODEConfigDirAware)this).getODEConfigDir();
+ System.out.println("Test config: " + config + ".");
+ System.setProperty("org.apache.ode.configDir", config);
+ } else {
+ System.out.println("Test config: default.");
+ }
+ } else if("<hib>".equals(config)) {
+ if( this instanceof ODEConfigDirAware ) {
+ config = ((ODEConfigDirAware)this).getODEConfigDir();
+ System.out.println("Test config: " + config + ".");
+ System.setProperty("org.apache.ode.configDir", config);
+ } else {
+ // why does this not work?
+// System.out.println("Test config: -Dode.persistence=hibernate");
+// System.setProperty("ode.persistence", "hibernate");
+ config = getClass().getClassLoader().getResource("webapp").getFile() + "/WEB-INF/conf.hib-derby";
+ System.out.println("Test config: " + config + ".");
+ System.setProperty("org.apache.ode.configDir", config);
+ }
+ } else {
+ System.out.println("Test config: " + config + ".");
+ System.setProperty("org.apache.ode.configDir", config);
+ }
+
startServer();
}
- @AfterMethod
+ @AfterMethod
protected void tearDown() throws Exception {
stopServer();
+
+ if( originalOdeConfigDir != null ) {
+ System.setProperty("org.apache.ode.configDir", originalOdeConfigDir);
+ } else {
+ System.clearProperty("org.apache.ode.configDir");
+ }
+ if( originalOdeConfigDir != null ) {
+ System.setProperty("ode.persistence", originalOdePersistence);
+ } else {
+ System.clearProperty("ode.persistence");
+ }
}
protected class ODEAxis2Server extends AxisServer {