git://wamblee.org
/
utils
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b7bf0cc
)
Removed the dependence on JpaTemplate
author
erik
<erik@77661180-640e-0410-b3a8-9f9b13e6d0e0>
Sat, 22 Mar 2008 12:16:28 +0000
(12:16 +0000)
committer
erik
<erik@77661180-640e-0410-b3a8-9f9b13e6d0e0>
Sat, 22 Mar 2008 12:16:28 +0000
(12:16 +0000)
mythtv/monitor/pom.xml
patch
|
blob
|
history
mythtv/monitor/src/main/java/org/wamblee/mythtv/RecordingDatabase.java
patch
|
blob
|
history
mythtv/war/src/main/resources/org.wamblee.mythtv.application.xml
patch
|
blob
|
history
mythtv/war/src/main/resources/org.wamblee.mythtv.properties
patch
|
blob
|
history
diff --git
a/mythtv/monitor/pom.xml
b/mythtv/monitor/pom.xml
index 03dd8fb88e7d2f312744e8b06230ce1e4883b304..8dffe8a15eee84516436e421861a288397f21923 100644
(file)
--- a/
mythtv/monitor/pom.xml
+++ b/
mythtv/monitor/pom.xml
@@
-28,10
+28,6
@@
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
</dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jpa</artifactId>
- </dependency>
<dependency>
<groupId>org.wamblee</groupId>
<artifactId>wamblee-hibernate-jpa</artifactId>
<dependency>
<groupId>org.wamblee</groupId>
<artifactId>wamblee-hibernate-jpa</artifactId>
diff --git
a/mythtv/monitor/src/main/java/org/wamblee/mythtv/RecordingDatabase.java
b/mythtv/monitor/src/main/java/org/wamblee/mythtv/RecordingDatabase.java
index cbcf89d20caf4924fb176e2519d56c2ad1d5739f..aafa25378cc4259536cdf43af141efbe933995aa 100644
(file)
--- a/
mythtv/monitor/src/main/java/org/wamblee/mythtv/RecordingDatabase.java
+++ b/
mythtv/monitor/src/main/java/org/wamblee/mythtv/RecordingDatabase.java
@@
-16,48
+16,29
@@
package org.wamblee.mythtv;
package org.wamblee.mythtv;
-import java.sql.SQLException;
-import java.util.HashMap;
import java.util.List;
import java.util.List;
-import java.util.Map;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
-import org.hibernate.criterion.Expression;
-import org.springframework.orm.hibernate3.HibernateCallback;
-import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
-import org.springframework.orm.jpa.JpaTemplate;
-import org.springframework.orm.jpa.support.JpaDaoSupport;
/**
*
*/
/**
*
*/
-public class RecordingDatabase
extends JpaDaoSupport
{
+public class RecordingDatabase {
private static final Log LOG = LogFactory.getLog(RecordingDatabase.class);
private static final Log LOG = LogFactory.getLog(RecordingDatabase.class);
-
- public RecordingDatabase() {
- // Empty
- }
- public void init() {
- /*
- for (Recording recording: (List<Recording>)getHibernateTemplate().loadAll(Recording.class) ) {
- LOG.info("Found recording " + recording);
- }
- LOG.info("After listing recordings");
- */
+ private EntityManager _entityManager;
+
+ public RecordingDatabase(EntityManager aEntityManager) {
+ _entityManager = aEntityManager;
}
public Recording findRecording(final String aName) {
}
public Recording findRecording(final String aName) {
- JpaTemplate jpaTemplate = getJpaTemplate();
- EntityManager entityManager = jpaTemplate.getEntityManager();
- Query query = entityManager.createQuery(
+ Query query = _entityManager.createQuery(
"select r from Recording r where r.basename = ?1");
query.setParameter(1, aName);
List<Recording> result = query.getResultList();
"select r from Recording r where r.basename = ?1");
query.setParameter(1, aName);
List<Recording> result = query.getResultList();
@@
-71,6
+52,6
@@
public class RecordingDatabase extends JpaDaoSupport {
}
public void update(Recording aRecording) {
}
public void update(Recording aRecording) {
-
getJpaTemplate().getEntityManager()
.merge(aRecording);
+
_entityManager
.merge(aRecording);
}
}
}
}
diff --git
a/mythtv/war/src/main/resources/org.wamblee.mythtv.application.xml
b/mythtv/war/src/main/resources/org.wamblee.mythtv.application.xml
index dafa987ddac5d42ba0bf3eecef20a8703f3249f6..7b9e8c0765bd4ad2679c99aa60712999e8d25290 100644
(file)
--- a/
mythtv/war/src/main/resources/org.wamblee.mythtv.application.xml
+++ b/
mythtv/war/src/main/resources/org.wamblee.mythtv.application.xml
@@
-23,11
+23,10
@@
</bean>
</bean>
- <bean id="org.wamblee.mythtv.RecordingDatabase" class="org.wamblee.mythtv.RecordingDatabase"
- init-method="init">
- <property name="entityManager">
+ <bean id="org.wamblee.mythtv.RecordingDatabase" class="org.wamblee.mythtv.RecordingDatabase">
+ <constructor-arg>
<ref bean="entityManager"/>
<ref bean="entityManager"/>
- </
property
>
+ </
constructor-arg
>
</bean>
<bean id="org.wamblee.mythtv.LinkStructure"
</bean>
<bean id="org.wamblee.mythtv.LinkStructure"
diff --git
a/mythtv/war/src/main/resources/org.wamblee.mythtv.properties
b/mythtv/war/src/main/resources/org.wamblee.mythtv.properties
index 85f9a0e88d6f9af65924cde26669e9d075ae626e..c7bf5062989ae8173414d931a327f41cf0a3fa85 100644
(file)
--- a/
mythtv/war/src/main/resources/org.wamblee.mythtv.properties
+++ b/
mythtv/war/src/main/resources/org.wamblee.mythtv.properties
@@
-1,8
+1,8
@@
org.wamblee.mythtv.datasource=jdbc/mythtv
org.wamblee.mythtv.datasource=jdbc/mythtv
-org.wamblee.mythtv.pollinterval=
120
-org.wamblee.mythtv.monitordir=/data/vcr
-org.wamblee.mythtv.linkdir=/data/vcr/links
+org.wamblee.mythtv.pollinterval=
2
+
#
org.wamblee.mythtv.monitordir=/data/vcr
+
#
org.wamblee.mythtv.linkdir=/data/vcr/links
-
#
org.wamblee.mythtv.monitordir=/ext/home/erik/java/workspace/utils/mythtv/testdata/input
-
#
org.wamblee.mythtv.linkdir=/ext/home/erik/java/workspace/utils/mythtv/testdata/links
+org.wamblee.mythtv.monitordir=/ext/home/erik/java/workspace/utils/mythtv/testdata/input
+org.wamblee.mythtv.linkdir=/ext/home/erik/java/workspace/utils/mythtv/testdata/links