Do not make containerisms public. (FELIX-2645)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1005843 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java b/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java
index 36d673a..4a54aaf 100644
--- a/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java
+++ b/framework/src/main/java/org/apache/felix/framework/ExtensionManager.java
@@ -610,6 +610,7 @@
return null;
}
+ // TODO: REMOVE - Remove when class path scanning is implemented.
public URL getEntryAsURL(String name)
{
return null;
@@ -763,6 +764,7 @@
return getClass().getClassLoader().getResourceAsStream(urlPath);
}
+ // TODO: REMOVE - Remove when class path scanning is implemented.
public URL getLocalURL(int index, String urlPath)
{
return getClass().getClassLoader().getResource(urlPath);
diff --git a/framework/src/main/java/org/apache/felix/framework/ModuleImpl.java b/framework/src/main/java/org/apache/felix/framework/ModuleImpl.java
index 944e2c7..082a719 100644
--- a/framework/src/main/java/org/apache/felix/framework/ModuleImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/ModuleImpl.java
@@ -1091,6 +1091,7 @@
return getContentPath()[index - 1].getEntryAsStream(urlPath);
}
+ // TODO: REMOVE - Remove when class path scanning is implemented.
public URL getLocalURL(int index, String urlPath)
{
if (urlPath.startsWith("/"))
diff --git a/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java b/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java
index 6835c66..5968924 100644
--- a/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java
+++ b/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java
@@ -28,7 +28,7 @@
import org.apache.felix.framework.util.Util;
-public class URLHandlersBundleURLConnection extends URLConnection
+class URLHandlersBundleURLConnection extends URLConnection
{
private Felix m_framework;
private Module m_targetModule;
@@ -201,7 +201,8 @@
*
* @return the local URL
*/
- public URL getLocalURL()
+ // TODO: REMOVE - Remove when class path scanning is implemented.
+ URL getLocalURL()
{
if ((m_targetModule == null) || (m_classPathIdx < 0))
{
diff --git a/framework/src/main/java/org/apache/felix/framework/cache/ContentDirectoryContent.java b/framework/src/main/java/org/apache/felix/framework/cache/ContentDirectoryContent.java
index aed76c6..1fa4f0c 100644
--- a/framework/src/main/java/org/apache/felix/framework/cache/ContentDirectoryContent.java
+++ b/framework/src/main/java/org/apache/felix/framework/cache/ContentDirectoryContent.java
@@ -82,6 +82,7 @@
return m_content.getEntryAsStream(m_rootPath + name);
}
+ // TODO: REMOVE - Remove when class path scanning is implemented.
public URL getEntryAsURL(String name)
{
return m_content.getEntryAsURL(m_rootPath + name);
diff --git a/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java b/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java
index b9ecc1c..f9276ab 100644
--- a/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java
+++ b/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java
@@ -133,6 +133,7 @@
return new FileInputStream(new File(m_dir, name));
}
+ // TODO: REMOVE - Remove when class path scanning is implemented.
public URL getEntryAsURL(String name)
{
if ((name.length() > 0) && (name.charAt(0) == '/'))
diff --git a/framework/src/main/java/org/apache/felix/framework/cache/JarContent.java b/framework/src/main/java/org/apache/felix/framework/cache/JarContent.java
index 5085fd6..57c21e4 100644
--- a/framework/src/main/java/org/apache/felix/framework/cache/JarContent.java
+++ b/framework/src/main/java/org/apache/felix/framework/cache/JarContent.java
@@ -192,6 +192,7 @@
return is;
}
+ // TODO: REMOVE - Remove when class path scanning is implemented.
public URL getEntryAsURL(String name)
{
try
diff --git a/framework/src/main/java/org/apache/felix/framework/resolver/Content.java b/framework/src/main/java/org/apache/felix/framework/resolver/Content.java
index 3655307..79aa8d7 100644
--- a/framework/src/main/java/org/apache/felix/framework/resolver/Content.java
+++ b/framework/src/main/java/org/apache/felix/framework/resolver/Content.java
@@ -120,5 +120,6 @@
* @return A URL using a standard protocol such as file, jar
* or null if not possible.
*/
+ // TODO: REMOVE - Remove when class path scanning is implemented.
URL getEntryAsURL(String name);
}
\ No newline at end of file
diff --git a/framework/src/main/java/org/apache/felix/framework/resolver/Module.java b/framework/src/main/java/org/apache/felix/framework/resolver/Module.java
index 695bfd3..db7d7bf 100644
--- a/framework/src/main/java/org/apache/felix/framework/resolver/Module.java
+++ b/framework/src/main/java/org/apache/felix/framework/resolver/Module.java
@@ -72,5 +72,6 @@
throws IOException;
InputStream getInputStream(int index, String urlPath)
throws IOException;
+ // TODO: REMOVE - Remove when class path scanning is implemented.
URL getLocalURL(int index, String urlPath);
}
\ No newline at end of file