You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2012/01/05 15:16:38 UTC
svn commit: r1227602 [10/10] - in /karaf/trunk: ./ admin/command/
admin/core/ admin/core/src/test/java/org/apache/karaf/jpm/
admin/management/ deployer/blueprint/ deployer/features/ deployer/kar/
deployer/spring/ deployer/wrap/ diagnostic/command/ diag...
Added: karaf/trunk/main/src/main/java/org/osgi/service/startlevel/StartLevel.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/osgi/service/startlevel/StartLevel.java?rev=1227602&view=auto
==============================================================================
--- karaf/trunk/main/src/main/java/org/osgi/service/startlevel/StartLevel.java (added)
+++ karaf/trunk/main/src/main/java/org/osgi/service/startlevel/StartLevel.java Thu Jan 5 14:16:33 2012
@@ -0,0 +1,276 @@
+/*
+ * Copyright (c) OSGi Alliance (2002, 2010). All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.osgi.service.startlevel;
+
+import org.osgi.framework.Bundle;
+
+/**
+ * The StartLevel service allows management agents to manage a start level
+ * assigned to each bundle and the active start level of the Framework. There is
+ * at most one StartLevel service present in the OSGi environment.
+ *
+ * <p>
+ * A start level is defined to be a state of execution in which the Framework
+ * exists. StartLevel values are defined as unsigned integers with 0 (zero)
+ * being the state where the Framework is not launched. Progressively higher
+ * integral values represent progressively higher start levels. e.g. 2 is a
+ * higher start level than 1.
+ * <p>
+ * Access to the StartLevel service is protected by corresponding
+ * {@code ServicePermission}. In addition {@code AdminPermission}
+ * is required to actually modify start level information.
+ * <p>
+ * Start Level support in the Framework includes the ability to control the
+ * beginning start level of the Framework, to modify the active start level of
+ * the Framework and to assign a specific start level to a bundle. How the
+ * beginning start level of a Framework is specified is implementation
+ * dependent. It may be a command line argument when invoking the Framework
+ * implementation.
+ * <p>
+ * When the Framework is first started it must be at start level zero. In this
+ * state, no bundles are running. This is the initial state of the Framework
+ * before it is launched.
+ *
+ * When the Framework is launched, the Framework will enter start level one and
+ * all bundles which are assigned to start level one and whose autostart setting
+ * indicates the bundle should be started are started as described in the
+ * {@code Bundle.start} method. The Framework will continue to increase
+ * the start level, starting bundles at each start level, until the Framework
+ * has reached a beginning start level. At this point the Framework has
+ * completed starting bundles and will then fire a Framework event of type
+ * {@code FrameworkEvent.STARTED} to announce it has completed its
+ * launch.
+ *
+ * <p>
+ * Within a start level, bundles may be started in an order defined by the
+ * Framework implementation. This may be something like ascending
+ * {@code Bundle.getBundleId} order or an order based upon dependencies
+ * between bundles. A similar but reversed order may be used when stopping
+ * bundles within a start level.
+ *
+ * <p>
+ * The StartLevel service can be used by management bundles to alter the active
+ * start level of the framework.
+ *
+ * @ThreadSafe
+ * @noimplement
+ * @version $Id: bf1b71ed6c9f9d75785b26dccb34362017d93f4a $
+ * @deprecated This service has been replaced by the
+ * <code>org.osgi.framework.startlevel</code> package.
+ */
+public interface StartLevel {
+ /**
+ * Return the active start level value of the Framework.
+ *
+ * If the Framework is in the process of changing the start level this
+ * method must return the active start level if this differs from the
+ * requested start level.
+ *
+ * @return The active start level value of the Framework.
+ */
+ public int getStartLevel();
+
+ /**
+ * Modify the active start level of the Framework.
+ *
+ * <p>
+ * The Framework will move to the requested start level. This method will
+ * return immediately to the caller and the start level change will occur
+ * asynchronously on another thread.
+ *
+ * <p>
+ * If the specified start level is higher than the active start level, the
+ * Framework will continue to increase the start level until the Framework
+ * has reached the specified start level.
+ *
+ * At each intermediate start level value on the way to and including the
+ * target start level, the Framework must:
+ * <ol>
+ * <li>Change the active start level to the intermediate start level value.
+ * <li>Start bundles at the intermediate start level whose autostart
+ * setting indicate they must be started. They are started as described in
+ * the {@link Bundle#start(int)} method using the
+ * {@link Bundle#START_TRANSIENT} option. The
+ * {@link Bundle#START_ACTIVATION_POLICY} option must also be used if
+ * {@link #isBundleActivationPolicyUsed(Bundle)} returns {@code true}
+ * for the bundle.
+ * </ol>
+ * When this process completes after the specified start level is reached,
+ * the Framework will fire a Framework event of type
+ * {@code FrameworkEvent.STARTLEVEL_CHANGED} to announce it has moved
+ * to the specified start level.
+ *
+ * <p>
+ * If the specified start level is lower than the active start level, the
+ * Framework will continue to decrease the start level until the Framework
+ * has reached the specified start level.
+ *
+ * At each intermediate start level value on the way to and including the
+ * specified start level, the framework must:
+ * <ol>
+ * <li>Stop bundles at the intermediate start level as described in the
+ * {@link Bundle#stop(int)} method using the {@link Bundle#STOP_TRANSIENT}
+ * option.
+ * <li>Change the active start level to the intermediate start level value.
+ * </ol>
+ * When this process completes after the specified start level is reached,
+ * the Framework will fire a Framework event of type
+ * {@code FrameworkEvent.STARTLEVEL_CHANGED} to announce it has moved
+ * to the specified start level.
+ *
+ * <p>
+ * If the specified start level is equal to the active start level, then no
+ * bundles are started or stopped, however, the Framework must fire a
+ * Framework event of type {@code FrameworkEvent.STARTLEVEL_CHANGED}
+ * to announce it has finished moving to the specified start level. This
+ * event may arrive before this method return.
+ *
+ * @param startlevel The requested start level for the Framework.
+ * @throws IllegalArgumentException If the specified start level is less
+ * than or equal to zero.
+ * @throws SecurityException If the caller does not have
+ * {@code AdminPermission[System Bundle,STARTLEVEL]} and the
+ * Java runtime environment supports permissions.
+ */
+ public void setStartLevel(int startlevel);
+
+ /**
+ * Return the assigned start level value for the specified Bundle.
+ *
+ * @param bundle The target bundle.
+ * @return The start level value of the specified Bundle.
+ * @throws java.lang.IllegalArgumentException If the specified bundle has
+ * been uninstalled or if the specified bundle was not created by
+ * the same framework instance that registered this
+ * {@code StartLevel} service.
+ */
+ public int getBundleStartLevel(Bundle bundle);
+
+ /**
+ * Assign a start level value to the specified Bundle.
+ *
+ * <p>
+ * The specified bundle will be assigned the specified start level. The
+ * start level value assigned to the bundle will be persistently recorded by
+ * the Framework.
+ * <p>
+ * If the new start level for the bundle is lower than or equal to the
+ * active start level of the Framework and the bundle's autostart setting
+ * indicates the bundle must be started, the Framework will start the
+ * specified bundle as described in the {@link Bundle#start(int)} method
+ * using the {@link Bundle#START_TRANSIENT} option. The
+ * {@link Bundle#START_ACTIVATION_POLICY} option must also be used if
+ * {@link #isBundleActivationPolicyUsed(Bundle)} returns {@code true}
+ * for the bundle. The actual starting of this bundle must occur
+ * asynchronously.
+ * <p>
+ * If the new start level for the bundle is higher than the active start
+ * level of the Framework, the Framework will stop the specified bundle as
+ * described in the {@link Bundle#stop(int)} method using the
+ * {@link Bundle#STOP_TRANSIENT} option. The actual stopping of this bundle
+ * must occur asynchronously.
+ *
+ * @param bundle The target bundle.
+ * @param startlevel The new start level for the specified Bundle.
+ * @throws IllegalArgumentException If the specified bundle has been
+ * uninstalled, or if the specified start level is less than or
+ * equal to zero, or if the specified bundle is the system bundle,
+ * or if the specified bundle was not created by the same framework
+ * instance that registered this {@code StartLevel} service.
+ * @throws SecurityException If the caller does not have
+ * {@code AdminPermission[bundle,EXECUTE]} and the Java runtime
+ * environment supports permissions.
+ */
+ public void setBundleStartLevel(Bundle bundle, int startlevel);
+
+ /**
+ * Return the initial start level value that is assigned to a Bundle when it
+ * is first installed.
+ *
+ * @return The initial start level value for Bundles.
+ * @see #setInitialBundleStartLevel
+ */
+ public int getInitialBundleStartLevel();
+
+ /**
+ * Set the initial start level value that is assigned to a Bundle when it is
+ * first installed.
+ *
+ * <p>
+ * The initial bundle start level will be set to the specified start level.
+ * The initial bundle start level value will be persistently recorded by the
+ * Framework.
+ *
+ * <p>
+ * When a Bundle is installed via {@code BundleContext.installBundle},
+ * it is assigned the initial bundle start level value.
+ *
+ * <p>
+ * The default initial bundle start level value is 1 unless this method has
+ * been called to assign a different initial bundle start level value.
+ *
+ * <p>
+ * This method does not change the start level values of installed bundles.
+ *
+ * @param startlevel The initial start level for newly installed bundles.
+ * @throws IllegalArgumentException If the specified start level is less
+ * than or equal to zero.
+ * @throws SecurityException If the caller does not have
+ * {@code AdminPermission[System Bundle,STARTLEVEL]} and the
+ * Java runtime environment supports permissions.
+ */
+ public void setInitialBundleStartLevel(int startlevel);
+
+ /**
+ * Returns whether the specified bundle's autostart setting indicates the
+ * bundle must be started.
+ * <p>
+ * The autostart setting of a bundle indicates whether the bundle is to be
+ * started when its start level is reached.
+ *
+ * @param bundle The bundle whose autostart setting is to be examined.
+ * @return {@code true} if the autostart setting of the bundle
+ * indicates the bundle is to be started. {@code false}
+ * otherwise.
+ * @throws java.lang.IllegalArgumentException If the specified bundle has
+ * been uninstalled or if the specified bundle was not created by
+ * the same framework instance that registered this
+ * {@code StartLevel} service.
+ * @see Bundle#START_TRANSIENT
+ */
+ public boolean isBundlePersistentlyStarted(Bundle bundle);
+
+ /**
+ * Returns whether the specified bundle's autostart setting indicates that
+ * the activation policy declared in the bundle's manifest must be used.
+ * <p>
+ * The autostart setting of a bundle indicates whether the bundle's declared
+ * activation policy is to be used when the bundle is started.
+ *
+ * @param bundle The bundle whose autostart setting is to be examined.
+ * @return {@code true} if the bundle's autostart setting indicates the
+ * activation policy declared in the manifest must be used.
+ * {@code false} if the bundle must be eagerly activated.
+ * @throws java.lang.IllegalArgumentException If the specified bundle has
+ * been uninstalled or if the specified bundle was not created by
+ * the same framework instance that registered this
+ * {@code StartLevel} service.
+ * @since 1.1
+ * @see Bundle#START_ACTIVATION_POLICY
+ */
+ public boolean isBundleActivationPolicyUsed(Bundle bundle);
+}
Added: karaf/trunk/main/src/main/java/org/osgi/service/startlevel/package-info.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/osgi/service/startlevel/package-info.java?rev=1227602&view=auto
==============================================================================
--- karaf/trunk/main/src/main/java/org/osgi/service/startlevel/package-info.java (added)
+++ karaf/trunk/main/src/main/java/org/osgi/service/startlevel/package-info.java Thu Jan 5 14:16:33 2012
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) OSGi Alliance (2010). All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Start Level Package Version 1.1.
+ *
+ * <p>
+ * <b>Deprecated.</b>
+ * <i>This package is deprecated and has been replaced by the
+ * {@code org.osgi.framework.startlevel} package.</i>
+ *
+ * <p>
+ * Bundles wishing to use this package must list the package in the
+ * Import-Package header of the bundle's manifest.
+ *
+ * <p>
+ * Example import for consumers using the API in this package:
+ * <p>
+ * {@code Import-Package: org.osgi.service.startlevel; version="[1.1,2.0)"}
+ *
+ * @version $Id: 6e311e6e404688d5f5f88cde403ca2066de7c20b $
+ */
+
+package org.osgi.service.startlevel;
Added: karaf/trunk/main/src/main/java/org/osgi/service/startlevel/packageinfo
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/osgi/service/startlevel/packageinfo?rev=1227602&view=auto
==============================================================================
--- karaf/trunk/main/src/main/java/org/osgi/service/startlevel/packageinfo (added)
+++ karaf/trunk/main/src/main/java/org/osgi/service/startlevel/packageinfo Thu Jan 5 14:16:33 2012
@@ -0,0 +1 @@
+version 1.1
Added: karaf/trunk/main/src/main/java/org/osgi/service/url/AbstractURLStreamHandlerService.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/osgi/service/url/AbstractURLStreamHandlerService.java?rev=1227602&view=auto
==============================================================================
--- karaf/trunk/main/src/main/java/org/osgi/service/url/AbstractURLStreamHandlerService.java (added)
+++ karaf/trunk/main/src/main/java/org/osgi/service/url/AbstractURLStreamHandlerService.java Thu Jan 5 14:16:33 2012
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) OSGi Alliance (2002, 2010). All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.osgi.service.url;
+
+import java.net.*;
+
+/**
+ * Abstract implementation of the {@code URLStreamHandlerService}
+ * interface. All the methods simply invoke the corresponding methods on
+ * {@code java.net.URLStreamHandler} except for {@code parseURL}
+ * and {@code setURL}, which use the {@code URLStreamHandlerSetter}
+ * parameter. Subclasses of this abstract class should not need to override the
+ * {@code setURL} and {@code parseURL(URLStreamHandlerSetter,...)}
+ * methods.
+ *
+ * @ThreadSafe
+ * @version $Id: 465a0ed86f5d49b338ffc6a13bb68f60f04e54d6 $
+ */
+public abstract class AbstractURLStreamHandlerService extends URLStreamHandler
+ implements URLStreamHandlerService {
+ /**
+ * @see "java.net.URLStreamHandler.openConnection"
+ */
+ public abstract URLConnection openConnection(URL u)
+ throws java.io.IOException;
+
+ /**
+ * The {@code URLStreamHandlerSetter} object passed to the parseURL
+ * method.
+ */
+ protected volatile URLStreamHandlerSetter realHandler;
+
+ /**
+ * Parse a URL using the {@code URLStreamHandlerSetter} object. This
+ * method sets the {@code realHandler} field with the specified
+ * {@code URLStreamHandlerSetter} object and then calls
+ * {@code parseURL(URL,String,int,int)}.
+ *
+ * @param realHandler The object on which the {@code setURL} method
+ * must be invoked for the specified URL.
+ * @see "java.net.URLStreamHandler.parseURL"
+ */
+ public void parseURL(URLStreamHandlerSetter realHandler, URL u,
+ String spec, int start, int limit) {
+ this.realHandler = realHandler;
+ parseURL(u, spec, start, limit);
+ }
+
+ /**
+ * This method calls {@code super.toExternalForm}.
+ *
+ * @see "java.net.URLStreamHandler.toExternalForm"
+ */
+ public String toExternalForm(URL u) {
+ return super.toExternalForm(u);
+ }
+
+ /**
+ * This method calls {@code super.equals(URL,URL)}.
+ *
+ * @see "java.net.URLStreamHandler.equals(URL,URL)"
+ */
+ public boolean equals(URL u1, URL u2) {
+ return super.equals(u1, u2);
+ }
+
+ /**
+ * This method calls {@code super.getDefaultPort}.
+ *
+ * @see "java.net.URLStreamHandler.getDefaultPort"
+ */
+ public int getDefaultPort() {
+ return super.getDefaultPort();
+ }
+
+ /**
+ * This method calls {@code super.getHostAddress}.
+ *
+ * @see "java.net.URLStreamHandler.getHostAddress"
+ */
+ public InetAddress getHostAddress(URL u) {
+ return super.getHostAddress(u);
+ }
+
+ /**
+ * This method calls {@code super.hashCode(URL)}.
+ *
+ * @see "java.net.URLStreamHandler.hashCode(URL)"
+ */
+ public int hashCode(URL u) {
+ return super.hashCode(u);
+ }
+
+ /**
+ * This method calls {@code super.hostsEqual}.
+ *
+ * @see "java.net.URLStreamHandler.hostsEqual"
+ */
+ public boolean hostsEqual(URL u1, URL u2) {
+ return super.hostsEqual(u1, u2);
+ }
+
+ /**
+ * This method calls {@code super.sameFile}.
+ *
+ * @see "java.net.URLStreamHandler.sameFile"
+ */
+ public boolean sameFile(URL u1, URL u2) {
+ return super.sameFile(u1, u2);
+ }
+
+ /**
+ * This method calls
+ * {@code realHandler.setURL(URL,String,String,int,String,String)}.
+ *
+ * @see "java.net.URLStreamHandler.setURL(URL,String,String,int,String,String)"
+ * @deprecated This method is only for compatibility with handlers written
+ * for JDK 1.1.
+ */
+ protected void setURL(URL u, String proto, String host, int port,
+ String file, String ref) {
+ realHandler.setURL(u, proto, host, port, file, ref);
+ }
+
+ /**
+ * This method calls
+ * {@code realHandler.setURL(URL,String,String,int,String,String,String,String)}.
+ *
+ * @see "java.net.URLStreamHandler.setURL(URL,String,String,int,String,String,String,String)"
+ */
+ protected void setURL(URL u, String proto, String host, int port,
+ String auth, String user, String path, String query, String ref) {
+ realHandler.setURL(u, proto, host, port, auth, user, path, query, ref);
+ }
+}
Added: karaf/trunk/main/src/main/java/org/osgi/service/url/URLConstants.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/osgi/service/url/URLConstants.java?rev=1227602&view=auto
==============================================================================
--- karaf/trunk/main/src/main/java/org/osgi/service/url/URLConstants.java (added)
+++ karaf/trunk/main/src/main/java/org/osgi/service/url/URLConstants.java Thu Jan 5 14:16:33 2012
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) OSGi Alliance (2002, 2010). All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.osgi.service.url;
+
+/**
+ * Defines standard names for property keys associated with
+ * {@link URLStreamHandlerService} and {@code java.net.ContentHandler}
+ * services.
+ *
+ * <p>
+ * The values associated with these keys are of type
+ * {@code java.lang.String[]} or {@code java.lang.String}, unless
+ * otherwise indicated.
+ *
+ * @noimplement
+ * @version $Id: 5ec8db316249f4b956fe083b986c11153d0fa8fe $
+ */
+public interface URLConstants {
+ /**
+ * Service property naming the protocols serviced by a
+ * URLStreamHandlerService. The property's value is a protocol name or an
+ * array of protocol names.
+ */
+ public static final String URL_HANDLER_PROTOCOL = "url.handler.protocol";
+ /**
+ * Service property naming the MIME types serviced by a
+ * java.net.ContentHandler. The property's value is a MIME type or an array
+ * of MIME types.
+ */
+ public static final String URL_CONTENT_MIMETYPE = "url.content.mimetype";
+}
Added: karaf/trunk/main/src/main/java/org/osgi/service/url/URLStreamHandlerService.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/osgi/service/url/URLStreamHandlerService.java?rev=1227602&view=auto
==============================================================================
--- karaf/trunk/main/src/main/java/org/osgi/service/url/URLStreamHandlerService.java (added)
+++ karaf/trunk/main/src/main/java/org/osgi/service/url/URLStreamHandlerService.java Thu Jan 5 14:16:33 2012
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) OSGi Alliance (2002, 2010). All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.osgi.service.url;
+
+import java.net.*;
+
+/**
+ * Service interface with public versions of the protected
+ * {@code java.net.URLStreamHandler} methods.
+ * <p>
+ * The important differences between this interface and the
+ * {@code URLStreamHandler} class are that the {@code setURL}
+ * method is absent and the {@code parseURL} method takes a
+ * {@link URLStreamHandlerSetter} object as the first argument. Classes
+ * implementing this interface must call the {@code setURL} method on the
+ * {@code URLStreamHandlerSetter} object received in the
+ * {@code parseURL} method instead of
+ * {@code URLStreamHandler.setURL} to avoid a
+ * {@code SecurityException}.
+ *
+ * @see AbstractURLStreamHandlerService
+ *
+ * @ThreadSafe
+ * @version $Id: 4982ef5b407669975afe2856a9702246d2d9c2ba $
+ */
+public interface URLStreamHandlerService {
+ /**
+ * @see "java.net.URLStreamHandler.openConnection"
+ */
+ public URLConnection openConnection(URL u) throws java.io.IOException;
+
+ /**
+ * Parse a URL. This method is called by the {@code URLStreamHandler}
+ * proxy, instead of {@code java.net.URLStreamHandler.parseURL},
+ * passing a {@code URLStreamHandlerSetter} object.
+ *
+ * @param realHandler The object on which {@code setURL} must be
+ * invoked for this URL.
+ * @see "java.net.URLStreamHandler.parseURL"
+ */
+ public void parseURL(URLStreamHandlerSetter realHandler, URL u,
+ String spec, int start, int limit);
+
+ /**
+ * @see "java.net.URLStreamHandler.toExternalForm"
+ */
+ public String toExternalForm(URL u);
+
+ /**
+ * @see "java.net.URLStreamHandler.equals(URL, URL)"
+ */
+ public boolean equals(URL u1, URL u2);
+
+ /**
+ * @see "java.net.URLStreamHandler.getDefaultPort"
+ */
+ public int getDefaultPort();
+
+ /**
+ * @see "java.net.URLStreamHandler.getHostAddress"
+ */
+ public InetAddress getHostAddress(URL u);
+
+ /**
+ * @see "java.net.URLStreamHandler.hashCode(URL)"
+ */
+ public int hashCode(URL u);
+
+ /**
+ * @see "java.net.URLStreamHandler.hostsEqual"
+ */
+ public boolean hostsEqual(URL u1, URL u2);
+
+ /**
+ * @see "java.net.URLStreamHandler.sameFile"
+ */
+ public boolean sameFile(URL u1, URL u2);
+}
Added: karaf/trunk/main/src/main/java/org/osgi/service/url/URLStreamHandlerSetter.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/osgi/service/url/URLStreamHandlerSetter.java?rev=1227602&view=auto
==============================================================================
--- karaf/trunk/main/src/main/java/org/osgi/service/url/URLStreamHandlerSetter.java (added)
+++ karaf/trunk/main/src/main/java/org/osgi/service/url/URLStreamHandlerSetter.java Thu Jan 5 14:16:33 2012
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) OSGi Alliance (2002, 2010). All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.osgi.service.url;
+
+import java.net.URL;
+
+/**
+ * Interface used by {@code URLStreamHandlerService} objects to call the
+ * {@code setURL} method on the proxy {@code URLStreamHandler}
+ * object.
+ *
+ * <p>
+ * Objects of this type are passed to the
+ * {@link URLStreamHandlerService#parseURL} method. Invoking the
+ * {@code setURL} method on the {@code URLStreamHandlerSetter}
+ * object will invoke the {@code setURL} method on the proxy
+ * {@code URLStreamHandler} object that is actually registered with
+ * {@code java.net.URL} for the protocol.
+ *
+ * @ThreadSafe
+ * @version $Id: f55d4c29678503c244f56dcb2b5621b3be11cc8d $
+ */
+public interface URLStreamHandlerSetter {
+ /**
+ * @see "java.net.URLStreamHandler.setURL(URL,String,String,int,String,String)"
+ *
+ * @deprecated This method is only for compatibility with handlers written
+ * for JDK 1.1.
+ */
+ public void setURL(URL u, String protocol, String host, int port,
+ String file, String ref);
+
+ /**
+ * @see "java.net.URLStreamHandler.setURL(URL,String,String,int,String,String,String,String)"
+ */
+ public void setURL(URL u, String protocol, String host, int port,
+ String authority, String userInfo, String path, String query,
+ String ref);
+}
Added: karaf/trunk/main/src/main/java/org/osgi/service/url/package-info.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/osgi/service/url/package-info.java?rev=1227602&view=auto
==============================================================================
--- karaf/trunk/main/src/main/java/org/osgi/service/url/package-info.java (added)
+++ karaf/trunk/main/src/main/java/org/osgi/service/url/package-info.java Thu Jan 5 14:16:33 2012
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) OSGi Alliance (2010). All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * URL Stream and Content Handlers Package Version 1.0.
+ *
+ * <p>
+ * Bundles wishing to use this package must list the package in the
+ * Import-Package header of the bundle's manifest.
+ *
+ * <p>
+ * Example import for consumers using the API in this package:
+ * <p>
+ * {@code Import-Package: org.osgi.service.url; version="[1.0,2.0)"}
+ *
+ * @version $Id: 5eaeb551c53ee18d53480e5c03d2b7771f3e6aea $
+ */
+
+package org.osgi.service.url;
Added: karaf/trunk/main/src/main/java/org/osgi/service/url/packageinfo
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/osgi/service/url/packageinfo?rev=1227602&view=auto
==============================================================================
--- karaf/trunk/main/src/main/java/org/osgi/service/url/packageinfo (added)
+++ karaf/trunk/main/src/main/java/org/osgi/service/url/packageinfo Thu Jan 5 14:16:33 2012
@@ -0,0 +1 @@
+version 1.0
Modified: karaf/trunk/main/src/test/resources/test-karaf-home/etc/config.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/test/resources/test-karaf-home/etc/config.properties?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/main/src/test/resources/test-karaf-home/etc/config.properties (original)
+++ karaf/trunk/main/src/test/resources/test-karaf-home/etc/config.properties Thu Jan 5 14:16:33 2012
@@ -31,7 +31,7 @@ karaf.framework=felix
#
# Location of the OSGi frameworks
#
-karaf.framework.felix=${karaf.default.repository}/org/apache/felix/org.apache.felix.framework/3.0.6/org.apache.felix.framework-3.0.6.jar
+karaf.framework.felix=${karaf.default.repository}/org/apache/felix/org.apache.felix.framework/4.0.2/org.apache.felix.framework-4.0.2.jar
# To enable the use of the startup.properties file to control the start level:
karaf.auto.start=
Added: karaf/trunk/main/src/test/resources/test-karaf-home/system/org/apache/felix/org.apache.felix.framework/4.0.2/org.apache.felix.framework-4.0.2.jar
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/test/resources/test-karaf-home/system/org/apache/felix/org.apache.felix.framework/4.0.2/org.apache.felix.framework-4.0.2.jar?rev=1227602&view=auto
==============================================================================
Files karaf/trunk/main/src/test/resources/test-karaf-home/system/org/apache/felix/org.apache.felix.framework/4.0.2/org.apache.felix.framework-4.0.2.jar (added) and karaf/trunk/main/src/test/resources/test-karaf-home/system/org/apache/felix/org.apache.felix.framework/4.0.2/org.apache.felix.framework-4.0.2.jar Thu Jan 5 14:16:33 2012 differ
Modified: karaf/trunk/management/mbeans/bundles/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/bundles/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/management/mbeans/bundles/pom.xml (original)
+++ karaf/trunk/management/mbeans/bundles/pom.xml Thu Jan 5 14:16:33 2012
@@ -39,8 +39,8 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: karaf/trunk/management/mbeans/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/config/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/management/mbeans/config/pom.xml (original)
+++ karaf/trunk/management/mbeans/config/pom.xml Thu Jan 5 14:16:33 2012
@@ -39,8 +39,8 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/management/mbeans/dev/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/dev/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/management/mbeans/dev/pom.xml (original)
+++ karaf/trunk/management/mbeans/dev/pom.xml Thu Jan 5 14:16:33 2012
@@ -39,8 +39,8 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/management/mbeans/http/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/http/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/management/mbeans/http/pom.xml (original)
+++ karaf/trunk/management/mbeans/http/pom.xml Thu Jan 5 14:16:33 2012
@@ -39,8 +39,8 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/management/mbeans/log/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/log/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/management/mbeans/log/pom.xml (original)
+++ karaf/trunk/management/mbeans/log/pom.xml Thu Jan 5 14:16:33 2012
@@ -39,8 +39,8 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/management/mbeans/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/obr/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/management/mbeans/obr/pom.xml (original)
+++ karaf/trunk/management/mbeans/obr/pom.xml Thu Jan 5 14:16:33 2012
@@ -39,8 +39,8 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/management/mbeans/packages/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/packages/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/management/mbeans/packages/pom.xml (original)
+++ karaf/trunk/management/mbeans/packages/pom.xml Thu Jan 5 14:16:33 2012
@@ -39,8 +39,8 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: karaf/trunk/management/mbeans/services/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/services/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/management/mbeans/services/pom.xml (original)
+++ karaf/trunk/management/mbeans/services/pom.xml Thu Jan 5 14:16:33 2012
@@ -39,8 +39,8 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: karaf/trunk/management/server/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/management/server/pom.xml (original)
+++ karaf/trunk/management/server/pom.xml Thu Jan 5 14:16:33 2012
@@ -40,8 +40,8 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Thu Jan 5 14:16:33 2012
@@ -678,11 +678,6 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${osgi.version}</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>${osgi.compendium.version}</version>
</dependency>
Modified: karaf/trunk/region/commands/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/region/commands/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/region/commands/pom.xml (original)
+++ karaf/trunk/region/commands/pom.xml Thu Jan 5 14:16:33 2012
@@ -38,8 +38,8 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/region/persist/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/region/persist/pom.xml (original)
+++ karaf/trunk/region/persist/pom.xml Thu Jan 5 14:16:33 2012
@@ -38,8 +38,8 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/scheduler/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/scheduler/core/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/scheduler/core/pom.xml (original)
+++ karaf/trunk/scheduler/core/pom.xml Thu Jan 5 14:16:33 2012
@@ -69,8 +69,8 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/shell/bundles/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/bundles/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/shell/bundles/pom.xml (original)
+++ karaf/trunk/shell/bundles/pom.xml Thu Jan 5 14:16:33 2012
@@ -55,8 +55,8 @@
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/shell/commands/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/shell/commands/pom.xml (original)
+++ karaf/trunk/shell/commands/pom.xml Thu Jan 5 14:16:33 2012
@@ -58,8 +58,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/shell/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/shell/config/pom.xml (original)
+++ karaf/trunk/shell/config/pom.xml Thu Jan 5 14:16:33 2012
@@ -56,8 +56,8 @@
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/shell/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/shell/console/pom.xml (original)
+++ karaf/trunk/shell/console/pom.xml Thu Jan 5 14:16:33 2012
@@ -60,8 +60,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/shell/dev/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/shell/dev/pom.xml (original)
+++ karaf/trunk/shell/dev/pom.xml Thu Jan 5 14:16:33 2012
@@ -52,8 +52,8 @@
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/shell/http/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/http/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/shell/http/pom.xml (original)
+++ karaf/trunk/shell/http/pom.xml Thu Jan 5 14:16:33 2012
@@ -44,8 +44,8 @@
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/shell/log/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/shell/log/pom.xml (original)
+++ karaf/trunk/shell/log/pom.xml Thu Jan 5 14:16:33 2012
@@ -44,8 +44,8 @@
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/shell/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/shell/obr/pom.xml (original)
+++ karaf/trunk/shell/obr/pom.xml Thu Jan 5 14:16:33 2012
@@ -49,8 +49,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/shell/services/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/services/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/shell/services/pom.xml (original)
+++ karaf/trunk/shell/services/pom.xml Thu Jan 5 14:16:33 2012
@@ -49,8 +49,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/shell/ssh/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/pom.xml (original)
+++ karaf/trunk/shell/ssh/pom.xml Thu Jan 5 14:16:33 2012
@@ -44,8 +44,8 @@
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
Modified: karaf/trunk/system/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/system/core/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/system/core/pom.xml (original)
+++ karaf/trunk/system/core/pom.xml Thu Jan 5 14:16:33 2012
@@ -41,8 +41,8 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/tooling/exam/container/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/pom.xml (original)
+++ karaf/trunk/tooling/exam/container/pom.xml Thu Jan 5 14:16:33 2012
@@ -45,8 +45,8 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: karaf/trunk/tooling/karaf-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/pom.xml (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/pom.xml Thu Jan 5 14:16:33 2012
@@ -136,8 +136,8 @@
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
Modified: karaf/trunk/util/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/util/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/util/pom.xml (original)
+++ karaf/trunk/util/pom.xml Thu Jan 5 14:16:33 2012
@@ -35,8 +35,8 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/web/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/web/core/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/web/core/pom.xml (original)
+++ karaf/trunk/web/core/pom.xml Thu Jan 5 14:16:33 2012
@@ -41,8 +41,8 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/webconsole/admin/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/admin/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/webconsole/admin/pom.xml (original)
+++ karaf/trunk/webconsole/admin/pom.xml Thu Jan 5 14:16:33 2012
@@ -49,8 +49,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/webconsole/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/console/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/webconsole/console/pom.xml (original)
+++ karaf/trunk/webconsole/console/pom.xml Thu Jan 5 14:16:33 2012
@@ -43,8 +43,8 @@
<artifactId>geronimo-servlet_2.5_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: karaf/trunk/webconsole/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/features/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/webconsole/features/pom.xml (original)
+++ karaf/trunk/webconsole/features/pom.xml Thu Jan 5 14:16:33 2012
@@ -39,8 +39,8 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/webconsole/gogo/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/gogo/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/webconsole/gogo/pom.xml (original)
+++ karaf/trunk/webconsole/gogo/pom.xml Thu Jan 5 14:16:33 2012
@@ -39,8 +39,8 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/webconsole/http/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/http/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/webconsole/http/pom.xml (original)
+++ karaf/trunk/webconsole/http/pom.xml Thu Jan 5 14:16:33 2012
@@ -39,8 +39,8 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/wrapper/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/pom.xml?rev=1227602&r1=1227601&r2=1227602&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/pom.xml (original)
+++ karaf/trunk/wrapper/core/pom.xml Thu Jan 5 14:16:33 2012
@@ -62,8 +62,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>