Changeset 217
- Timestamp:
- 03/05/10 14:55:59 (14 years ago)
- Location:
- VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/DataStore.java
r146 r217 1 1 package eu.clarin.cmdi.virtualcollectionregistry; 2 2 3 import java.util.HashMap;4 3 import java.util.Map; 5 4 import java.util.logging.Level; … … 20 19 } 21 20 } // inner class ThreadLocalEntityManager 22 private static final Logger logger = Logger.getLogger(DataStore.class 23 .getName()); 24 private static DataStore s_instance = new DataStore(); 25 private EntityManagerFactory emf = null; 26 private ThreadLocalEntityManager em = new ThreadLocalEntityManager(); 21 private static final Logger logger = 22 Logger.getLogger(DataStore.class.getName()); 23 private final EntityManagerFactory emf; 24 private final ThreadLocalEntityManager em = new ThreadLocalEntityManager(); 27 25 28 private DataStore() { 29 } 30 31 public void initalize(Map<String, String> config) 32 throws VirtualCollectionRegistryException { 33 logger.fine("initializing"); 34 if (config != null) { 35 config = new HashMap<String, String>(); 36 } 26 DataStore(Map<String, String> config) 27 throws VirtualCollectionRegistryException { 37 28 try { 38 29 emf = Persistence.createEntityManagerFactory( … … 40 31 } catch (Exception e) { 41 32 logger.log(Level.SEVERE, "error initializing data store", e); 42 throw new VirtualCollectionRegistryException( 43 "error initializing",e);33 throw new VirtualCollectionRegistryException("error initializing", 34 e); 44 35 } 45 36 logger.finer("data store was successfully initialized"); … … 52 43 } 53 44 54 public static DataStore instance() {55 return s_instance;56 }57 58 45 public EntityManager getEntityManager() { 59 46 return em.get(); … … 71 58 } 72 59 } 73 } 60 61 } // class DataStore -
VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionRegistry.java
r215 r217 2 2 3 3 import java.security.Principal; 4 import java.util.Collections; 4 5 import java.util.HashSet; 5 6 import java.util.List; … … 29 30 new VirtualCollectionRegistry(); 30 31 private AtomicBoolean intialized = new AtomicBoolean(false); 31 private VirtualCollectionRegistryMarshaller marshaller; 32 private DataStore datastore = null; 33 private VirtualCollectionRegistryMarshaller marshaller = null; 32 34 33 35 private VirtualCollectionRegistry() { … … 47 49 logger.fine("initialize ..."); 48 50 if (config == null) { 49 throw new NullPointerException("config == null");51 config = Collections.emptyMap(); 50 52 } 51 53 for (String key : config.keySet()) { 52 54 logger.fine("XXX: " + key + " = \"" + config.get(key) + "\""); 53 55 } 56 datastore = new DataStore(config); 54 57 marshaller = new VirtualCollectionRegistryMarshaller(); 55 58 intialized.set(true); … … 57 60 58 61 public void destroy() throws VirtualCollectionRegistryException { 62 if (datastore != null) { 63 datastore.destroy(); 64 } 59 65 } 60 66 … … 67 73 } 68 74 75 public DataStore getDataStore() { 76 return datastore; 77 } 78 69 79 public VirtualCollectionRegistryMarshaller getMarshaller() { 70 80 return marshaller; … … 85 95 86 96 try { 87 EntityManager em = DataStore.instance().getEntityManager();97 EntityManager em = datastore.getEntityManager(); 88 98 em.getTransaction().begin(); 89 99 … … 144 154 145 155 try { 146 EntityManager em = DataStore.instance().getEntityManager();156 EntityManager em = datastore.getEntityManager(); 147 157 em.getTransaction().begin(); 148 158 VirtualCollection c = em.find(VirtualCollection.class, new Long(id)); … … 200 210 201 211 try { 202 EntityManager em = DataStore.instance().getEntityManager();212 EntityManager em = datastore.getEntityManager(); 203 213 em.getTransaction().begin(); 204 214 VirtualCollection vc = em.find(VirtualCollection.class, new Long(id)); … … 231 241 232 242 try { 233 EntityManager em = DataStore.instance().getEntityManager();243 EntityManager em = datastore.getEntityManager(); 234 244 em.getTransaction().begin(); 235 245 VirtualCollection vc = em.find(VirtualCollection.class, … … 257 267 258 268 try { 259 EntityManager em = DataStore.instance().getEntityManager();269 EntityManager em = datastore.getEntityManager(); 260 270 em.getTransaction().begin(); 261 271 ResourceMetadata md = em.find(ResourceMetadata.class, new Long(id)); … … 278 288 public VirtualCollectionList getVirtualCollections(String query, 279 289 int offset, int count) throws VirtualCollectionRegistryException { 280 EntityManager em = DataStore.instance().getEntityManager();290 EntityManager em = datastore.getEntityManager(); 281 291 try { 282 292 em.getTransaction().begin(); … … 330 340 throw new NullPointerException("principal == null"); 331 341 } 332 EntityManager em = DataStore.instance().getEntityManager();342 EntityManager em = datastore.getEntityManager(); 333 343 try { 334 344 em.getTransaction().begin(); -
VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/rest/ContextListener.java
r146 r217 8 8 import javax.servlet.ServletContextListener; 9 9 10 import eu.clarin.cmdi.virtualcollectionregistry.DataStore;11 10 import eu.clarin.cmdi.virtualcollectionregistry.VirtualCollectionRegistry; 12 11 import eu.clarin.cmdi.virtualcollectionregistry.VirtualCollectionRegistryException; … … 27 26 } 28 27 try { 29 DataStore.instance().initalize(config);30 28 VirtualCollectionRegistry.initalize(config); 31 29 } catch (VirtualCollectionRegistryException e) { … … 38 36 try { 39 37 VirtualCollectionRegistry.instance().destroy(); 40 DataStore.instance().destroy();41 38 } catch (VirtualCollectionRegistryException e) { 42 39 ctx.log("error destroying registry", e); 43 40 } 44 41 } 45 } 42 43 } // class ContextListener -
VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/rest/PersistenceFilter.java
r171 r217 10 10 import javax.servlet.ServletResponse; 11 11 12 import eu.clarin.cmdi.virtualcollectionregistry. DataStore;12 import eu.clarin.cmdi.virtualcollectionregistry.VirtualCollectionRegistry; 13 13 14 14 public class PersistenceFilter implements Filter { … … 27 27 throw new ServletException("error while processing request", e); 28 28 } finally { 29 DataStore.instance().closeEntityManager(); 29 VirtualCollectionRegistry.instance().getDataStore() 30 .closeEntityManager(); 30 31 } 31 32 } … … 34 35 // DO NOTHING 35 36 } 36 } // class PersitenceFilter 37 38 } // class PersistenceFilter -
VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/rest/VirtualCollectionRegistryRestService.java
r215 r217 28 28 import javax.ws.rs.core.UriInfo; 29 29 30 import eu.clarin.cmdi.virtualcollectionregistry.DataStore;31 30 import eu.clarin.cmdi.virtualcollectionregistry.VirtualCollectionRegistry; 32 31 import eu.clarin.cmdi.virtualcollectionregistry.VirtualCollectionRegistryException; … … 210 209 public Response getHandle(@PathParam("pid") String pid) { 211 210 System.err.println("Pid: " + pid); 212 EntityManager em = DataStore.instance().getEntityManager();211 EntityManager em = registry.getDataStore().getEntityManager(); 213 212 try { 214 213 em.getTransaction().begin();
Note: See TracChangeset
for help on using the changeset viewer.