You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hise-commits@incubator.apache.org by rr...@apache.org on 2010/01/14 13:26:47 UTC
svn commit: r899191 - in /incubator/hise/trunk: hise-services/
hise-services/src/main/java/org/apache/hise/dao/
hise-services/src/test/java/org/apache/hise/
hise-services/src/test/resources/ hise-test-example/ hise-web/
hise-web/soapui-tests/ hise-web/...
Author: rr
Date: Thu Jan 14 13:26:46 2010
New Revision: 899191
URL: http://svn.apache.org/viewvc?rev=899191&view=rev
Log:
Fixed Organization Entity groups collection + updated tests
Modified:
incubator/hise/trunk/hise-services/pom.xml
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/HISEDao.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java
incubator/hise/trunk/hise-services/src/test/java/org/apache/hise/DaoTest.java
incubator/hise/trunk/hise-services/src/test/resources/dao.xml
incubator/hise/trunk/hise-test-example/pom.xml
incubator/hise/trunk/hise-web/pom.xml
incubator/hise/trunk/hise-web/soapui-tests/hise-soapui-project.xml
incubator/hise/trunk/hise-web/src/test/resources/hise-ds.xml
Modified: incubator/hise/trunk/hise-services/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/pom.xml?rev=899191&r1=899190&r2=899191&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/pom.xml (original)
+++ incubator/hise/trunk/hise-services/pom.xml Thu Jan 14 13:26:46 2010
@@ -225,6 +225,12 @@
<version>1.1.108</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>oracle</groupId>
+ <artifactId>ojdbc5</artifactId>
+ <version>11.1.0.6.0</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/HISEDao.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/HISEDao.java?rev=899191&r1=899190&r2=899191&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/HISEDao.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/HISEDao.java Thu Jan 14 13:26:46 2010
@@ -345,7 +345,7 @@
return (List<Task>) getJpaTemplate().executeFind(new JpaCallback() {
public Object doInJpa(EntityManager em) throws PersistenceException {
return em.createQuery("select distinct t from Task t where t.actualOwner.name = :user")
- .setParameter("user", user.name)
+ .setParameter("user", user.getName())
.setMaxResults(maxTasks)
.getResultList();
}
@@ -355,7 +355,7 @@
return (List<Task>) getJpaTemplate().executeFind(new JpaCallback() {
public Object doInJpa(EntityManager em) throws PersistenceException {
return em.createQuery("select distinct t from Task t, TaskOrgEntity e where e.task = t and (e.name = :user and e.type = 'USER' or e.name in (:groups) and e.type = 'GROUP') and e.genericHumanRole = :role")
- .setParameter("user", user.name)
+ .setParameter("user", user.getName())
.setParameter("groups", getUserGroups(user))
.setParameter("role", genericHumanRole)
.setMaxResults(maxTasks)
@@ -389,4 +389,11 @@
public void persist(Object o) {
getJpaTemplate().persist(o);
}
+
+ public <T> void clearAllRecords(Class<T> clazz) {
+ log.debug("select t from " + clazz.getName());
+ for (Object o : getJpaTemplate().find("select t from " + clazz.getName() + " t")) {
+ getJpaTemplate().remove(o);
+ }
+ }
}
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java?rev=899191&r1=899190&r2=899191&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java Thu Jan 14 13:26:46 2010
@@ -19,11 +19,14 @@
package org.apache.hise.dao;
+import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
+import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@@ -32,6 +35,7 @@
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
+import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
@@ -50,20 +54,27 @@
// protected Long id;
@Id
- protected String name;
+ private String name;
@Enumerated(value = EnumType.STRING)
private TaskOrgEntity.OrgEntityType type;
private String userPassword;
- @OneToMany(mappedBy="name", cascade = {CascadeType.ALL})
- private Set<OrgEntity> userGroups = new HashSet<OrgEntity>();
+ @OneToMany(cascade = {CascadeType.ALL})
+ @JoinTable(name="USER_GROUPS")
+ private Collection<OrgEntity> userGroups = new HashSet<OrgEntity>();
+
- public Set<OrgEntity> getUserGroups() {
+ public Collection<OrgEntity> getUserGroups() {
return userGroups;
}
+ public void addToGroup(OrgEntity group) {
+// userGroups.add(group.getName());
+ userGroups.add(group);
+ }
+
public String getName() {
return name;
}
Modified: incubator/hise/trunk/hise-services/src/test/java/org/apache/hise/DaoTest.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/test/java/org/apache/hise/DaoTest.java?rev=899191&r1=899190&r2=899191&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/test/java/org/apache/hise/DaoTest.java (original)
+++ incubator/hise/trunk/hise-services/src/test/java/org/apache/hise/DaoTest.java Thu Jan 14 13:26:46 2010
@@ -21,13 +21,14 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.TransactionCallback;
import org.springframework.transaction.support.TransactionTemplate;
@ContextConfiguration(locations = "classpath:/dao.xml")
-public class DaoTest extends AbstractTransactionalJUnit4SpringContextTests {
+public class DaoTest extends AbstractJUnit4SpringContextTests {
@Autowired
private HISEDao hiseDao;
@@ -35,11 +36,17 @@
@Autowired
private JpaTransactionManager transactionManager;
- private OrgEntity o, o2;
+ private void cleanup() throws Exception {
+ hiseDao.clearAllRecords(OrgEntity.class);
+ hiseDao.clearAllRecords(Task.class);
+ hiseDao.clearAllRecords(Job.class);
+ }
private Long addTask() throws Exception {
Assert.assertTrue(hiseDao != null);
+ OrgEntity o, o2;
+
o2 = new OrgEntity();
o2.setName("group1");
o2.setType(OrgEntityType.GROUP);
@@ -49,7 +56,8 @@
o.setName("user1");
o.setType(OrgEntityType.USER);
o.setUserPassword("abc");
- o.getUserGroups().add(o2);
+
+ o.addToGroup(o2);
hiseDao.saveOrgEntity(o);
Task t = new Task();
@@ -100,18 +108,51 @@
addTask();
}
+
+
@Test
public void testUserTasks() throws Exception {
- addTask();
- List<Task> r = hiseDao.getUserTasks(o, "", GenericHumanRole.ACTUALOWNER, "", Collections.EMPTY_LIST, "", null, 100);
- Assert.assertEquals("asd", r.get(0).getTaskDefinitionKey());
+ TransactionTemplate tt = new TransactionTemplate(transactionManager);
+ final Long tid = (Long) tt.execute(new TransactionCallback() {
+ public Object doInTransaction(TransactionStatus arg0) {
+ try {
+ return addTask();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ });
+ tt.execute(new TransactionCallback() {
+ public Object doInTransaction(TransactionStatus arg0) {
+ try {
+ OrgEntity o = hiseDao.load(OrgEntity.class, "user1");
+ List<Task> r = hiseDao.getUserTasks(o, "", GenericHumanRole.ACTUALOWNER, "", Collections.EMPTY_LIST, "", null, 100);
+ Assert.assertEquals("asd", r.get(0).getTaskDefinitionKey());
+ return null;
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ });
}
@Test
public void testUserTasks2() throws Exception {
- addTask2();
- List<Task> r = hiseDao.getUserTasks(o, "", GenericHumanRole.POTENTIALOWNERS, "", Collections.EMPTY_LIST, "", null, 100);
- Assert.assertEquals("asd2", r.get(0).getTaskDefinitionKey());
+ TransactionTemplate tt = new TransactionTemplate(transactionManager);
+ final Long tid = (Long) tt.execute(new TransactionCallback() {
+ public Object doInTransaction(TransactionStatus arg0) {
+ try{
+ cleanup();
+ addTask2();
+ OrgEntity o = hiseDao.load(OrgEntity.class, "user1");
+ List<Task> r = hiseDao.getUserTasks(o, "", GenericHumanRole.POTENTIALOWNERS, "", Collections.EMPTY_LIST, "", null, 100);
+ Assert.assertEquals("asd2", r.get(0).getTaskDefinitionKey());
+ return null;
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ });
}
@Test
@@ -120,6 +161,7 @@
final Long tid = (Long) tt.execute(new TransactionCallback() {
public Object doInTransaction(TransactionStatus arg0) {
try {
+ cleanup();
return addTask();
} catch (Exception e) {
throw new RuntimeException(e);
@@ -141,19 +183,52 @@
@Test
public void testGrupQuery() throws Exception {
- addTask3();
- List<Task> r = hiseDao.getUserTasks(o, "", GenericHumanRole.POTENTIALOWNERS, "", Collections.EMPTY_LIST, "", null, 100);
- Assert.assertEquals("asd3", r.get(0).getTaskDefinitionKey());
+ TransactionTemplate tt = new TransactionTemplate(transactionManager);
+ tt.execute(new TransactionCallback() {
+ public Object doInTransaction(TransactionStatus arg0) {
+ try {
+ cleanup();
+ addTask3();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ return null;
+ }
+ });
+
+ tt.execute(new TransactionCallback() {
+ public Object doInTransaction(TransactionStatus arg0) {
+ try {
+ OrgEntity o = hiseDao.load(OrgEntity.class, "user1");
+ List<Task> r = hiseDao.getUserTasks(o, "", GenericHumanRole.POTENTIALOWNERS, "", Collections.EMPTY_LIST, "", null, 100);
+ Assert.assertEquals("asd3", r.get(0).getTaskDefinitionKey());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ return null;
+ }
+ });
}
@Test
public void testJobs() throws Exception {
- Job j = new Job();
- j.setFire(new Date(1213L));
- j.setAction("abc");
- hiseDao.persist(j);
-
- List<Job> r = hiseDao.listJobs(new Date(1214L), 12);
- Assert.assertEquals("abc", r.get(0).getAction());
+ TransactionTemplate tt = new TransactionTemplate(transactionManager);
+ tt.execute(new TransactionCallback() {
+ public Object doInTransaction(TransactionStatus arg0) {
+ try {
+ cleanup();
+ Job j = new Job();
+ j.setFire(new Date(1213L));
+ j.setAction("abc");
+ hiseDao.persist(j);
+
+ List<Job> r = hiseDao.listJobs(new Date(1214L), 12);
+ Assert.assertEquals("abc", r.get(0).getAction());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ return null;
+ }
+ });
}
}
Modified: incubator/hise/trunk/hise-services/src/test/resources/dao.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/test/resources/dao.xml?rev=899191&r1=899190&r2=899191&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/test/resources/dao.xml (original)
+++ incubator/hise/trunk/hise-services/src/test/resources/dao.xml Thu Jan 14 13:26:46 2010
@@ -31,8 +31,26 @@
</bean>
<util:map id="htJPAPropertyMap">
- <entry key="hibernate.hbm2ddl.auto" value="create-drop"/>
+ <entry key="hibernate.hbm2ddl.auto" value="create"/>
</util:map>
+
+ <!--
+ <bean id="htJPAVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
+ <property name="showSql" value="true" />
+ <property name="generateDdl" value="true" />
+ <property name="databasePlatform" value="org.hibernate.dialect.OracleDialect" />
+ </bean>
+
+ <bean id="htDataSource" class="org.springframework.jdbc.datasource.SingleConnectionDataSource" lazy-init="true">
+ <property name="driverClassName" value="oracle.jdbc.driver.OracleDriver" />
+ <property name="url" value="jdbc:oracle:thin:@localhost:1521:XE"/>
+ <property name="username" value="hise" />
+ <property name="password" value="hise"/>
+ <property name="autoCommit" value="false" />
+ <property name="suppressClose" value="true" />
+ </bean>
+ -->
+
<bean id="htJPAVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
<property name="showSql" value="true"/>
@@ -49,6 +67,7 @@
<property name="autoCommit" value="false"/>
<property name="suppressClose" value="true"/>
</bean>
+
<!--
<bean id="htJPAVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter"> <property name="showSql" value="false"/> <property name="generateDdl" value="true"/> <property name="databasePlatform" value="org.hibernate.dialect.OracleDialect"/> </bean> <bean id="htDataSource" class="org.springframework.jdbc.datasource.SingleConnectionDataSource" lazy-init="true"> <property name="driverClassName" value="oracle.jdbc.driver.OracleDriver"/> <property name="url" value="jdbc:oracle:thin:@localhost:1521:XE"/> <property name="username" value="hise"/> <property name="password" value="hise"/> <property name="autoCommit" value="false"/> <property name="suppressClose" value="true"/> </bean>
Modified: incubator/hise/trunk/hise-test-example/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-test-example/pom.xml?rev=899191&r1=899190&r2=899191&view=diff
==============================================================================
--- incubator/hise/trunk/hise-test-example/pom.xml (original)
+++ incubator/hise/trunk/hise-test-example/pom.xml Thu Jan 14 13:26:46 2010
@@ -28,12 +28,12 @@
<packaging>jar</packaging>
<version>1.0.21-SNAPSHOT</version>
<dependencies>
+ <!--
<dependency>
<groupId>oracle</groupId>
<artifactId>ojdbc5</artifactId>
<version>11.1.0.6.0</version>
</dependency>
- <!--
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
Modified: incubator/hise/trunk/hise-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-web/pom.xml?rev=899191&r1=899190&r2=899191&view=diff
==============================================================================
--- incubator/hise/trunk/hise-web/pom.xml (original)
+++ incubator/hise/trunk/hise-web/pom.xml Thu Jan 14 13:26:46 2010
@@ -33,6 +33,13 @@
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.1.108</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>oracle</groupId>
+ <artifactId>ojdbc5</artifactId>
+ <version>11.1.0.6.0</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hise</groupId>
Modified: incubator/hise/trunk/hise-web/soapui-tests/hise-soapui-project.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-web/soapui-tests/hise-soapui-project.xml?rev=899191&r1=899190&r2=899191&view=diff
==============================================================================
--- incubator/hise/trunk/hise-web/soapui-tests/hise-soapui-project.xml (original)
+++ incubator/hise/trunk/hise-web/soapui-tests/hise-soapui-project.xml Thu Jan 14 13:26:46 2010
@@ -3455,24 +3455,24 @@
</ClaimApprovalRequest>
</cla:approve>
</soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="SOAP Response"/><con:assertion type="SOAP Fault Assertion"/><con:credentials><con:username>user1</con:username><con:password>user1pass</con:password></con:credentials><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.insurance.example.com/claims/ClaimsHandlingPT/approveRequest" to="" replyTo="http://localhost:8086/ClaimsResponseService/" addDefaultTo="true"/></con:request></con:config></con:testStep><con:testStep type="properties" name="Properties"><con:settings/><con:config xsi:type="con:PropertiesStep" saveFirst="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:properties><con:property><con:name>tid</con:name><con:value>1</con:value></con:property></con:properties></con:config></con:testStep><con:testStep type="transfer" name="Property Transfer"><con:settings/><con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:transfers se
tNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" useXQuery="true" entitize="false" transferChildNodes="false"><con:name>tid</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>approve - Request 1</con:sourceStep><con:sourcePath><a>{*/*/*/text()}</a></con:sourcePath><con:targetType>tid</con:targetType><con:targetStep>Properties</con:targetStep></con:transfers></con:config></con:testStep><con:testStep type="request" name="suspendUntil - Request 1"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>taskOperationsSOAP</con:interface><con:operation>suspendUntil</con:operation><con:request name="suspendUntil - Request 1" outgoingWss="" incomingWss="" wssPasswordType="PasswordText"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/taskOperations/</con:endpoint><con:request><![CDATA[<soapenv
:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.example.org/WS-HT/api/xsd">
+</soapenv:Envelope>]]></con:request><con:assertion type="SOAP Response"/><con:assertion type="SOAP Fault Assertion"/><con:credentials><con:username>user1</con:username><con:password>user1pass</con:password></con:credentials><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.insurance.example.com/claims/ClaimsHandlingPT/approveRequest" to="" replyTo="http://localhost:8086/ClaimsResponseService/" addDefaultTo="true"/></con:request></con:config></con:testStep><con:testStep type="properties" name="Properties"><con:settings/><con:config xsi:type="con:PropertiesStep" saveFirst="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:properties><con:property><con:name>tid</con:name><con:value>3</con:value></con:property></con:properties></con:config></con:testStep><con:testStep type="transfer" name="Property Transfer"><con:settings/><con:config xsi:type="con:PropertyTransfersStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:transfers se
tNullOnMissingSource="true" transferTextContent="true" failOnError="true" ignoreEmpty="false" transferToAll="false" useXQuery="true" entitize="false" transferChildNodes="false"><con:name>tid</con:name><con:sourceType>Response</con:sourceType><con:sourceStep>approve - Request 1</con:sourceStep><con:sourcePath><a>{*/*/*/text()}</a></con:sourcePath><con:targetType>tid</con:targetType><con:targetStep>Properties</con:targetStep></con:transfers></con:config></con:testStep><con:testStep type="request" name="suspendUntil - Request 1"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>taskOperationsSOAP</con:interface><con:operation>suspendUntil</con:operation><con:request name="suspendUntil - Request 1" outgoingWss="" incomingWss="" wssPasswordType="PasswordText"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/taskOperations/</con:endpoint><con:request><![CDATA[<soapenv
:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.example.org/WS-HT/api/xsd">
<soapenv:Header/>
<soapenv:Body>
<xsd:suspendUntil>
<xsd:identifier>${Properties#tid}</xsd:identifier>
<xsd:time>
- <xsd:timePeriod>PT5S</xsd:timePeriod>
+ <xsd:timePeriod>PT8S</xsd:timePeriod>
</xsd:time>
</xsd:suspendUntil>
</soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="SOAP Response"/><con:assertion type="SOAP Fault Assertion"/><con:credentials><con:username>user2</con:username><con:password>user2pass</con:password></con:credentials><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.example.org/WS-HT/api/wsdl/taskOperations/suspendUntilRequest"/></con:request></con:config></con:testStep><con:testStep type="request" name="getTaskInfo"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>taskOperationsSOAP</con:interface><con:operation>getTaskInfo</con:operation><con:request name="getTaskInfo" wssPasswordType="PasswordText"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/taskOperations/</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.example.org/WS-HT/api/xsd">
+</soapenv:Envelope>]]></con:request><con:assertion type="SOAP Response"/><con:assertion type="SOAP Fault Assertion"/><con:credentials><con:username>user2</con:username><con:password>user2pass</con:password></con:credentials><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.example.org/WS-HT/api/wsdl/taskOperations/suspendUntilRequest"/></con:request></con:config></con:testStep><con:testStep type="delay" name="Delay"><con:settings/><con:config><delay>5000</delay></con:config></con:testStep><con:testStep type="request" name="getTaskInfo"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>taskOperationsSOAP</con:interface><con:operation>getTaskInfo</con:operation><con:request name="getTaskInfo" wssPasswordType="PasswordText"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/taskOperations/</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:s
oapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.example.org/WS-HT/api/xsd">
<soapenv:Header/>
<soapenv:Body>
<xsd:getTaskInfo>
<xsd:identifier>${Properties#tid}</xsd:identifier>
</xsd:getTaskInfo>
</soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="SOAP Response"/><con:assertion type="XQuery Match"><con:configuration><path><a xmlns:ns3="http://www.example.org/WS-HT/api">{*/*/*/*/ns3:status/text()}</a></path><content><a xmlns:ns3="http://www.example.org/WS-HT/api">SUSPENDED</a></content><allowWildcards>false</allowWildcards></con:configuration></con:assertion><con:credentials><con:username>user1</con:username><con:password>user1pass</con:password></con:credentials><con:wsaConfig mustUnderstand="NONE" version="200508"/></con:request></con:config></con:testStep><con:testStep type="delay" name="Delay"><con:settings/><con:config><delay>5000</delay></con:config></con:testStep><con:testStep type="request" name="getTaskInfo2 1"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>taskOperationsSOAP</con:interface><con:operation>getTaskInfo</con:operation><con:request name="getTaskInfo2 1" w
ssPasswordType="PasswordText"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/taskOperations/</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.example.org/WS-HT/api/xsd">
+</soapenv:Envelope>]]></con:request><con:assertion type="SOAP Response"/><con:assertion type="XQuery Match"><con:configuration><path><a xmlns:ns3="http://www.example.org/WS-HT/api">{*/*/*/*/ns3:status/text()}</a></path><content><a xmlns:ns3="http://www.example.org/WS-HT/api">SUSPENDED</a></content><allowWildcards>false</allowWildcards></con:configuration></con:assertion><con:credentials><con:username>user1</con:username><con:password>user1pass</con:password></con:credentials><con:wsaConfig mustUnderstand="NONE" version="200508"/></con:request></con:config></con:testStep><con:testStep type="delay" name="Delay2"><con:settings/><con:config><delay>5000</delay></con:config></con:testStep><con:testStep type="request" name="getTaskInfo2 1"><con:settings/><con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:interface>taskOperationsSOAP</con:interface><con:operation>getTaskInfo</con:operation><con:request name="getTaskInfo2 1"
wssPasswordType="PasswordText"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/taskOperations/</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.example.org/WS-HT/api/xsd">
<soapenv:Header/>
<soapenv:Body>
<xsd:getTaskInfo>
Modified: incubator/hise/trunk/hise-web/src/test/resources/hise-ds.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-web/src/test/resources/hise-ds.xml?rev=899191&r1=899190&r2=899191&view=diff
==============================================================================
--- incubator/hise/trunk/hise-web/src/test/resources/hise-ds.xml (original)
+++ incubator/hise/trunk/hise-web/src/test/resources/hise-ds.xml Thu Jan 14 13:26:46 2010
@@ -46,7 +46,7 @@
<entry key="hibernate.jdbc.batch_size" value="0" />
<entry key="hibernate.default_batch_fetch_size" value="20"/>
-->
- <entry key="hibernate.hbm2ddl.auto" value="create-drop" />
+ <entry key="hibernate.hbm2ddl.auto" value="create" />
</util:map>
<!--