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/15 13:52:34 UTC
svn commit: r899630 - in /incubator/hise/trunk: hise-services/
hise-services/src/main/java/org/apache/hise/dao/
hise-services/src/main/java/org/apache/hise/engine/
hise-services/src/main/java/org/apache/hise/engine/jaxws/
hise-services/src/main/java/or...
Author: rr
Date: Fri Jan 15 13:52:32 2010
New Revision: 899630
URL: http://svn.apache.org/viewvc?rev=899630&view=rev
Log:
HISE-3: Added openjpa 1.2.1 support
Modified:
incubator/hise/trunk/hise-services/pom.xml
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Attachment.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Comment.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Deadline.java
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/JpaBase.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Message.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/PresentationParameter.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Task.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/DefaultHISEUserDetails.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEScheduler.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/TaskOperationsImpl.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/Task.java
incubator/hise/trunk/hise-services/src/main/resources/org/apache/hise/persistence.xml
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-web/pom.xml
incubator/hise/trunk/hise-web/src/main/resources/hise-cxf.xml
incubator/hise/trunk/hise-web/src/main/resources/hise-ds.xml
incubator/hise/trunk/hise-web/src/test/java/org/apache/hise/SampleUsers.java
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=899630&r1=899629&r2=899630&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/pom.xml (original)
+++ incubator/hise/trunk/hise-services/pom.xml Fri Jan 15 13:52:32 2010
@@ -132,6 +132,12 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.0.1B</version>
+ </dependency>
+ <!--
+ <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
<version>3.4.0.GA</version>
@@ -143,11 +149,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.0.1B</version>
- </dependency>
- <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>3.4.0.GA</version>
@@ -173,6 +174,7 @@
</exclusion>
</exclusions>
</dependency>
+ -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
@@ -328,5 +330,10 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>1.2.1</version>
+ </dependency>
</dependencies>
</project>
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Attachment.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Attachment.java?rev=899630&r1=899629&r2=899630&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Attachment.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Attachment.java Fri Jan 15 13:52:32 2010
@@ -40,8 +40,7 @@
public class Attachment extends JpaBase {
@Id
- @GeneratedValue(strategy = GenerationType.AUTO, generator = "attc_seq")
- @SequenceGenerator(name = "attc_seq", sequenceName = "attc_seq")
+ @GeneratedValue
private Long id;
@Column
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Comment.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Comment.java?rev=899630&r1=899629&r2=899630&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Comment.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Comment.java Fri Jan 15 13:52:32 2010
@@ -49,13 +49,15 @@
@Temporal(TemporalType.TIMESTAMP)
private Date date;
- @Column(length = 4096)
+ @Column(length = 4000)
private String content;
@ManyToOne
@JoinColumn(name = "TASK_ID")
private Task task;
+ public Comment() {}
+
public Comment(String content, Task task) {
this.content = content;
this.date = new Date();
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Deadline.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Deadline.java?rev=899630&r1=899629&r2=899630&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Deadline.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Deadline.java Fri Jan 15 13:52:32 2010
@@ -47,8 +47,7 @@
public class Deadline extends JpaBase {
@Id
- @GeneratedValue(strategy = GenerationType.AUTO, generator = "ddln_seq")
- @SequenceGenerator(name = "ddln_seq", sequenceName = "ddln_seq")
+ @GeneratedValue
private Long id;
@Column(name = "EVENT_DATE")
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=899630&r1=899629&r2=899630&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 Fri Jan 15 13:52:32 2010
@@ -305,18 +305,7 @@
// }
//
- public Task loadTask(Long taskId) {
- return getJpaTemplate().find(Task.class, taskId);
- }
-
- public void saveTask(Task t) {
- getJpaTemplate().persist(t);
- }
- public <T> T load(Class<T> what, Object id) {
- return getJpaTemplate().find(what, id);
- }
-
// public Person loadUser(String userId) {
// return getJpaTemplate().find(Person.class, userId);
// }
@@ -348,9 +337,14 @@
public Object doInJpa(EntityManager em) throws PersistenceException {
return new JpaQueryBuilder().buildQuery(em,
new Object[] {
- "select distinct t from Task t, TaskOrgEntity e where e.task = t and (e.name = :user and e.type = 'USER'",
+ "select distinct t from Task t, TaskOrgEntity e where e.task = t and (e.name = :user and e.type = :constUser",
new JQBParam("user", query.getUser()),
- new JQBParam("groups", query.getUserGroups(), " or e.name in (:groups) and e.type = 'GROUP'"),
+ new JQBParam("constUser", TaskOrgEntity.OrgEntityType.USER),
+ new JQBParam("groups", query.getUserGroups(),
+ new Object[] {
+ " or e.name in (:groups) and e.type = :constGroup",
+ new JQBParam("constGroup", TaskOrgEntity.OrgEntityType.GROUP)
+ }),
") and e.genericHumanRole = :role",
new JQBParam("role", query.getGenericHumanRole())
})
@@ -374,16 +368,18 @@
});
}
- public void saveOrgEntity(OrgEntity o) {
- getJpaTemplate().persist(o);
+ public <T> T find(Class<T> what, Object id) {
+ return getJpaTemplate().find(what, id);
}
public void remove(Object o) {
getJpaTemplate().remove(o);
+ getJpaTemplate().flush();
}
public void persist(Object o) {
getJpaTemplate().persist(o);
+ getJpaTemplate().flush();
}
public <T> void clearAllRecords(Class<T> clazz) {
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/JpaBase.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/JpaBase.java?rev=899630&r1=899629&r2=899630&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/JpaBase.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/JpaBase.java Fri Jan 15 13:52:32 2010
@@ -46,6 +46,7 @@
@Override
public boolean equals(Object obj) {
+ if (obj == null) return false;
List<Object> l1 = new ArrayList<Object>();
Collections.addAll(l1, getKeys());
List<Object> l2 = new ArrayList<Object>();
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Message.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Message.java?rev=899630&r1=899629&r2=899630&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Message.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Message.java Fri Jan 15 13:52:32 2010
@@ -60,8 +60,7 @@
private static final Log log = LogFactory.getLog(Message.class);
@Id
- @GeneratedValue(strategy = GenerationType.AUTO, generator = "mssg_seq")
- @SequenceGenerator(name = "mssg_seq", sequenceName = "mssg_seq")
+ @GeneratedValue
private Long id;
private String partName;
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/PresentationParameter.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/PresentationParameter.java?rev=899630&r1=899629&r2=899630&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/PresentationParameter.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/PresentationParameter.java Fri Jan 15 13:52:32 2010
@@ -32,13 +32,9 @@
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
-import javax.persistence.Transient;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.hibernate.annotations.Index;
/**
* Evaluated value of Task's presentation parameter.
@@ -51,8 +47,6 @@
private static final Log log = LogFactory.getLog(PresentationParameter.class);
@Id
- @GeneratedValue(strategy = GenerationType.AUTO, generator = "prpr_seq")
- @SequenceGenerator(name = "prpr_seq", sequenceName = "prpr_seq")
private Long id;
private String name;
@@ -77,7 +71,6 @@
@ManyToOne
@JoinColumn(name = "task_id", nullable = false)
- @Index(name = "prpr_task_id_idx")
private Task task;
public void setName(String name) {
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Task.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Task.java?rev=899630&r1=899629&r2=899630&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Task.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Task.java Fri Jan 15 13:52:32 2010
@@ -169,8 +169,7 @@
* Task's id. Autogenerated.
*/
@Id
- @GeneratedValue(strategy = GenerationType.AUTO, generator = "task_seq")
- @SequenceGenerator(name = "task_seq", sequenceName = "task_seq")
+ @GeneratedValue(strategy = GenerationType.SEQUENCE)
private Long id;
/**
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/DefaultHISEUserDetails.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/DefaultHISEUserDetails.java?rev=899630&r1=899629&r2=899630&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/DefaultHISEUserDetails.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/DefaultHISEUserDetails.java Fri Jan 15 13:52:32 2010
@@ -20,12 +20,12 @@
}
public String getUserPassword(String user1) {
- OrgEntity user = hiseDao.load(OrgEntity.class, user1);
+ OrgEntity user = hiseDao.find(OrgEntity.class, user1);
return user.getUserPassword();
}
public Collection<String> getUserGroups(String user1) {
- OrgEntity user = hiseDao.load(OrgEntity.class, user1);
+ OrgEntity user = hiseDao.find(OrgEntity.class, user1);
Collection<String> r = new ArrayList<String>();
for (OrgEntity g : user.getUserGroups()) {
Validate.isTrue(g.getType() == OrgEntityType.GROUP);
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEScheduler.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEScheduler.java?rev=899630&r1=899629&r2=899630&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEScheduler.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEScheduler.java Fri Jan 15 13:52:32 2010
@@ -47,7 +47,7 @@
tt.execute(new TransactionCallback() {
public Object doInTransaction(TransactionStatus ts) {
- Job j3 = hiseEngine.getHiseDao().load(Job.class, j2);
+ Job j3 = hiseEngine.getHiseDao().find(Job.class, j2);
if (j3 == null) {
__log.debug("Skipping job " + j3 + " - it's no longer id DB");
} else {
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/TaskOperationsImpl.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/TaskOperationsImpl.java?rev=899630&r1=899629&r2=899630&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/TaskOperationsImpl.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/TaskOperationsImpl.java Fri Jan 15 13:52:32 2010
@@ -252,7 +252,7 @@
}
public org.apache.hise.lang.xsd.htda.TTask getTaskInfo(String identifier) throws IllegalArgumentFault {
- return convertTask(hiseEngine.getHiseDao().loadTask(Long.parseLong(identifier)));
+ return convertTask(hiseEngine.getHiseDao().find(org.apache.hise.dao.Task.class, Long.parseLong(identifier)));
}
public TTaskQueryResultSet query(String selectClause, String whereClause, String orderByClause, Integer maxTasks, Integer taskIndexOffset) throws IllegalArgumentFault, IllegalStateFault {
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/Task.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/Task.java?rev=899630&r1=899629&r2=899630&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/Task.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/Task.java Fri Jan 15 13:52:32 2010
@@ -136,7 +136,7 @@
public static Task load(HISEEngine engine, Long id) {
Task t = new Task(engine);
HISEDao dao = engine.getHiseDao();
- t.taskDto = dao.loadTask(id);
+ t.taskDto = dao.find(org.apache.hise.dao.Task.class, id);
// t.setTaskDto(em.find(Task.class, , arg1)engine.taskDao.fetch(id));
t.taskDefinition = engine.getTaskDefinition(t.taskDto.getTaskDefinitionName());
return t;
@@ -184,7 +184,7 @@
t.setStatus(Status.READY);
t.tryNominateOwner();
- engine.getHiseDao().saveTask(u);
+ engine.getHiseDao().persist(u);
return t;
Modified: incubator/hise/trunk/hise-services/src/main/resources/org/apache/hise/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/resources/org/apache/hise/persistence.xml?rev=899630&r1=899629&r2=899630&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/resources/org/apache/hise/persistence.xml (original)
+++ incubator/hise/trunk/hise-services/src/main/resources/org/apache/hise/persistence.xml Fri Jan 15 13:52:32 2010
@@ -19,7 +19,6 @@
-->
<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
<persistence-unit name="org.apache.hise">
- <provider>org.hibernate.ejb.HibernatePersistence</provider>
<class>org.apache.hise.dao.Attachment</class>
<class>org.apache.hise.dao.Comment</class>
<class>org.apache.hise.dao.Deadline</class>
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=899630&r1=899629&r2=899630&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 Fri Jan 15 13:52:32 2010
@@ -51,7 +51,7 @@
o2 = new OrgEntity();
o2.setName("group1");
o2.setType(OrgEntityType.GROUP);
- hiseDao.saveOrgEntity(o2);
+ hiseDao.persist(o2);
o = new OrgEntity();
o.setName("user1");
@@ -59,7 +59,7 @@
o.setUserPassword("abc");
o.addToGroup(o2);
- hiseDao.saveOrgEntity(o);
+ hiseDao.persist(o);
Task t = new Task();
t.setStatus(Status.CREATED);
@@ -67,8 +67,10 @@
t.setActualOwner("user1");
t.getInput().put("abc", new Message("abc", "def"));
- hiseDao.saveTask(t);
- return t.getId();
+ hiseDao.persist(t);
+ Long id = t.getId();
+ Assert.assertNotNull(id);
+ return id;
}
private void addTask2() throws Exception {
@@ -84,7 +86,7 @@
x.setTask(t);
pa.add(x);
t.setPeopleAssignments(pa);
- hiseDao.saveTask(t);
+ hiseDao.persist(t);
}
private void addTask3() throws Exception {
@@ -100,13 +102,22 @@
x.setTask(t);
pa.add(x);
t.setPeopleAssignments(pa);
- hiseDao.saveTask(t);
+ hiseDao.persist(t);
}
@Test
public void testDao() throws Exception {
- addTask();
+ 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);
+ }
+ }
+ });
}
@@ -117,6 +128,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);
@@ -178,7 +190,7 @@
tt.execute(new TransactionCallback() {
public Object doInTransaction(TransactionStatus arg0) {
try {
- Assert.assertTrue(hiseDao.loadTask(tid).getInput().get("abc").getMessage().equals("def"));
+ Assert.assertTrue(hiseDao.find(Task.class, tid).getInput().get("abc").getMessage().equals("def"));
} catch (Exception e) {
throw new RuntimeException(e);
}
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=899630&r1=899629&r2=899630&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/test/resources/dao.xml (original)
+++ incubator/hise/trunk/hise-services/src/test/resources/dao.xml Fri Jan 15 13:52:32 2010
@@ -24,16 +24,17 @@
<bean id="htEntityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="dataSource" ref="htDataSource"/>
- <property name="jpaVendorAdapter" ref="htJPAVendorAdapter"/>
- <property name="jpaPropertyMap" ref="htJPAPropertyMap"/>
+ <property name="jpaVendorAdapter" ref="jpaVendorAdapter"/>
+ <property name="jpaPropertyMap" ref="jpaPropertyMap"/>
<property name="persistenceXmlLocation" value="classpath:/org/apache/hise/persistence.xml"/>
<property name="persistenceUnitName" value="org.apache.hise"/>
</bean>
- <util:map id="htJPAPropertyMap">
+ <util:map id="jpaPropertyMap">
+<!--
<entry key="hibernate.hbm2ddl.auto" value="create"/>
+ -->
</util:map>
-
<!--
<bean id="htJPAVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
<property name="showSql" value="true" />
@@ -50,13 +51,53 @@
<property name="suppressClose" value="true" />
</bean>
-->
-
+<!-- OpenJPA Oracle
+ <bean id="jpaVendorAdapter" class="org.apache.hise.dao.vendor.OpenJpaVendorAdapter">
+ <property name="database" value="ORACLE" />
+ <property name="databasePlatform" value="org.apache.openjpa.jdbc.sql.OracleDictionary" />
+ <property name="generateDdl" value="true" />
+ <property name="showSql" value="true" />
+ <property name="extProperties">
+ <util:map>
+ <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true,SchemaAction='drop,add')"/>
+ </util:map>
+ </property>
+ </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"/>
<property name="generateDdl" value="true"/>
<property name="databasePlatform" value="org.hibernate.dialect.H2Dialect"/>
</bean>
+ <bean id="jpaVendorAdapter" class="org.apache.hise.dao.vendor.OpenJpa2VendorAdapter">
+ -->
+
+<!-- OpenJPA H2
+ -->
+ <bean id="jpaVendorAdapter" class="org.apache.hise.dao.vendor.OpenJpaVendorAdapter">
+ <property name="database" value="H2" />
+ <property name="databasePlatform" value="org.apache.openjpa.jdbc.sql.H2Dictionary" />
+ <property name="generateDdl" value="true" />
+ <property name="showSql" value="true" />
+ <property name="extProperties">
+ <util:map>
+ <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true,SchemaAction='drop,add')"/>
+ </util:map>
+ </property>
+ </bean>
+
<bean id="htDataSource" class="org.springframework.jdbc.datasource.SingleConnectionDataSource" lazy-init="true">
<property name="driverClassName" value="org.h2.Driver"/>
<property name="url" value="jdbc:h2:mem:test"/>
Modified: incubator/hise/trunk/hise-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-web/pom.xml?rev=899630&r1=899629&r2=899630&view=diff
==============================================================================
--- incubator/hise/trunk/hise-web/pom.xml (original)
+++ incubator/hise/trunk/hise-web/pom.xml Fri Jan 15 13:52:32 2010
@@ -168,11 +168,6 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>3.4.0.GA</version>
- </dependency>
- <dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.8.0.GA</version>
Modified: incubator/hise/trunk/hise-web/src/main/resources/hise-cxf.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-web/src/main/resources/hise-cxf.xml?rev=899630&r1=899629&r2=899630&view=diff
==============================================================================
--- incubator/hise/trunk/hise-web/src/main/resources/hise-cxf.xml (original)
+++ incubator/hise/trunk/hise-web/src/main/resources/hise-cxf.xml Fri Jan 15 13:52:32 2010
@@ -60,7 +60,7 @@
<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
<property name="entityManagerFactory" ref="htEntityManagerFactory"/>
- <property name="dataSource" ref="htDataSource"/>
+ <property name="dataSource" ref="dataSource"/>
</bean>
<bean name="taskOperations" class="org.apache.hise.engine.jaxws.TaskOperationsImpl" init-method="init">
Modified: incubator/hise/trunk/hise-web/src/main/resources/hise-ds.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-web/src/main/resources/hise-ds.xml?rev=899630&r1=899629&r2=899630&view=diff
==============================================================================
--- incubator/hise/trunk/hise-web/src/main/resources/hise-ds.xml (original)
+++ incubator/hise/trunk/hise-web/src/main/resources/hise-ds.xml Fri Jan 15 13:52:32 2010
@@ -28,7 +28,7 @@
">
<bean id="htEntityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
- <property name="dataSource" ref="htDataSource" />
+ <property name="dataSource" ref="dataSource" />
<property name="jpaVendorAdapter" ref="htJPAVendorAdapter"/>
<property name="jpaPropertyMap" ref="htJPAPropertyMap"/>
<property name="persistenceXmlLocation" value="classpath:/org/apache/hise/persistence.xml" />
@@ -56,7 +56,7 @@
<property name="databasePlatform" value="org.hibernate.dialect.H2Dialect" />
</bean>
- <bean id="htDataSource" class="org.springframework.jdbc.datasource.SingleConnectionDataSource" lazy-init="true">
+ <bean id="dataSource" class="org.springframework.jdbc.datasource.SingleConnectionDataSource" lazy-init="true">
<property name="driverClassName" value="org.h2.Driver" />
<property name="url" value="jdbc:h2:file:~/hise-db;DB_CLOSE_ON_EXIT=false" />
<property name="username" value="sa" />
@@ -74,7 +74,7 @@
<property name="databasePlatform" value="org.hibernate.dialect.MySQL5Dialect" />
</bean>
- <bean id="htDataSource" class="org.springframework.jdbc.datasource.SingleConnectionDataSource" lazy-init="true">
+ <bean id="dataSource" class="org.springframework.jdbc.datasource.SingleConnectionDataSource" lazy-init="true">
<property name="driverClassName" value="com.mysql.jdbc.Driver" />
<property name="url" value="jdbc:mysql://localhost/hise"/>
<property name="username" value="root" />
@@ -91,7 +91,7 @@
<property name="databasePlatform" value="org.hibernate.dialect.OracleDialect" />
</bean>
- <bean id="htDataSource" class="org.springframework.jdbc.datasource.SingleConnectionDataSource" lazy-init="true">
+ <bean id="dataSource" 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" />
Modified: incubator/hise/trunk/hise-web/src/test/java/org/apache/hise/SampleUsers.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-web/src/test/java/org/apache/hise/SampleUsers.java?rev=899630&r1=899629&r2=899630&view=diff
==============================================================================
--- incubator/hise/trunk/hise-web/src/test/java/org/apache/hise/SampleUsers.java (original)
+++ incubator/hise/trunk/hise-web/src/test/java/org/apache/hise/SampleUsers.java Fri Jan 15 13:52:32 2010
@@ -30,14 +30,14 @@
{
g.setName("group1");
g.setType(TaskOrgEntity.OrgEntityType.GROUP);
- hiseDao.saveOrgEntity(g);
+ hiseDao.persist(g);
}
{
OrgEntity o = new OrgEntity();
o.setName("user1");
o.setType(TaskOrgEntity.OrgEntityType.USER);
o.setUserPassword("user1pass");
- hiseDao.saveOrgEntity(o);
+ hiseDao.persist(o);
}
{
OrgEntity o = new OrgEntity();
@@ -45,7 +45,7 @@
o.setType(TaskOrgEntity.OrgEntityType.USER);
o.setUserPassword("user2pass");
o.getUserGroups().add(g);
- hiseDao.saveOrgEntity(o);
+ hiseDao.persist(o);
}
return null;
}
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=899630&r1=899629&r2=899630&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 Fri Jan 15 13:52:32 2010
@@ -28,14 +28,14 @@
">
<bean id="htEntityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
- <property name="dataSource" ref="htDataSource" />
- <property name="jpaVendorAdapter" ref="htJPAVendorAdapter"/>
- <property name="jpaPropertyMap" ref="htJPAPropertyMap"/>
+ <property name="dataSource" ref="dataSource" />
+ <property name="jpaVendorAdapter" ref="jpaVendorAdapter"/>
+ <property name="jpaPropertyMap" ref="jpaPropertyMap"/>
<property name="persistenceXmlLocation" value="classpath:/org/apache/hise/persistence.xml" />
<property name="persistenceUnitName" value="org.apache.hise"/>
</bean>
- <util:map id="htJPAPropertyMap">
+ <util:map id="jpaPropertyMap">
<!--
<entry key="hibernate.search.default.directory_provider" value="org.hibernate.search.store.RAMDirectoryProvider" />
<entry key="hibernate.cache.provider_class" value="net.sf.ehcache.hibernate.SingletonEhCacheProvider" />
@@ -45,8 +45,8 @@
<entry key="hibernate.cache.use_structured_entries" value="true" />
<entry key="hibernate.jdbc.batch_size" value="0" />
<entry key="hibernate.default_batch_fetch_size" value="20"/>
- -->
<entry key="hibernate.hbm2ddl.auto" value="create" />
+ -->
</util:map>
<!--
@@ -56,7 +56,7 @@
<property name="databasePlatform" value="org.hibernate.dialect.H2Dialect" />
</bean>
- <bean id="htDataSource" class="org.springframework.jdbc.datasource.SingleConnectionDataSource" lazy-init="true">
+ <bean id="dataSource" class="org.springframework.jdbc.datasource.SingleConnectionDataSource" lazy-init="true">
<property name="driverClassName" value="org.h2.Driver" />
<property name="url" value="jdbc:h2:file:~/hise-db;DB_CLOSE_ON_EXIT=false" />
<property name="username" value="sa" />
@@ -75,7 +75,7 @@
<property name="databasePlatform" value="org.hibernate.dialect.MySQL5Dialect" />
</bean>
- <bean id="htDataSource" class="org.springframework.jdbc.datasource.SingleConnectionDataSource" lazy-init="true">
+ <bean id="dataSource" class="org.springframework.jdbc.datasource.SingleConnectionDataSource" lazy-init="true">
<property name="driverClassName" value="com.mysql.jdbc.Driver" />
<property name="url" value="jdbc:mysql://localhost/hise"/>
<property name="username" value="root" />
@@ -85,13 +85,27 @@
</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="jpaVendorAdapter" class="org.apache.hise.dao.vendor.OpenJpaVendorAdapter">
+ <property name="database" value="ORACLE"/>
+ <property name="databasePlatform" value="org.apache.openjpa.jdbc.sql.OracleDictionary"/>
+ <property name="generateDdl" value="true" />
+ <property name="showSql" value="true" />
+ <property name="extProperties">
+ <util:map>
+ <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true,SchemaAction='drop,add')"/>
+ </util:map>
+ </property>
+ </bean>
+
- <bean id="htDataSource" class="org.springframework.jdbc.datasource.SingleConnectionDataSource" lazy-init="true">
+ <bean id="dataSource" 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" />