Author: cschneider
Date: Fri Feb 13 08:38:56 2015
New Revision: 1659466
URL: http://svn.apache.org/r1659466
Log:
Extract some functionality into separate classes
Added:
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/ManagedPersistenceUnitFactoryFactory.java
aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/impl/
aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/impl/PersistenceBundleLifecycleTest.java
- copied, changed from r1657779,
aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/PersistenceBundleLifecycleTest.java
Removed:
aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/PersistenceBundleLifecycleTest.java
Modified:
aries/trunk/jpa/jpa-container/pom.xml
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleManager.java
Modified: aries/trunk/jpa/jpa-container/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/pom.xml?rev=1659466&r1=1659465&r2=1659466&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/pom.xml (original)
+++ aries/trunk/jpa/jpa-container/pom.xml Fri Feb 13 08:38:56 2015
@@ -62,7 +62,7 @@
javax.transaction;version="[1.1,2)"
</aries.osgi.dynamic>
<aries.osgi.activator>
- org.apache.aries.jpa.container.impl.PersistenceBundleManager
+ org.apache.aries.jpa.container.impl.Activator
</aries.osgi.activator>
<lastReleaseVersion>1.0.0</lastReleaseVersion>
</properties>
Added:
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java?rev=1659466&view=auto
==============================================================================
---
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java
(added)
+++
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java
Fri Feb 13 08:38:56 2015
@@ -0,0 +1,26 @@
+package org.apache.aries.jpa.container.impl;
+
+import org.apache.aries.jpa.container.parsing.PersistenceDescriptorParser;
+import
org.apache.aries.jpa.container.parsing.impl.PersistenceDescriptorParserImpl;
+import org.apache.aries.jpa.container.tx.impl.OSGiTransactionManager;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+ private PersistenceBundleManager pbm;
+
+ public void start(BundleContext context) throws Exception {
+ PersistenceDescriptorParser parser = new
PersistenceDescriptorParserImpl();
+ context.registerService(PersistenceDescriptorParser.class.getName(),
parser, null);
+ pbm = new PersistenceBundleManager(context, parser);
+ pbm.open();
+ }
+
+ public void stop(BundleContext context) throws Exception {
+ pbm.close();
+ OSGiTransactionManager otm = OSGiTransactionManager.get();
+ if (otm != null)
+ otm.destroy();
+ }
+
+}
Added:
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/ManagedPersistenceUnitFactoryFactory.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/ManagedPersistenceUnitFactoryFactory.java?rev=1659466&view=auto
==============================================================================
---
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/ManagedPersistenceUnitFactoryFactory.java
(added)
+++
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/ManagedPersistenceUnitFactoryFactory.java
Fri Feb 13 08:38:56 2015
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIESOR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.aries.jpa.container.impl;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Properties;
+
+import org.apache.aries.jpa.container.ManagedPersistenceUnitInfoFactory;
+import
org.apache.aries.jpa.container.unit.impl.ManagedPersistenceUnitInfoFactoryImpl;
+import org.osgi.framework.Bundle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Creates either the default or a customer MPUF.
+ * Loads the jpa container properties to determine if a custom MPUF is defined.
+ */
+public class ManagedPersistenceUnitFactoryFactory {
+ /** Logger */
+ private static final Logger _logger =
LoggerFactory.getLogger("org.apache.aries.jpa.container");
+
+ @SuppressWarnings("unchecked")
+ public static ManagedPersistenceUnitInfoFactory create(Bundle bundle) {
+ Properties config = new Properties();
+ URL u =
bundle.getResource(ManagedPersistenceUnitInfoFactory.ARIES_JPA_CONTAINER_PROPERTIES);
+
+ if (u != null) {
+ if (_logger.isInfoEnabled())
+ _logger.info(NLS.MESSAGES
+ .getMessage("aries.jpa.config.file.found",
+
ManagedPersistenceUnitInfoFactory.ARIES_JPA_CONTAINER_PROPERTIES,
+ bundle.getSymbolicName(), bundle.getVersion(),
config));
+ try {
+ config.load(u.openStream());
+ } catch (IOException e) {
+ _logger.error(NLS.MESSAGES
+ .getMessage("aries.jpa.config.file.read.error",
+
ManagedPersistenceUnitInfoFactory.ARIES_JPA_CONTAINER_PROPERTIES,
+ bundle.getSymbolicName(),
bundle.getVersion()), e);
+ }
+ } else {
+ if (_logger.isInfoEnabled())
+ _logger.info(NLS.MESSAGES
+ .getMessage("aries.jpa.config.file.not.found",
+
ManagedPersistenceUnitInfoFactory.ARIES_JPA_CONTAINER_PROPERTIES,
+ bundle.getSymbolicName(), bundle.getVersion(),
config));
+ }
+ // Create the pluggable ManagedPersistenceUnitInfoFactory
+ String className =
config.getProperty(ManagedPersistenceUnitInfoFactory.DEFAULT_PU_INFO_FACTORY_KEY);
+
+ if (className != null) {
+ try {
+ Class<? extends ManagedPersistenceUnitInfoFactory> clazz =
(Class<? extends ManagedPersistenceUnitInfoFactory>)bundle
+ .loadClass(className);
+ return clazz.newInstance();
+ } catch (Exception e) {
+
_logger.error(NLS.MESSAGES.getMessage("unable.to.create.mpuif", className), e);
+ }
+ }
+
+ return new ManagedPersistenceUnitInfoFactoryImpl();
+ }
+}
Modified:
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleManager.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleManager.java?rev=1659466&r1=1659465&r2=1659466&view=diff
==============================================================================
---
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleManager.java
(original)
+++
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleManager.java
Fri Feb 13 08:38:56 2015
@@ -20,10 +20,8 @@
package org.apache.aries.jpa.container.impl;
import java.io.Closeable;
-import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -46,24 +44,18 @@ import org.apache.aries.jpa.container.pa
import org.apache.aries.jpa.container.parsing.PersistenceDescriptor;
import org.apache.aries.jpa.container.parsing.PersistenceDescriptorParser;
import
org.apache.aries.jpa.container.parsing.PersistenceDescriptorParserException;
-import
org.apache.aries.jpa.container.parsing.impl.PersistenceDescriptorParserImpl;
import org.apache.aries.jpa.container.quiesce.impl.CountdownCallback;
import org.apache.aries.jpa.container.quiesce.impl.DestroyCallback;
import org.apache.aries.jpa.container.quiesce.impl.QuiesceHandler;
import org.apache.aries.jpa.container.quiesce.impl.QuiesceParticipantFactory;
-import org.apache.aries.jpa.container.tx.impl.OSGiTransactionManager;
-import
org.apache.aries.jpa.container.unit.impl.ManagedPersistenceUnitInfoFactoryImpl;
-import org.apache.aries.util.AriesFrameworkUtil;
import org.apache.aries.util.VersionRange;
import org.apache.aries.util.io.IOUtils;
import org.apache.aries.util.tracker.RecursiveBundleTracker;
import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
-import org.osgi.framework.ServiceRegistration;
import org.osgi.framework.Version;
import org.osgi.util.tracker.BundleTrackerCustomizer;
import org.osgi.util.tracker.ServiceTracker;
@@ -77,9 +69,8 @@ import org.slf4j.LoggerFactory;
* matching PersistenceProvider
*/
@SuppressWarnings("rawtypes")
-public class PersistenceBundleManager implements BundleTrackerCustomizer,
ServiceTrackerCustomizer, BundleActivator, QuiesceHandler
+public class PersistenceBundleManager implements BundleTrackerCustomizer,
ServiceTrackerCustomizer, QuiesceHandler
{
- /** Logger */
private static final Logger _logger =
LoggerFactory.getLogger("org.apache.aries.jpa.container");
/** The bundle context for this bundle */
@@ -107,10 +98,6 @@ public class PersistenceBundleManager im
private ManagedPersistenceUnitInfoFactory persistenceUnitFactory;
/** Parser for persistence descriptors */
private PersistenceDescriptorParser parser;
- /** Registration for the Parser */
- private ServiceRegistration parserReg;
- /** Configuration for this extender */
- private Properties config;
private RecursiveBundleTracker tracker;
private ServiceTracker serviceTracker;
@@ -118,42 +105,37 @@ public class PersistenceBundleManager im
private Closeable quiesceParticipant;
/** Are we quiescing */
private AtomicBoolean quiesce = new AtomicBoolean(false);
-
- @SuppressWarnings("unchecked")
- private void open() {
- //Create the pluggable ManagedPersistenceUnitInfoFactory
- String className =
config.getProperty(ManagedPersistenceUnitInfoFactory.DEFAULT_PU_INFO_FACTORY_KEY);
-
- if(className != null) {
- try {
- Class<? extends ManagedPersistenceUnitInfoFactory> clazz =
- (Class<? extends ManagedPersistenceUnitInfoFactory>)
ctx.getBundle().loadClass(className);
- persistenceUnitFactory = clazz.newInstance();
- } catch (Exception e) {
- _logger.error(NLS.MESSAGES.getMessage("unable.to.create.mpuif",
className), e);
- }
+
+ public PersistenceBundleManager(BundleContext ctx,
PersistenceDescriptorParser parser) {
+ this.ctx = ctx;
+ this.parser = parser;
}
-
- if(persistenceUnitFactory == null)
- persistenceUnitFactory = new ManagedPersistenceUnitInfoFactoryImpl();
- serviceTracker.open();
- tracker.open();
- }
- private void close()
- {
- if (tracker != null) {
- tracker.close();
+ @SuppressWarnings("unchecked")
+ void open() {
+ quiesceParticipant = QuiesceParticipantFactory.create(ctx, this);
+ persistenceUnitFactory =
ManagedPersistenceUnitFactoryFactory.create(ctx.getBundle());
+
+ serviceTracker = new ServiceTracker(ctx,
PersistenceProvider.class.getName(), this);
+
+ tracker = new RecursiveBundleTracker(ctx, Bundle.INSTALLED |
Bundle.RESOLVED | Bundle.STARTING
+ | Bundle.ACTIVE |
Bundle.STOPPING, this);
+
+ serviceTracker.open();
+ tracker.open();
}
-
- if (serviceTracker != null) {
- serviceTracker.close();
+
+ void close() {
+ if (tracker != null) {
+ tracker.close();
+ }
+
+ if (serviceTracker != null) {
+ serviceTracker.close();
+ }
+ IOUtils.close(quiesceParticipant);
}
-
- OSGiTransactionManager otm = OSGiTransactionManager.get();
- if(otm != null)
- otm.destroy();
- }
+
public Object addingBundle(Bundle bundle, BundleEvent event)
{
if(!!!quiesce.get()){
@@ -246,40 +228,6 @@ public class PersistenceBundleManager im
}
}
- /**
- * Add config properties, making sure to read in the properties file
- * and override the supplied properties
- * @param props
- */
- private void initConfig() {
- config = new Properties();
- URL u =
ctx.getBundle().getResource(ManagedPersistenceUnitInfoFactory.ARIES_JPA_CONTAINER_PROPERTIES);
-
- if(u != null) {
- if(_logger.isInfoEnabled())
- _logger.info(NLS.MESSAGES.getMessage("aries.jpa.config.file.found",
-
ManagedPersistenceUnitInfoFactory.ARIES_JPA_CONTAINER_PROPERTIES,
- ctx.getBundle().getSymbolicName(),
- ctx.getBundle().getVersion(),
- config));
- try {
- config.load(u.openStream());
- } catch (IOException e) {
-
_logger.error(NLS.MESSAGES.getMessage("aries.jpa.config.file.read.error",
-
ManagedPersistenceUnitInfoFactory.ARIES_JPA_CONTAINER_PROPERTIES,
-
ctx.getBundle().getSymbolicName(),
- ctx.getBundle().getVersion()),
e);
- }
- } else {
- if(_logger.isInfoEnabled())
-
_logger.info(NLS.MESSAGES.getMessage("aries.jpa.config.file.not.found",
- ManagedPersistenceUnitInfoFactory.ARIES_JPA_CONTAINER_PROPERTIES,
- ctx.getBundle().getSymbolicName(),
- ctx.getBundle().getVersion(),
- config));
- }
- }
-
public void modifiedBundle(Bundle bundle, BundleEvent event, Object object) {
EntityManagerFactoryManager mgr = (EntityManagerFactoryManager) object;
@@ -639,36 +587,6 @@ public class PersistenceBundleManager im
removedService(reference, service);
addingService(reference);
}
-
-
- @SuppressWarnings("unchecked")
- public void start(BundleContext context) throws Exception {
-
- ctx = context;
-
- initConfig();
- initParser();
-
- serviceTracker = new ServiceTracker(ctx,
PersistenceProvider.class.getName(), this);
-
- tracker = new RecursiveBundleTracker(ctx, Bundle.INSTALLED |
Bundle.RESOLVED | Bundle.STARTING |
- Bundle.ACTIVE | Bundle.STOPPING, this);
-
- open();
-
- QuiesceParticipantFactory.create(context, this);
- }
-
- private void initParser() {
- parser = new PersistenceDescriptorParserImpl();
- parserReg =
ctx.registerService(PersistenceDescriptorParser.class.getName(), parser, null);
- }
-
- public void stop(BundleContext context) throws Exception {
- close();
- AriesFrameworkUtil.safeUnregisterService(parserReg);
- IOUtils.close(quiesceParticipant);
- }
public BundleContext getCtx() {
return ctx;
Copied:
aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/impl/PersistenceBundleLifecycleTest.java
(from r1657779,
aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/PersistenceBundleLifecycleTest.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/impl/PersistenceBundleLifecycleTest.java?p2=aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/impl/PersistenceBundleLifecycleTest.java&p1=aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/PersistenceBundleLifecycleTest.java&r1=1657779&r2=1659466&rev=1659466&view=diff
==============================================================================
---
aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/PersistenceBundleLifecycleTest.java
(original)
+++
aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/impl/PersistenceBundleLifecycleTest.java
Fri Feb 13 08:38:56 2015
@@ -18,7 +18,7 @@
*/
-package org.apache.aries.jpa.container;
+package org.apache.aries.jpa.container.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -47,8 +47,11 @@ import javax.persistence.EntityManagerFa
import javax.persistence.spi.PersistenceProvider;
import javax.persistence.spi.PersistenceUnitInfo;
+import org.apache.aries.jpa.container.ManagedPersistenceUnitInfoFactory;
+import org.apache.aries.jpa.container.PersistenceUnitConstants;
import org.apache.aries.jpa.container.impl.EntityManagerFactoryManager;
import org.apache.aries.jpa.container.impl.PersistenceBundleManager;
+import
org.apache.aries.jpa.container.parsing.impl.PersistenceDescriptorParserImpl;
import org.apache.aries.mocks.BundleContextMock;
import org.apache.aries.mocks.BundleMock;
import org.apache.aries.quiesce.manager.QuiesceCallback;
@@ -133,7 +136,7 @@ public class PersistenceBundleLifecycleT
new MethodCall(BundleContext.class, "getBundles"),
new Bundle[] {persistenceBundle});
- mgr = new PersistenceBundleManager();
+ mgr = new PersistenceBundleManager(extenderContext, new
PersistenceDescriptorParserImpl());
return extenderContext;
}
@@ -141,8 +144,8 @@ public class PersistenceBundleLifecycleT
@Test
public void testManager_NonPersistenceBundle() throws Exception
{
- BundleContext ctx = preExistingBundleSetup();
- mgr.start(ctx);
+ preExistingBundleSetup();
+ mgr.open();
//Check the persistence.xml was not looked for
Skeleton.getSkeleton(persistenceBundle).assertNotCalled(new
MethodCall(Bundle.class, "getEntry", String.class));
@@ -158,12 +161,12 @@ public class PersistenceBundleLifecycleT
@Test
public void testManager_OnePreExistingPersistenceBundle_NoProvider() throws
Exception
{
- BundleContext ctx = preExistingBundleSetup();
+ preExistingBundleSetup();
//Set the persistence.xml etc
setupPersistenceBundle("file4", "");
- mgr.start(ctx);
+ mgr.open();
//Check the persistence.xml was looked for
Skeleton.getSkeleton(persistenceBundle).assertCalled(new
MethodCall(Bundle.class, "getEntry", "META-INF/persistence.xml"));
@@ -190,7 +193,7 @@ public class PersistenceBundleLifecycleT
pp, hash1 );
ServiceReference ref = reg.getReference();
- mgr.start(ctx);
+ mgr.open();
//Check the persistence.xml was looked for
Skeleton.getSkeleton(persistenceBundle).assertCalled(new
MethodCall(Bundle.class, "getEntry", "META-INF/persistence.xml"));
@@ -217,7 +220,7 @@ public class PersistenceBundleLifecycleT
ServiceReference ref = reg.getReference();
setupWABBundle();
- mgr.start(extenderContext);
+ mgr.open();
Skeleton.getSkeleton(persistenceBundle).assertCalledExactNumberOfTimes(new
MethodCall(Bundle.class, "getEntry", String.class), 3);
@@ -240,7 +243,7 @@ public class PersistenceBundleLifecycleT
ServiceReference ref = reg.getReference();
setupEJBBundle();
- mgr.start(extenderContext);
+ mgr.open();
Skeleton.getSkeleton(persistenceBundle).assertCalledExactNumberOfTimes(new
MethodCall(Bundle.class, "getEntry", String.class), 1);
@@ -262,7 +265,7 @@ public class PersistenceBundleLifecycleT
setupPersistenceBundle("file4", "");
- mgr.start(extenderContext);
+ mgr.open();
//Check the persistence.xml was looked for
Skeleton.getSkeleton(persistenceBundle).assertCalled(new
MethodCall(Bundle.class, "getEntry", "META-INF/persistence.xml"));
@@ -280,7 +283,7 @@ public class PersistenceBundleLifecycleT
setupPersistenceBundle("file4", "");
- mgr.start(extenderContext);
+ mgr.open();
//Check the persistence.xml was looked for
Skeleton.getSkeleton(persistenceBundle).assertCalled(new
MethodCall(Bundle.class, "getEntry", "META-INF/persistence.xml"));
@@ -309,7 +312,7 @@ public class PersistenceBundleLifecycleT
setupPersistenceBundle("file4", "");
- mgr.start(extenderContext);
+ mgr.open();
//Check the persistence.xml was looked for
Skeleton.getSkeleton(persistenceBundle).assertCalled(new
MethodCall(Bundle.class, "getEntry", "META-INF/persistence.xml"));
@@ -360,7 +363,7 @@ public class PersistenceBundleLifecycleT
{
testManager_OnePreExistingPersistenceBundle_OneExistingProvider();
- mgr.stop(extenderBundle.getBundleContext());
+ mgr.close();
assertCloseCalled();
BundleContextMock.assertNoServiceExists(EntityManagerFactory.class.getName());
@@ -373,8 +376,8 @@ public class PersistenceBundleLifecycleT
BundleContext extenderContext = extenderBundle.getBundleContext();
- mgr = new PersistenceBundleManager();
- mgr.start(extenderContext);
+ mgr = new PersistenceBundleManager(extenderContext, new
PersistenceDescriptorParserImpl());
+ mgr.open();
Hashtable<String,String> hash1 = new Hashtable<String, String>();
hash1.put("javax.persistence.provider", "no.such.Provider");
@@ -459,7 +462,7 @@ public class PersistenceBundleLifecycleT
pp, hash1 );
ServiceReference ref = reg.getReference();
- mgr.start(extenderContext);
+ mgr.open();
testSuccessfulCreationEvent(ref, extenderContext, 1);
testSuccessfulRegistrationEvent(ref, extenderContext, 1);
@@ -501,7 +504,7 @@ public class PersistenceBundleLifecycleT
pp, hash1 );
ServiceReference ref = reg.getReference();
- mgr.start(extenderContext);
+ mgr.open();
testSuccessfulCreationEvent(ref, extenderContext, 1);
testSuccessfulRegistrationEvent(ref, extenderContext, 1);
@@ -536,7 +539,7 @@ public class PersistenceBundleLifecycleT
setupPersistenceBundle("file4", "");
- mgr.start(extenderContext);
+ mgr.open();
testSuccessfulCreationEvent(ref, extenderContext, 1);
testSuccessfulRegistrationEvent(ref, extenderContext, 1);
@@ -558,7 +561,7 @@ private void assertCloseCalled() {
BundleContext extenderContext = extenderBundle.getBundleContext();
- mgr = new PersistenceBundleManager();
+ mgr = new PersistenceBundleManager(extenderContext, new
PersistenceDescriptorParserImpl());
Hashtable<String,String> hash1 = new Hashtable<String, String>();
hash1.put("javax.persistence.provider", "no.such.Provider");
@@ -566,7 +569,7 @@ private void assertCloseCalled() {
pp, hash1 );
setupPersistenceBundle("file3", "");
- mgr.start(extenderContext);
+ mgr.open();
Object o = mgr.addingBundle(persistenceBundle, null);
@@ -598,7 +601,7 @@ private void assertCloseCalled() {
setupPersistenceBundle("file5", "");
- mgr.start(extenderContext);
+ mgr.open();
testSuccessfulCreationEvent(ppRef, extenderContext, 1);
testSuccessfulRegistrationEvent(ppRef, extenderContext, 1);
Skeleton.getSkeleton(pp).clearMethodCalls();
@@ -631,7 +634,7 @@ private void assertCloseCalled() {
Skeleton.getSkeleton(extenderBundle).setReturnValue(new
MethodCall(Bundle.class, "getResource",
ManagedPersistenceUnitInfoFactory.ARIES_JPA_CONTAINER_PROPERTIES),
getClass().getClassLoader().getResource("testProps.props"));
- mgr.start(extenderContext);
+ mgr.open();
testSuccessfulCreationEvent(ppRef, extenderContext, 1);
testSuccessfulRegistrationEvent(ppRef, extenderContext, 1);
//Clear the call to createContainerEntityManagerFactory so that we can
check nothing
@@ -660,7 +663,7 @@ private void assertCloseCalled() {
setupPersistenceBundle("file6", "");
- mgr.start(extenderContext);
+ mgr.open();
//Check the persistence.xml was looked for
Skeleton.getSkeleton(persistenceBundle).assertCalled(new
MethodCall(Bundle.class, "getEntry", "META-INF/persistence.xml"));
@@ -694,7 +697,7 @@ private void assertCloseCalled() {
setupPersistenceBundle("file7", "");
- mgr.start(extenderContext);
+ mgr.open();
//Check the persistence.xml was looked for
Skeleton.getSkeleton(persistenceBundle).assertCalled(new
MethodCall(Bundle.class, "getEntry", "META-INF/persistence.xml"));
@@ -725,7 +728,7 @@ private void assertCloseCalled() {
pp2, hash2 );
setupPersistenceBundle("file8", "");
- mgr.start(extenderContext);
+ mgr.open();
//Check the persistence.xml was looked for
Skeleton.getSkeleton(persistenceBundle).assertCalled(new
MethodCall(Bundle.class, "getEntry", "META-INF/persistence.xml"));
@@ -747,7 +750,7 @@ private void assertCloseCalled() {
setupPersistenceBundle("file9", "");
- mgr.start(extenderContext);
+ mgr.open();
assertCorrectPersistenceProviderUsed(extenderContext, providerP100);
}
@@ -761,7 +764,7 @@ private void assertCloseCalled() {
setupPersistenceBundle("file10", "");
- mgr.start(extenderContext);
+ mgr.open();
assertCorrectPersistenceProviderUsed(extenderContext, providerP101);
}
@@ -775,7 +778,7 @@ private void assertCloseCalled() {
setupPersistenceBundle("file11", "");
- mgr.start(extenderContext);
+ mgr.open();
assertCorrectPersistenceProviderUsed(extenderContext, providerP101);
}
@@ -789,7 +792,7 @@ private void assertCloseCalled() {
setupPersistenceBundle("file12", "");
- mgr.start(extenderContext);
+ mgr.open();
assertCorrectPersistenceProviderUsed(extenderContext, providerP111);
}
@@ -803,7 +806,7 @@ private void assertCloseCalled() {
setupPersistenceBundle("file13", "");
- mgr.start(extenderContext);
+ mgr.open();
BundleContextMock.assertNoServiceExists(EntityManagerFactory.class.getName());
@@ -820,7 +823,7 @@ private void assertCloseCalled() {
setupPersistenceBundle("file14", "");
- mgr.start(extenderContext);
+ mgr.open();
assertCorrectPersistenceProviderUsed(extenderContext, providerP101, 2);
}
@@ -834,7 +837,7 @@ private void assertCloseCalled() {
setupPersistenceBundle("file15", "");
- mgr.start(extenderContext);
+ mgr.open();
BundleContextMock.assertNoServiceExists(EntityManagerFactory.class.getName());
@@ -851,7 +854,7 @@ private void assertCloseCalled() {
setupPersistenceBundle("file16", "");
- mgr.start(extenderContext);
+ mgr.open();
BundleContextMock.assertNoServiceExists(EntityManagerFactory.class.getName());
@@ -868,7 +871,7 @@ private void assertCloseCalled() {
setupPersistenceBundle("file17", "");
- mgr.start(extenderContext);
+ mgr.open();
BundleContextMock.assertNoServiceExists(EntityManagerFactory.class.getName());
@@ -886,7 +889,7 @@ private void assertCloseCalled() {
setupPersistenceBundle("file18", "");
- mgr.start(extenderContext);
+ mgr.open();
BundleContextMock.assertNoServiceExists(EntityManagerFactory.class.getName());
@@ -903,7 +906,7 @@ private void assertCloseCalled() {
setupPersistenceBundle("file19", "");
- mgr.start(extenderContext);
+ mgr.open();
BundleContextMock.assertNoServiceExists(EntityManagerFactory.class.getName());
@@ -920,7 +923,7 @@ private void assertCloseCalled() {
setupPersistenceBundle("file20", "");
- mgr.start(extenderContext);
+ mgr.open();
BundleContextMock.assertNoServiceExists(EntityManagerFactory.class.getName());
@@ -942,7 +945,7 @@ private void assertCloseCalled() {
ServiceReference ref = reg.getReference();
setupPersistenceBundle21();
- mgr.start(extenderContext);
+ mgr.open();
testSuccessfulCreationEvent(ref, extenderContext, 4);
testSuccessfulRegistrationEvent(ref, extenderContext, 4, "persistence",
"found", "jar", "another");
@@ -957,7 +960,7 @@ private void assertCloseCalled() {
public void testQuiesceNoOp() throws Exception
{
BundleContext ctx = preExistingBundleSetup();
- mgr.start(ctx);
+ mgr.open();
QuiesceCallback cbk = Skeleton.newMock(QuiesceCallback.class);
@@ -984,7 +987,7 @@ private void assertCloseCalled() {
setupPersistenceBundle("file14", "");
- mgr.start(ctx);
+ mgr.open();
assertCorrectPersistenceProviderUsed(ctx, providerP101, 2);
@@ -1015,7 +1018,7 @@ private void assertCloseCalled() {
setupPersistenceBundle("file14", "");
- mgr.start(ctx);
+ mgr.open();
assertCorrectPersistenceProviderUsed(ctx, providerP101, 2);
@@ -1069,7 +1072,7 @@ private void assertCloseCalled() {
public void testQuiesceAllNoOp() throws Exception
{
BundleContext ctx = preExistingBundleSetup();
- mgr.start(ctx);
+ mgr.open();
QuiesceCallback cbk = Skeleton.newMock(QuiesceCallback.class);
@@ -1095,7 +1098,7 @@ private void assertCloseCalled() {
setupPersistenceBundle("file14", "");
- mgr.start(ctx);
+ mgr.open();
assertCorrectPersistenceProviderUsed(ctx, providerP101, 2);
@@ -1142,7 +1145,7 @@ private void assertCloseCalled() {
skel.setReturnValue(new MethodCall(Bundle.class, "getVersion"), new
Version("0.0.0"));
- mgr.start(ctx);
+ mgr.open();
mgr.addingBundle(persistenceBundle2, new BundleEvent(BundleEvent.STARTING,
persistenceBundle2));
@@ -1217,7 +1220,7 @@ private void assertCloseCalled() {
setupPersistenceBundle("file25", "");
- mgr.start(extenderContext);
+ mgr.open();
//Check the persistence.xml was looked for
Skeleton.getSkeleton(persistenceBundle).assertCalled(new
MethodCall(Bundle.class, "getEntry", "META-INF/persistence.xml"));
