You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2005/08/19 21:54:41 UTC
svn commit: r233548 [4/6] - in /incubator/felix/trunk: ./
src/org/apache/felix/ src/org/apache/felix/bundlerepository/
src/org/apache/felix/bundlerepository/impl/
src/org/apache/felix/bundlerepository/impl/kxmlsax/
src/org/apache/felix/bundlerepository...
Modified: incubator/felix/trunk/src/org/apache/felix/framework/cache/DefaultBundleArchive.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/cache/DefaultBundleArchive.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/cache/DefaultBundleArchive.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/cache/DefaultBundleArchive.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.cache;
+package org.apache.felix.framework.cache;
import java.io.*;
import java.security.*;
@@ -23,8 +23,8 @@
import java.util.jar.Manifest;
import java.util.zip.ZipEntry;
-import org.apache.osgi.framework.LogWrapper;
-import org.apache.osgi.framework.util.*;
+import org.apache.felix.framework.LogWrapper;
+import org.apache.felix.framework.util.*;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleActivator;
@@ -33,7 +33,7 @@
* This class, combined with <tt>DefaultBundleCache</tt>, implements the
* default file system-based bundle cache for Felix.
* </p>
- * @see org.apache.osgi.framework.util.DefaultBundleCache
+ * @see org.apache.felix.framework.util.DefaultBundleCache
**/
public class DefaultBundleArchive implements BundleArchive
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/cache/DefaultBundleCache.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/cache/DefaultBundleCache.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/cache/DefaultBundleCache.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/cache/DefaultBundleCache.java Fri Aug 19 12:53:58 2005
@@ -14,12 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.cache;
+package org.apache.felix.framework.cache;
import java.io.*;
-import org.apache.osgi.framework.LogWrapper;
-import org.apache.osgi.framework.util.PropertyResolver;
+import org.apache.felix.framework.LogWrapper;
+import org.apache.felix.framework.util.PropertyResolver;
/**
* <p>
@@ -63,7 +63,7 @@
* For specific information on how to configure Felix using system properties,
* refer to the Felix usage documentation.
* </p>
- * @see org.apache.osgi.framework.util.DefaultBundleArchive
+ * @see org.apache.felix.framework.util.DefaultBundleArchive
**/
public class DefaultBundleCache implements BundleCache
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/ext/FelixBundleContext.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/ext/FelixBundleContext.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/ext/FelixBundleContext.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/ext/FelixBundleContext.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.ext;
+package org.apache.felix.framework.ext;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/Artifact.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/Artifact.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/Artifact.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/Artifact.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer;
+package org.apache.felix.framework.installer;
import java.io.IOException;
import java.io.InputStream;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/BooleanProperty.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/BooleanProperty.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/BooleanProperty.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/BooleanProperty.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer;
+package org.apache.felix.framework.installer;
public interface BooleanProperty extends Property
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/Install.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/Install.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/Install.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/Install.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer;
+package org.apache.felix.framework.installer;
import java.awt.*;
import java.awt.event.*;
@@ -24,11 +24,11 @@
import javax.swing.*;
import javax.swing.border.BevelBorder;
-import org.apache.osgi.framework.installer.artifact.*;
-import org.apache.osgi.framework.installer.editor.BooleanEditor;
-import org.apache.osgi.framework.installer.editor.FileEditor;
-import org.apache.osgi.framework.installer.property.*;
-import org.apache.osgi.framework.util.FelixConstants;
+import org.apache.felix.framework.installer.artifact.*;
+import org.apache.felix.framework.installer.editor.BooleanEditor;
+import org.apache.felix.framework.installer.editor.FileEditor;
+import org.apache.felix.framework.installer.property.*;
+import org.apache.felix.framework.util.FelixConstants;
public class Install extends JFrame
{
@@ -87,7 +87,7 @@
// Eventually these should be read from a file.
java.util.List list = new ArrayList();
- // Add the shell choice property.
+ // Add the impl choice property.
prop = new BooleanPropertyImpl("Shell", true);
prop.setEditor(new BooleanEditor((BooleanProperty) prop, "Text", "GUI"));
list.add(prop);
@@ -284,9 +284,9 @@
{
String msg = "<html>"
+ "<center><h1>Felix " + FelixConstants.FELIX_VERSION_VALUE + "</h1></center>"
- + "You can download example bundles at the Felix shell prompt by<br>"
+ + "You can download example bundles at the Felix impl prompt by<br>"
+ "using the <b><tt>obr</tt></b> command to access the OSGi Bundle Repository;<br>"
- + "type <b><tt>obr help</tt></b> at the Felix shell prompt for details."
+ + "type <b><tt>obr help</tt></b> at the Felix impl prompt for details."
+ "</html>";
JLabel label = new JLabel(msg);
label.setFont(new Font("SansSerif", Font.PLAIN, 11));
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/Property.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/Property.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/Property.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/Property.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer;
+package org.apache.felix.framework.installer;
import javax.swing.JComponent;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/PropertyPanel.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/PropertyPanel.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/PropertyPanel.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/PropertyPanel.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer;
+package org.apache.felix.framework.installer;
import java.awt.*;
import java.util.*;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/Status.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/Status.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/Status.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/Status.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer;
+package org.apache.felix.framework.installer;
public interface Status
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/StringProperty.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/StringProperty.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/StringProperty.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/StringProperty.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer;
+package org.apache.felix.framework.installer;
public interface StringProperty extends Property
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/AbstractArtifact.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/AbstractArtifact.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/AbstractArtifact.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/AbstractArtifact.java Fri Aug 19 12:53:58 2005
@@ -14,13 +14,13 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer.artifact;
+package org.apache.felix.framework.installer.artifact;
import java.io.*;
import java.util.Map;
-import org.apache.osgi.framework.installer.*;
-import org.apache.osgi.framework.installer.property.StringPropertyImpl;
+import org.apache.felix.framework.installer.*;
+import org.apache.felix.framework.installer.property.StringPropertyImpl;
public abstract class AbstractArtifact implements Artifact
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/AbstractFileArtifact.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/AbstractFileArtifact.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/AbstractFileArtifact.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/AbstractFileArtifact.java Fri Aug 19 12:53:58 2005
@@ -14,12 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer.artifact;
+package org.apache.felix.framework.installer.artifact;
import java.io.InputStream;
import java.util.Map;
-import org.apache.osgi.framework.installer.*;
+import org.apache.felix.framework.installer.*;
public abstract class AbstractFileArtifact extends AbstractArtifact
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/AbstractJarArtifact.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/AbstractJarArtifact.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/AbstractJarArtifact.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/AbstractJarArtifact.java Fri Aug 19 12:53:58 2005
@@ -14,14 +14,14 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer.artifact;
+package org.apache.felix.framework.installer.artifact;
import java.io.*;
import java.util.Map;
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
-import org.apache.osgi.framework.installer.*;
+import org.apache.felix.framework.installer.*;
public abstract class AbstractJarArtifact extends AbstractArtifact
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/ResourceFileArtifact.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/ResourceFileArtifact.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/ResourceFileArtifact.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/ResourceFileArtifact.java Fri Aug 19 12:53:58 2005
@@ -14,14 +14,14 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer.artifact;
+package org.apache.felix.framework.installer.artifact;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.osgi.framework.installer.Status;
-import org.apache.osgi.framework.installer.StringProperty;
-import org.apache.osgi.framework.installer.resource.ResourceLoader;
+import org.apache.felix.framework.installer.Status;
+import org.apache.felix.framework.installer.StringProperty;
+import org.apache.felix.framework.installer.resource.ResourceLoader;
public class ResourceFileArtifact extends AbstractFileArtifact
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/ResourceJarArtifact.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/ResourceJarArtifact.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/ResourceJarArtifact.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/ResourceJarArtifact.java Fri Aug 19 12:53:58 2005
@@ -14,14 +14,14 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer.artifact;
+package org.apache.felix.framework.installer.artifact;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.osgi.framework.installer.Status;
-import org.apache.osgi.framework.installer.StringProperty;
-import org.apache.osgi.framework.installer.resource.ResourceLoader;
+import org.apache.felix.framework.installer.Status;
+import org.apache.felix.framework.installer.StringProperty;
+import org.apache.felix.framework.installer.resource.ResourceLoader;
public class ResourceJarArtifact extends AbstractJarArtifact
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/URLFileArtifact.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/URLFileArtifact.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/URLFileArtifact.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/URLFileArtifact.java Fri Aug 19 12:53:58 2005
@@ -14,14 +14,14 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer.artifact;
+package org.apache.felix.framework.installer.artifact;
import java.io.*;
import java.net.URL;
import java.net.URLConnection;
-import org.apache.osgi.framework.installer.Status;
-import org.apache.osgi.framework.installer.StringProperty;
+import org.apache.felix.framework.installer.Status;
+import org.apache.felix.framework.installer.StringProperty;
public class URLFileArtifact extends AbstractFileArtifact
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/URLJarArtifact.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/URLJarArtifact.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/URLJarArtifact.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/artifact/URLJarArtifact.java Fri Aug 19 12:53:58 2005
@@ -14,14 +14,14 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer.artifact;
+package org.apache.felix.framework.installer.artifact;
import java.io.*;
import java.net.URL;
import java.net.URLConnection;
-import org.apache.osgi.framework.installer.Status;
-import org.apache.osgi.framework.installer.StringProperty;
+import org.apache.felix.framework.installer.Status;
+import org.apache.felix.framework.installer.StringProperty;
public class URLJarArtifact extends AbstractJarArtifact
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/editor/BooleanEditor.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/editor/BooleanEditor.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/editor/BooleanEditor.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/editor/BooleanEditor.java Fri Aug 19 12:53:58 2005
@@ -14,15 +14,15 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer.editor;
+package org.apache.felix.framework.installer.editor;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.*;
-import org.apache.osgi.framework.installer.BooleanProperty;
-import org.apache.osgi.framework.installer.Property;
+import org.apache.felix.framework.installer.BooleanProperty;
+import org.apache.felix.framework.installer.Property;
public class BooleanEditor extends JPanel
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/editor/BooleanStringEditor.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/editor/BooleanStringEditor.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/editor/BooleanStringEditor.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/editor/BooleanStringEditor.java Fri Aug 19 12:53:58 2005
@@ -14,14 +14,14 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer.editor;
+package org.apache.felix.framework.installer.editor;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
-import org.apache.osgi.framework.installer.*;
+import org.apache.felix.framework.installer.*;
public class BooleanStringEditor extends JPanel
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/editor/FileEditor.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/editor/FileEditor.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/editor/FileEditor.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/editor/FileEditor.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer.editor;
+package org.apache.felix.framework.installer.editor;
import java.awt.*;
import java.awt.event.*;
@@ -22,8 +22,8 @@
import javax.swing.*;
-import org.apache.osgi.framework.installer.Property;
-import org.apache.osgi.framework.installer.StringProperty;
+import org.apache.felix.framework.installer.Property;
+import org.apache.felix.framework.installer.StringProperty;
public class FileEditor extends JPanel
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/editor/StringEditor.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/editor/StringEditor.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/editor/StringEditor.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/editor/StringEditor.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer.editor;
+package org.apache.felix.framework.installer.editor;
import java.awt.*;
import java.awt.event.FocusEvent;
@@ -23,8 +23,8 @@
import javax.swing.JPanel;
import javax.swing.JTextField;
-import org.apache.osgi.framework.installer.Property;
-import org.apache.osgi.framework.installer.StringProperty;
+import org.apache.felix.framework.installer.Property;
+import org.apache.felix.framework.installer.StringProperty;
public class StringEditor extends JPanel
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/property/BooleanPropertyImpl.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/property/BooleanPropertyImpl.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/property/BooleanPropertyImpl.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/property/BooleanPropertyImpl.java Fri Aug 19 12:53:58 2005
@@ -14,12 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer.property;
+package org.apache.felix.framework.installer.property;
import javax.swing.JComponent;
-import org.apache.osgi.framework.installer.BooleanProperty;
-import org.apache.osgi.framework.installer.editor.BooleanEditor;
+import org.apache.felix.framework.installer.BooleanProperty;
+import org.apache.felix.framework.installer.editor.BooleanEditor;
public class BooleanPropertyImpl implements BooleanProperty
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/property/BooleanStringPropertyImpl.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/property/BooleanStringPropertyImpl.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/property/BooleanStringPropertyImpl.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/property/BooleanStringPropertyImpl.java Fri Aug 19 12:53:58 2005
@@ -14,13 +14,13 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer.property;
+package org.apache.felix.framework.installer.property;
import javax.swing.JComponent;
-import org.apache.osgi.framework.installer.BooleanProperty;
-import org.apache.osgi.framework.installer.StringProperty;
-import org.apache.osgi.framework.installer.editor.BooleanStringEditor;
+import org.apache.felix.framework.installer.BooleanProperty;
+import org.apache.felix.framework.installer.StringProperty;
+import org.apache.felix.framework.installer.editor.BooleanStringEditor;
public class BooleanStringPropertyImpl implements BooleanProperty, StringProperty
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/property/NotBooleanPropertyImpl.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/property/NotBooleanPropertyImpl.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/property/NotBooleanPropertyImpl.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/property/NotBooleanPropertyImpl.java Fri Aug 19 12:53:58 2005
@@ -14,12 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer.property;
+package org.apache.felix.framework.installer.property;
import javax.swing.JComponent;
-import org.apache.osgi.framework.installer.BooleanProperty;
-import org.apache.osgi.framework.installer.editor.BooleanEditor;
+import org.apache.felix.framework.installer.BooleanProperty;
+import org.apache.felix.framework.installer.editor.BooleanEditor;
public class NotBooleanPropertyImpl implements BooleanProperty
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/property/StringPropertyImpl.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/property/StringPropertyImpl.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/property/StringPropertyImpl.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/property/StringPropertyImpl.java Fri Aug 19 12:53:58 2005
@@ -14,12 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer.property;
+package org.apache.felix.framework.installer.property;
import javax.swing.JComponent;
-import org.apache.osgi.framework.installer.StringProperty;
-import org.apache.osgi.framework.installer.editor.StringEditor;
+import org.apache.felix.framework.installer.StringProperty;
+import org.apache.felix.framework.installer.editor.StringEditor;
public class StringPropertyImpl implements StringProperty
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/installer/resource/ResourceLoader.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/installer/resource/ResourceLoader.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/installer/resource/ResourceLoader.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/installer/resource/ResourceLoader.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.installer.resource;
+package org.apache.felix.framework.installer.resource;
import java.io.InputStream;
import java.net.URL;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/manifest.mf
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/manifest.mf?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/manifest.mf (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/manifest.mf Fri Aug 19 12:53:58 2005
@@ -1,2 +1,2 @@
-Main-Class: org.apache.osgi.framework.Main
+Main-Class: org.apache.felix.framework.Main
Class-Path: osgi.jar moduleloader.jar
Modified: incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4Attribute.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4Attribute.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4Attribute.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4Attribute.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.searchpolicy;
+package org.apache.felix.framework.searchpolicy;
public class R4Attribute
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4Directive.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4Directive.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4Directive.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4Directive.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.searchpolicy;
+package org.apache.felix.framework.searchpolicy;
public class R4Directive
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4Package.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4Package.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4Package.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4Package.java Fri Aug 19 12:53:58 2005
@@ -14,12 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.searchpolicy;
+package org.apache.felix.framework.searchpolicy;
import java.util.*;
-import org.apache.osgi.framework.util.FelixConstants;
-import org.apache.osgi.framework.util.Util;
+import org.apache.felix.framework.util.FelixConstants;
+import org.apache.felix.framework.util.Util;
public class R4Package
{
@@ -190,7 +190,7 @@
}
// Get the class name portion of the target class.
- String className = org.apache.osgi.moduleloader.Util.getClassName(name);
+ String className = org.apache.felix.moduleloader.Util.getClassName(name);
// If there are no include filters then all classes are included
// by default, otherwise try to find one match.
Modified: incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4SearchPolicy.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4SearchPolicy.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4SearchPolicy.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4SearchPolicy.java Fri Aug 19 12:53:58 2005
@@ -14,15 +14,15 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.searchpolicy;
+package org.apache.felix.framework.searchpolicy;
import java.net.URL;
import java.util.*;
-import org.apache.osgi.framework.LogWrapper;
-import org.apache.osgi.moduleloader.*;
-import org.apache.osgi.moduleloader.search.ResolveException;
-import org.apache.osgi.moduleloader.search.ResolveListener;
+import org.apache.felix.framework.LogWrapper;
+import org.apache.felix.moduleloader.*;
+import org.apache.felix.moduleloader.search.ResolveException;
+import org.apache.felix.moduleloader.search.ResolveListener;
public class R4SearchPolicy implements SearchPolicy, ModuleListener
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4Version.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4Version.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4Version.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4Version.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.searchpolicy;
+package org.apache.felix.framework.searchpolicy;
import java.util.StringTokenizer;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4Wire.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4Wire.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4Wire.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/searchpolicy/R4Wire.java Fri Aug 19 12:53:58 2005
@@ -14,9 +14,9 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.searchpolicy;
+package org.apache.felix.framework.searchpolicy;
-import org.apache.osgi.moduleloader.Module;
+import org.apache.felix.moduleloader.Module;
public class R4Wire
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/BundleListenerWrapper.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/BundleListenerWrapper.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/BundleListenerWrapper.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/BundleListenerWrapper.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util;
+package org.apache.felix.framework.util;
import java.security.AccessController;
import java.security.PrivilegedAction;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/CaseInsensitiveMap.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/CaseInsensitiveMap.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/CaseInsensitiveMap.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/CaseInsensitiveMap.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util;
+package org.apache.felix.framework.util;
import java.util.*;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/DispatchQueue.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/DispatchQueue.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/DispatchQueue.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/DispatchQueue.java Fri Aug 19 12:53:58 2005
@@ -14,11 +14,11 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util;
+package org.apache.felix.framework.util;
import java.util.*;
-import org.apache.osgi.framework.LogWrapper;
+import org.apache.felix.framework.LogWrapper;
/**
* This class implements an event dispatching queue to simplify delivering
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/Dispatcher.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/Dispatcher.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/Dispatcher.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/Dispatcher.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util;
+package org.apache.felix.framework.util;
import java.util.EventListener;
import java.util.EventObject;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/FelixConstants.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/FelixConstants.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/FelixConstants.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/FelixConstants.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util;
+package org.apache.felix.framework.util;
public interface FelixConstants extends org.osgi.framework.Constants
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/FelixDispatchQueue.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/FelixDispatchQueue.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/FelixDispatchQueue.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/FelixDispatchQueue.java Fri Aug 19 12:53:58 2005
@@ -14,12 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util;
+package org.apache.felix.framework.util;
import java.util.EventListener;
import java.util.EventObject;
-import org.apache.osgi.framework.LogWrapper;
+import org.apache.felix.framework.LogWrapper;
import org.osgi.framework.*;
/**
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/FrameworkListenerWrapper.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/FrameworkListenerWrapper.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/FrameworkListenerWrapper.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/FrameworkListenerWrapper.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util;
+package org.apache.felix.framework.util;
import java.security.AccessController;
import java.security.PrivilegedAction;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/IteratorToEnumeration.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/IteratorToEnumeration.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/IteratorToEnumeration.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/IteratorToEnumeration.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util;
+package org.apache.felix.framework.util;
import java.util.Enumeration;
import java.util.Iterator;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/LibraryInfo.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/LibraryInfo.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/LibraryInfo.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/LibraryInfo.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util;
+package org.apache.felix.framework.util;
import java.util.*;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/ListenerWrapper.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/ListenerWrapper.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/ListenerWrapper.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/ListenerWrapper.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util;
+package org.apache.felix.framework.util;
import java.util.EventListener;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/MapToDictionary.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/MapToDictionary.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/MapToDictionary.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/MapToDictionary.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util;
+package org.apache.felix.framework.util;
import java.util.*;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/MutablePropertyResolver.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/MutablePropertyResolver.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/MutablePropertyResolver.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/MutablePropertyResolver.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util;
+package org.apache.felix.framework.util;
public interface MutablePropertyResolver extends PropertyResolver
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/MutablePropertyResolverImpl.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/MutablePropertyResolverImpl.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/MutablePropertyResolverImpl.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/MutablePropertyResolverImpl.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util;
+package org.apache.felix.framework.util;
import java.util.Map;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/ObjectInputStreamX.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/ObjectInputStreamX.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/ObjectInputStreamX.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/ObjectInputStreamX.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util;
+package org.apache.felix.framework.util;
import java.io.*;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/PropertyResolver.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/PropertyResolver.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/PropertyResolver.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/PropertyResolver.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util;
+package org.apache.felix.framework.util;
public interface PropertyResolver
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/ServiceListenerWrapper.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/ServiceListenerWrapper.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/ServiceListenerWrapper.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/ServiceListenerWrapper.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util;
+package org.apache.felix.framework.util;
import java.security.*;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/Util.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/Util.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/Util.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/Util.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util;
+package org.apache.felix.framework.util;
import java.io.*;
import java.util.ArrayList;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/AttributeNotFoundException.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/AttributeNotFoundException.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/AttributeNotFoundException.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/AttributeNotFoundException.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util.ldap;
+package org.apache.felix.framework.util.ldap;
public class AttributeNotFoundException extends EvaluationException
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Driver.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Driver.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Driver.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Driver.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util.ldap;
+package org.apache.felix.framework.util.ldap;
import java.io.*;
import java.util.*;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/EvaluationException.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/EvaluationException.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/EvaluationException.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/EvaluationException.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util.ldap;
+package org.apache.felix.framework.util.ldap;
public class EvaluationException extends Exception
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Evaluator.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Evaluator.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Evaluator.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Evaluator.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util.ldap;
+package org.apache.felix.framework.util.ldap;
import java.util.Stack;
import java.util.Vector;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/LdapLexer.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/LdapLexer.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/LdapLexer.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/LdapLexer.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util.ldap;
+package org.apache.felix.framework.util.ldap;
import java.io.IOException;
import java.io.Reader;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Mapper.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Mapper.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Mapper.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Mapper.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util.ldap;
+package org.apache.felix.framework.util.ldap;
public interface Mapper
{
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Operator.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Operator.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Operator.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Operator.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util.ldap;
+package org.apache.felix.framework.util.ldap;
import java.util.Stack;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/ParseException.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/ParseException.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/ParseException.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/ParseException.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util.ldap;
+package org.apache.felix.framework.util.ldap;
public class ParseException extends Exception {
public ParseException() {super();}
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Parser.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Parser.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Parser.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Parser.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util.ldap;
+package org.apache.felix.framework.util.ldap;
import java.io.IOException;
import java.io.PrintStream;
Modified: incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Unknown.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Unknown.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Unknown.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/framework/util/ldap/Unknown.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.framework.util.ldap;
+package org.apache.felix.framework.util.ldap;
/**
* This class is used to create simple marker instances that are inserted
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/DefaultURLPolicy.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/DefaultURLPolicy.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/DefaultURLPolicy.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/DefaultURLPolicy.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader;
+package org.apache.felix.moduleloader;
import java.net.URL;
@@ -37,9 +37,9 @@
* the above <tt>URL</tt> and retrieve the associated resource bytes using
* methods from <tt>ModuleManager</tt> and <tt>Module</tt>.
* </p>
- * @see org.apache.osgi.moduleloader.ModuleManager
- * @see org.apache.osgi.moduleloader.Module
- * @see org.apache.osgi.moduleloader.URLPolicy
+ * @see org.apache.felix.moduleloader.ModuleManager
+ * @see org.apache.felix.moduleloader.Module
+ * @see org.apache.felix.moduleloader.URLPolicy
**/
public class DefaultURLPolicy implements URLPolicy
{
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/JarResourceSource.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/JarResourceSource.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/JarResourceSource.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/JarResourceSource.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader;
+package org.apache.felix.moduleloader;
import java.io.*;
import java.util.jar.JarFile;
@@ -26,7 +26,7 @@
* from a JAR file. The approach used by this implementation is to defer
* opening the JAR file until a request for a resource is made.
* </p>
- * @see org.apache.osgi.moduleloader.ResourceSource
+ * @see org.apache.felix.moduleloader.ResourceSource
**/
public class JarResourceSource implements ResourceSource
{
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/LibrarySource.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/LibrarySource.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/LibrarySource.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/LibrarySource.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader;
+package org.apache.felix.moduleloader;
/**
* <p>
@@ -30,8 +30,8 @@
* should be implemented such that they can be opened, closed, and then
* re-opened.
* </p>
- * @see org.apache.osgi.moduleloader.Module
- * @see org.apache.osgi.moduleloader.ModuleClassLoader
+ * @see org.apache.felix.moduleloader.Module
+ * @see org.apache.felix.moduleloader.ModuleClassLoader
**/
public interface LibrarySource
{
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/Module.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/Module.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/Module.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/Module.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader;
+package org.apache.felix.moduleloader;
import java.security.AccessController;
import java.security.PrivilegedAction;
@@ -69,10 +69,10 @@
* associated with it. The <tt>ModuleClassLoader</tt> consults these two types
* of sources to find classes, resources, and native libraries.
* </p>
- * @see org.apache.osgi.moduleloader.ModuleManager
- * @see org.apache.osgi.moduleloader.ModuleClassLoader
- * @see org.apache.osgi.moduleloader.ResourceSource
- * @see org.apache.osgi.moduleloader.LibrarySource
+ * @see org.apache.felix.moduleloader.ModuleManager
+ * @see org.apache.felix.moduleloader.ModuleClassLoader
+ * @see org.apache.felix.moduleloader.ResourceSource
+ * @see org.apache.felix.moduleloader.LibrarySource
**/
public class Module
{
@@ -115,9 +115,9 @@
* class loader should be used as a resource source; this is an
* ugly hack to allow a module to masquerade as the system
* class loader.
- * @see org.apache.osgi.moduleloader.ModuleManager
- * @see org.apache.osgi.moduleloader.ResourceSource
- * @see org.apache.osgi.moduleloader.LibrarySource
+ * @see org.apache.felix.moduleloader.ModuleManager
+ * @see org.apache.felix.moduleloader.ResourceSource
+ * @see org.apache.felix.moduleloader.LibrarySource
**/
public Module(
ModuleManager mgr, String id, Object[][] attributes,
@@ -199,7 +199,7 @@
* </p>
* @return the array of <tt>ResourceSource</tt>s associated with
* the module.
- * @see org.apache.osgi.moduleloader.ResourceSource
+ * @see org.apache.felix.moduleloader.ResourceSource
**/
public ResourceSource[] getResourceSources()
{
@@ -214,7 +214,7 @@
* </p>
* @return the array of <tt>LibrarySource</tt>s associated with
* the module.
- * @see org.apache.osgi.moduleloader.LibrarySource
+ * @see org.apache.felix.moduleloader.LibrarySource
**/
public LibrarySource[] getLibrarySources()
{
@@ -228,7 +228,7 @@
* action to avoid a security exception being thrown to the caller.
* </p>
* @return the <tt>ModuleClassLoader</tt> associated with this module.
- * @see org.apache.osgi.moduleloader.ModuleClassLoader
+ * @see org.apache.felix.moduleloader.ModuleClassLoader
**/
public synchronized ModuleClassLoader getClassLoader()
{
@@ -268,8 +268,8 @@
* @param attributes the new attributes to be associated with the module.
* @param resSources the new resource sources to be associated with the module.
* @param libSources the new library sources to be associated with the module.
- * @see org.apache.osgi.moduleloader.ResourceSource
- * @see org.apache.osgi.moduleloader.LibrarySource
+ * @see org.apache.felix.moduleloader.ResourceSource
+ * @see org.apache.felix.moduleloader.LibrarySource
**/
protected synchronized void reset(
Object[][] attributes, ResourceSource[] resSources,
@@ -311,8 +311,8 @@
* @param attributes the attributes to be put into a map.
* @param resSources the resource sources to be opened.
* @param libSources the library sources to be opened.
- * @see org.apache.osgi.moduleloader.ResourceSource
- * @see org.apache.osgi.moduleloader.LibrarySource
+ * @see org.apache.felix.moduleloader.ResourceSource
+ * @see org.apache.felix.moduleloader.LibrarySource
**/
private void initialize(
Object[][] attributes, ResourceSource[] resSources, LibrarySource[] libSources)
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleClassLoader.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleClassLoader.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleClassLoader.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleClassLoader.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader;
+package org.apache.felix.moduleloader;
import java.io.IOException;
import java.net.URL;
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleEvent.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleEvent.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleEvent.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleEvent.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader;
+package org.apache.felix.moduleloader;
import java.util.EventObject;
@@ -25,9 +25,9 @@
* events, a <tt>ModuleListener</tt> must be added to the <tt>ModuleManager</tt>
* instance.
* </p>
- * @see org.apache.osgi.moduleloader.ModuleManager
- * @see org.apache.osgi.moduleloader.Module
- * @see org.apache.osgi.moduleloader.ModuleListener
+ * @see org.apache.felix.moduleloader.ModuleManager
+ * @see org.apache.felix.moduleloader.Module
+ * @see org.apache.felix.moduleloader.ModuleListener
**/
public class ModuleEvent extends EventObject
{
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleListener.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleListener.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleListener.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleListener.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader;
+package org.apache.felix.moduleloader;
import java.util.EventListener;
@@ -24,8 +24,8 @@
* To receive events, an implementation of this listener must be added
* to the <tt>ModuleManager</tt> instance.
* </p>
- * @see org.apache.osgi.moduleloader.ModuleManager
- * @see org.apache.osgi.moduleloader.ModuleEvent
+ * @see org.apache.felix.moduleloader.ModuleManager
+ * @see org.apache.felix.moduleloader.ModuleEvent
**/
public interface ModuleListener extends EventListener
{
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleManager.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleManager.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleManager.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleManager.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader;
+package org.apache.felix.moduleloader;
import java.util.*;
@@ -89,11 +89,11 @@
* share modules across multiple <tt>ModuleManager</tt>s. A given <tt>ModuleManager</tt>
* can only have one <tt>SelectionPolicy</tt> and one <tt>URLPolicy</tt>.
* </p>
- * @see org.apache.osgi.moduleloader.Module
- * @see org.apache.osgi.moduleloader.ModuleClassLoader
- * @see org.apache.osgi.moduleloader.SearchPolicy
- * @see org.apache.osgi.moduleloader.URLPolicy
- * @see org.apache.osgi.moduleloader.DefaultURLPolicy
+ * @see org.apache.felix.moduleloader.Module
+ * @see org.apache.felix.moduleloader.ModuleClassLoader
+ * @see org.apache.felix.moduleloader.SearchPolicy
+ * @see org.apache.felix.moduleloader.URLPolicy
+ * @see org.apache.felix.moduleloader.DefaultURLPolicy
**/
public class ModuleManager
{
@@ -110,7 +110,7 @@
* search policy and the default <tt>URL</tt> policy.
* </p>
* @param searchPolicy the search policy that the instance should use.
- * @see org.apache.osgi.moduleloader.SearchPolicy
+ * @see org.apache.felix.moduleloader.SearchPolicy
**/
public ModuleManager(SearchPolicy searchPolicy)
{
@@ -124,8 +124,8 @@
* </p>
* @param searchPolicy the search policy that the instance should use.
* @param urlPolicy the <tt>URL</tt> policy that the instance should use.
- * @see org.apache.osgi.moduleloader.SearchPolicy
- * @see org.apache.osgi.moduleloader.URLPolicy
+ * @see org.apache.felix.moduleloader.SearchPolicy
+ * @see org.apache.felix.moduleloader.URLPolicy
**/
public ModuleManager(SearchPolicy searchPolicy, URLPolicy urlPolicy)
{
@@ -148,7 +148,7 @@
* Returns the <tt>URL</tt> policy used by this instance.
* </p>
* @return the <tt>URL</tt> policy used by this instance.
- * @see org.apache.osgi.moduleloader.URLPolicy
+ * @see org.apache.felix.moduleloader.URLPolicy
**/
public URLPolicy getURLPolicy()
{
@@ -160,7 +160,7 @@
* Returns the search policy used by this instance.
* </p>
* @return the search policy used by this instance.
- * @see org.apache.osgi.moduleloader.SearchPolicy
+ * @see org.apache.felix.moduleloader.SearchPolicy
**/
public SearchPolicy getSearchPolicy()
{
@@ -176,7 +176,7 @@
* </p>
* @return an array of all modules being managed by the <tt>ModuleManager</tt>
* instance.
- * @see org.apache.osgi.moduleloader.Module
+ * @see org.apache.felix.moduleloader.Module
**/
public synchronized Module[] getModules()
{
@@ -190,7 +190,7 @@
* </p>
* @param id the identifier for the module to be retrieved.
* @return the module associated with the identifier or <tt>null</tt>.
- * @see org.apache.osgi.moduleloader.Module
+ * @see org.apache.felix.moduleloader.Module
**/
public synchronized Module getModule(String id)
{
@@ -214,9 +214,9 @@
* @return the newly created module.
* @throws java.lang.IllegalArgumentException if the module identifier
* is not unique.
- * @see org.apache.osgi.moduleloader.Module
- * @see org.apache.osgi.moduleloader.ResourceSource
- * @see org.apache.osgi.moduleloader.LibrarySource
+ * @see org.apache.felix.moduleloader.Module
+ * @see org.apache.felix.moduleloader.ResourceSource
+ * @see org.apache.felix.moduleloader.LibrarySource
**/
public Module addModule(String id, Object[][] attributes,
ResourceSource[] resSources, LibrarySource[] libSources)
@@ -281,9 +281,9 @@
* with the module.
* @param libSources an array of <tt>LibrarySource</tt>s to associate
* with the module.
- * @see org.apache.osgi.moduleloader.Module
- * @see org.apache.osgi.moduleloader.ResourceSource
- * @see org.apache.osgi.moduleloader.LibrarySource
+ * @see org.apache.felix.moduleloader.Module
+ * @see org.apache.felix.moduleloader.ResourceSource
+ * @see org.apache.felix.moduleloader.LibrarySource
**/
public void resetModule(
Module module, Object[][] attributes,
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleURLConnection.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleURLConnection.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleURLConnection.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleURLConnection.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader;
+package org.apache.felix.moduleloader;
import java.io.*;
import java.net.URL;
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleURLStreamHandler.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleURLStreamHandler.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleURLStreamHandler.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/ModuleURLStreamHandler.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader;
+package org.apache.felix.moduleloader;
import java.io.IOException;
import java.net.*;
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/ResourceNotFoundException.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/ResourceNotFoundException.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/ResourceNotFoundException.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/ResourceNotFoundException.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader;
+package org.apache.felix.moduleloader;
public class ResourceNotFoundException extends Exception
{
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/ResourceSource.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/ResourceSource.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/ResourceSource.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/ResourceSource.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader;
+package org.apache.felix.moduleloader;
/**
* <p>
@@ -33,8 +33,8 @@
* should be implemented such that they can be opened, closed, and then
* re-opened.
* </p>
- * @see org.apache.osgi.moduleloader.Module
- * @see org.apache.osgi.moduleloader.ModuleClassLoader
+ * @see org.apache.felix.moduleloader.Module
+ * @see org.apache.felix.moduleloader.ModuleClassLoader
**/
public interface ResourceSource
{
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/SearchPolicy.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/SearchPolicy.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/SearchPolicy.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/SearchPolicy.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader;
+package org.apache.felix.moduleloader;
import java.net.URL;
@@ -225,7 +225,7 @@
* @param module the target module that is loading the resource.
* @param name the name of the resource being loaded.
* @return a <tt>URL</tt> to the resource if found, <tt>null</tt> otherwise.
- * @throws org.apache.osgi.moduleloader.ResourceNotFoundException if the
+ * @throws org.apache.felix.moduleloader.ResourceNotFoundException if the
* resource could not be found and the entire search operation
* should fail.
**/
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/URLPolicy.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/URLPolicy.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/URLPolicy.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/URLPolicy.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader;
+package org.apache.felix.moduleloader;
import java.net.URL;
@@ -38,8 +38,8 @@
* called <a href="DefaultURLPolicy.html"><tt>DefaultURLPolicy</tt></a>, but
* it only supports resource loading, not security.
* </p>
- * @see org.apache.osgi.moduleloader.ModuleManager
- * @see org.apache.osgi.moduleloader.DefaultURLPolicy
+ * @see org.apache.felix.moduleloader.ModuleManager
+ * @see org.apache.felix.moduleloader.DefaultURLPolicy
**/
public interface URLPolicy
{
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/Util.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/Util.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/Util.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/Util.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader;
+package org.apache.felix.moduleloader;
public class Util
{
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/search/CompatibilityPolicy.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/search/CompatibilityPolicy.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/search/CompatibilityPolicy.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/search/CompatibilityPolicy.java Fri Aug 19 12:53:58 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader.search;
+package org.apache.felix.moduleloader.search;
/**
* <p>
@@ -25,7 +25,7 @@
* is to allow the <tt>ImportSearchPolicy</tt> to determine if one
* import/export identifier and version is compatible with another.
* </p>
- * @see org.apache.osgi.moduleloader.search.ImportSearchPolicy
+ * @see org.apache.felix.moduleloader.search.ImportSearchPolicy
**/
public interface CompatibilityPolicy
{
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ExhaustiveSearchPolicy.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ExhaustiveSearchPolicy.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ExhaustiveSearchPolicy.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ExhaustiveSearchPolicy.java Fri Aug 19 12:53:58 2005
@@ -14,11 +14,11 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader.search;
+package org.apache.felix.moduleloader.search;
import java.net.URL;
-import org.apache.osgi.moduleloader.*;
+import org.apache.felix.moduleloader.*;
/**
* <p>
@@ -35,10 +35,10 @@
* the module manager at run time, there is no attempt to clean up its
* loaded classes.
* </p>
- * @see org.apache.osgi.moduleloader.SearchPolicy
- * @see org.apache.osgi.moduleloader.Module
- * @see org.apache.osgi.moduleloader.ModuleClassLoader
- * @see org.apache.osgi.moduleloader.ModuleManager
+ * @see org.apache.felix.moduleloader.SearchPolicy
+ * @see org.apache.felix.moduleloader.Module
+ * @see org.apache.felix.moduleloader.ModuleClassLoader
+ * @see org.apache.felix.moduleloader.ModuleManager
**/
public class ExhaustiveSearchPolicy implements SearchPolicy
{
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ImportSearchPolicy.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ImportSearchPolicy.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ImportSearchPolicy.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ImportSearchPolicy.java Fri Aug 19 12:53:58 2005
@@ -14,12 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader.search;
+package org.apache.felix.moduleloader.search;
import java.net.URL;
import java.util.*;
-import org.apache.osgi.moduleloader.*;
+import org.apache.felix.moduleloader.*;
/**
* <p>
@@ -205,10 +205,10 @@
* import, where the import is also propagated via the module's export. The module
* has multiple resource sources, but no library sources.
* </p>
- * @see org.apache.osgi.moduleloader.SearchPolicy
- * @see org.apache.osgi.moduleloader.Module
- * @see org.apache.osgi.moduleloader.ModuleClassLoader
- * @see org.apache.osgi.moduleloader.ModuleManager
+ * @see org.apache.felix.moduleloader.SearchPolicy
+ * @see org.apache.felix.moduleloader.Module
+ * @see org.apache.felix.moduleloader.ModuleClassLoader
+ * @see org.apache.felix.moduleloader.ModuleManager
**/
public class ImportSearchPolicy implements SearchPolicy, ModuleListener
{
@@ -513,7 +513,7 @@
* modules are marked as validated, if they are not already validated.
* If an error occurs, the valid state of all modules remains unchanged.
* @param module the module to validate.
- * @throws org.apache.osgi.moduleloader.search.ValidationException if
+ * @throws org.apache.felix.moduleloader.search.ValidationException if
* the module or any dependent modules could not be validated.
**/
public void validate(Module module)
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ResolveException.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ResolveException.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ResolveException.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ResolveException.java Fri Aug 19 12:53:58 2005
@@ -14,10 +14,10 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader.search;
+package org.apache.felix.moduleloader.search;
-import org.apache.osgi.framework.searchpolicy.R4Package;
-import org.apache.osgi.moduleloader.Module;
+import org.apache.felix.framework.searchpolicy.R4Package;
+import org.apache.felix.moduleloader.Module;
/**
* <p>
@@ -26,7 +26,7 @@
* identifier and version number. If the error was a result of a propagation
* conflict, then the propagation error flag is set.
* </p>
- * @see org.apache.osgi.moduleloader.search.ImportSearchPolicy#validate(org.apache.osgi.moduleloader.Module)
+ * @see org.apache.felix.moduleloader.search.ImportSearchPolicy#validate(org.apache.felix.moduleloader.Module)
**/
public class ResolveException extends Exception
{
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ResolveListener.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ResolveListener.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ResolveListener.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ResolveListener.java Fri Aug 19 12:53:58 2005
@@ -14,11 +14,11 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader.search;
+package org.apache.felix.moduleloader.search;
import java.util.EventListener;
-import org.apache.osgi.moduleloader.ModuleEvent;
+import org.apache.felix.moduleloader.ModuleEvent;
/**
* <p>
@@ -26,7 +26,7 @@
* events that are generated by the <tt>R4SearchPolicy</tt>. Events
* are fired when a module is resolved and when it is unresolved.
* </p>
- * @see org.apache.osgi.framework.searchpolicy.R4SearchPolicy
+ * @see org.apache.felix.framework.searchpolicy.R4SearchPolicy
**/
public interface ResolveListener extends EventListener
{
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/search/SelectionPolicy.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/search/SelectionPolicy.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/search/SelectionPolicy.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/search/SelectionPolicy.java Fri Aug 19 12:53:58 2005
@@ -14,9 +14,9 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader.search;
+package org.apache.felix.moduleloader.search;
-import org.apache.osgi.moduleloader.Module;
+import org.apache.felix.moduleloader.Module;
/**
* <p>
@@ -26,7 +26,7 @@
* for a given module. A concrete implementation of this interface is
* required to create an instance of <tt>ImportSearchPolicy</tt>.
* </p>
- * @see org.apache.osgi.moduleloader.search.ImportSearchPolicy
+ * @see org.apache.felix.moduleloader.search.ImportSearchPolicy
**/
public interface SelectionPolicy
{
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/search/SelfContainedSearchPolicy.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/search/SelfContainedSearchPolicy.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/search/SelfContainedSearchPolicy.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/search/SelfContainedSearchPolicy.java Fri Aug 19 12:53:58 2005
@@ -14,11 +14,11 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader.search;
+package org.apache.felix.moduleloader.search;
import java.net.URL;
-import org.apache.osgi.moduleloader.*;
+import org.apache.felix.moduleloader.*;
/**
* <p>
@@ -28,10 +28,10 @@
* particular module's resource sources are search. No classes or
* resources are shared among modules.
* </p>
- * @see org.apache.osgi.moduleloader.SearchPolicy
- * @see org.apache.osgi.moduleloader.Module
- * @see org.apache.osgi.moduleloader.ModuleClassLoader
- * @see org.apache.osgi.moduleloader.ModuleManager
+ * @see org.apache.felix.moduleloader.SearchPolicy
+ * @see org.apache.felix.moduleloader.Module
+ * @see org.apache.felix.moduleloader.ModuleClassLoader
+ * @see org.apache.felix.moduleloader.ModuleManager
**/
public class SelfContainedSearchPolicy implements SearchPolicy
{
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ValidationException.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ValidationException.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ValidationException.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ValidationException.java Fri Aug 19 12:53:58 2005
@@ -14,9 +14,9 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader.search;
+package org.apache.felix.moduleloader.search;
-import org.apache.osgi.moduleloader.Module;
+import org.apache.felix.moduleloader.Module;
/**
* <p>
@@ -25,7 +25,7 @@
* identifier and version number. If the error was a result of a propagation
* conflict, then the propagation error flag is set.
* </p>
- * @see org.apache.osgi.moduleloader.search.ImportSearchPolicy#validate(org.apache.osgi.moduleloader.Module)
+ * @see org.apache.felix.moduleloader.search.ImportSearchPolicy#validate(org.apache.felix.moduleloader.Module)
**/
public class ValidationException extends Exception
{
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ValidationListener.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ValidationListener.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ValidationListener.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/search/ValidationListener.java Fri Aug 19 12:53:58 2005
@@ -14,11 +14,11 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader.search;
+package org.apache.felix.moduleloader.search;
import java.util.EventListener;
-import org.apache.osgi.moduleloader.ModuleEvent;
+import org.apache.felix.moduleloader.ModuleEvent;
/**
* <p>
@@ -26,7 +26,7 @@
* events that are generated by the <tt>ImportSearchPolicy</tt>. Events
* are fired when a module is validated and when it is invalidated.
* </p>
- * @see org.apache.osgi.moduleloader.search.ImportSearchPolicy
+ * @see org.apache.felix.moduleloader.search.ImportSearchPolicy
**/
public interface ValidationListener extends EventListener
{
Modified: incubator/felix/trunk/src/org/apache/felix/moduleloader/search/compatibility/ExactCompatibilityPolicy.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/src/org/apache/felix/moduleloader/search/compatibility/ExactCompatibilityPolicy.java?rev=233548&r1=233470&r2=233548&view=diff
==============================================================================
--- incubator/felix/trunk/src/org/apache/felix/moduleloader/search/compatibility/ExactCompatibilityPolicy.java (original)
+++ incubator/felix/trunk/src/org/apache/felix/moduleloader/search/compatibility/ExactCompatibilityPolicy.java Fri Aug 19 12:53:58 2005
@@ -14,9 +14,9 @@
* limitations under the License.
*
*/
-package org.apache.osgi.moduleloader.search.compatibility;
+package org.apache.felix.moduleloader.search.compatibility;
-import org.apache.osgi.moduleloader.search.CompatibilityPolicy;
+import org.apache.felix.moduleloader.search.CompatibilityPolicy;
/**
* This class implements a simple version numbering compatibility policy for the
@@ -25,8 +25,8 @@
* "<tt>leftId.equals(rightId) && leftVersion.equals(rightVersion)</tt>". Any
* calls to the <tt>compare()</tt> method result in an exception since this
* policy has no basis for comparing identifiers and versions.
- * @see org.apache.osgi.moduleloader.search.CompatibilityPolicy
- * @see org.apache.osgi.moduleloader.search.ImportSearchPolicy
+ * @see org.apache.felix.moduleloader.search.CompatibilityPolicy
+ * @see org.apache.felix.moduleloader.search.ImportSearchPolicy
**/
public class ExactCompatibilityPolicy implements CompatibilityPolicy
{