Author: pauls
Date: Wed Feb 5 22:12:26 2020
New Revision: 1873674
URL: http://svn.apache.org/viewvc?rev=1873674&view=rev
Log:
Update to latest connect interfaces
Added:
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ModuleConnector.java
- copied, changed from r1873673,
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ConnectFramework.java
Removed:
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ConnectFramework.java
Modified:
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/BundleWiringImpl.java
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/Felix.java
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/FrameworkFactory.java
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/cache/BundleCache.java
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/cache/ConnectRevision.java
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ConnectContent.java
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ConnectFrameworkFactory.java
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ConnectModule.java
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/namespace/IdentityNamespace.java
felix/sandbox/pauls/connect/src/test/java/org/apache/felix/framework/ConnectTest.java
Modified:
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/BundleWiringImpl.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/BundleWiringImpl.java?rev=1873674&r1=1873673&r2=1873674&view=diff
==============================================================================
---
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/BundleWiringImpl.java
(original)
+++
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/BundleWiringImpl.java
Wed Feb 5 22:12:26 2020
@@ -1585,7 +1585,8 @@ public class BundleWiringImpl implements
((BundleClassLoader) cl).findResource(name);
}
else {
- result = isClass ? cl.loadClass(name) :
cl.getResource(name);
+ result = isClass ? cl.loadClass(name) :
!name.startsWith("/") ? cl.getResource(name) :
+ cl.getResource(name.substring(1));
}
Modified:
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/Felix.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/Felix.java?rev=1873674&r1=1873673&r2=1873674&view=diff
==============================================================================
---
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/Felix.java
(original)
+++
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/Felix.java
Wed Feb 5 22:12:26 2020
@@ -58,7 +58,7 @@ import org.osgi.framework.ServicePermiss
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
import org.osgi.framework.Version;
-import org.osgi.framework.connect.ConnectFramework;
+import org.osgi.framework.connect.ModuleConnector;
import org.osgi.framework.launch.Framework;
import org.osgi.framework.namespace.HostNamespace;
import org.osgi.framework.startlevel.FrameworkStartLevel;
@@ -214,7 +214,7 @@ public class Felix extends BundleImpl im
// Do we need to consult the default java security policy if no security
provider is present?
private volatile boolean m_securityDefaultPolicy;
- private final ConnectFramework m_connectFramework;
+ private final ModuleConnector m_connectFramework;
/**
* <p>
@@ -357,7 +357,7 @@ public class Felix extends BundleImpl im
this(configMap, null);
}
- public Felix(Map configMap, ConnectFramework connectFramework)
+ public Felix(Map configMap, ModuleConnector connectFramework)
{
super();
// Copy the configuration properties; convert keys to strings.
Modified:
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/FrameworkFactory.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/FrameworkFactory.java?rev=1873674&r1=1873673&r2=1873674&view=diff
==============================================================================
---
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/FrameworkFactory.java
(original)
+++
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/FrameworkFactory.java
Wed Feb 5 22:12:26 2020
@@ -20,7 +20,7 @@ package org.apache.felix.framework;
import java.util.Map;
-import org.osgi.framework.connect.ConnectFramework;
+import org.osgi.framework.connect.ModuleConnector;
import org.osgi.framework.launch.Framework;
public class FrameworkFactory implements
org.osgi.framework.launch.FrameworkFactory,
org.osgi.framework.connect.ConnectFrameworkFactory
@@ -31,7 +31,7 @@ public class FrameworkFactory implements
}
@Override
- public Framework newFramework(Map<String, String> configuration,
ConnectFramework connectFramework)
+ public Framework newFramework(Map<String, String> configuration,
ModuleConnector connectFramework)
{
return new Felix(configuration, connectFramework);
}
Modified:
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/cache/BundleArchive.java?rev=1873674&r1=1873673&r2=1873674&view=diff
==============================================================================
---
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
(original)
+++
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
Wed Feb 5 22:12:26 2020
@@ -29,7 +29,7 @@ import org.apache.felix.framework.util.W
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
-import org.osgi.framework.connect.ConnectFramework;
+import org.osgi.framework.connect.ModuleConnector;
import org.osgi.framework.connect.ConnectModule;
/**
@@ -127,7 +127,7 @@ public class BundleArchive
* @param is input stream from which to read the bundle content.
* @throws Exception if any error occurs.
**/
- public BundleArchive(Logger logger, Map configMap, WeakZipFileFactory
zipFactory, ConnectFramework
+ public BundleArchive(Logger logger, Map configMap, WeakZipFileFactory
zipFactory, ModuleConnector
connectFactory,
File archiveRootDir, long id, int startLevel, String location,
InputStream is)
throws Exception
@@ -151,7 +151,7 @@ public class BundleArchive
m_module = Optional.ofNullable(connectFactory).flatMap(factory -> {
try
{
- return connectFactory.getModule(m_originalLocation);
+ return connectFactory.connect(m_originalLocation);
}
catch (BundleException e)
{
@@ -178,7 +178,7 @@ public class BundleArchive
* @param configMap configMap for BundleArchive
* @throws Exception if any error occurs.
**/
- public BundleArchive(Logger logger, Map configMap, WeakZipFileFactory
zipFactory, ConnectFramework connectFactory,
+ public BundleArchive(Logger logger, Map configMap, WeakZipFileFactory
zipFactory, ModuleConnector connectFactory,
File archiveRootDir)
throws Exception
{
@@ -233,7 +233,7 @@ public class BundleArchive
m_module = Optional.ofNullable(connectFactory).flatMap(factory -> {
try
{
- return connectFactory.getModule(location);
+ return connectFactory.connect(location);
}
catch (BundleException e)
{
Modified:
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/cache/BundleCache.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/cache/BundleCache.java?rev=1873674&r1=1873673&r2=1873674&view=diff
==============================================================================
---
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/cache/BundleCache.java
(original)
+++
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/cache/BundleCache.java
Wed Feb 5 22:12:26 2020
@@ -22,7 +22,7 @@ import org.apache.felix.framework.Logger
import org.apache.felix.framework.util.SecureAction;
import org.apache.felix.framework.util.WeakZipFileFactory;
import org.osgi.framework.Constants;
-import org.osgi.framework.connect.ConnectFramework;
+import org.osgi.framework.connect.ModuleConnector;
import java.io.File;
import java.io.FileOutputStream;
@@ -403,7 +403,7 @@ public class BundleCache
deleteDirectoryTree(cacheDir);
}
- public BundleArchive[] getArchives(ConnectFramework connectFactory)
+ public BundleArchive[] getArchives(ModuleConnector connectFactory)
throws Exception
{
// Get buffer size value.
@@ -452,7 +452,7 @@ public class BundleCache
archiveList.toArray(new BundleArchive[archiveList.size()]);
}
- public BundleArchive create(long id, int startLevel, String location,
InputStream is, ConnectFramework connectFactory)
+ public BundleArchive create(long id, int startLevel, String location,
InputStream is, ModuleConnector connectFactory)
throws Exception
{
File cacheDir = determineCacheDir(m_configMap);
Modified:
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/cache/ConnectRevision.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/cache/ConnectRevision.java?rev=1873674&r1=1873673&r2=1873674&view=diff
==============================================================================
---
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/cache/ConnectRevision.java
(original)
+++
felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/cache/ConnectRevision.java
Wed Feb 5 22:12:26 2020
@@ -18,10 +18,8 @@
*/
package org.apache.felix.framework.cache;
-import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
-import java.io.UncheckedIOException;
import java.util.Map;
import java.util.Optional;
@@ -41,7 +39,8 @@ public class ConnectRevision extends Bun
{
super(logger, configMap, revisionRootDir, location);
m_zipFactory = zipFactory;
- m_module = module.getContent().open();
+ m_module = module.getContent();
+ m_module.open();
// If the revision directory exists, then we don't
// need to initialize since it has already been done.
if (BundleCache.getSecureAction().fileExists(getRevisionRootDir()))
Modified:
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ConnectContent.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ConnectContent.java?rev=1873674&r1=1873673&r2=1873674&view=diff
==============================================================================
---
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ConnectContent.java
(original)
+++
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ConnectContent.java
Wed Feb 5 22:12:26 2020
@@ -34,10 +34,15 @@ import org.osgi.framework.wiring.BundleR
* instance. The framework must close the connect content once the connect
* content is no longer used as the content of a current bundle revision or an
* in use bundle revision.
+ * <p>
+ * An entry in a connect content is identified by a path name that is a
+ * '{@code /}'-separated path. A connect content may treat directories as
+ * entries. A directory entry path name will end with a slash ('/'). A
directory
+ * entry may be located using a path name that drops the trailing slash.
*
* @see BundleRevisions
* @ThreadSafe
- * @author $Id: ce8ae5d57f40d8cca91e06184cd732c3c0953f6a $
+ * @author $Id: 44ec66031f9460c48453c7113e4871472a7c475c $
*/
public interface ConnectContent {
/**
@@ -71,7 +76,8 @@ public interface ConnectContent {
* Returns the connect entry for the specified path name in this
content.
* The {@link Optional#empty() empty} value is returned if an entry
with the
* specified path name does not exist. The path must not start with a
- * "/" and is relative to the root of this content.
+ * "/" and is relative to the root of this content. A connect
+ * entry for a directory will have a path name that ends with a slash
('/').
*
* @param path the path name of the entry
* @return the connect entry, or {@link Optional#empty() empty} if not
@@ -100,21 +106,20 @@ public interface ConnectContent {
/**
* Opens this connect content. The framework will open the content when
it
* needs to access the content for a bundle revision associated with the
- * connect content. The framework may lazily open the content until the
- * first request is made to access the bundle revision content.
+ * connect content. The framework may lazily postpone to open the
content
+ * until right before requests to access the bundle revision content are
+ * made.
*
- * @return a reference to this object
* @throws IOException if an error occurred opening the content
*/
- ConnectContent open() throws IOException;
+ void open() throws IOException;
/**
* Closes this connect content.
*
- * @return a reference to this object
* @throws IOException if an error occurred closing the connect content
*/
- ConnectContent close() throws IOException;
+ void close() throws IOException;
/**
* Represents the entry of a connect module
Modified:
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ConnectFrameworkFactory.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ConnectFrameworkFactory.java?rev=1873674&r1=1873673&r2=1873674&view=diff
==============================================================================
---
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ConnectFrameworkFactory.java
(original)
+++
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ConnectFrameworkFactory.java
Wed Feb 5 22:12:26 2020
@@ -24,7 +24,7 @@ import org.osgi.framework.launch.Framewo
/**
* A factory for creating {@link Framework} instances.
* <p>
- * If a framework supports {@link ConnectFramework} then the implementation jar
+ * If a framework supports {@link ModuleConnector} then the implementation jar
* must contain the following resource:
*
* <pre>
@@ -45,13 +45,13 @@ import org.osgi.framework.launch.Framewo
* ConnectFrameworkFactory instance from the resource.
*
* @ThreadSafe
- * @author $Id: cb596326be33a0782240ce47d5212a797c1724ba $
+ * @author $Id: c1193dbc989c5cc0840f0b6a66a229b95d6fbc4e $
*/
@ProviderType
public interface ConnectFrameworkFactory {
/**
* Create a new {@link Framework} instance using the specified
- * {@link ConnectFramework connect framework}.
+ * {@link ModuleConnector module connector}.
*
* @param configuration The framework properties to configure the new
* framework instance. If framework properties are not
provided
@@ -64,17 +64,17 @@ public interface ConnectFrameworkFactory
* from the specified configuration argument since the
* configuration argument can be changed after the framework
* instance has been created.
- * @param connectFramework The connect framework that the new framework
- * instance will use. The specified connect framework
argument
- * may be {@code null}.
+ * @param moduleConnector The module connector that the new framework
+ * instance will use. The specified module connector
argument may
+ * be {@code null}.
* @return A new, configured {@link Framework} instance. The framework
* instance must be in the {@link Bundle#INSTALLED} state.
* @throws SecurityException If the caller does not have
* {@code AllPermission}, and the Java Runtime Environment
* supports permissions.
- * @see ConnectFramework
+ * @see ModuleConnector
* @since 1.3
*/
Framework newFramework(Map<String,String> configuration,
- ConnectFramework connectFramework);
+ ModuleConnector moduleConnector);
}
Modified:
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ConnectModule.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ConnectModule.java?rev=1873674&r1=1873673&r2=1873674&view=diff
==============================================================================
---
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ConnectModule.java
(original)
+++
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ConnectModule.java
Wed Feb 5 22:12:26 2020
@@ -21,22 +21,25 @@ import org.osgi.framework.launch.Framewo
import org.osgi.framework.wiring.BundleRevision;
/**
- * A connect module instance is used by a {@link Framework framework} to load
- * content for a bundle revision installed in the framework.
+ * A connect module instance is used by a {@link Framework framework} when a
+ * bundle location is connected to connect module. The connected bundle must
use
+ * the connect module to load content for the bundle revisions installed in the
+ * framework for the connected bundle.
*
* @ThreadSafe
- * @author $Id: 394a6872eb27589cc914095457cf3f4d7d82f6bf $
+ * @author $Id: 421e5c4762caa3798def32c52c3c1347648a5606 $
*/
public interface ConnectModule {
/**
* Returns the current content of this connect module. The framework
will
- * get the content when it needs to access the content for the current
- * {@link BundleRevision bundle revision} associated with this connect
- * module. The framework may lazily open the content until the first
request
- * is made to access the bundle content.
+ * call this method when it needs to access the content for the current
+ * {@link BundleRevision bundle revision} that is connected to this
connect
+ * module. The framework may lazily postpone to open the content until
right
+ * before requests to access the bundle revision content are made.
*
* @return the current content of this connect module
* @throws IOException if an error occurred getting the content
+ * @see ModuleConnector#connect(String)
*/
ConnectContent getContent() throws IOException;
}
Copied:
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ModuleConnector.java
(from r1873673,
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ConnectFramework.java)
URL:
http://svn.apache.org/viewvc/felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ModuleConnector.java?p2=felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ModuleConnector.java&p1=felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ConnectFramework.java&r1=1873673&r2=1873674&rev=1873674&view=diff
==============================================================================
---
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ConnectFramework.java
(original)
+++
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/connect/ModuleConnector.java
Wed Feb 5 22:12:26 2020
@@ -25,57 +25,62 @@ import org.osgi.framework.Constants;
import org.osgi.framework.launch.Framework;
/**
- * A connect framework provides access to instances of {@link ConnectModule}
- * that are used by a {@link Framework} instance to provide content and classes
- * for a bundle installed in the Framework. A connect framework is provided
when
- * {@link ConnectFrameworkFactory#newFramework(java.util.Map, ConnectFramework)
- * creating} a framework instance. Because a connect framework instance can
- * participate in the initialization of the framework and the life cycle of a
- * framework instance the connect framework instance should only be used with a
- * single framework instance.
+ * A <code>ModuleConnector</code> provides connections to instances of
+ * {@link ConnectModule} that are used by a {@link Framework} instance to
+ * connect installed bundles locations with content provided by the
+ * <code>ModuleConnector</code>. This allows a <code>ModuleConnector</code> to
+ * provide content and classes for a connected bundle installed in the
+ * <code>Framework</code>. A <code>ModuleConnector</code> is provided when
+ * {@link ConnectFrameworkFactory#newFramework(java.util.Map, ModuleConnector)
+ * creating} a framework instance. Because a <code>ModuleConnector</code>
+ * instance can participate in the initialization of the <code>Framework</code>
+ * and the life cycle of a <code>Framework</code> instance the
+ * <code>ModuleConnector</code> instance should only be used with a single
+ * <code>Framework</code> instance at a time.
*
* @ThreadSafe
- * @author $Id: c01477fd91e5a4f084d178476ff57a58315155f6 $
+ * @author $Id: 3f9a112c56a213eb81baf1fe568ce4f0ecdd1321 $
*/
-public interface ConnectFramework {
+public interface ModuleConnector {
/**
- * Initializes the connect framework with the
+ * Initializes this module connector with the
* {@link Constants#FRAMEWORK_STORAGE framework persistent storage}
file and
* framework properties configured for a {@link Framework} instance.
This
* method is called once by a {@link Framework} instance and is called
- * before any other methods on this connect framework are called.
+ * before any other methods on this module connector are called.
*
- * @param configuration The framework properties to used configure the
new
+ * @param configuration The framework properties used configure the new
* framework instance. An unmodifiable map of framework
* configuration properties that were used to create a new
* framework instance.
* @param storage the persistent storage area used by the {@link
Framework}
- * or {@code null} if the if the platform does not have file
- * system support.
- * @return a reference to this object
+ * or {@code null} if the platform does not have file system
+ * support.
*/
- ConnectFramework initialize(File storage, Map<String,String>
configuration);
+ void initialize(File storage, Map<String,String> configuration);
/**
- * Returns the connect module for the specified bundle location. If an
+ * Connects a bundle location with a {@link ConnectModule}. If an
* {@link Optional#empty() empty} optional is returned the the framework
* must handle reading the content of the bundle itself. If a value is
* {@link Optional#isPresent() present} in the returned optional then
the
- * {@link Optional#get() value} from the optional must be used to
access the
+ * <code>ConnectModule</code> {@link Optional#get() value} from the
optional
+ * must be used to connect the bundle to the returned {@link
ConnectModule}.
+ * The returned connect module is used by the framework to access the
* content of the bundle.
*
* @param location the bundle location used to install a bundle
* @return the connect module for the specified bundle location
* @throws BundleException if the location cannot be handled
*/
- Optional<ConnectModule> getModule(String location) throws
BundleException;
+ Optional<ConnectModule> connect(String location) throws BundleException;
/**
- * Creates a new activator for this connect framework. A new activator
is
+ * Creates a new activator for this module connector. A new activator is
* created by the framework each time the framework is
- * {@link Framework#init() initialized}. An activator allows the connect
- * framework to participate in the framework life cyle. When the
framework
+ * {@link Framework#init() initialized}. An activator allows the module
+ * connector to participate in the framework life cycle. When the
framework
* is {@link Framework#init() initialized} the activator
* {@link BundleActivator#start(org.osgi.framework.BundleContext) start}
* method is called. When the framework is {@link Framework#stop()
stopped}
@@ -83,7 +88,7 @@ public interface ConnectFramework {
* {@link BundleActivator#stop(org.osgi.framework.BundleContext) stop}
* method is called
*
- * @return a new activator for this connect framework or
+ * @return a new activator for this module connector or
* {@link Optional#empty() empty} if no activator is available
*/
Optional<BundleActivator> createBundleActivator();
Modified:
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/namespace/IdentityNamespace.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/namespace/IdentityNamespace.java?rev=1873674&r1=1873673&r2=1873674&view=diff
==============================================================================
---
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/namespace/IdentityNamespace.java
(original)
+++
felix/sandbox/pauls/connect/src/main/java/org/osgi/framework/namespace/IdentityNamespace.java
Wed Feb 5 22:12:26 2020
@@ -41,7 +41,7 @@ import org.osgi.resource.Namespace;
* capability.
*
* @Immutable
- * @author $Id: 9d6919eafe3107b8326283f332e07c93077d4d69 $
+ * @author $Id: 27ae5d1c50d9fffcd7089d0fb225d8e793c4677a $
*/
public final class IdentityNamespace extends Namespace {
@@ -108,7 +108,7 @@ public final class IdentityNamespace ext
* The attribute value that contains tags for the resource. A tag is
used to
* identify an aspect of the resource that is not otherwise expressed
by the
* capabilities of the resource. The value of this attribute must be of
type
- * {@code List<Version>}.
+ * {@code List<String>}.
*
* @since 1.2
*/
Modified:
felix/sandbox/pauls/connect/src/test/java/org/apache/felix/framework/ConnectTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pauls/connect/src/test/java/org/apache/felix/framework/ConnectTest.java?rev=1873674&r1=1873673&r2=1873674&view=diff
==============================================================================
---
felix/sandbox/pauls/connect/src/test/java/org/apache/felix/framework/ConnectTest.java
(original)
+++
felix/sandbox/pauls/connect/src/test/java/org/apache/felix/framework/ConnectTest.java
Wed Feb 5 22:12:26 2020
@@ -44,7 +44,7 @@ import org.osgi.framework.FrameworkEvent
import org.osgi.framework.FrameworkListener;
import org.osgi.framework.Version;
import org.osgi.framework.connect.ConnectContent;
-import org.osgi.framework.connect.ConnectFramework;
+import org.osgi.framework.connect.ModuleConnector;
import org.osgi.framework.connect.ConnectModule;
import org.osgi.framework.launch.Framework;
import org.osgi.framework.namespace.PackageNamespace;
@@ -71,16 +71,16 @@ public class ConnectTest extends TestCas
try
{
final AtomicReference<String> version = new
AtomicReference<String>("1.0.0");
- ConnectFramework connectFactory = new ConnectFramework()
+ ModuleConnector connectFactory = new ModuleConnector()
{
@Override
- public ConnectFramework initialize(File storage, Map<String,
String> configuration)
+ public void initialize(File storage, Map<String, String>
configuration)
{
- return null;
+
}
@Override
- public Optional<ConnectModule> getModule(String location)
throws IllegalStateException
+ public Optional<ConnectModule> connect(String location) throws
IllegalStateException
{
return location.startsWith("connect:foo") ?
Optional.of(new ConnectModule()
{
@@ -136,15 +136,13 @@ public class ConnectTest extends TestCas
}
@Override
- public ConnectContent open() throws IOException
+ public void open() throws IOException
{
- return this;
}
@Override
- public ConnectContent close() throws
IOException
+ public void close() throws IOException
{
- return this;
}
@Override
@@ -215,15 +213,15 @@ public class ConnectTest extends TestCas
}
@Override
- public ConnectContent open() throws IOException
+ public void open() throws IOException
{
- return this;
+
}
@Override
- public ConnectContent close() throws
IOException
+ public void close() throws IOException
{
- return this;
+
}
@Override
