Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessProfileDAOImpl.java URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessProfileDAOImpl.java?rev=947422&r1=947421&r2=947422&view=diff ============================================================================== --- ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessProfileDAOImpl.java (original) +++ ode/trunk/axis2-war/src/test/java/org/apache/ode/dao/jpa/ProcessProfileDAOImpl.java Sun May 23 15:01:38 2010 @@ -23,18 +23,19 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.ode.bpel.dao.ActivityRecoveryDAO; -import org.apache.ode.bpel.dao.CorrelationSetDAO; -import org.apache.ode.bpel.dao.CorrelatorDAO; -import org.apache.ode.bpel.dao.FaultDAO; -import org.apache.ode.bpel.dao.MessageDAO; -import org.apache.ode.bpel.dao.MessageExchangeDAO; -import org.apache.ode.bpel.dao.MessageRouteDAO; -import org.apache.ode.bpel.dao.PartnerLinkDAO; -import org.apache.ode.bpel.dao.ProcessInstanceDAO; -import org.apache.ode.bpel.dao.ProcessProfileDAO; -import org.apache.ode.bpel.dao.ScopeDAO; -import org.apache.ode.bpel.dao.XmlDataDAO; +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; +import org.apache.ode.dao.bpel.ProcessProfileDAO; +import org.apache.ode.dao.jpa.bpel.ProcessDAOImpl; import javax.persistence.EntityManager; import javax.persistence.Query; @@ -42,7 +43,7 @@ import javax.persistence.Query; /** * OpenJPA based {...@link ProcessProfileDAO} implementation */ -public class ProcessProfileDAOImpl extends OpenJPADAO implements ProcessProfileDAO { +public class ProcessProfileDAOImpl implements ProcessProfileDAO { @SuppressWarnings("unused") private static final Log __log = LogFactory.getLog(ProcessProfileDAOImpl.class); @@ -50,6 +51,7 @@ public class ProcessProfileDAOImpl exten protected ProcessDAOImpl process; public ProcessProfileDAOImpl(EntityManager em, ProcessDAOImpl process) { + assert process != null; this.process = process; this.em = em; }
Modified: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/process-sample02_standalone_policy/sample02-policy-for-service.xml URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/process-sample02_standalone_policy/sample02-policy-for-service.xml?rev=947422&r1=947421&r2=947422&view=diff ============================================================================== --- ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/process-sample02_standalone_policy/sample02-policy-for-service.xml (original) +++ ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/process-sample02_standalone_policy/sample02-policy-for-service.xml Sun May 23 15:01:38 2010 @@ -72,7 +72,7 @@ <ramp:signatureCrypto> <ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin"> <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property> - <ramp:property name="org.apache.ws.security.crypto.merlin.file">service.jks</ramp:property> + <ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampartPolicy/secured-processes/service.jks</ramp:property> <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property> </ramp:crypto> </ramp:signatureCrypto> Modified: ode/trunk/axis2-war/src/test/webapp/WEB-INF/conf.hib-derby/ode-axis2.properties URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/webapp/WEB-INF/conf.hib-derby/ode-axis2.properties?rev=947422&r1=947421&r2=947422&view=diff ============================================================================== --- ode/trunk/axis2-war/src/test/webapp/WEB-INF/conf.hib-derby/ode-axis2.properties (original) +++ ode/trunk/axis2-war/src/test/webapp/WEB-INF/conf.hib-derby/ode-axis2.properties Sun May 23 15:01:38 2010 @@ -14,10 +14,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # - ode-axis2.dao.factory=org.apache.ode.axis2.instancecleanup.HibDaoConnectionFactoryImpl -ode-axis2.db.emb.name=hibdb +ode-axis2.dao.factory.store=org.apache.ode.dao.hib.store.ConfStoreDAOConnectionFactoryImpl +ode-axis2.db.emb.name=ode-db-hib ode-axis2.db.mode=EMBEDDED +ode-axis2.db.emb.type=derby +ode-axis2.db.emb.create=false 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 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=947422&r1=947421&r2=947422&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 Sun May 23 15:01:38 2010 @@ -15,4 +15,6 @@ # limitations under the License. # -ode-axis2.dao.factory=org.apache.ode.axis2.instancecleanup.JpaDaoConnectionFactoryImpl \ No newline at end of file +ode-axis2.dao.factory=org.apache.ode.axis2.instancecleanup.JpaDaoConnectionFactoryImpl +ode-axis2.db.emb.type=derby +ode-axis2.db.emb.create=false \ No newline at end of file Modified: ode/trunk/axis2/pom.xml URL: http://svn.apache.org/viewvc/ode/trunk/axis2/pom.xml?rev=947422&r1=947421&r2=947422&view=diff ============================================================================== --- ode/trunk/axis2/pom.xml (original) +++ ode/trunk/axis2/pom.xml Sun May 23 15:01:38 2010 @@ -122,6 +122,22 @@ </excludes> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>wsdl</classifier> + <classesDirectory>src/main/wsdl</classesDirectory> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> 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=947422&r1=947421&r2=947422&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 Sun May 23 15:01:38 2010 @@ -278,7 +278,7 @@ public class OdeConfigProperties { } public int getPoolMaxSize() { - return Integer.valueOf(getProperty(OdeConfigProperties.PROP_POOL_MAX, "10")); + return Integer.valueOf(getProperty(OdeConfigProperties.PROP_POOL_MAX, "15")); } public int getPoolMinSize() { Modified: ode/trunk/bpel-schemas/pom.xml URL: http://svn.apache.org/viewvc/ode/trunk/bpel-schemas/pom.xml?rev=947422&r1=947421&r2=947422&view=diff ============================================================================== --- ode/trunk/bpel-schemas/pom.xml (original) +++ ode/trunk/bpel-schemas/pom.xml Sun May 23 15:01:38 2010 @@ -50,6 +50,7 @@ <configuration> <schemaDirectory>src/main/xsd</schemaDirectory> <sourceGenerationDirectory>target/generated/xmlbeans</sourceGenerationDirectory> + <classGenerationDirectory>target/generated/xmlbeans</classGenerationDirectory> <xmlConfigs> <xmlConfig implementation="java.io.File">src/main/xsd/dd.xsdconfig</xmlConfig> <xmlConfig implementation="java.io.File">src/main/xsd/pmapi.xsdconfig</xmlConfig> @@ -65,6 +66,25 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>xsd</classifier> + <classesDirectory>src/main/xsd</classesDirectory> + <includes> + <include>*.xsd</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> Modified: ode/trunk/dao-hibernate-db/pom.xml URL: http://svn.apache.org/viewvc/ode/trunk/dao-hibernate-db/pom.xml?rev=947422&r1=947421&r2=947422&view=diff ============================================================================== --- ode/trunk/dao-hibernate-db/pom.xml (original) +++ ode/trunk/dao-hibernate-db/pom.xml Sun May 23 15:01:38 2010 @@ -21,7 +21,7 @@ <project> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ode</groupId> - <artifactId>ode-dao-hibernate-db</artifactId> + <artifactId>ode-dao-hib-db</artifactId> <name>ODE :: Hibernate DAO DDL Generation</name> <parent> Modified: ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/BpelDAOConnectionFactoryImpl.java URL: http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/BpelDAOConnectionFactoryImpl.java?rev=947422&r1=947421&r2=947422&view=diff ============================================================================== --- ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/BpelDAOConnectionFactoryImpl.java (original) +++ ode/trunk/dao-hibernate/src/main/java/org/apache/ode/dao/hib/bpel/BpelDAOConnectionFactoryImpl.java Sun May 23 15:01:38 2010 @@ -48,9 +48,9 @@ public class BpelDAOConnectionFactoryImp protected SessionManager _sessionManager; - private DataSource _ds; + protected DataSource _ds; - private TransactionManager _tm; + protected TransactionManager _txm; /** * Constructor. @@ -72,12 +72,12 @@ public class BpelDAOConnectionFactoryImp */ @SuppressWarnings("unchecked") public void init(Properties initialProps, TransactionManager mgr, Object env) { - _tm=mgr; + _txm=mgr; _ds=(DataSource)env; - if (_tm == null){ + if (_txm == null){ __log.error("Hibernate BpelDAOConnectionFactoryImpl requires a JTA Transaction Manager to be set."); } - _sessionManager = setupSessionManager(initialProps, _tm, _ds); + _sessionManager = setupSessionManager(initialProps, _txm, _ds); } @@ -198,7 +198,7 @@ public class BpelDAOConnectionFactoryImp } public void setTransactionManager(Object tm) { - _tm = (TransactionManager) tm; + _txm = (TransactionManager) tm; } public void setUnmanagedDataSource(DataSource ds) { Modified: ode/trunk/dao-jpa-db/pom.xml URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa-db/pom.xml?rev=947422&r1=947421&r2=947422&view=diff ============================================================================== --- ode/trunk/dao-jpa-db/pom.xml (original) +++ ode/trunk/dao-jpa-db/pom.xml Sun May 23 15:01:38 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.ode</groupId> <artifactId>ode</artifactId> - <version>1.3.4-SNAPSHOT</version> + <version>1.3.5-SNAPSHOT</version> </parent> <dependencies>
