You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by je...@apache.org on 2010/08/18 06:51:45 UTC
svn commit: r986564 [1/4] - in /ode/trunk: ./ axis2-war/
axis2-war/src/main/assembly/ axis2-war/src/test/java/org/apache/ode/axis2/
axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/
axis2-war/src/test/java/org/apache/ode/bpel/dao/ axis2-war...
Author: jeffyu
Date: Wed Aug 18 04:51:39 2010
New Revision: 986564
URL: http://svn.apache.org/viewvc?rev=986564&view=rev
Log:
* revert back to the original ode-trunk. (without adding jpa refactoring work)
Added:
ode/trunk/axis2-war/src/test/java/org/apache/ode/bpel/dao/ProcessInstanceProfileDAO.java
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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/ProcessInstanceProfileDAO.java
- copied unchanged from r986560, ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/ProcessInstanceProfileDAO.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/ProcessProfileDAO.java
- copied unchanged from r986560, ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/ProcessProfileDAO.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessInstanceProfileDAOImpl.java
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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/
- copied from r986560, ode/trunk/axis2-war/src/test/java/org/apache/ode/daohib/
ode/trunk/axis2-war/src/test/java/org/apache/ode/daohib/bpel/
- copied from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, ode/trunk/axis2-war/src/test/java/org/apache/ode/daohib/bpel/ProcessProfileDaoImpl.java
ode/trunk/bpel-runtime/pom2.xml
- copied unchanged from r986560, ode/trunk/bpel-runtime/pom2.xml
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ConfStoreConnection.java
- copied unchanged from r986560, ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ConfStoreConnection.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ConfStoreConnectionFactory.java
- copied unchanged from r986560, ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ConfStoreConnectionFactory.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDAO.java
- copied unchanged from r986560, ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDAO.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfDAO.java
- copied unchanged from r986560, ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfDAO.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/
- copied from r986560, ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/ConfStoreConnectionHib.java
- copied unchanged from r986560, ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/ConfStoreConnectionHib.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
- copied unchanged from r986560, ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DeploymentUnitDaoImpl.java
- copied unchanged from r986560, ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DeploymentUnitDaoImpl.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/HibObj.java
- copied unchanged from r986560, ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/HibObj.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/ProcessConfDaoImpl.java
- copied unchanged from r986560, ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/ProcessConfDaoImpl.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/VersionTrackerDAOImpl.java
- copied unchanged from r986560, ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/VersionTrackerDAOImpl.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/
- copied from r986560, ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ConfStoreConnectionJpa.java
- copied unchanged from r986560, ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ConfStoreConnectionJpa.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java
- copied unchanged from r986560, ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/DeploymentUnitDaoImpl.java
- copied unchanged from r986560, ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/DeploymentUnitDaoImpl.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/JpaObj.java
- copied unchanged from r986560, ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/JpaObj.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ProcessConfDaoImpl.java
- copied unchanged from r986560, ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ProcessConfDaoImpl.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ProcessConfPropertyDaoImpl.java
- copied unchanged from r986560, ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ProcessConfPropertyDaoImpl.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/VersionTrackerDAOImpl.java
- copied unchanged from r986560, ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/VersionTrackerDAOImpl.java
ode/trunk/bpel-store/src/main/resources/META-INF/
- copied from r986560, ode/trunk/bpel-store/src/main/resources/META-INF/
ode/trunk/bpel-store/src/main/resources/META-INF/persistence.xml
- copied unchanged from r986560, ode/trunk/bpel-store/src/main/resources/META-INF/persistence.xml
ode/trunk/bpel-store/src/test/java/org/apache/ode/store/hib/
- copied from r986560, ode/trunk/bpel-store/src/test/java/org/apache/ode/store/hib/
ode/trunk/bpel-store/src/test/java/org/apache/ode/store/hib/DaoTest.java
- copied unchanged from r986560, ode/trunk/bpel-store/src/test/java/org/apache/ode/store/hib/DaoTest.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/
- copied from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/DataSourceConnectionProvider.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/DataSourceConnectionProvider.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/HibernateTransactionManagerLookup.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/HibernateTransactionManagerLookup.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/NativeHiLoGenerator.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/NativeHiLoGenerator.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/SessionManager.java
- copied unchanged from r986560, 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/
- copied from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ActivityRecoveryDaoImpl.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ActivityRecoveryDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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/CorrelationSetDaoImpl.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelationSetDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorMessageDaoImpl.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorMessageDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/FaultDAOImpl.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/FaultDAOImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateDao.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateDao.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateHandle.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateHandle.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageDaoImpl.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
- copied unchanged from r986560, 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/MessageRouteDaoImpl.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageRouteDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/PartnerLinkDAOImpl.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/PartnerLinkDAOImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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/ProcessManagementDaoImpl.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessManagementDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ScopeDaoImpl.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ScopeDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/XmlDataDaoImpl.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/XmlDataDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/
- copied from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/GZipDataType.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/GZipDataType.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HActivityRecovery.java
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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/HMessageExchangeProperty.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessageExchangeProperty.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HObject.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HObject.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HPartnerLink.java
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HXmlData.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/package.html
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/package.html
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/package.html
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/package.html
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ql/
- copied from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ql/
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ql/HibernateInstancesQueryCompiler.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ql/HibernateInstancesQueryCompiler.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ql/StateComparator.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ql/StateComparator.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/hobj/
- copied from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/hobj/
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/package.html
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/package.html
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/ql/
- copied from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/ql/
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/ql/instances/
- copied from r986560, ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/ql/instances/
ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/
- copied from r986560, ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/
ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/
- copied from r986560, ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/
ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/BaseTestDAO.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/BaseTestDAO.java
ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/ListInstanceTest.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/ListInstanceTest.java
ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/MexTest.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/MexTest.java
ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/ProcessManagementDaoTest.java
- copied unchanged from r986560, ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/ProcessManagementDaoTest.java
ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java
- copied unchanged from r986560, ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java
ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java
- copied unchanged from r986560, ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ActivityRecoveryDAOImpl.java
- copied unchanged from r986560, ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ActivityRecoveryDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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/JpaTxMgrProvider.java
- copied unchanged from r986560, ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaTxMgrProvider.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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/ProcessManagementDAOImpl.java
- copied unchanged from r986560, ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessManagementDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java
- copied unchanged from r986560, 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
- copied unchanged from r986560, 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
- copied unchanged from r986560, ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/XmlDataProperty.java
Removed:
ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/bpel/
ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/hib/
ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/jpa/bpel/
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/
ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/dbutil/DatabaseConnectionManager.java
ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/dbutil/DerbyDatabase.java
ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/dbutil/EmbeddedDatabase.java
ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/dbutil/H2Database.java
ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/txutil/
ode/trunk/bpel-store/src/test/java/org/apache/ode/store/DaoTest.java
ode/trunk/bpel-test/src/main/java/org/apache/ode/test/MockTransactionManager.java
ode/trunk/bpel-test/src/test/java/org/apache/ode/test/dao/
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/
ode/trunk/dao-hibernate/src/test/java/org/apache/ode/dao/
ode/trunk/dao-jpa-db/
ode/trunk/dao-jpa-hibernate/
ode/trunk/dao-jpa-ojpa/
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaConnection.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaOperator.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/
Modified:
ode/trunk/axis2-war/pom.xml
ode/trunk/axis2-war/src/main/assembly/bin.xml
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
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/ProcessCronCleanupTest.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/axis2/instancecleanup/SystemCronCleanupTest.java
ode/trunk/axis2-war/src/test/maven2/ode-axis2.properties
ode/trunk/axis2-war/src/test/resources/test-log4j.properties
ode/trunk/axis2-war/src/test/webapp/WEB-INF/conf.jpa-derby/ode-axis2.properties
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/OdeGlobalConfig.java
ode/trunk/bpel-dao/pom.xml
ode/trunk/bpel-epr/pom.xml
ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
ode/trunk/bpel-runtime/pom.xml
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelDatabase.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelManagementFacadeImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcessDatabase.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BrokeredMyRoleMessageExchangeImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Contexts.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/DebuggerSupport.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/InterceptorContextImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MexDaoUtil.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerRoleMessageExchangeImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessCleanUpRunnable.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessStatusConverter.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/RuntimeDataCleanupRunnable.java (contents, props changed)
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeyMigration.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeySetDataMigration.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeySetMigration.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelatorsMigration.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/Migration.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/MigrationHandler.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/OutstandingRequestsMigration.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/Replayer.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerBpelRuntimeContextImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerContext.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerScheduler.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/intercept/MessageExchangeInterceptor.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionFactoryImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/CorrelationSetDaoImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/CorrelatorDaoImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/FaultDaoImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageDAOImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageExchangeDAOImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageRouteDaoImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/PartnerLinkDAOImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessInstanceDaoImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessManagementDaoImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ScopeDaoImpl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/XmlDataDaoImpl.java
ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImplTest.java
ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/cron/CronSchedulerTest.java
ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableEngineTest.java
ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java
ode/trunk/bpel-runtime/src/test/resources/log4j.properties
ode/trunk/bpel-store/pom.xml
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
ode/trunk/bpel-store/src/test/java/org/apache/ode/store/ProcessStoreTest.java
ode/trunk/bpel-test/pom.xml
ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java
ode/trunk/bpel-test/src/test/java/org/apache/ode/test/VersionedRedeployTest.java
ode/trunk/dao-hibernate-db/build.xml
ode/trunk/dao-hibernate-db/pom.xml
ode/trunk/dao-hibernate/pom.xml
ode/trunk/dao-jpa-ojpa-derby/pom.xml
ode/trunk/dao-jpa/pom.xml
ode/trunk/dao-jpa/src/main/resources/META-INF/persistence.xml
ode/trunk/jbi/pom.xml
ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java
ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
ode/trunk/jbi/src/test/jbi/ode-jbi.properties
ode/trunk/pom.xml
ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java
ode/trunk/scheduler-simple/src/test/resources/log4j.properties
Modified: ode/trunk/axis2-war/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/pom.xml?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/axis2-war/pom.xml (original)
+++ ode/trunk/axis2-war/pom.xml Wed Aug 18 04:51:39 2010
@@ -90,23 +90,6 @@
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
- <artifactId>ode-dao-jpa</artifactId>
- <classifier>openjpa</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-dao-hibernate</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-dao-jpa-ojpa</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-dao-jpa-hibernate</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-ql</artifactId>
</dependency>
<dependency>
@@ -174,10 +157,6 @@
<artifactId>derbytools</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- </dependency>
- <dependency>
<groupId>org.jibx</groupId>
<artifactId>jibx-run</artifactId>
<version>${jibx.version}</version>
@@ -268,7 +247,7 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
+ <artifactId>hibernate</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -436,8 +415,6 @@
<exclude>**/management/InstanceManagementTest.java</exclude>
<exclude>**/rampart/basic/*Test.java</exclude>
<exclude>**/rampart/policy/*Test.java</exclude>
- <exclude>**/instancecleanup/*Test.java</exclude>
- <exclude>**/correlation/*Test.java</exclude>
</excludes>
<includes>
<include>**/*Test.java</include>
Modified: ode/trunk/axis2-war/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/main/assembly/bin.xml?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/main/assembly/bin.xml (original)
+++ ode/trunk/axis2-war/src/main/assembly/bin.xml Wed Aug 18 04:51:39 2010
@@ -37,12 +37,7 @@
</fileSet>
<fileSet>
- <directory>${basedir}/../dao-jpa-db/target/derby</directory>
- <outputDirectory>/WEB-INF</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../dao-jpa-db/target/h2</directory>
+ <directory>${basedir}/../dao-jpa-ojpa-derby/target/derby</directory>
<outputDirectory>/WEB-INF</outputDirectory>
</fileSet>
@@ -93,8 +88,7 @@
<include>org.apache.ode:ode-utils</include>
<include>org.apache.ode:ode-agents</include>
<include>org.apache.ode:ode-bpel-obj</include>
- <include>org.apache.ode:ode-dao-jpa:jar:openjpa</include>
- <include>org.apache.ode:ode-dao-jpa-ojpa</include>
+ <include>org.apache.ode:ode-dao-jpa</include>
<include>org.apache.ode:ode-bpel-ql</include>
<include>antlr:antlr</include>
<include>javax.activation:activation</include>
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=986564&r1=986563&r2=986564&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 Wed Aug 18 04:51:39 2010
@@ -21,16 +21,12 @@ package org.apache.ode.axis2;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.deployment.DeploymentConstants;
import org.apache.axis2.deployment.DeploymentEngine;
-import org.apache.axis2.deployment.FileSystemConfigurator;
import org.apache.axis2.deployment.repository.util.ArchiveReader;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisConfigurator;
import org.apache.axis2.engine.AxisServer;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.commons.logging.Log;
@@ -176,7 +172,7 @@ public abstract class Axis2TestBase {
@BeforeMethod
protected void setUp() throws Exception {
- System.out.println("##### Running "+getClass().getName());
+ log.debug("##### Running "+getClass().getName());
/**
* 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
@@ -249,7 +245,7 @@ public abstract class Axis2TestBase {
log.info("Axis2 Repo dir: " + axis2RepoDir);
}
- configContext = ConfigurationContextFactory.createConfigurationContext(new TestConfigurator(odeRootDir, axis2RepoDir, axis2ConfLocation));
+ configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(axis2RepoDir, axis2ConfLocation);
// do not use 8080 for tests, and make sure to pass a string, not an int
configContext.getAxisConfiguration().getTransportIn("http").addParameter(new Parameter("port", ""+getTestPort(0)));
}
@@ -323,9 +319,6 @@ public abstract class Axis2TestBase {
if(url.getPort()==DEFAULT_TEST_PORT_0 && url.getPort()!=getTestPort(0)){
url= new URL(url.getProtocol()+"://"+url.getHost()+":"+getTestPort(0)+url.getPath()+(url.getQuery()!=null?"?"+url.getQuery():""));
}
- System.out.println("url is: " + url.toString());
- System.out.println("file is: " + getResource(filename));
-
return HttpSoapSender.doSend(url,
new FileInputStream(getResource(filename)), null, 0, null, null, null);
} catch (IOException e) {
@@ -360,20 +353,4 @@ public abstract class Axis2TestBase {
return _ode;
}
}
-
- public static class TestConfigurator extends FileSystemConfigurator implements AxisConfigurator {
-
- String _serviceDir;
-
- public TestConfigurator(String webRoot, String serviceDir, String axis2xml) throws AxisFault {
- super(webRoot, axis2xml);
- _serviceDir = serviceDir;
- }
-
- public synchronized AxisConfiguration getAxisConfiguration() throws AxisFault {
- servicesPath = _serviceDir + File.separator + DeploymentConstants.SERVICE_PATH;
- return super.getAxisConfiguration();
- }
-
- }
}
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureHibTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureHibTest.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureHibTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureHibTest.java Wed Aug 18 04:51:39 2010
@@ -19,10 +19,8 @@
package org.apache.ode.axis2.instancecleanup;
-
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
-import org.hibernate.Query;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
public class CleanFailureHibTest extends CleanFailureTest {
@Override
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureTest.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureTest.java Wed Aug 18 04:51:39 2010
@@ -20,8 +20,8 @@
package org.apache.ode.axis2.instancecleanup;
import org.apache.ode.axis2.DummyService;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
import org.testng.annotations.Test;
public class CleanFailureTest extends CleanTestBase {
@@ -29,13 +29,9 @@ public class CleanFailureTest extends Cl
public void testCleanAll() throws Exception {
String bundleName = "TestCleanFailure";
// deploy the required service
- System.out.println("-------> Starting deploying .......");
server.deployService(DummyService.class.getCanonicalName());
- if (server.isDeployed(bundleName)) {
- server.undeployProcess(bundleName);
- }
+ if (server.isDeployed(bundleName)) server.undeployProcess(bundleName);
server.deployProcess(bundleName);
- System.out.println("-------> DEPLOYED SUCCESSFULLY.......");
try {
initialLargeDataCount = getLargeDataCount(0);
server.sendRequestFile("http://localhost:8888/processes/helloWorld", bundleName, "testRequest.soap");
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultHibTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultHibTest.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultHibTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultHibTest.java Wed Aug 18 04:51:39 2010
@@ -19,7 +19,7 @@
package org.apache.ode.axis2.instancecleanup;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
public class CleanFaultHibTest extends CleanFaultTest {
@Override
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultTest.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultTest.java Wed Aug 18 04:51:39 2010
@@ -22,8 +22,8 @@ package org.apache.ode.axis2.instancecle
import static org.testng.AssertJUnit.fail;
import org.apache.ode.axis2.DummyService;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
import org.apache.ode.bpel.iapi.ContextException;
import org.testng.annotations.Test;
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessHibTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessHibTest.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessHibTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessHibTest.java Wed Aug 18 04:51:39 2010
@@ -19,8 +19,7 @@
package org.apache.ode.axis2.instancecleanup;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
-
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
public class CleanSuccessHibTest extends CleanSuccessTest {
@Override
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessTest.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessTest.java Wed Aug 18 04:51:39 2010
@@ -19,8 +19,8 @@
package org.apache.ode.axis2.instancecleanup;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
import org.apache.ode.bpel.iapi.ContextException;
import org.testng.annotations.Test;
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanTestBase.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanTestBase.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanTestBase.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanTestBase.java Wed Aug 18 04:51:39 2010
@@ -27,14 +27,13 @@ import java.io.File;
import org.apache.ode.axis2.Axis2TestBase;
import org.apache.ode.axis2.ODEConfigDirAware;
import org.apache.ode.axis2.ODEConfigProperties;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceProfileDAO;
-import org.apache.ode.dao.bpel.ProcessProfileDAO;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceProfileDAO;
+import org.apache.ode.bpel.dao.ProcessProfileDAO;
import org.apache.ode.il.EmbeddedGeronimoFactory;
import org.apache.ode.il.dbutil.Database;
import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
import javax.transaction.TransactionManager;
@@ -44,11 +43,11 @@ public abstract class CleanTestBase exte
protected int initialLargeDataCount = 0;
@AfterMethod
- public void tearDown() throws Exception {
+ protected void tearDown() throws Exception {
stopTM();
super.tearDown();
}
-
+
protected void initTM() throws Exception {
if( txm != null ) {
try {
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/HibDaoConnectionFactoryImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/HibDaoConnectionFactoryImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/HibDaoConnectionFactoryImpl.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/HibDaoConnectionFactoryImpl.java Wed Aug 18 04:51:39 2010
@@ -24,20 +24,21 @@ import java.util.Properties;
import javax.sql.DataSource;
import javax.transaction.TransactionManager;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceProfileDAO;
-import org.apache.ode.dao.bpel.ProcessProfileDAO;
-import org.apache.ode.dao.hib.SessionManager;
-import org.apache.ode.dao.hib.bpel.BpelDAOConnectionFactoryImpl;
-import org.apache.ode.dao.hib.bpel.BpelDAOConnectionImpl;
-import org.apache.ode.dao.hib.bpel.ProcessDaoImpl;
-import org.apache.ode.dao.hib.bpel.ProcessInstanceDaoImpl;
-import org.apache.ode.dao.hib.bpel.ProcessInstanceProfileDaoImpl;
-import org.apache.ode.dao.hib.bpel.ProcessProfileDaoImpl;
-import org.apache.ode.dao.hib.bpel.hobj.HProcess;
-import org.apache.ode.dao.hib.bpel.hobj.HProcessInstance;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceProfileDAO;
+import org.apache.ode.bpel.dao.ProcessProfileDAO;
+import org.apache.ode.daohib.SessionManager;
+import org.apache.ode.daohib.bpel.BpelDAOConnectionFactoryImpl;
+import org.apache.ode.daohib.bpel.BpelDAOConnectionImpl;
+import org.apache.ode.daohib.bpel.ProcessDaoImpl;
+import org.apache.ode.daohib.bpel.ProcessInstanceDaoImpl;
+import org.apache.ode.daohib.bpel.ProcessInstanceProfileDaoImpl;
+import org.apache.ode.daohib.bpel.ProcessProfileDaoImpl;
+import org.apache.ode.daohib.bpel.hobj.HProcess;
+import org.apache.ode.daohib.bpel.hobj.HProcessInstance;
+import org.hibernate.MappingException;
import org.hibernate.Session;
import org.hibernate.cfg.Configuration;
import org.hibernate.event.PostInsertEvent;
@@ -50,16 +51,19 @@ public class HibDaoConnectionFactoryImpl
private static ProcessDaoImpl process;
@Override
- public void init(Properties initialProps, TransactionManager mgr, Object env) {
- _ds = (DataSource) env;
- _txm = mgr;
- Configuration conf = SessionManager.getDefaultConfiguration();
- conf.setListener("post-insert", HibDaoConnectionFactoryImpl.this);
- _sessionManager = setupSessionManager(conf, initialProps, _txm, _ds);
- _staticSessionManager = _sessionManager;
+ protected SessionManager createSessionManager(Properties properties, DataSource ds, TransactionManager tm) {
+ _staticSessionManager = new SessionManager(properties, ds, tm) {
+ @Override
+ public Configuration getDefaultConfiguration() throws MappingException {
+ Configuration conf = super.getDefaultConfiguration();
+ conf.setListener("post-insert", HibDaoConnectionFactoryImpl.this);
+ return conf;
+ }
+ };
+
+ return _staticSessionManager;
}
- @Override
public BpelDAOConnection getConnection() {
return new ProfilingBpelDAOConnectionImpl(_sessionManager);
}
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/JpaDaoConnectionFactoryImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/JpaDaoConnectionFactoryImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/JpaDaoConnectionFactoryImpl.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/JpaDaoConnectionFactoryImpl.java Wed Aug 18 04:51:39 2010
@@ -22,24 +22,22 @@ package org.apache.ode.axis2.instancecle
import java.util.Properties;
import javax.persistence.EntityManager;
-import javax.transaction.TransactionManager;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceProfileDAO;
-import org.apache.ode.dao.bpel.ProcessProfileDAO;
-import org.apache.ode.dao.jpa.JpaOperator;
-import org.apache.ode.dao.jpa.bpel.BpelDAOConnectionImpl;
-import org.apache.ode.dao.jpa.bpel.ProcessDAOImpl;
-import org.apache.ode.dao.jpa.bpel.ProcessInstanceDAOImpl;
-import org.apache.ode.dao.jpa.bpel.ProcessInstanceProfileDAOImpl;
-import org.apache.ode.dao.jpa.bpel.ProcessProfileDAOImpl;
-import org.apache.ode.dao.jpa.openjpa.BpelDAOConnectionFactoryImpl;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceProfileDAO;
+import org.apache.ode.bpel.dao.ProcessProfileDAO;
+import org.apache.ode.dao.jpa.BPELDAOConnectionFactoryImpl;
+import org.apache.ode.dao.jpa.BPELDAOConnectionImpl;
+import org.apache.ode.dao.jpa.ProcessDAOImpl;
+import org.apache.ode.dao.jpa.ProcessInstanceDAOImpl;
+import org.apache.ode.dao.jpa.ProcessInstanceProfileDAOImpl;
+import org.apache.ode.dao.jpa.ProcessProfileDAOImpl;
import org.apache.openjpa.event.LifecycleEvent;
import org.apache.openjpa.event.PersistListener;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
-public class JpaDaoConnectionFactoryImpl extends BpelDAOConnectionFactoryImpl implements PersistListener {
+public class JpaDaoConnectionFactoryImpl extends BPELDAOConnectionFactoryImpl implements PersistListener {
private static ProcessInstanceDAO instance;
private static ProcessDAO process;
@@ -52,16 +50,16 @@ public class JpaDaoConnectionFactoryImpl
}
@Override
- public void init(Properties properties, TransactionManager mgr, Object env) {
- super.init(properties, mgr, env);
+ public void init(Properties properties) {
+ super.init(properties);
if( _emf instanceof OpenJPAEntityManagerFactorySPI ) {
((OpenJPAEntityManagerFactorySPI)_emf).addLifecycleListener(this, ProcessInstanceDAOImpl.class, ProcessDAOImpl.class);
}
}
@Override
- protected BpelDAOConnectionImpl createBPELDAOConnection(EntityManager em, TransactionManager mgr, JpaOperator operator) {
- return new ProfilingBPELDAOConnectionImpl(em, mgr, operator);
+ protected BPELDAOConnectionImpl createBPELDAOConnection(EntityManager em) {
+ return new ProfilingBPELDAOConnectionImpl(em);
}
public void afterPersist(LifecycleEvent event) {
@@ -75,11 +73,11 @@ public class JpaDaoConnectionFactoryImpl
public void beforePersist(LifecycleEvent event) {
}
- public static class ProfilingBPELDAOConnectionImpl extends BpelDAOConnectionImpl implements ProfilingBpelDAOConnection {
- public ProfilingBPELDAOConnectionImpl(EntityManager em, TransactionManager mgr, JpaOperator operator) {
- super(em, mgr, operator);
+ public static class ProfilingBPELDAOConnectionImpl extends BPELDAOConnectionImpl implements ProfilingBpelDAOConnection {
+ public ProfilingBPELDAOConnectionImpl(EntityManager em) {
+ super(em);
}
-
+
public ProcessProfileDAO createProcessProfile(ProcessDAO process) {
return new ProcessProfileDAOImpl(_em, (ProcessDAOImpl)process);
}
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProcessCronCleanupTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProcessCronCleanupTest.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProcessCronCleanupTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProcessCronCleanupTest.java Wed Aug 18 04:51:39 2010
@@ -18,8 +18,8 @@
*/
package org.apache.ode.axis2.instancecleanup;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
import org.testng.annotations.Test;
public class ProcessCronCleanupTest extends CleanTestBase {
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProfilingBpelDAOConnection.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProfilingBpelDAOConnection.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProfilingBpelDAOConnection.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProfilingBpelDAOConnection.java Wed Aug 18 04:51:39 2010
@@ -19,11 +19,11 @@
package org.apache.ode.axis2.instancecleanup;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceProfileDAO;
-import org.apache.ode.dao.bpel.ProcessProfileDAO;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceProfileDAO;
+import org.apache.ode.bpel.dao.ProcessProfileDAO;
public interface ProfilingBpelDAOConnection extends BpelDAOConnection {
ProcessProfileDAO createProcessProfile(ProcessDAO instance);
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/SystemCronCleanupTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/SystemCronCleanupTest.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/SystemCronCleanupTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/SystemCronCleanupTest.java Wed Aug 18 04:51:39 2010
@@ -19,8 +19,8 @@
package org.apache.ode.axis2.instancecleanup;
import org.apache.commons.logging.LogFactory;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
import org.apache.ode.bpel.engine.cron.SystemSchedulesConfig;
import org.testng.annotations.AfterClass;
Modified: ode/trunk/axis2-war/src/test/maven2/ode-axis2.properties
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/maven2/ode-axis2.properties?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/maven2/ode-axis2.properties (original)
+++ ode/trunk/axis2-war/src/test/maven2/ode-axis2.properties Wed Aug 18 04:51:39 2010
@@ -22,7 +22,6 @@ ode-axis2.db.int.driver=org.h2.Driver
ode-axis2.cluster.localRoute.targets=http://doesntexist:8080/ode/processes/
ode-axis2.cluster.localRoute.base=http://localhost:8888/ode/processes/
ode-axis2.event.listeners=org.apache.ode.bpel.common.evt.DebugBpelEventListener
-hibernate.dialect=org.hibernate.dialect.H2Dialect
+#hibernate.dialect=org.hibernate.dialect.H2Dialect
ode-axis2.acquireTransactionLocks=true
-ode-axis2.db.emb.create=false
Modified: ode/trunk/axis2-war/src/test/resources/test-log4j.properties
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/test-log4j.properties?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/test-log4j.properties (original)
+++ ode/trunk/axis2-war/src/test/resources/test-log4j.properties Wed Aug 18 04:51:39 2010
@@ -22,22 +22,20 @@
# The logging properties used during tests..
#
#log4j.rootLogger=DEBUG, file
-log4j.rootLogger=DEBUG, file
+log4j.rootLogger=INFO, file
log4j.appender.file=org.apache.log4j.FileAppender
log4j.appender.file.File=target/test/test.log
log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d %-5p [%c] %m%n
+log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} | %-5p | %-10t | %-24.24c{1} | %-30.30C %4L | %m%n
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%c] %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} | %-5p | %-10t | %-24.24c{1} | %-30.30C %4L | %m%n
log4j.category.httpclient=INFO
log4j.category.httpclient.Wire=INFO
-log4j.category.org.apache.ode=DEBUG
-log4j.category.org.apache.ode.sql=INFO
+log4j.category.org.apache.ode=INFO
log4j.category.hibernate=INFO
log4j.category.org.hibernate=INFO
log4j.category.org.apache.axis2=INFO
-log4j.category.openjpa=INFO
Modified: ode/trunk/axis2-war/src/test/webapp/WEB-INF/conf.jpa-derby/ode-axis2.properties
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/webapp/WEB-INF/conf.jpa-derby/ode-axis2.properties?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/webapp/WEB-INF/conf.jpa-derby/ode-axis2.properties (original)
+++ ode/trunk/axis2-war/src/test/webapp/WEB-INF/conf.jpa-derby/ode-axis2.properties Wed Aug 18 04:51:39 2010
@@ -15,9 +15,4 @@
# limitations under the License.
#
-ode-axis2.dao.factory=org.apache.ode.axis2.instancecleanup.JpaDaoConnectionFactoryImpl
-#ode-axis2.db.mode=INTERNAL
-#ode-axis2.db.int.jdbcurl=jdbc:h2:file:${basedir}/target/webapp/WEB-INF/jpadb/ode-ojpa-h2;DB_CLOSE_ON_EXIT=false;user=sa;TRACE_LEVEL_FILE=3
-#ode-axis2.db.int.driver=org.h2.Driver
-#ode-axis2.acquireTransactionLocks=true
-ode-axis2.db.emb.type=derby
\ No newline at end of file
+ode-axis2.dao.factory=org.apache.ode.axis2.instancecleanup.JpaDaoConnectionFactoryImpl
\ No newline at end of file
Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java (original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java Wed Aug 18 04:51:39 2010
@@ -58,6 +58,7 @@ import org.apache.ode.axis2.service.Depl
import org.apache.ode.axis2.service.ManagementService;
import org.apache.ode.axis2.util.ClusterUrlTransformer;
import org.apache.ode.bpel.connector.BpelServerConnector;
+import org.apache.ode.bpel.dao.BpelDAOConnectionFactory;
import org.apache.ode.bpel.engine.BpelServerImpl;
import org.apache.ode.bpel.engine.CountLRUDehydrationPolicy;
import org.apache.ode.bpel.engine.cron.CronScheduler;
@@ -72,8 +73,6 @@ import org.apache.ode.bpel.intercept.Mes
import org.apache.ode.bpel.memdao.BpelDAOConnectionFactoryImpl;
import org.apache.ode.bpel.pmapi.InstanceManagement;
import org.apache.ode.bpel.pmapi.ProcessManagement;
-import org.apache.ode.dao.bpel.BpelDAOConnectionFactory;
-import org.apache.ode.dao.store.ConfStoreDAOConnectionFactory;
import org.apache.ode.il.dbutil.Database;
import org.apache.ode.scheduler.simple.JdbcDelegate;
import org.apache.ode.scheduler.simple.SimpleScheduler;
@@ -110,8 +109,6 @@ public class ODEServer {
protected TransactionManager _txMgr;
protected BpelDAOConnectionFactory _daoCF;
-
- protected ConfStoreDAOConnectionFactory _storeDaoCF;
protected ExecutorService _executorService;
@@ -438,7 +435,6 @@ public class ODEServer {
__log.info(__msgs.msgOdeUsingDAOImpl(_odeConfig.getDAOConnectionFactory()));
try {
_daoCF = _db.createDaoCF();
- _storeDaoCF = _db.createDaoStoreCF();
} catch (Exception ex) {
String errmsg = __msgs.msgDAOInstantiationFailed(_odeConfig.getDAOConnectionFactory());
__log.error(errmsg, ex);
@@ -458,7 +454,7 @@ public class ODEServer {
}
protected ProcessStoreImpl createProcessStore(EndpointReferenceContext eprContext, DataSource ds) {
- return new ProcessStoreImpl(eprContext,_txMgr,_storeDaoCF);
+ return new ProcessStoreImpl(eprContext, ds, _odeConfig.getDAOConnectionFactory(), _odeConfig, false);
}
protected Scheduler createScheduler() {
Modified: ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/OdeGlobalConfig.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/OdeGlobalConfig.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/OdeGlobalConfig.java (original)
+++ ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/OdeGlobalConfig.java Wed Aug 18 04:51:39 2010
@@ -24,7 +24,7 @@ public class OdeGlobalConfig {
return Boolean.parseBoolean(System.getProperty("org.apache.ode.queueInOutMessages", "true"));
}
public static boolean autoRetireProcess() {
- return Boolean.parseBoolean(System.getProperty("org.apache.ode.autoRetireProcess", "true"));
+ return Boolean.parseBoolean(System.getProperty("org.apache.ode.autoRetireProcess", "false"));
}
public static boolean autoincrementVersion() {
return Boolean.parseBoolean(System.getProperty("org.apache.ode.autoincrementVersion", "true"));
Modified: ode/trunk/bpel-dao/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-dao/pom.xml?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-dao/pom.xml (original)
+++ ode/trunk/bpel-dao/pom.xml Wed Aug 18 04:51:39 2010
@@ -36,9 +36,5 @@
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- </dependency>
</dependencies>
</project>
Modified: ode/trunk/bpel-epr/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-epr/pom.xml?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-epr/pom.xml (original)
+++ ode/trunk/bpel-epr/pom.xml Wed Aug 18 04:51:39 2010
@@ -48,15 +48,8 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
Modified: ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java (original)
+++ ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java Wed Aug 18 04:51:39 2010
@@ -45,10 +45,6 @@ public class OdeConfigProperties {
public static final String PROP_DB_EXTERNAL_DS = "db.ext.dataSource";
public static final String PROP_DB_EMBEDDED_NAME = "db.emb.name";
-
- public static final String PROP_DB_EMBEDDED_TYPE = "db.emb.type";
-
- public static final String PROP_DB_EMBEDDED_CREATE = "db.emb.create";
public static final String PROP_DB_INTERNAL_URL = "db.int.jdbcurl";
@@ -77,7 +73,7 @@ public class OdeConfigProperties {
public static final String PROP_WORKING_DIR = "working.dir";
public static final String PROP_DEPLOY_DIR = "deploy.dir";
-
+
public static final String PROP_EVENT_LISTENERS = "event.listeners";
public static final String PROP_MEX_INTERCEPTORS = "mex.interceptors";
@@ -87,27 +83,23 @@ public class OdeConfigProperties {
public static final String PROP_PROCESS_DEHYDRATION = "process.dehydration";
public static final String PROP_PROCESS_DEHYDRATION_MAXIMUM_AGE = "process.dehydration.maximum.age";
-
+
public static final String PROP_PROCESS_DEHYDRATION_MAXIMUM_COUNT = "process.dehydration.maximum.count";
-
+
public static final String PROP_PROCESS_HYDRATION_LAZY = "process.hydration.lazy";
-
+
public static final String PROP_PROCESS_HYDRATION_LAZY_MINIMUM_SIZE = "process.hydration.lazy.minimum.size";
-
+
public static final String PROP_PROCESS_HYDRATION_THROTTLED_MAXIMUM_COUNT = "process.hydration.throttled.maximum.count";
-
+
public static final String PROP_PROCESS_HYDRATION_THROTTLED_MAXIMUM_SIZE = "process.hydration.throttled.maximum.size";
-
+
public static final String PROP_PROCESS_INSTANCE_THROTTLED_MAXIMUM_COUNT = "process.instance.throttled.maximum.count";
-
- public static final String PROP_DAOCF = "dao.factory";
- public static final String PROP_DAOCF_STORE = "dao.factory.store";
+ public static final String PROP_DAOCF = "dao.factory";
- public static final String PROP_DAOCF_SCHEDULER = "dao.factory.scheduler";
-
public static final String PROP_MIGRATION_TRANSACTION_TIMEOUT = "migration.transaction.timeout";
-
+
public static final String DEFAULT_TX_FACTORY_CLASS_NAME = "org.apache.ode.il.EmbeddedGeronimoFactory";
private File _cfgFile;
@@ -118,12 +110,7 @@ public class OdeConfigProperties {
/** Default defaults for the database embedded name and dao connection factory class. */
private static String __dbEmbName = "jpadb";
- public static String DEFAULT_DAOCF_CLASS = "org.apache.ode.dao.jpa.openjpa.BpelDAOConnectionFactoryImpl";
- public static String DEFAULT_DAOCF_STORE_CLASS = "org.apache.ode.dao.jpa.openjpa.ConfStoreDAOConnectionFactoryImpl";
-
- /** Default defaults for the database embedded name and dao connection factory class. */
- public static String DEFAULT_DB_EMB_NAME = "ode-db";
- public static String DEFAULT_DB_EMB_TYPE = "h2";
+ private static String __daoCfClass = "org.apache.ode.dao.jpa.BPELDAOConnectionFactoryImpl";
static {
String odep = System.getProperty("ode.persistence");
@@ -131,8 +118,8 @@ public class OdeConfigProperties {
"hibernate".equalsIgnoreCase(odep)) {
__log.debug("Using HIBERNATE due to system property override!");
__dbEmbName = "hibdb";
- DEFAULT_DAOCF_CLASS = "org.apache.ode.dao.hib.bpel.BpelDAOConnectionFactoryImpl";
- DEFAULT_DAOCF_STORE_CLASS = "org.apache.ode.dao.hib.store.ConfStoreDAOConnectionFactoryImpl";
+ __daoCfClass = "org.apache.ode.daohib.bpel.BpelDAOConnectionFactoryImpl";
+
}
}
/**
@@ -148,18 +135,6 @@ public class OdeConfigProperties {
/** Embedded database (Ode provides default embedded database with connection pool) */
EMBEDDED
}
-
- /**
- * Possible database implementation.
- */
- public enum EmbeddedDbType {
-
- DERBY,
-
- H2,
-
- HSQL
- }
public OdeConfigProperties(File cfgFile, String prefix) {
_cfgFile = cfgFile;
@@ -213,28 +188,15 @@ public class OdeConfigProperties {
}
- public EmbeddedDbType getDbEmbeddedType() {
- return EmbeddedDbType.valueOf(getProperty(OdeConfigProperties.PROP_DB_EMBEDDED_TYPE, DEFAULT_DB_EMB_TYPE).trim().toUpperCase());
- }
-
- public boolean isDbEmbeddedCreate() {
- return Boolean.valueOf(getProperty(OdeConfigProperties.PROP_DB_EMBEDDED_CREATE, "true"));
- }
-
public DatabaseMode getDbMode() {
return DatabaseMode.valueOf(getProperty(OdeConfigProperties.PROP_DB_MODE, DatabaseMode.EMBEDDED.toString()).trim()
.toUpperCase());
}
public String getDAOConnectionFactory() {
- return getProperty(PROP_DAOCF, DEFAULT_DAOCF_CLASS);
- }
-
- public String getDAOConfStoreConnectionFactory() {
- return getProperty(PROP_DAOCF_STORE, DEFAULT_DAOCF_STORE_CLASS);
+ return getProperty(PROP_DAOCF, __daoCfClass);
}
-
public String getDbDataSource() {
return getProperty(OdeConfigProperties.PROP_DB_EXTERNAL_DS, "java:comp/env/jdbc/ode-ds");
}
@@ -242,11 +204,11 @@ public class OdeConfigProperties {
public String getDbIntenralJdbcUrl() {
return getProperty(OdeConfigProperties.PROP_DB_INTERNAL_URL, "jdbc:derby://localhost/ode");
}
-
+
public String getDbInternalMCFClass() {
return getProperty("db.int.mcf");
}
-
+
public Properties getDbInternalMCFProperties() {
String prefix = _prefix + "db.int.mcf.";
Properties p = new Properties();
@@ -277,7 +239,7 @@ public class OdeConfigProperties {
}
public int getPoolMaxSize() {
- return Integer.valueOf(getProperty(OdeConfigProperties.PROP_POOL_MAX, "15"));
+ return Integer.valueOf(getProperty(OdeConfigProperties.PROP_POOL_MAX, "10"));
}
public int getPoolMinSize() {
@@ -299,7 +261,7 @@ public class OdeConfigProperties {
public String getDeployDir() {
return getProperty(OdeConfigProperties.PROP_DEPLOY_DIR);
}
-
+
public String getTxFactoryClass() {
return getProperty(OdeConfigProperties.PROP_TX_FACTORY_CLASS, DEFAULT_TX_FACTORY_CLASS_NAME);
}
@@ -320,38 +282,38 @@ public class OdeConfigProperties {
return Boolean.valueOf(getProperty(OdeConfigProperties.PROP_PROCESS_DEHYDRATION, "false"));
}
- public long getDehydrationMaximumAge() {
+ public long getDehydrationMaximumAge() {
return Long.valueOf(getProperty(PROP_PROCESS_DEHYDRATION_MAXIMUM_AGE, ""+20*60*1000));
}
-
+
public int getDehydrationMaximumCount() {
return Integer.valueOf(getProperty(PROP_PROCESS_DEHYDRATION_MAXIMUM_COUNT, ""+1000));
}
-
+
public boolean isHydrationLazy() {
return Boolean.valueOf(getProperty(OdeConfigProperties.PROP_PROCESS_HYDRATION_LAZY, "true"));
}
-
+
public int getHydrationLazyMinimumSize() {
return Integer.valueOf(getProperty(OdeConfigProperties.PROP_PROCESS_HYDRATION_LAZY_MINIMUM_SIZE, String.valueOf(0)));
}
-
+
public int getProcessThrottledMaximumCount() {
return Integer.valueOf(getProperty(OdeConfigProperties.PROP_PROCESS_HYDRATION_THROTTLED_MAXIMUM_COUNT, String.valueOf(Integer.MAX_VALUE)));
}
-
+
public int getInstanceThrottledMaximumCount() {
return Integer.valueOf(getProperty(OdeConfigProperties.PROP_PROCESS_INSTANCE_THROTTLED_MAXIMUM_COUNT, String.valueOf(Integer.MAX_VALUE)));
}
-
+
public long getProcessThrottledMaximumSize() {
return Long.valueOf(getProperty(OdeConfigProperties.PROP_PROCESS_HYDRATION_THROTTLED_MAXIMUM_SIZE, String.valueOf(Long.MAX_VALUE)));
}
-
+
public boolean isProcessSizeThrottled() {
return getProcessThrottledMaximumSize() == Long.MAX_VALUE;
}
-
+
public boolean isDbLoggingEnabled() {
return Boolean.valueOf(getProperty(OdeConfigProperties.PROP_DB_LOGGING, "false"));
}
@@ -376,7 +338,7 @@ public class OdeConfigProperties {
public String getDbInternalPassword() {
return getProperty(PROP_DB_INTERNAL_PASSWORD);
}
-
+
public int getMigrationTransactionTimeout() {
return Integer.valueOf(getProperty(PROP_MIGRATION_TRANSACTION_TIMEOUT, String.valueOf(0)));
}