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:12:59 UTC
svn commit: r986561 [1/13] - 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-wa...
Author: jeffyu
Date: Wed Aug 18 04:12:49 2010
New Revision: 986561
URL: http://svn.apache.org/viewvc?rev=986561&view=rev
Log:
* ODE-805, cleanup jpa module. will commit this first, and then make a branch for this.
Added:
ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/bpel/
ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/bpel/ProcessInstanceProfileDAO.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/bpel/ProcessProfileDAO.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/hib/
ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/hib/bpel/
ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/hib/bpel/ProcessInstanceProfileDaoImpl.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/hib/bpel/ProcessProfileDaoImpl.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/jpa/bpel/
ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/jpa/bpel/ProcessInstanceProfileDAOImpl.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/jpa/bpel/ProcessProfileDAOImpl.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/DAOConnection.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/DAOConnectionFactory.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/ActivityRecoveryDAO.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/BpelDAOConnection.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/BpelDAOConnectionFactory.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/BpelDAOConnectionFactoryJDBC.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/CorrelationSetDAO.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/CorrelatorDAO.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/CorrelatorMessageDAO.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/DeferredProcessInstanceCleanable.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/FaultDAO.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/FilteredInstanceDeletable.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/MessageDAO.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/MessageExchangeDAO.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/MessageRouteDAO.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/NoRootContextException.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/PartnerLinkDAO.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/ProcessDAO.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/ProcessInstanceDAO.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/ProcessManagementDAO.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/QueryReturnedEmptyResultException.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/QueryReturnedMultipleResultsException.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/RoleEnum.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/ScopeDAO.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/ScopeStateEnum.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/bpel/XmlDataDAO.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/store/
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/store/ConfStoreDAOConnection.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/store/ConfStoreDAOConnectionFactory.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/store/DeploymentUnitDAO.java
ode/trunk/bpel-dao/src/main/java/org/apache/ode/dao/store/ProcessConfDAO.java
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-epr/src/main/java/org/apache/ode/il/txutil/TransactionConfigException.java
ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/txutil/TxManager.java
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/bpel-test/src/test/java/org/apache/ode/test/dao/bpel/
ode/trunk/bpel-test/src/test/java/org/apache/ode/test/dao/bpel/BaseTestDAO.java
ode/trunk/bpel-test/src/test/java/org/apache/ode/test/dao/bpel/ListInstanceTest.java
ode/trunk/bpel-test/src/test/java/org/apache/ode/test/dao/bpel/MexTest.java
ode/trunk/bpel-test/src/test/java/org/apache/ode/test/dao/bpel/ProcessManagementDaoTest.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/DataSourceConnectionProvider.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/HibernateTransactionManagerLookup.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/JotmTransaction.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/JotmTransactionFactory.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/NativeHiLoGenerator.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/SessionManager.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/ActivityRecoveryDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/BpelDAOConnectionFactoryImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/BpelDAOConnectionImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/CorrelationSetDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/CorrelatorDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/CorrelatorMessageDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/CriteriaBuilder.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/FaultDAOImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/HibernateDao.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/HibernateHandle.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/MessageDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/MessageExchangeDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/MessageRouteDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/PartnerLinkDAOImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/ProcessDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/ProcessInstanceDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/ProcessManagementDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/ScopeDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/XmlDataDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/GZipDataType.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/HActivityRecovery.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/HBpelEvent.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/HCorrelationProperty.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/HCorrelationSet.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/HCorrelator.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/HCorrelatorMessage.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/HCorrelatorMessageKey.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/HCorrelatorSelector.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/HFaultData.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/HLargeData.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/HMessage.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/HMessageExchange.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/HMessageExchangeProperty.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/HObject.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/HPartnerLink.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/HProcess.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/HProcessInstance.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/HScope.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/HVariableProperty.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/HXmlData.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/hobj/package.html
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/package.html
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/ql/
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/ql/HibernateInstancesQueryCompiler.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/ql/StateComparator.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/package.html
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/store/
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/store/ConfStoreDAOConnectionFactoryImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/store/ConfStoreDAOConnectionImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/store/HibernateDao.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/store/hobj/
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/store/hobj/DeploymentUnitDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/store/hobj/ProcessConfDaoImpl.java
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/store/hobj/VersionTrackerDAOImpl.java
ode/trunk/dao-hibernate/src/test/java/org/apache/ode/dao/
ode/trunk/dao-hibernate/src/test/java/org/apache/ode/dao/hib/
ode/trunk/dao-hibernate/src/test/java/org/apache/ode/dao/hib/bpel/
ode/trunk/dao-jpa-db/
ode/trunk/dao-jpa-db/build.xml (with props)
ode/trunk/dao-jpa-db/derby.log
ode/trunk/dao-jpa-db/pom.xml (with props)
ode/trunk/dao-jpa-db/shutdown.sql (with props)
ode/trunk/dao-jpa-db/src/
ode/trunk/dao-jpa-db/src/main/
ode/trunk/dao-jpa-db/src/main/assembly/
ode/trunk/dao-jpa-db/src/main/assembly/bin.xml (with props)
ode/trunk/dao-jpa-db/src/main/descriptors/
ode/trunk/dao-jpa-db/src/main/descriptors/persistence.derby.xml (with props)
ode/trunk/dao-jpa-db/src/main/descriptors/persistence.h2.xml (with props)
ode/trunk/dao-jpa-db/src/main/descriptors/persistence.mysql.xml (with props)
ode/trunk/dao-jpa-db/src/main/descriptors/persistence.oracle.xml (with props)
ode/trunk/dao-jpa-db/src/main/descriptors/persistence.postgres.xml (with props)
ode/trunk/dao-jpa-db/src/main/scripts/
ode/trunk/dao-jpa-db/src/main/scripts/common.sql (with props)
ode/trunk/dao-jpa-db/src/main/scripts/license-header.sql (with props)
ode/trunk/dao-jpa-db/src/main/scripts/simplesched-derby.sql (with props)
ode/trunk/dao-jpa-db/src/main/scripts/simplesched-h2.sql (with props)
ode/trunk/dao-jpa-db/src/main/scripts/simplesched-mysql.sql (with props)
ode/trunk/dao-jpa-db/src/main/scripts/simplesched-oracle.sql (with props)
ode/trunk/dao-jpa-db/src/main/scripts/simplesched-postgres.sql (with props)
ode/trunk/dao-jpa-db/src/test/
ode/trunk/dao-jpa-db/src/test/java/
ode/trunk/dao-jpa-db/src/test/java/org/
ode/trunk/dao-jpa-db/src/test/java/org/apache/
ode/trunk/dao-jpa-db/src/test/java/org/apache/ode/
ode/trunk/dao-jpa-db/src/test/java/org/apache/ode/dao/
ode/trunk/dao-jpa-db/src/test/java/org/apache/ode/dao/jpa/
ode/trunk/dao-jpa-db/src/test/java/org/apache/ode/dao/jpa/test/
ode/trunk/dao-jpa-db/src/test/resources/
ode/trunk/dao-jpa-db/src/test/resources/META-INF/
ode/trunk/dao-jpa-db/src/test/resources/META-INF/persistence.xml (with props)
ode/trunk/dao-jpa-hibernate/
ode/trunk/dao-jpa-hibernate/build.xml
ode/trunk/dao-jpa-hibernate/pom.xml
ode/trunk/dao-jpa-hibernate/src/
ode/trunk/dao-jpa-hibernate/src/main/
ode/trunk/dao-jpa-hibernate/src/main/descriptors/
ode/trunk/dao-jpa-hibernate/src/main/descriptors/persistence.db.xml
ode/trunk/dao-jpa-hibernate/src/main/files/
ode/trunk/dao-jpa-hibernate/src/main/files/hibernate.cfg/
ode/trunk/dao-jpa-hibernate/src/main/files/hibernate.cfg/hsql.properties
ode/trunk/dao-jpa-hibernate/src/main/files/hibernate.cfg/mysql.properties
ode/trunk/dao-jpa-hibernate/src/main/files/hibernate.cfg/oracle.properties
ode/trunk/dao-jpa-hibernate/src/main/files/hibernate.cfg/postgres.properties
ode/trunk/dao-jpa-hibernate/src/main/files/hibernate.cfg/sqlserver.properties
ode/trunk/dao-jpa-hibernate/src/main/java/
ode/trunk/dao-jpa-hibernate/src/main/java/org/
ode/trunk/dao-jpa-hibernate/src/main/java/org/apache/
ode/trunk/dao-jpa-hibernate/src/main/java/org/apache/ode/
ode/trunk/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/
ode/trunk/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/
ode/trunk/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/
ode/trunk/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/BpelDAOConnectionFactoryImpl.java
ode/trunk/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/ConfStoreDAOConnectionFactoryImpl.java
ode/trunk/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/DataSourceConnectionProvider.java
ode/trunk/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/HibernateTransactionManagerLookup.java
ode/trunk/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/HibernateUtil.java
ode/trunk/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/JpaOperatorImpl.java
ode/trunk/dao-jpa-hibernate/src/main/resources/
ode/trunk/dao-jpa-hibernate/src/main/resources/META-INF/
ode/trunk/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml
ode/trunk/dao-jpa-hibernate/src/main/scripts/
ode/trunk/dao-jpa-hibernate/src/main/scripts/common.sql
ode/trunk/dao-jpa-hibernate/src/main/scripts/license-header.sql
ode/trunk/dao-jpa-hibernate/src/main/scripts/simplesched-hsql.sql
ode/trunk/dao-jpa-hibernate/src/main/scripts/simplesched-mysql.sql
ode/trunk/dao-jpa-hibernate/src/main/scripts/simplesched-oracle.sql
ode/trunk/dao-jpa-hibernate/src/main/scripts/simplesched-postgres.sql
ode/trunk/dao-jpa-hibernate/src/main/scripts/simplesched-sqlserver.sql
ode/trunk/dao-jpa-ojpa/
ode/trunk/dao-jpa-ojpa/pom.xml
ode/trunk/dao-jpa-ojpa/src/
ode/trunk/dao-jpa-ojpa/src/main/
ode/trunk/dao-jpa-ojpa/src/main/descriptors/
ode/trunk/dao-jpa-ojpa/src/main/descriptors/persistence.derby.xml
ode/trunk/dao-jpa-ojpa/src/main/descriptors/persistence.mysql.xml
ode/trunk/dao-jpa-ojpa/src/main/descriptors/persistence.oracle.xml
ode/trunk/dao-jpa-ojpa/src/main/descriptors/persistence.postgres.xml
ode/trunk/dao-jpa-ojpa/src/main/java/
ode/trunk/dao-jpa-ojpa/src/main/java/org/
ode/trunk/dao-jpa-ojpa/src/main/java/org/apache/
ode/trunk/dao-jpa-ojpa/src/main/java/org/apache/ode/
ode/trunk/dao-jpa-ojpa/src/main/java/org/apache/ode/dao/
ode/trunk/dao-jpa-ojpa/src/main/java/org/apache/ode/dao/jpa/
ode/trunk/dao-jpa-ojpa/src/main/java/org/apache/ode/dao/jpa/openjpa/
ode/trunk/dao-jpa-ojpa/src/main/java/org/apache/ode/dao/jpa/openjpa/BpelDAOConnectionFactoryImpl.java
ode/trunk/dao-jpa-ojpa/src/main/java/org/apache/ode/dao/jpa/openjpa/ConfStoreDAOConnectionFactoryImpl.java
ode/trunk/dao-jpa-ojpa/src/main/java/org/apache/ode/dao/jpa/openjpa/JpaOperatorImpl.java
ode/trunk/dao-jpa-ojpa/src/main/java/org/apache/ode/dao/jpa/openjpa/JpaTxMgrProvider.java
ode/trunk/dao-jpa-ojpa/src/main/scripts/
ode/trunk/dao-jpa-ojpa/src/main/scripts/license-header.sql
ode/trunk/dao-jpa-ojpa/src/main/scripts/simplesched-derby.sql
ode/trunk/dao-jpa-ojpa/src/main/scripts/simplesched-mysql.sql
ode/trunk/dao-jpa-ojpa/src/main/scripts/simplesched-oracle.sql
ode/trunk/dao-jpa-ojpa/src/main/scripts/simplesched-postgres.sql
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/bpel/ActivityRecoveryDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/BpelDAO.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/BpelDAOConnectionImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrSetProperty.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelationSetDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelatorDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/EventDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/FaultDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/JpaTxMgrProvider.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageExchangeDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageRouteDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MexProperty.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/PartnerLinkDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessInstanceDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessManagementDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ScopeDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/XmlDataDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/XmlDataProperty.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/ConfStoreDAO.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/ConfStoreDAOConnectionImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/DeploymentUnitDaoImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/ProcessConfDaoImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/ProcessConfPropertyDaoImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/VersionTrackerDAOImpl.java
Removed:
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/ProcessInstanceProfileDAO.java
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
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/bpel-runtime/pom2.xml
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
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
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/
ode/trunk/bpel-store/src/main/resources/META-INF/
ode/trunk/bpel-store/src/test/java/org/apache/ode/store/hib/
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/
ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/
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
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
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/JpaTxMgrProvider.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/ProcessManagementDAOImpl.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
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
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=986561&r1=986560&r2=986561&view=diff
==============================================================================
--- ode/trunk/axis2-war/pom.xml (original)
+++ ode/trunk/axis2-war/pom.xml Wed Aug 18 04:12:49 2010
@@ -90,6 +90,23 @@
</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>
@@ -157,6 +174,10 @@
<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>
@@ -247,7 +268,7 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
+ <artifactId>hibernate-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -415,6 +436,8 @@
<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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -37,7 +37,12 @@
</fileSet>
<fileSet>
- <directory>${basedir}/../dao-jpa-ojpa-derby/target/derby</directory>
+ <directory>${basedir}/../dao-jpa-db/target/derby</directory>
+ <outputDirectory>/WEB-INF</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../dao-jpa-db/target/h2</directory>
<outputDirectory>/WEB-INF</outputDirectory>
</fileSet>
@@ -88,7 +93,8 @@
<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</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-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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -21,12 +21,16 @@ 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;
@@ -172,7 +176,7 @@ public abstract class Axis2TestBase {
@BeforeMethod
protected void setUp() throws Exception {
- log.debug("##### Running "+getClass().getName());
+ System.out.println("##### 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
@@ -245,7 +249,7 @@ public abstract class Axis2TestBase {
log.info("Axis2 Repo dir: " + axis2RepoDir);
}
- configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(axis2RepoDir, axis2ConfLocation);
+ configContext = ConfigurationContextFactory.createConfigurationContext(new TestConfigurator(odeRootDir, 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)));
}
@@ -319,6 +323,9 @@ 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) {
@@ -353,4 +360,20 @@ 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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -19,8 +19,10 @@
package org.apache.ode.axis2.instancecleanup;
-import org.apache.ode.bpel.dao.ProcessDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+
+import org.apache.ode.dao.bpel.ProcessDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceDAO;
+import org.hibernate.Query;
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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -20,8 +20,8 @@
package org.apache.ode.axis2.instancecleanup;
import org.apache.ode.axis2.DummyService;
-import org.apache.ode.bpel.dao.ProcessDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ProcessDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceDAO;
import org.testng.annotations.Test;
public class CleanFailureTest extends CleanTestBase {
@@ -29,9 +29,13 @@ 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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -19,7 +19,7 @@
package org.apache.ode.axis2.instancecleanup;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.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=986561&r1=986560&r2=986561&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:12:49 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.bpel.dao.ProcessDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ProcessDAO;
+import org.apache.ode.dao.bpel.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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -19,7 +19,8 @@
package org.apache.ode.axis2.instancecleanup;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -19,8 +19,8 @@
package org.apache.ode.axis2.instancecleanup;
-import org.apache.ode.bpel.dao.ProcessDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ProcessDAO;
+import org.apache.ode.dao.bpel.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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -27,13 +27,14 @@ 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.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.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.il.EmbeddedGeronimoFactory;
import org.apache.ode.il.dbutil.Database;
import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
import javax.transaction.TransactionManager;
@@ -43,11 +44,11 @@ public abstract class CleanTestBase exte
protected int initialLargeDataCount = 0;
@AfterMethod
- protected void tearDown() throws Exception {
+ public 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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -24,21 +24,20 @@ import java.util.Properties;
import javax.sql.DataSource;
import javax.transaction.TransactionManager;
-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.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.hibernate.Session;
import org.hibernate.cfg.Configuration;
import org.hibernate.event.PostInsertEvent;
@@ -51,19 +50,16 @@ public class HibDaoConnectionFactoryImpl
private static ProcessDaoImpl process;
@Override
- 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;
+ 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;
}
+ @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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -22,22 +22,24 @@ package org.apache.ode.axis2.instancecle
import java.util.Properties;
import javax.persistence.EntityManager;
+import javax.transaction.TransactionManager;
-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.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.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;
@@ -50,16 +52,16 @@ public class JpaDaoConnectionFactoryImpl
}
@Override
- public void init(Properties properties) {
- super.init(properties);
+ public void init(Properties properties, TransactionManager mgr, Object env) {
+ super.init(properties, mgr, env);
if( _emf instanceof OpenJPAEntityManagerFactorySPI ) {
((OpenJPAEntityManagerFactorySPI)_emf).addLifecycleListener(this, ProcessInstanceDAOImpl.class, ProcessDAOImpl.class);
}
}
@Override
- protected BPELDAOConnectionImpl createBPELDAOConnection(EntityManager em) {
- return new ProfilingBPELDAOConnectionImpl(em);
+ protected BpelDAOConnectionImpl createBPELDAOConnection(EntityManager em, TransactionManager mgr, JpaOperator operator) {
+ return new ProfilingBPELDAOConnectionImpl(em, mgr, operator);
}
public void afterPersist(LifecycleEvent event) {
@@ -73,11 +75,11 @@ public class JpaDaoConnectionFactoryImpl
public void beforePersist(LifecycleEvent event) {
}
- public static class ProfilingBPELDAOConnectionImpl extends BPELDAOConnectionImpl implements ProfilingBpelDAOConnection {
- public ProfilingBPELDAOConnectionImpl(EntityManager em) {
- super(em);
+ public static class ProfilingBPELDAOConnectionImpl extends BpelDAOConnectionImpl implements ProfilingBpelDAOConnection {
+ public ProfilingBPELDAOConnectionImpl(EntityManager em, TransactionManager mgr, JpaOperator operator) {
+ super(em, mgr, operator);
}
-
+
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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -18,8 +18,8 @@
*/
package org.apache.ode.axis2.instancecleanup;
-import org.apache.ode.bpel.dao.ProcessDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ProcessDAO;
+import org.apache.ode.dao.bpel.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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -19,11 +19,11 @@
package org.apache.ode.axis2.instancecleanup;
-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.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;
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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -19,8 +19,8 @@
package org.apache.ode.axis2.instancecleanup;
import org.apache.commons.logging.LogFactory;
-import org.apache.ode.bpel.dao.ProcessDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ProcessDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceDAO;
import org.apache.ode.bpel.engine.cron.SystemSchedulesConfig;
import org.testng.annotations.AfterClass;
Added: ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/bpel/ProcessInstanceProfileDAO.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/bpel/ProcessInstanceProfileDAO.java?rev=986561&view=auto
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/bpel/ProcessInstanceProfileDAO.java (added)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/bpel/ProcessInstanceProfileDAO.java Wed Aug 18 04:12:49 2010
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+
+package org.apache.ode.dao.bpel;
+
+import java.util.List;
+
+import org.apache.ode.dao.bpel.ActivityRecoveryDAO;
+import org.apache.ode.dao.bpel.CorrelationSetDAO;
+import org.apache.ode.dao.bpel.FaultDAO;
+import org.apache.ode.dao.bpel.MessageDAO;
+import org.apache.ode.dao.bpel.MessageExchangeDAO;
+import org.apache.ode.dao.bpel.MessageRouteDAO;
+import org.apache.ode.dao.bpel.PartnerLinkDAO;
+import org.apache.ode.dao.bpel.ProcessDAO;
+import org.apache.ode.dao.bpel.ScopeDAO;
+import org.apache.ode.dao.bpel.XmlDataDAO;
+
+public interface ProcessInstanceProfileDAO extends ProcessProfileDAO {
+ ProcessDAO getProcess();
+
+ List<ActivityRecoveryDAO> findActivityRecoveriesByInstance();
+
+ List<CorrelationSetDAO> findCorrelationSetsByInstance();
+
+ List<FaultDAO> findFaultsByInstance();
+
+ List<MessageDAO> findMessagesByInstance();
+
+ List<MessageExchangeDAO> findMessageExchangesByInstance();
+
+ List<MessageRouteDAO> findMessageRoutesByInstance();
+
+ List<PartnerLinkDAO> findPartnerLinksByInstance();
+
+ List<ScopeDAO> findScopesByInstance();
+
+ List<XmlDataDAO> findXmlDataByInstance();
+
+ int countEventsByInstance();
+}
\ No newline at end of file
Added: ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/bpel/ProcessProfileDAO.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/bpel/ProcessProfileDAO.java?rev=986561&view=auto
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/bpel/ProcessProfileDAO.java (added)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/bpel/ProcessProfileDAO.java Wed Aug 18 04:12:49 2010
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+
+package org.apache.ode.dao.bpel;
+
+import java.util.List;
+
+import org.apache.ode.dao.bpel.ActivityRecoveryDAO;
+import org.apache.ode.dao.bpel.CorrelationSetDAO;
+import org.apache.ode.dao.bpel.CorrelatorDAO;
+import org.apache.ode.dao.bpel.FaultDAO;
+import org.apache.ode.dao.bpel.MessageDAO;
+import org.apache.ode.dao.bpel.MessageExchangeDAO;
+import org.apache.ode.dao.bpel.MessageRouteDAO;
+import org.apache.ode.dao.bpel.PartnerLinkDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ScopeDAO;
+import org.apache.ode.dao.bpel.XmlDataDAO;
+
+public interface ProcessProfileDAO {
+ boolean doesProcessExist();
+
+ List<ProcessInstanceDAO> findInstancesByProcess();
+
+ List<ActivityRecoveryDAO> findActivityRecoveriesByProcess();
+
+ List<CorrelationSetDAO> findCorrelationSetsByProcess();
+
+ List<CorrelatorDAO> findCorrelatorsByProcess();
+
+ List<FaultDAO> findFaultsByProcess();
+
+ List<MessageDAO> findMessagesByProcess();
+
+ List<MessageExchangeDAO> findMessageExchangesByProcess();
+
+ List<MessageRouteDAO> findMessageRoutesByProcess();
+
+ List<PartnerLinkDAO> findPartnerLinksByProcess();
+
+ List<ScopeDAO> findScopesByProcess();
+
+ List<XmlDataDAO> findXmlDataByProcess();
+
+ int countEventsByProcess();
+}
\ No newline at end of file
Added: ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/hib/bpel/ProcessInstanceProfileDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/hib/bpel/ProcessInstanceProfileDaoImpl.java?rev=986561&view=auto
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/hib/bpel/ProcessInstanceProfileDaoImpl.java (added)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/hib/bpel/ProcessInstanceProfileDaoImpl.java Wed Aug 18 04:12:49 2010
@@ -0,0 +1,135 @@
+/*
+ * 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.
+ */
+
+package org.apache.ode.dao.hib.bpel;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ode.dao.bpel.ActivityRecoveryDAO;
+import org.apache.ode.dao.bpel.CorrelationSetDAO;
+import org.apache.ode.dao.bpel.FaultDAO;
+import org.apache.ode.dao.bpel.MessageDAO;
+import org.apache.ode.dao.bpel.MessageExchangeDAO;
+import org.apache.ode.dao.bpel.MessageRouteDAO;
+import org.apache.ode.dao.bpel.PartnerLinkDAO;
+import org.apache.ode.dao.bpel.ProcessDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceProfileDAO;
+import org.apache.ode.dao.bpel.ScopeDAO;
+import org.apache.ode.dao.bpel.XmlDataDAO;
+import org.apache.ode.dao.hib.SessionManager;
+import org.apache.ode.dao.hib.bpel.hobj.HActivityRecovery;
+import org.apache.ode.dao.hib.bpel.hobj.HCorrelationSet;
+import org.apache.ode.dao.hib.bpel.hobj.HCorrelatorSelector;
+import org.apache.ode.dao.hib.bpel.hobj.HFaultData;
+import org.apache.ode.dao.hib.bpel.hobj.HMessage;
+import org.apache.ode.dao.hib.bpel.hobj.HMessageExchange;
+import org.apache.ode.dao.hib.bpel.hobj.HPartnerLink;
+import org.apache.ode.dao.hib.bpel.hobj.HScope;
+import org.apache.ode.dao.hib.bpel.hobj.HXmlData;
+import org.hibernate.Query;
+
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * Hibernate based {@link ProcessInstanceProfileDao} implementation
+ */
+public class ProcessInstanceProfileDaoImpl extends ProcessProfileDaoImpl implements ProcessInstanceProfileDAO {
+ @SuppressWarnings("unused")
+ private static final Log __log = LogFactory.getLog(ProcessInstanceProfileDaoImpl.class);
+
+ private ProcessInstanceDaoImpl instance;
+
+ public ProcessInstanceProfileDaoImpl(SessionManager sm, ProcessInstanceDaoImpl instance) {
+ super(sm, (ProcessDaoImpl)instance.getProcess());
+ entering("ProcessInstanceProfileDaoImpl.ProcessInstanceProfileDaoImpl");
+ this.instance = instance;
+ }
+
+ public SessionManager getSessionManager() {
+ return _sm;
+ }
+
+ public ProcessDAO getProcess() {
+ return process;
+ }
+
+ public List<MessageExchangeDAO> findMessageExchangesByInstance() {
+ return findByInstance("from HMessageExchange as x where x.instance = :instance)", MessageExchangeDaoImpl.class, HMessageExchange.class);
+ }
+
+ public List<MessageRouteDAO> findMessageRoutesByInstance() {
+ return findByInstance("from HCorrelatorSelector as s where s.instance = :instance", MessageRouteDaoImpl.class, HCorrelatorSelector.class);
+ }
+
+ public List<MessageDAO> findMessagesByInstance() {
+ return findByInstance("from HMessage as m where m.messageExchange.instance = :instance)", MessageDaoImpl.class, HMessage.class);
+ }
+
+ public List<PartnerLinkDAO> findPartnerLinksByInstance() {
+ return findByInstance("from HPartnerLink as p where p.scope.instance = :instance)", PartnerLinkDAOImpl.class, HPartnerLink.class);
+ }
+
+ public List<ScopeDAO> findScopesByInstance() {
+ return findByInstance("from HScope as s where s.instance = :instance)", ScopeDaoImpl.class, HScope.class);
+ }
+
+ public List<XmlDataDAO> findXmlDataByInstance() {
+ return findByInstance("from HXmlData as x where x.instance = :instance", XmlDataDaoImpl.class, HXmlData.class);
+ }
+
+ public List<ActivityRecoveryDAO> findActivityRecoveriesByInstance() {
+ return findByInstance("from HActivityRecovery as a where a.instance = :instance", ActivityRecoveryDaoImpl.class, HActivityRecovery.class);
+ }
+
+ public List<CorrelationSetDAO> findCorrelationSetsByInstance() {
+ return findByInstance("from HCorrelationSet as s where s.instance = :instance", CorrelationSetDaoImpl.class, HCorrelationSet.class);
+ }
+
+ public List<FaultDAO> findFaultsByInstance() {
+ return findByInstance("from HFaultData as f where f in (select i.fault from HProcessInstance as i where i = :instance and i.fault is not null)", FaultDAOImpl.class, HFaultData.class);
+ }
+
+ public int countEventsByInstance() {
+ Query query = getSession().createQuery("select count(id) from HBpelEvent as e where e.instance = :instance");
+ query.setParameter("instance", instance._hobj);
+
+ return ((Long)query.uniqueResult()).intValue();
+ }
+
+ @SuppressWarnings("unchecked")
+ protected <D, H> List<D> findByInstance(String queryString, Class daoClass, Class hibClass) {
+ List<D> results = new ArrayList<D>();
+
+ try {
+ Query query = getSession().createQuery(queryString);
+ query.setParameter("instance", instance._hobj);
+ for( H hibObj : (Collection<H>)query.list()) {
+ Constructor<D> c = daoClass.getConstructor(SessionManager.class, hibClass);
+ results.add( c.newInstance(_sm, hibObj) );
+ }
+ } catch( Exception e ) {
+ throw new RuntimeException(e);
+ }
+
+ return results;
+ }
+}
\ No newline at end of file
Added: ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/hib/bpel/ProcessProfileDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/hib/bpel/ProcessProfileDaoImpl.java?rev=986561&view=auto
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/hib/bpel/ProcessProfileDaoImpl.java (added)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/hib/bpel/ProcessProfileDaoImpl.java Wed Aug 18 04:12:49 2010
@@ -0,0 +1,156 @@
+/*
+ * 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.
+ */
+
+package org.apache.ode.dao.hib.bpel;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ode.dao.bpel.ActivityRecoveryDAO;
+import org.apache.ode.dao.bpel.CorrelationSetDAO;
+import org.apache.ode.dao.bpel.CorrelatorDAO;
+import org.apache.ode.dao.bpel.FaultDAO;
+import org.apache.ode.dao.bpel.MessageDAO;
+import org.apache.ode.dao.bpel.MessageExchangeDAO;
+import org.apache.ode.dao.bpel.MessageRouteDAO;
+import org.apache.ode.dao.bpel.PartnerLinkDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ProcessProfileDAO;
+import org.apache.ode.dao.bpel.ScopeDAO;
+import org.apache.ode.dao.bpel.XmlDataDAO;
+import org.apache.ode.dao.hib.SessionManager;
+import org.apache.ode.dao.hib.bpel.hobj.HActivityRecovery;
+import org.apache.ode.dao.hib.bpel.hobj.HCorrelationSet;
+import org.apache.ode.dao.hib.bpel.hobj.HCorrelator;
+import org.apache.ode.dao.hib.bpel.hobj.HCorrelatorSelector;
+import org.apache.ode.dao.hib.bpel.hobj.HFaultData;
+import org.apache.ode.dao.hib.bpel.hobj.HMessage;
+import org.apache.ode.dao.hib.bpel.hobj.HMessageExchange;
+import org.apache.ode.dao.hib.bpel.hobj.HPartnerLink;
+import org.apache.ode.dao.hib.bpel.hobj.HProcess;
+import org.apache.ode.dao.hib.bpel.hobj.HProcessInstance;
+import org.apache.ode.dao.hib.bpel.hobj.HScope;
+import org.apache.ode.dao.hib.bpel.hobj.HXmlData;
+import org.hibernate.Query;
+
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * Hibernate based {@link ProcessProfileDAO} implementation
+ */
+public class ProcessProfileDaoImpl extends HibernateDao implements ProcessProfileDAO {
+ @SuppressWarnings("unused")
+ private static final Log __log = LogFactory.getLog(ProcessProfileDaoImpl.class);
+
+ protected ProcessDaoImpl process;
+
+ public ProcessProfileDaoImpl(SessionManager sm, ProcessDaoImpl process) {
+ super(sm, process._hobj);
+ entering("ProcessProfileDaoImpl.ProcessProfileDaoImpl");
+ this.process = process;
+ }
+
+ public SessionManager getSessionManager() {
+ return _sm;
+ }
+
+ @SuppressWarnings("unchecked")
+ public boolean doesProcessExist() {
+ boolean exists = false;
+
+ Query query = getSession().createQuery("select count(id) from HProcess as p where p.guid = :guid");
+ query.setParameter("guid", ((HProcess)process._hobj).getGuid());
+ for( Long cnt : (List<Long>)query.list()) {
+ exists = cnt.intValue() > 0;
+ }
+
+ return exists;
+ }
+
+ public List<ProcessInstanceDAO> findInstancesByProcess() {
+ return findByProcess("from HProcessInstance as i where i.process = :process)", ProcessInstanceDaoImpl.class, HProcessInstance.class);
+ }
+
+ public List<MessageExchangeDAO> findMessageExchangesByProcess() {
+ return findByProcess("from HMessageExchange as x where x.instance.process = :process)", MessageExchangeDaoImpl.class, HMessageExchange.class);
+ }
+
+ public List<MessageRouteDAO> findMessageRoutesByProcess() {
+ return findByProcess("from HCorrelatorSelector as s where s.instance.process = :process)", MessageRouteDaoImpl.class, HCorrelatorSelector.class);
+ }
+
+ public List<MessageDAO> findMessagesByProcess() {
+ return findByProcess("from HMessage as m where m.messageExchange.process = :process)", MessageDaoImpl.class, HMessage.class);
+ }
+
+ public List<PartnerLinkDAO> findPartnerLinksByProcess() {
+ return findByProcess("from HPartnerLink as p where p.process = :process)", PartnerLinkDAOImpl.class, HPartnerLink.class);
+ }
+
+ public List<ScopeDAO> findScopesByProcess() {
+ return findByProcess("from HScope as s where s.instance.process = :process", ScopeDaoImpl.class, HScope.class);
+ }
+
+ public List<XmlDataDAO> findXmlDataByProcess() {
+ return findByProcess("from HXmlData as x where x.instance.process = :process", XmlDataDaoImpl.class, HXmlData.class);
+ }
+
+ public List<ActivityRecoveryDAO> findActivityRecoveriesByProcess() {
+ return findByProcess("from HActivityRecovery as a where a.instance.process = :process", ActivityRecoveryDaoImpl.class, HActivityRecovery.class);
+ }
+
+ public List<CorrelationSetDAO> findCorrelationSetsByProcess() {
+ return findByProcess("from HCorrelationSet as s where s.process = :process", CorrelationSetDaoImpl.class, HCorrelationSet.class);
+ }
+
+ public List<CorrelatorDAO> findCorrelatorsByProcess() {
+ return findByProcess("from HCorrelator as c where c.process = :process", CorrelatorDaoImpl.class, HCorrelator.class);
+ }
+
+ public List<FaultDAO> findFaultsByProcess() {
+ return findByProcess("from HFaultData as f where f in (select i.fault from HProcessInstance as i where i.process = :process and i.fault is not null)", FaultDAOImpl.class, HFaultData.class);
+ }
+
+ public int countEventsByProcess() {
+ Query query = getSession().createQuery("select count(id) from HBpelEvent as e where e.instance.process = :process");
+ query.setParameter("process", process._hobj);
+
+ return ((Long)query.uniqueResult()).intValue();
+ }
+
+ @SuppressWarnings("unchecked")
+ protected <D, H> List<D> findByProcess(String queryString, Class daoClass, Class hibClass) {
+ List<D> results = new ArrayList<D>();
+
+ try {
+ Query query = getSession().createQuery(queryString);
+ query.setParameter("process", process._hobj);
+ for( H hibObj : (Collection<H>)query.list()) {
+ Constructor<D> c = daoClass.getConstructor(SessionManager.class, hibClass);
+ results.add( c.newInstance(_sm, hibObj) );
+ }
+ } catch( Exception e ) {
+ throw new RuntimeException(e);
+ }
+
+ return results;
+ }
+}
\ No newline at end of file
Added: ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/jpa/bpel/ProcessInstanceProfileDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/jpa/bpel/ProcessInstanceProfileDAOImpl.java?rev=986561&view=auto
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/jpa/bpel/ProcessInstanceProfileDAOImpl.java (added)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/jpa/bpel/ProcessInstanceProfileDAOImpl.java Wed Aug 18 04:12:49 2010
@@ -0,0 +1,109 @@
+/*
+ * 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.
+ */
+
+package org.apache.ode.dao.jpa.bpel;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ode.dao.bpel.ActivityRecoveryDAO;
+import org.apache.ode.dao.bpel.CorrelationSetDAO;
+import org.apache.ode.dao.bpel.FaultDAO;
+import org.apache.ode.dao.bpel.MessageDAO;
+import org.apache.ode.dao.bpel.MessageExchangeDAO;
+import org.apache.ode.dao.bpel.MessageRouteDAO;
+import org.apache.ode.dao.bpel.PartnerLinkDAO;
+import org.apache.ode.dao.bpel.ProcessDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceProfileDAO;
+import org.apache.ode.dao.bpel.ScopeDAO;
+import org.apache.ode.dao.bpel.XmlDataDAO;
+
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+
+/**
+ * OpenJPA based {@link ProcessInstanceProfileDAO} implementation
+ */
+public class ProcessInstanceProfileDAOImpl extends ProcessProfileDAOImpl implements ProcessInstanceProfileDAO {
+ @SuppressWarnings("unused")
+ private static final Log __log = LogFactory.getLog(ProcessInstanceProfileDAOImpl.class);
+
+ private ProcessInstanceDAOImpl instance;
+
+ public ProcessInstanceProfileDAOImpl(EntityManager em, ProcessInstanceDAOImpl instance) {
+ super(em, (ProcessDAOImpl)instance.getProcess());
+ this.instance = instance;
+ }
+
+ public ProcessDAO getProcess() {
+ return process;
+ }
+
+ public List<MessageExchangeDAO> findMessageExchangesByInstance() {
+ return findByInstance("select x from MessageExchangeDAOImpl as x where x._processInst = :instance");
+ }
+
+ public List<MessageRouteDAO> findMessageRoutesByInstance() {
+ return findByInstance("select r from MessageRouteDAOImpl as r where r._processInst = :instance");
+ }
+
+ public List<MessageDAO> findMessagesByInstance() {
+ return findByInstance("select m from MessageDAOImpl as m where m._messageExchange._processInst = :instance");
+ }
+
+ public List<PartnerLinkDAO> findPartnerLinksByInstance() {
+ return findByInstance("select p from PartnerLinkDAOImpl as p where p._scope._processInstance = :instance");
+ }
+
+ public List<ScopeDAO> findScopesByInstance() {
+ return findByInstance("select s from ScopeDAOImpl as s where s._processInstance = :instance");
+ }
+
+ public List<XmlDataDAO> findXmlDataByInstance() {
+ return findByInstance("select x from XmlDataDAOImpl as x where x._scope._processInstance = :instance");
+ }
+
+ public List<ActivityRecoveryDAO> findActivityRecoveriesByInstance() {
+ return findByInstance("select a from ActivityRecoveryDAOImpl as a where a._instance = :instance");
+ }
+
+ public List<CorrelationSetDAO> findCorrelationSetsByInstance() {
+ return findByInstance("select s from CorrelationSetDAOImpl as s where s._scope._processInstance = :instance");
+ }
+
+ public List<FaultDAO> findFaultsByInstance() {
+ return findByInstance("select f from FaultDAOImpl as f where f._id in (select i._fault from ProcessInstanceDAOImpl as i where i = :instance and i._fault is not null)");
+ }
+
+ public int countEventsByInstance() {
+ Query query = em.createQuery("select count(e._id) from EventDAOImpl as e where e._instance = :instance");
+ query.setParameter("instance", instance);
+
+ return ((Long)query.getSingleResult()).intValue();
+ }
+
+ @SuppressWarnings("unchecked")
+ protected <D> List<D> findByInstance(String queryString) {
+ Query query = em.createQuery(queryString);
+ query.setParameter("instance", instance);
+
+ return query.getResultList();
+ }
+}
\ No newline at end of file
Added: ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/jpa/bpel/ProcessProfileDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/jpa/bpel/ProcessProfileDAOImpl.java?rev=986561&view=auto
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/jpa/bpel/ProcessProfileDAOImpl.java (added)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/jpa/bpel/ProcessProfileDAOImpl.java Wed Aug 18 04:12:49 2010
@@ -0,0 +1,122 @@
+/*
+ * 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.
+ */
+
+package org.apache.ode.dao.jpa.bpel;
+
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ode.dao.bpel.ActivityRecoveryDAO;
+import org.apache.ode.dao.bpel.CorrelationSetDAO;
+import org.apache.ode.dao.bpel.CorrelatorDAO;
+import org.apache.ode.dao.bpel.FaultDAO;
+import org.apache.ode.dao.bpel.MessageDAO;
+import org.apache.ode.dao.bpel.MessageExchangeDAO;
+import org.apache.ode.dao.bpel.MessageRouteDAO;
+import org.apache.ode.dao.bpel.PartnerLinkDAO;
+import org.apache.ode.dao.bpel.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.ProcessProfileDAO;
+import org.apache.ode.dao.bpel.ScopeDAO;
+import org.apache.ode.dao.bpel.XmlDataDAO;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+
+/**
+ * OpenJPA based {@link ProcessProfileDAO} implementation
+ */
+public class ProcessProfileDAOImpl implements ProcessProfileDAO {
+ @SuppressWarnings("unused")
+ private static final Log __log = LogFactory.getLog(ProcessProfileDAOImpl.class);
+
+ protected EntityManager em;
+ protected ProcessDAOImpl process;
+
+ public ProcessProfileDAOImpl(EntityManager em, ProcessDAOImpl process) {
+ this.process = process;
+ this.em = em;
+ }
+
+ public boolean doesProcessExist() {
+ Query query = em.createQuery("select count(p._id) from ProcessDAOImpl as p where p._guid = :guid");
+ query.setParameter("guid", process.getGuid());
+
+ return ((Long)query.getSingleResult()) > 0;
+ }
+
+ public List<ProcessInstanceDAO> findInstancesByProcess() {
+ return findByProcess("select i from ProcessInstanceDAOImpl as i where i._process = :process");
+ }
+
+ public List<MessageExchangeDAO> findMessageExchangesByProcess() {
+ return findByProcess("select x from MessageExchangeDAOImpl as x where x._processInst._process = :process");
+ }
+
+ public List<MessageRouteDAO> findMessageRoutesByProcess() {
+ return findByProcess("select r from MessageRouteDAOImpl as r where r._processInst._process = :process");
+ }
+
+ public List<MessageDAO> findMessagesByProcess() {
+ return findByProcess("select m from MessageDAOImpl as m where m._messageExchange._process = :process");
+ }
+
+ public List<PartnerLinkDAO> findPartnerLinksByProcess() {
+ return findByProcess("select p from PartnerLinkDAOImpl as p where p._scope._processInstance._process = :process");
+ }
+
+ public List<ScopeDAO> findScopesByProcess() {
+ return findByProcess("select s from ScopeDAOImpl as s where s._processInstance._process = :process");
+ }
+
+ public List<XmlDataDAO> findXmlDataByProcess() {
+ return findByProcess("select x from XmlDataDAOImpl as x where x._scope._processInstance._process = :process");
+ }
+
+ public List<ActivityRecoveryDAO> findActivityRecoveriesByProcess() {
+ return findByProcess("select a from ActivityRecoveryDAOImpl as a where a._instance._process = :process");
+ }
+
+ public List<CorrelationSetDAO> findCorrelationSetsByProcess() {
+ return findByProcess("select s from CorrelationSetDAOImpl as s where s._scope._processInstance._process = :process");
+ }
+
+ public List<CorrelatorDAO> findCorrelatorsByProcess() {
+ return findByProcess("select c from CorrelatorDAOImpl as c where c._process = :process");
+ }
+
+ public List<FaultDAO> findFaultsByProcess() {
+ return findByProcess("select f from FaultDAOImpl as f where f._id in(select i._fault from ProcessInstanceDAOImpl as i where i._process = :process and i._fault is not null)");
+ }
+
+ public int countEventsByProcess() {
+ Query query = em.createQuery("select count(e._id) from EventDAOImpl as e where e._instance._process = :process");
+ query.setParameter("process", process);
+
+ return ((Long)query.getSingleResult()).intValue();
+ }
+
+ @SuppressWarnings("unchecked")
+ protected <D> List<D> findByProcess(String queryString) {
+ Query query = em.createQuery(queryString);
+ query.setParameter("process", process);
+
+ return query.getResultList();
+ }
+}
\ No newline at end of file
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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -22,6 +22,7 @@ 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