[prev in list] [next in list] [prev in thread] [next in thread]
List: juddi-cvs
Subject: svn commit: r711416 - in
From: tcunning () apache ! org
Date: 2008-11-04 21:23:07
Message-ID: 20081104212307.4E27B2388878 () eris ! apache ! org
[Download RAW message or body]
Author: tcunning
Date: Tue Nov 4 13:23:06 2008
New Revision: 711416
URL: http://svn.apache.org/viewvc?rev=711416&view=rev
Log:
JUDDI-132
Split out PersistenceManager from JPAUtil
Modified:
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/JPAUtil.java
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/m \
ain/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java?rev=711416&r1=711415&r2=711416&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java \
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java \
Tue Nov 4 13:23:06 2008 @@ -37,6 +37,7 @@
import org.apache.juddi.query.FindTModelByIdentifierQuery;
import org.apache.juddi.query.FindTModelByNameQuery;
import org.apache.juddi.query.util.DynamicQuery;
+import org.apache.juddi.query.PersistenceManager;
import org.apache.juddi.util.JPAUtil;
import org.apache.juddi.validation.ValidateInquiry;
import org.apache.juddi.error.InvalidKeyPassedException;
@@ -81,7 +82,7 @@
// TODO: Perform necessary authentication logic
String authInfo = body.getAuthInfo();
- EntityManager em = JPAUtil.getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
@@ -127,7 +128,7 @@
// TODO: Perform necessary authentication logic
String authInfo = body.getAuthInfo();
- EntityManager em = JPAUtil.getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
@@ -176,7 +177,7 @@
// TODO: Perform necessary authentication logic
String authInfo = body.getAuthInfo();
- EntityManager em = JPAUtil.getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
@@ -217,7 +218,7 @@
// TODO: Perform necessary authentication logic
String authInfo = body.getAuthInfo();
- EntityManager em = JPAUtil.getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
@@ -259,7 +260,7 @@
// TODO: Perform necessary authentication logic
String authInfo = body.getAuthInfo();
- EntityManager em = JPAUtil.getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
@@ -293,7 +294,7 @@
// TODO: Perform necessary authentication logic
String authInfo = body.getAuthInfo();
- EntityManager em = JPAUtil.getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
@@ -333,7 +334,7 @@
// TODO: Perform necessary authentication logic
String authInfo = body.getAuthInfo();
- EntityManager em = JPAUtil.getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
@@ -367,7 +368,7 @@
// TODO: Perform necessary authentication logic
String authInfo = body.getAuthInfo();
- EntityManager em = JPAUtil.getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
@@ -405,7 +406,7 @@
// TODO: Perform necessary authentication logic
String authInfo = body.getAuthInfo();
- EntityManager em = JPAUtil.getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/m \
ain/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java?rev=711416&r1=711415&r2=711416&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java \
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java \
Tue Nov 4 13:23:06 2008 @@ -50,6 +50,7 @@
import org.apache.juddi.mapping.MappingApiToModel;
import org.apache.juddi.util.JPAUtil;
import org.apache.juddi.validation.ValidatePublish;
+import org.apache.juddi.query.PersistenceManager;
import org.apache.juddi.api.datatype.PublisherDetail;
import org.apache.juddi.api.datatype.SavePublisher;
@@ -87,7 +88,7 @@
public void deleteBinding(DeleteBinding body)
throws DispositionReportFaultMessage {
- EntityManager em = JPAUtil.getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
@@ -109,7 +110,7 @@
public void deleteBusiness(DeleteBusiness body)
throws DispositionReportFaultMessage {
- EntityManager em = JPAUtil.getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
@@ -131,7 +132,7 @@
public void deletePublisherAssertions(DeletePublisherAssertions body)
throws DispositionReportFaultMessage {
- EntityManager em = JPAUtil.getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
@@ -154,7 +155,7 @@
public void deleteService(DeleteService body)
throws DispositionReportFaultMessage {
- EntityManager em = JPAUtil.getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
@@ -177,7 +178,7 @@
public void deleteTModel(DeleteTModel body)
throws DispositionReportFaultMessage {
- EntityManager em = JPAUtil.getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
@@ -223,7 +224,7 @@
public BindingDetail saveBinding(SaveBinding body)
throws DispositionReportFaultMessage {
- EntityManager em = JPAUtil.getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
@@ -262,7 +263,7 @@
public BusinessDetail saveBusiness(SaveBusiness body)
throws DispositionReportFaultMessage {
- EntityManager em = JPAUtil.getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
@@ -299,7 +300,7 @@
public ServiceDetail saveService(SaveService body)
throws DispositionReportFaultMessage {
- EntityManager em = JPAUtil.getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
@@ -338,7 +339,7 @@
public TModelDetail saveTModel(SaveTModel body)
throws DispositionReportFaultMessage {
- EntityManager em = JPAUtil.getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
@@ -386,7 +387,7 @@
public PublisherDetail savePublisher(SavePublisher body)
throws DispositionReportFaultMessage {
- EntityManager em = JPAUtil.getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
@@ -425,7 +426,7 @@
public void deletePublisher(DeletePublisher body)
throws DispositionReportFaultMessage {
- EntityManager em = JPAUtil.getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/m \
ain/java/org/apache/juddi/api/impl/UDDISecurityImpl.java?rev=711416&r1=711415&r2=711416&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java \
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java \
Tue Nov 4 13:23:06 2008 @@ -38,6 +38,7 @@
import org.apache.juddi.mapping.MappingModelToApi;
import org.apache.juddi.validation.ValidateAuth;
import org.apache.juddi.model.Publisher;
+import org.apache.juddi.query.PersistenceManager;
/**
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
@@ -51,7 +52,7 @@
public void discardAuthToken(DiscardAuthToken body)
throws DispositionReportFaultMessage {
- EntityManager em = JPAUtil.getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
@@ -79,7 +80,7 @@
if (publisherId == null || publisherId.length() == 0)
throw new UnknownUserException(new ErrorMessage("errors.auth.InvalidCredentials", \
publisherId));
- EntityManager em = JPAUtil.getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/JPAUtil.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/m \
ain/java/org/apache/juddi/util/JPAUtil.java?rev=711416&r1=711415&r2=711416&view=diff \
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/JPAUtil.java \
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/JPAUtil.java \
Tue Nov 4 13:23:06 2008 @@ -25,31 +25,15 @@
import javax.persistence.Query;
import java.util.List;
+import org.apache.juddi.query.PersistenceManager;
/**
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
public class JPAUtil {
- public static final String PERSISTENCE_UNIT_NAME = "juddiDatabase";
-
- private static final EntityManagerFactory emf;
-
- static {
- try {
- emf = Persistence.createEntityManagerFactory(PERSISTENCE_UNIT_NAME);
- }
- catch (Throwable t) {
- System.err.println("Initial entityManagerFactory creation failed:" + t);
- throw new ExceptionInInitializerError(t);
- }
- }
-
- public static EntityManager getEntityManager() {
- return emf.createEntityManager();
- }
public static void persistEntity(Object uddiEntity, Object entityKey) {
- EntityManager em = getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
@@ -64,7 +48,7 @@
}
public static Object getEntity(Class<?> entityClass, Object entityKey) {
- EntityManager em = getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
@@ -77,7 +61,7 @@
}
public static void deleteEntity(Class<?> entityClass, Object entityKey) {
- EntityManager em = getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
@@ -89,7 +73,7 @@
}
public static List runQuery(String qry, int maxRows, int listHead) {
- EntityManager em = getEntityManager();
+ EntityManager em = PersistenceManager.getEntityManager();
Query q = em.createQuery(qry);
q.setMaxResults(maxRows);
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic