SLING-5014 : Installer blacklist, to avoid reinstalling older bundles. Apply patch from Dominik Süß. Updated to latest parent pom and newer OSGi framework
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1765608 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 5e62a54..1297c42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>29</version>
<relativePath />
</parent>
@@ -54,29 +54,8 @@
<Bundle-Activator>
org.apache.sling.installer.core.impl.Activator
</Bundle-Activator>
- <Private-Package>
- org.apache.sling.installer.core.impl.*
- </Private-Package>
- <Export-Package>
- org.apache.sling.installer.api,
- org.apache.sling.installer.api.info,
- org.apache.sling.installer.api.event,
- org.apache.sling.installer.api.tasks,
- org.apache.sling.installer.api.jmx
- </Export-Package>
- <!--
- As we make use of optional features from 4.3 if they
- are available, we have to add the framework imports
- by hand:
- -->
- <Import-Package>
- org.osgi.framework;version="[1.4,2]",
- org.osgi.framework.wiring;resolution:=optional,
- *
- </Import-Package>
<Embed-Dependency>
org.apache.felix.configadmin;inline="org/apache/felix/cm/file/ConfigurationHandler.*",
- org.osgi.compendium;inline="org/osgi/util/tracker/*",
org.apache.sling.commons.osgi;inline="org/apache/sling/commons/osgi/ManifestHeader*.*|org/apache/sling/commons/osgi/PropertiesUtil.*|org/apache/sling/commons/osgi/SortingServiceTracker.*"
</Embed-Dependency>
</instructions>
@@ -132,12 +111,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.3.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -153,7 +127,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.8.6</version>
+ <version>1.8.10</version>
<scope>provided</scope>
</dependency>
<!-- Basic dependencies for Unit Tests -->
diff --git a/src/main/java/org/apache/sling/installer/api/OsgiInstaller.java b/src/main/java/org/apache/sling/installer/api/OsgiInstaller.java
index 4ec39e3..4ec36c6 100644
--- a/src/main/java/org/apache/sling/installer/api/OsgiInstaller.java
+++ b/src/main/java/org/apache/sling/installer/api/OsgiInstaller.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.installer.api;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Service for installing/updating/removing installable resources
diff --git a/src/main/java/org/apache/sling/installer/api/ResourceChangeListener.java b/src/main/java/org/apache/sling/installer/api/ResourceChangeListener.java
index 4080415..ebbf2a0 100644
--- a/src/main/java/org/apache/sling/installer/api/ResourceChangeListener.java
+++ b/src/main/java/org/apache/sling/installer/api/ResourceChangeListener.java
@@ -22,7 +22,7 @@
import java.util.Dictionary;
import java.util.Map;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/src/main/java/org/apache/sling/installer/api/UpdateHandler.java b/src/main/java/org/apache/sling/installer/api/UpdateHandler.java
index bf81fde..5a90f40 100644
--- a/src/main/java/org/apache/sling/installer/api/UpdateHandler.java
+++ b/src/main/java/org/apache/sling/installer/api/UpdateHandler.java
@@ -22,7 +22,7 @@
import java.util.Dictionary;
import java.util.Map;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
diff --git a/src/main/java/org/apache/sling/installer/api/event/InstallationEvent.java b/src/main/java/org/apache/sling/installer/api/event/InstallationEvent.java
index fa7ff6a..22b57d0 100644
--- a/src/main/java/org/apache/sling/installer/api/event/InstallationEvent.java
+++ b/src/main/java/org/apache/sling/installer/api/event/InstallationEvent.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.installer.api.event;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/src/main/java/org/apache/sling/installer/api/event/InstallationListener.java b/src/main/java/org/apache/sling/installer/api/event/InstallationListener.java
index bfd009e..64f359c 100644
--- a/src/main/java/org/apache/sling/installer/api/event/InstallationListener.java
+++ b/src/main/java/org/apache/sling/installer/api/event/InstallationListener.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.installer.api.event;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
diff --git a/src/main/java/org/apache/sling/installer/api/event/package-info.java b/src/main/java/org/apache/sling/installer/api/event/package-info.java
index 682d619..b9ba798 100644
--- a/src/main/java/org/apache/sling/installer/api/event/package-info.java
+++ b/src/main/java/org/apache/sling/installer/api/event/package-info.java
@@ -17,8 +17,7 @@
* under the License.
*/
-@Version("1.0.2")
+@org.osgi.annotation.versioning.Version("1.0.3")
package org.apache.sling.installer.api.event;
-import aQute.bnd.annotation.Version;
diff --git a/src/main/java/org/apache/sling/installer/api/info/InfoProvider.java b/src/main/java/org/apache/sling/installer/api/info/InfoProvider.java
index 2e98cfb..a3c47ee 100644
--- a/src/main/java/org/apache/sling/installer/api/info/InfoProvider.java
+++ b/src/main/java/org/apache/sling/installer/api/info/InfoProvider.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.installer.api.info;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/src/main/java/org/apache/sling/installer/api/info/InstallationState.java b/src/main/java/org/apache/sling/installer/api/info/InstallationState.java
index d3c91f4..240413f 100644
--- a/src/main/java/org/apache/sling/installer/api/info/InstallationState.java
+++ b/src/main/java/org/apache/sling/installer/api/info/InstallationState.java
@@ -21,8 +21,7 @@
import java.util.List;
import org.apache.sling.installer.api.tasks.RegisteredResource;
-
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The state of the OSGi installer at a given time.
diff --git a/src/main/java/org/apache/sling/installer/api/info/Resource.java b/src/main/java/org/apache/sling/installer/api/info/Resource.java
index c365860..497c3bf 100644
--- a/src/main/java/org/apache/sling/installer/api/info/Resource.java
+++ b/src/main/java/org/apache/sling/installer/api/info/Resource.java
@@ -22,10 +22,9 @@
import org.apache.sling.installer.api.tasks.RegisteredResource;
import org.apache.sling.installer.api.tasks.ResourceState;
import org.apache.sling.installer.api.tasks.ResourceTransformer;
+import org.osgi.annotation.versioning.ProviderType;
import org.osgi.framework.Version;
-import aQute.bnd.annotation.ProviderType;
-
/**
* A resource provides all relevant information about a registered
diff --git a/src/main/java/org/apache/sling/installer/api/info/ResourceGroup.java b/src/main/java/org/apache/sling/installer/api/info/ResourceGroup.java
index b499ae6..a0012ab 100644
--- a/src/main/java/org/apache/sling/installer/api/info/ResourceGroup.java
+++ b/src/main/java/org/apache/sling/installer/api/info/ResourceGroup.java
@@ -20,7 +20,7 @@
import java.util.List;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* This is a group of resources all pointing to the same artifact,
diff --git a/src/main/java/org/apache/sling/installer/api/info/package-info.java b/src/main/java/org/apache/sling/installer/api/info/package-info.java
index bcc93c7..ca6242b 100644
--- a/src/main/java/org/apache/sling/installer/api/info/package-info.java
+++ b/src/main/java/org/apache/sling/installer/api/info/package-info.java
@@ -17,8 +17,5 @@
* under the License.
*/
-@Version("1.0.2")
+@org.osgi.annotation.versioning.Version("1.0.3")
package org.apache.sling.installer.api.info;
-
-import aQute.bnd.annotation.Version;
-
diff --git a/src/main/java/org/apache/sling/installer/api/jmx/InstallerMBean.java b/src/main/java/org/apache/sling/installer/api/jmx/InstallerMBean.java
index 6686ff5..f26f171 100644
--- a/src/main/java/org/apache/sling/installer/api/jmx/InstallerMBean.java
+++ b/src/main/java/org/apache/sling/installer/api/jmx/InstallerMBean.java
@@ -19,7 +19,7 @@
package org.apache.sling.installer.api.jmx;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
@ProviderType
public interface InstallerMBean {
diff --git a/src/main/java/org/apache/sling/installer/api/jmx/package-info.java b/src/main/java/org/apache/sling/installer/api/jmx/package-info.java
index 64cb4e6..b4f6f38 100644
--- a/src/main/java/org/apache/sling/installer/api/jmx/package-info.java
+++ b/src/main/java/org/apache/sling/installer/api/jmx/package-info.java
@@ -17,8 +17,5 @@
* under the License.
*/
-@Version("1.0.2")
+@org.osgi.annotation.versioning.Version("1.0.3")
package org.apache.sling.installer.api.jmx;
-
-import aQute.bnd.annotation.Version;
-
diff --git a/src/main/java/org/apache/sling/installer/api/package-info.java b/src/main/java/org/apache/sling/installer/api/package-info.java
index 87573d3..3873153 100644
--- a/src/main/java/org/apache/sling/installer/api/package-info.java
+++ b/src/main/java/org/apache/sling/installer/api/package-info.java
@@ -17,8 +17,7 @@
* under the License.
*/
-@Version("3.2.0")
+@org.osgi.annotation.versioning.Version("3.2.1")
package org.apache.sling.installer.api;
-import aQute.bnd.annotation.Version;
diff --git a/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java b/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java
index 0ba33cd..adcdff8 100644
--- a/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java
+++ b/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.installer.api.tasks;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* The install task factory creates a task for a given
diff --git a/src/main/java/org/apache/sling/installer/api/tasks/InstallationContext.java b/src/main/java/org/apache/sling/installer/api/tasks/InstallationContext.java
index d7be9fa..b23aa84 100644
--- a/src/main/java/org/apache/sling/installer/api/tasks/InstallationContext.java
+++ b/src/main/java/org/apache/sling/installer/api/tasks/InstallationContext.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.installer.api.tasks;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Context for the installation tasks.
diff --git a/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java b/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java
index f8b699e..66faef7 100644
--- a/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java
+++ b/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java
@@ -22,7 +22,7 @@
import java.io.InputStream;
import java.util.Dictionary;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* A resource that's been registered in the OSGi controller.
diff --git a/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java b/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java
index 296ba4f..d12cfa2 100644
--- a/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java
+++ b/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.installer.api.tasks;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* A resource transformer transform a registered resource
diff --git a/src/main/java/org/apache/sling/installer/api/tasks/RetryHandler.java b/src/main/java/org/apache/sling/installer/api/tasks/RetryHandler.java
index ea6d5f8..4480a12 100644
--- a/src/main/java/org/apache/sling/installer/api/tasks/RetryHandler.java
+++ b/src/main/java/org/apache/sling/installer/api/tasks/RetryHandler.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.installer.api.tasks;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The retry handler should be informed by external services
diff --git a/src/main/java/org/apache/sling/installer/api/tasks/TaskResource.java b/src/main/java/org/apache/sling/installer/api/tasks/TaskResource.java
index a6d7f11..cd81fff 100644
--- a/src/main/java/org/apache/sling/installer/api/tasks/TaskResource.java
+++ b/src/main/java/org/apache/sling/installer/api/tasks/TaskResource.java
@@ -18,10 +18,9 @@
*/
package org.apache.sling.installer.api.tasks;
+import org.osgi.annotation.versioning.ProviderType;
import org.osgi.framework.Version;
-import aQute.bnd.annotation.ProviderType;
-
/**
* A task resource is a registered resource which has been
diff --git a/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java b/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java
index 7c928a2..b0e9200 100644
--- a/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java
+++ b/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.installer.api.tasks;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* This is a group of resources all pointing to the same artifact,
diff --git a/src/main/java/org/apache/sling/installer/api/tasks/package-info.java b/src/main/java/org/apache/sling/installer/api/tasks/package-info.java
index 0d63906..acaa09f 100644
--- a/src/main/java/org/apache/sling/installer/api/tasks/package-info.java
+++ b/src/main/java/org/apache/sling/installer/api/tasks/package-info.java
@@ -17,8 +17,5 @@
* under the License.
*/
-@Version("1.3.4")
+@org.osgi.annotation.versioning.Version("1.3.5")
package org.apache.sling.installer.api.tasks;
-
-import aQute.bnd.annotation.Version;
-
diff --git a/src/main/java/org/apache/sling/installer/core/impl/AbstractInstallTask.java b/src/main/java/org/apache/sling/installer/core/impl/AbstractInstallTask.java
index 818d9fe..ae960d1 100644
--- a/src/main/java/org/apache/sling/installer/core/impl/AbstractInstallTask.java
+++ b/src/main/java/org/apache/sling/installer/core/impl/AbstractInstallTask.java
@@ -23,7 +23,6 @@
import org.apache.sling.installer.core.impl.tasks.TaskSupport;
import org.apache.sling.installer.core.impl.util.BundleRefresher;
import org.osgi.framework.BundleContext;
-import org.osgi.service.startlevel.StartLevel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -62,10 +61,6 @@
return this.support.getBundleRefresher();
}
- protected StartLevel getStartLevel() {
- return this.support.getStartLevel();
- }
-
protected TaskSupport getTaskSupport() {
return this.support;
}
diff --git a/src/main/java/org/apache/sling/installer/core/impl/BundleBlackList.java b/src/main/java/org/apache/sling/installer/core/impl/BundleBlackList.java
new file mode 100644
index 0000000..ef0c085
--- /dev/null
+++ b/src/main/java/org/apache/sling/installer/core/impl/BundleBlackList.java
@@ -0,0 +1,104 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.apache.sling.installer.core.impl;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Version;
+import org.osgi.framework.VersionRange;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class BundleBlackList {
+
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ public BundleBlackList(BundleContext bc) {
+ BufferedReader r = null;
+ try {
+ String launchpadFolder = bc.getProperty("sling.launchpad");
+
+ String filepath = launchpadFolder + File.separator + BOOTSTRAP_FILENAME;
+ logger.debug("Parsing {} for uninstall directives to be used as blacklist", filepath);
+
+ r = new BufferedReader(new FileReader(filepath));
+ getBlackListFromBootstrapFile(r);
+ } catch (IOException ignore) {
+ // ignore
+ } finally {
+ if (r != null) {
+ try {
+ r.close();
+ } catch (IOException ignore) {
+ // ignore
+ }
+ }
+ }
+ }
+
+ /**
+ * The name of the bootstrap commands file
+ */
+ public static final String BOOTSTRAP_FILENAME = "sling_bootstrap.txt";
+
+ /**
+ * Prefix for uninstalls in command files
+ */
+ private static String UNINSTALL_PREFIX = "uninstall ";
+
+ private Map<String, VersionRange> blacklistMap = new HashMap<String, VersionRange>();
+
+ private void getBlackListFromBootstrapFile(BufferedReader r) throws IOException {
+ String line = null;
+ while ((line = r.readLine()) != null) {
+ line = line.trim();
+ String bundleSymbolicName = null;
+ VersionRange versionRange = null;
+ if (line.length() > 0 && line.startsWith(UNINSTALL_PREFIX)) {
+ final String[] s = line.split(" ");
+ extractBlackList(bundleSymbolicName, versionRange, s, 1, 2);
+ }
+ }
+
+ }
+
+ public boolean isBlacklisted(String symbolicName, Version version) {
+ if (blacklistMap.containsKey(symbolicName)) {
+ VersionRange range = blacklistMap.get(symbolicName);
+ return (range == null) || range.includes(version);
+ }
+ return false;
+ }
+
+ private void extractBlackList(String bundleSymbolicName, VersionRange versionRange, final String[] s, int posSymbolicName, int posVersionRange) {
+ if (s.length > posSymbolicName) {
+ bundleSymbolicName = s[posSymbolicName].trim();
+ }
+ if (s.length > posVersionRange) {
+ versionRange = new VersionRange(s[posVersionRange].trim());
+ }
+ blacklistMap.put(bundleSymbolicName, versionRange);
+ }
+}
diff --git a/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java b/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java
index 0d4caa9..4478ece 100644
--- a/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java
+++ b/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java
@@ -25,6 +25,7 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedList;
import java.util.List;
import java.util.Set;
@@ -158,6 +159,20 @@
}
return null;
}
+
+ /**
+ * Return an iterator containing all active resources in the group
+ */
+ public Iterator<TaskResource> getActiveResourceIterator(){
+ synchronized ( lock ) {
+ if ( this.getActiveResource() != null && this.resources.size() > 1 ) {
+ final List<TaskResource> taskResourceList = new LinkedList<TaskResource>(this.resources);
+ return taskResourceList.iterator();
+ }
+ }
+ return null;
+ }
+
/**
* Return the first resource or null
*/
diff --git a/src/main/java/org/apache/sling/installer/core/impl/InstallerMBeanImpl.java b/src/main/java/org/apache/sling/installer/core/impl/InstallerMBeanImpl.java
index f13c1d7..55c0645 100644
--- a/src/main/java/org/apache/sling/installer/core/impl/InstallerMBeanImpl.java
+++ b/src/main/java/org/apache/sling/installer/core/impl/InstallerMBeanImpl.java
@@ -35,6 +35,7 @@
//~---------------------------------------< InstallationListener >
+ @Override
public void onEvent(InstallationEvent event) {
switch (event.getType()) {
case STARTED:
@@ -43,24 +44,31 @@
case SUSPENDED:
active = false;
break;
+ default:
+ // nothing to do
+ break;
}
lastEventTime = System.currentTimeMillis();
}
//~----------------------------------------< InstallerMBean >
+ @Override
public int getActiveResourceCount() {
return infoProvider.getInstallationState().getActiveResources().size();
}
+ @Override
public int getInstalledResourceCount() {
return infoProvider.getInstallationState().getInstalledResources().size();
}
+ @Override
public boolean isActive() {
return active;
}
+ @Override
public long getSuspendedSince() {
return active ? -1 : lastEventTime;
}
diff --git a/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleInstallTask.java b/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleInstallTask.java
index 8c2f3d2..7127e0a 100644
--- a/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleInstallTask.java
+++ b/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleInstallTask.java
@@ -22,7 +22,7 @@
import org.apache.sling.installer.api.tasks.ResourceState;
import org.apache.sling.installer.api.tasks.TaskResourceGroup;
import org.osgi.framework.Bundle;
-import org.osgi.service.startlevel.StartLevel;
+import org.osgi.framework.startlevel.BundleStartLevel;
/**
* Install a bundle supplied as a RegisteredResource.
@@ -48,15 +48,9 @@
ctx.log("Installed bundle {} from resource {}", b, getResource());
// optionally set the start level
if ( startLevel > 0 ) {
- // get the start level service (if possible) so we can set the initial start level
- final StartLevel startLevelService = this.getStartLevel();
- if (startLevelService != null) {
- startLevelService.setBundleStartLevel(b, startLevel);
- ctx.log("Set start level for bundle {} to {}", b, startLevel);
- } else {
- this.getLogger().info("Ignoring start level {} for bundle {} - start level service not available.",
- startLevel, b);
- }
+ final BundleStartLevel startLevelService = b.adapt(BundleStartLevel.class);
+ startLevelService.setStartLevel(startLevel);
+ ctx.log("Set start level for bundle {} to {}", b, startLevel);
}
// fragment?
diff --git a/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java b/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java
index 48ce123..9744f3a 100644
--- a/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java
+++ b/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java
@@ -18,6 +18,8 @@
*/
package org.apache.sling.installer.core.impl.tasks;
+import java.util.Iterator;
+
import org.apache.sling.installer.api.InstallableResource;
import org.apache.sling.installer.api.ResourceChangeListener;
import org.apache.sling.installer.api.tasks.ChangeStateTask;
@@ -27,8 +29,11 @@
import org.apache.sling.installer.api.tasks.RetryHandler;
import org.apache.sling.installer.api.tasks.TaskResource;
import org.apache.sling.installer.api.tasks.TaskResourceGroup;
+import org.apache.sling.installer.core.impl.BundleBlackList;
+import org.apache.sling.installer.core.impl.EntityResourceList;
import org.apache.sling.installer.core.impl.InternalService;
import org.apache.sling.installer.core.impl.PersistentResourceList;
+import org.apache.sling.installer.core.impl.RegisteredResourceImpl;
import org.apache.sling.installer.core.impl.Util;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
@@ -63,9 +68,12 @@
/** The retry handler. */
private RetryHandler retryHandler;
+ private BundleBlackList bundleBlacklist;
+
/**
* @see org.apache.sling.installer.core.impl.InternalService#init(org.osgi.framework.BundleContext, org.apache.sling.installer.api.ResourceChangeListener, RetryHandler)
*/
+ @Override
public void init(final BundleContext bc, final ResourceChangeListener listener, final RetryHandler retryHandler) {
this.bundleContext = bc;
this.retryHandler = retryHandler;
@@ -74,18 +82,19 @@
this.bundleContext.addFrameworkListener(this);
this.taskSupport = new TaskSupport(bc);
+ this.bundleBlacklist = new BundleBlackList(bc);
}
/**
* @see org.apache.sling.installer.core.impl.InternalService#deactivate()
*/
+ @Override
public void deactivate() {
if ( this.bundleContext != null ) {
this.bundleContext.removeBundleListener(this);
this.bundleContext.removeFrameworkListener(this);
}
if ( this.taskSupport != null ) {
- this.taskSupport.deactivate();
this.taskSupport = null;
}
}
@@ -93,6 +102,7 @@
/**
* @see org.osgi.framework.FrameworkListener#frameworkEvent(org.osgi.framework.FrameworkEvent)
*/
+ @Override
public void frameworkEvent(final FrameworkEvent event) {
if ( event.getType() == FrameworkEvent.PACKAGES_REFRESHED ) {
logger.debug("Received FrameworkEvent triggering a retry of the installer: {}", event);
@@ -103,6 +113,7 @@
/**
* @see org.osgi.framework.BundleListener#bundleChanged(org.osgi.framework.BundleEvent)
*/
+ @Override
public void bundleChanged(final BundleEvent event) {
final int t = event.getType();
if (t == BundleEvent.INSTALLED || t == BundleEvent.RESOLVED || t == BundleEvent.STARTED || t == BundleEvent.UPDATED) {
@@ -114,6 +125,7 @@
/**
* @see org.apache.sling.installer.core.impl.InternalService#getDescription()
*/
+ @Override
public String getDescription() {
return "Apache Sling Bundle Install Task Factory";
}
@@ -123,7 +135,8 @@
*
* @see org.apache.sling.installer.api.tasks.InstallTaskFactory#createTask(org.apache.sling.installer.api.tasks.TaskResourceGroup)
*/
- public InstallTask createTask(final TaskResourceGroup resourceList) {
+ @Override
+ public InstallTask createTask(final TaskResourceGroup resourceList) {
// quick check of the resource type.
final TaskResource toActivate = resourceList.getActiveResource();
if ( toActivate.getType().equals(PersistentResourceList.RESTART_ACTIVE_BUNDLES_TYPE) ) {
@@ -160,7 +173,20 @@
if ( info != null ) {
// if this is an uninstall, check if we have to install an older version
// in this case we should do an update instead of uninstall/install (!)
- final TaskResource second = resourceList.getNextActiveResource();
+ Iterator<TaskResource> candidatesIt = ((EntityResourceList)resourceList).getActiveResourceIterator();
+ TaskResource second = null;
+ while (candidatesIt != null && second == null && candidatesIt.hasNext()) {
+ TaskResource candidate = candidatesIt.next();
+ boolean sameVersion = toActivate.getVersion().equals(candidate.getVersion());
+ if (!sameVersion) {
+ if (bundleBlacklist.isBlacklisted(symbolicName, candidate.getVersion())) {
+ // blaklisted candidates should be uninstalled to no longer be taken into account anymore
+ ((RegisteredResourceImpl)candidate).setState(ResourceState.UNINSTALL);
+ } else {
+ second = candidate;
+ }
+ }
+ }
if ( second != null &&
( second.getState() == ResourceState.IGNORED || second.getState() == ResourceState.INSTALLED || second.getState() == ResourceState.INSTALL ) ) {
second.setAttribute(FORCE_INSTALL_VERSION, info.version.toString());
@@ -195,8 +221,14 @@
new String[] {InstallTask.ASYNC_ATTR_NAME});
}
} else {
- // for install and update, we want the bundle with the highest version
- final BundleInfo info = this.getBundleInfo(symbolicName, null);
+ final Version newVersion = new Version((String) toActivate.getAttribute(Constants.BUNDLE_VERSION));
+ if (bundleBlacklist.isBlacklisted(symbolicName, newVersion)) {
+ result = new ChangeStateTask(resourceList, ResourceState.IGNORED);
+ } else {
+
+ // for install and update, we want the bundle with the
+ // highest version
+ final BundleInfo info = this.getBundleInfo(symbolicName, null);
// check if we should start the bundle as we installed it in the previous run
if (info == null) {
@@ -207,7 +239,6 @@
} else {
boolean doUpdate = false;
- final Version newVersion = new Version((String)toActivate.getAttribute(Constants.BUNDLE_VERSION));
final int compare = info.version.compareTo(newVersion);
if (compare < 0) {
// installed version is lower -> update
@@ -243,6 +274,7 @@
} else {
logger.debug("Nothing to install for {}, same version {} already installed.", toActivate, newVersion);
result = new ChangeStateTask(resourceList, ResourceState.IGNORED);
+ }
}
}
}
diff --git a/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java b/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java
index 45809cd..fec9d98 100644
--- a/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java
+++ b/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java
@@ -24,7 +24,7 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
import org.osgi.framework.Version;
-import org.osgi.service.startlevel.StartLevel;
+import org.osgi.framework.startlevel.BundleStartLevel;
/** Update a bundle from a RegisteredResource. Creates
* a bundleStartTask to restart the bundle if it was
@@ -49,8 +49,8 @@
if ( BundleUtil.isBundleActive(b) ) {
return true;
}
- final StartLevel startLevelService = this.getStartLevel();
- return startLevelService.isBundlePersistentlyStarted(b);
+ final BundleStartLevel startLevelService = b.adapt(BundleStartLevel.class);
+ return startLevelService.isPersistentlyStarted();
}
/**
@@ -70,7 +70,7 @@
// Do not update if same version, unless snapshot
boolean snapshot = false;
- final Version currentVersion = new Version((String)b.getHeaders().get(Constants.BUNDLE_VERSION));
+ final Version currentVersion = new Version(b.getHeaders().get(Constants.BUNDLE_VERSION));
snapshot = BundleInfo.isSnapshot(newVersion);
if (currentVersion.equals(newVersion) && !snapshot) {
// TODO : Isn't this already checked in the task creator?
@@ -95,14 +95,12 @@
// start level handling - after update to avoid starting the bundle
// just before the update
- final StartLevel startLevelService = this.getStartLevel();
- if ( startLevelService != null ) {
- final int newStartLevel = this.getBundleStartLevel();
- final int oldStartLevel = startLevelService.getBundleStartLevel(b);
- if ( newStartLevel != oldStartLevel && newStartLevel != 0 ) {
- startLevelService.setBundleStartLevel(b, newStartLevel);
- ctx.log("Set start level for bundle {} to {}", b, newStartLevel);
- }
+ final BundleStartLevel startLevelService = b.adapt(BundleStartLevel.class);
+ final int newStartLevel = this.getBundleStartLevel();
+ final int oldStartLevel = startLevelService.getStartLevel();
+ if ( newStartLevel != oldStartLevel && newStartLevel != 0 ) {
+ startLevelService.setStartLevel(newStartLevel);
+ ctx.log("Set start level for bundle {} to {}", b, newStartLevel);
}
if (reactivate) {
diff --git a/src/main/java/org/apache/sling/installer/core/impl/tasks/TaskSupport.java b/src/main/java/org/apache/sling/installer/core/impl/tasks/TaskSupport.java
index 18297f3..ec3d793 100644
--- a/src/main/java/org/apache/sling/installer/core/impl/tasks/TaskSupport.java
+++ b/src/main/java/org/apache/sling/installer/core/impl/tasks/TaskSupport.java
@@ -19,84 +19,29 @@
package org.apache.sling.installer.core.impl.tasks;
import org.apache.sling.installer.core.impl.util.BundleRefresher;
-import org.apache.sling.installer.core.impl.util.PABundleRefresher;
import org.apache.sling.installer.core.impl.util.WABundleRefresher;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.wiring.FrameworkWiring;
-import org.osgi.service.packageadmin.PackageAdmin;
-import org.osgi.service.startlevel.StartLevel;
-import org.osgi.util.tracker.ServiceTracker;
/**
* Support class for the tasks.
*/
public class TaskSupport {
- /** Interface of the package admin */
- private static String PACKAGE_ADMIN_NAME = PackageAdmin.class.getName();
-
- /** Interface of the start level */
- private static String START_LEVEL_NAME = StartLevel.class.getName();
-
- /** Tracker for the package admin. */
- private final ServiceTracker packageAdminTracker;
-
- /** Tracker for the start level service. */
- private final ServiceTracker startLevelTracker;
-
/** The bundle context. */
private final BundleContext bundleContext;
- /** Checked for wire admin? */
- private Boolean checkedWireAdmin;
-
public TaskSupport(final BundleContext bc) {
this.bundleContext = bc;
-
- // create and start tracker
- this.packageAdminTracker = new ServiceTracker(bc, PACKAGE_ADMIN_NAME, null);
- this.packageAdminTracker.open();
- this.startLevelTracker = new ServiceTracker(bc, START_LEVEL_NAME, null);
- this.startLevelTracker.open();
- }
-
- /**
- * Deactivate this helper.
- */
- public void deactivate() {
- if ( this.packageAdminTracker != null ) {
- this.packageAdminTracker.close();
- }
- if ( this.startLevelTracker != null ) {
- this.startLevelTracker.close();
- }
}
public BundleContext getBundleContext() {
return this.bundleContext;
}
- public StartLevel getStartLevel() {
- return (StartLevel) this.startLevelTracker.getService();
- }
-
public BundleRefresher getBundleRefresher() {
- if ( checkedWireAdmin == null ) {
- try {
- this.bundleContext.getBundle(Constants.SYSTEM_BUNDLE_LOCATION).adapt(FrameworkWiring.class);
- checkedWireAdmin = true;
- } catch (final Throwable t) {
- checkedWireAdmin = false;
- }
- }
- if ( checkedWireAdmin.booleanValue() ) {
- return new WABundleRefresher(this.bundleContext.getBundle(Constants.SYSTEM_BUNDLE_LOCATION).adapt(FrameworkWiring.class),
- this.bundleContext);
- } else {
- return new PABundleRefresher((PackageAdmin) this.packageAdminTracker.getService(),
- this.bundleContext);
- }
+ return new WABundleRefresher(this.bundleContext.getBundle(Constants.SYSTEM_BUNDLE_LOCATION).adapt(FrameworkWiring.class),
+ this.bundleContext);
}
-
}
diff --git a/src/main/java/org/apache/sling/installer/core/impl/util/PABundleRefresher.java b/src/main/java/org/apache/sling/installer/core/impl/util/PABundleRefresher.java
deleted file mode 100644
index 64b8c1e..0000000
--- a/src/main/java/org/apache/sling/installer/core/impl/util/PABundleRefresher.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT 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.apache.sling.installer.core.impl.util;
-
-import java.util.List;
-
-import org.apache.sling.installer.api.tasks.InstallationContext;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkEvent;
-import org.osgi.framework.FrameworkListener;
-import org.osgi.service.packageadmin.PackageAdmin;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Implementation using the package admin
- */
-public class PABundleRefresher implements BundleRefresher, FrameworkListener {
-
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
- /** Max time allowed to refresh packages */
- private static final int MAX_REFRESH_PACKAGES_WAIT_SECONDS = 90;
-
- /** Counter for package refresh events. */
- private volatile long refreshEventCount;
-
- private final PackageAdmin pckAdmin;
- private final RefreshDependenciesUtil rdu;
- private final BundleContext bundleContext;
-
- /** Lock object for syncing. */
- private final Object lock = new Object();
-
- public PABundleRefresher(final PackageAdmin pa, final BundleContext bundleContext) {
- this.pckAdmin = pa;
- this.bundleContext = bundleContext;
- this.rdu = new RefreshDependenciesUtil(pa);
- }
-
- /**
- * @see org.apache.sling.installer.core.impl.util.BundleRefresher#refreshBundles(org.apache.sling.installer.api.tasks.InstallationContext, java.util.List, boolean)
- */
- public void refreshBundles(final InstallationContext ctx,
- final List<Bundle> bundles,
- final boolean wait) {
- if ( bundles == null || bundles.size() > 0 ) {
- if ( bundles == null ) {
- ctx.log("Full package refreshing");
- } else {
- ctx.log("Refreshing {} bundles: {}", bundles.size(), bundles);
- }
- if ( !wait ) {
- this.pckAdmin.refreshPackages(bundles == null ? null : bundles.toArray(new Bundle[bundles.size()]));
- } else {
- this.refreshEventCount = -1;
- this.bundleContext.addFrameworkListener(this);
- try {
- this.refreshEventCount = 0;
- this.pckAdmin.refreshPackages(bundles == null ? null : bundles.toArray(new Bundle[bundles.size()]));
- final long end = System.currentTimeMillis() + (MAX_REFRESH_PACKAGES_WAIT_SECONDS * 1000);
- do {
- synchronized ( this.lock ) {
- final long waitTime = end - System.currentTimeMillis();
- if ( this.refreshEventCount < 1 && waitTime > 0 ) {
- try {
- ctx.log("Waiting up to {} seconds for bundles refresh", MAX_REFRESH_PACKAGES_WAIT_SECONDS);
- this.lock.wait(waitTime);
- } catch (final InterruptedException ignore) {
- // ignore
- }
- if ( end <= System.currentTimeMillis() && this.refreshEventCount < 1 ) {
- logger.warn("No FrameworkEvent.PACKAGES_REFRESHED event received within {}"
- + " seconds after refresh, aborting wait.",
- MAX_REFRESH_PACKAGES_WAIT_SECONDS);
- this.refreshEventCount++;
- }
- }
- }
- } while ( this.refreshEventCount < 1);
- } finally {
- this.bundleContext.removeFrameworkListener(this);
- }
- }
- if ( bundles == null ) {
- ctx.log("Done full package refresh");
- } else {
- ctx.log("Done refreshing {} bundles", bundles.size());
- }
- }
- }
-
- /**
- * Check whether a bundle refresh would affect the installer bundle
- * @see org.apache.sling.installer.core.impl.util.BundleRefresher#isInstallerBundleAffected(java.util.List)
- */
- public boolean isInstallerBundleAffected(final List<Bundle> bundles) {
- return rdu.isBundleAffected(bundleContext.getBundle(), bundles);
- }
-
- /**
- * @see org.osgi.framework.FrameworkListener#frameworkEvent(org.osgi.framework.FrameworkEvent)
- */
- public void frameworkEvent(final FrameworkEvent event) {
- if (event.getType() == FrameworkEvent.PACKAGES_REFRESHED) {
- logger.debug("FrameworkEvent.PACKAGES_REFRESHED");
- synchronized (this.lock) {
- this.refreshEventCount++;
- this.lock.notify();
- }
- }
- }
-}
\ No newline at end of file
diff --git a/src/main/java/org/osgi/framework/Bundle.java b/src/main/java/org/osgi/framework/Bundle.java
deleted file mode 100644
index b7cf15c..0000000
--- a/src/main/java/org/osgi/framework/Bundle.java
+++ /dev/null
@@ -1,1215 +0,0 @@
-/*
- * Copyright (c) OSGi Alliance (2000, 2009). 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.framework;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.Map;
-
-/**
- * An installed bundle in the Framework.
- *
- * <p>
- * A <code>Bundle</code> object is the access point to define the lifecycle of
- * an installed bundle. Each bundle installed in the OSGi environment must have
- * an associated <code>Bundle</code> object.
- *
- * <p>
- * A bundle must have a unique identity, a <code>long</code>, chosen by the
- * Framework. This identity must not change during the lifecycle of a bundle,
- * even when the bundle is updated. Uninstalling and then reinstalling the
- * bundle must create a new unique identity.
- *
- * <p>
- * A bundle can be in one of six states:
- * <ul>
- * <li>{@link #UNINSTALLED}
- * <li>{@link #INSTALLED}
- * <li>{@link #RESOLVED}
- * <li>{@link #STARTING}
- * <li>{@link #STOPPING}
- * <li>{@link #ACTIVE}
- * </ul>
- * <p>
- * Values assigned to these states have no specified ordering; they represent
- * bit values that may be ORed together to determine if a bundle is in one of
- * the valid states.
- *
- * <p>
- * A bundle should only execute code when its state is one of
- * <code>STARTING</code>,<code>ACTIVE</code>, or <code>STOPPING</code>.
- * An <code>UNINSTALLED</code> bundle can not be set to another state; it is a
- * zombie and can only be reached because references are kept somewhere.
- *
- * <p>
- * The Framework is the only entity that is allowed to create
- * <code>Bundle</code> objects, and these objects are only valid within the
- * Framework that created them.
- *
- * @ThreadSafe
- * @version $Revision$
- */
-public interface Bundle {
- /**
- * The bundle is uninstalled and may not be used.
- *
- * <p>
- * The <code>UNINSTALLED</code> state is only visible after a bundle is
- * uninstalled; the bundle is in an unusable state but references to the
- * <code>Bundle</code> object may still be available and used for
- * introspection.
- * <p>
- * The value of <code>UNINSTALLED</code> is 0x00000001.
- */
- public static final int UNINSTALLED = 0x00000001;
-
- /**
- * The bundle is installed but not yet resolved.
- *
- * <p>
- * A bundle is in the <code>INSTALLED</code> state when it has been
- * installed in the Framework but is not or cannot be resolved.
- * <p>
- * This state is visible if the bundle's code dependencies are not resolved.
- * The Framework may attempt to resolve an <code>INSTALLED</code> bundle's
- * code dependencies and move the bundle to the <code>RESOLVED</code>
- * state.
- * <p>
- * The value of <code>INSTALLED</code> is 0x00000002.
- */
- public static final int INSTALLED = 0x00000002;
-
- /**
- * The bundle is resolved and is able to be started.
- *
- * <p>
- * A bundle is in the <code>RESOLVED</code> state when the Framework has
- * successfully resolved the bundle's code dependencies. These dependencies
- * include:
- * <ul>
- * <li>The bundle's class path from its {@link Constants#BUNDLE_CLASSPATH}
- * Manifest header.
- * <li>The bundle's package dependencies from its
- * {@link Constants#EXPORT_PACKAGE} and {@link Constants#IMPORT_PACKAGE}
- * Manifest headers.
- * <li>The bundle's required bundle dependencies from its
- * {@link Constants#REQUIRE_BUNDLE} Manifest header.
- * <li>A fragment bundle's host dependency from its
- * {@link Constants#FRAGMENT_HOST} Manifest header.
- * </ul>
- * <p>
- * Note that the bundle is not active yet. A bundle must be put in the
- * <code>RESOLVED</code> state before it can be started. The Framework may
- * attempt to resolve a bundle at any time.
- * <p>
- * The value of <code>RESOLVED</code> is 0x00000004.
- */
- public static final int RESOLVED = 0x00000004;
-
- /**
- * The bundle is in the process of starting.
- *
- * <p>
- * A bundle is in the <code>STARTING</code> state when its
- * {@link #start(int) start} method is active. A bundle must be in this
- * state when the bundle's {@link BundleActivator#start} is called. If the
- * <code>BundleActivator.start</code> method completes without exception,
- * then the bundle has successfully started and must move to the
- * <code>ACTIVE</code> state.
- * <p>
- * If the bundle has a
- * {@link Constants#ACTIVATION_LAZY lazy activation policy}, then the
- * bundle may remain in this state for some time until the activation is
- * triggered.
- * <p>
- * The value of <code>STARTING</code> is 0x00000008.
- */
- public static final int STARTING = 0x00000008;
-
- /**
- * The bundle is in the process of stopping.
- *
- * <p>
- * A bundle is in the <code>STOPPING</code> state when its
- * {@link #stop(int) stop} method is active. A bundle must be in this state
- * when the bundle's {@link BundleActivator#stop} method is called. When the
- * <code>BundleActivator.stop</code> method completes the bundle is
- * stopped and must move to the <code>RESOLVED</code> state.
- * <p>
- * The value of <code>STOPPING</code> is 0x00000010.
- */
- public static final int STOPPING = 0x00000010;
-
- /**
- * The bundle is now running.
- *
- * <p>
- * A bundle is in the <code>ACTIVE</code> state when it has been
- * successfully started and activated.
- * <p>
- * The value of <code>ACTIVE</code> is 0x00000020.
- */
- public static final int ACTIVE = 0x00000020;
-
- /**
- * The bundle start operation is transient and the persistent autostart
- * setting of the bundle is not modified.
- *
- * <p>
- * This bit may be set when calling {@link #start(int)} to notify the
- * framework that the autostart setting of the bundle must not be modified.
- * If this bit is not set, then the autostart setting of the bundle is
- * modified.
- *
- * @since 1.4
- * @see #start(int)
- */
- public static final int START_TRANSIENT = 0x00000001;
-
- /**
- * The bundle start operation must activate the bundle according to the
- * bundle's declared
- * {@link Constants#BUNDLE_ACTIVATIONPOLICY activation policy}.
- *
- * <p>
- * This bit may be set when calling {@link #start(int)} to notify the
- * framework that the bundle must be activated using the bundle's declared
- * activation policy.
- *
- * @since 1.4
- * @see Constants#BUNDLE_ACTIVATIONPOLICY
- * @see #start(int)
- */
- public static final int START_ACTIVATION_POLICY = 0x00000002;
-
- /**
- * The bundle stop is transient and the persistent autostart setting of the
- * bundle is not modified.
- *
- * <p>
- * This bit may be set when calling {@link #stop(int)} to notify the
- * framework that the autostart setting of the bundle must not be modified.
- * If this bit is not set, then the autostart setting of the bundle is
- * modified.
- *
- * @since 1.4
- * @see #stop(int)
- */
- public static final int STOP_TRANSIENT = 0x00000001;
-
- /**
- * Request that all certificates used to sign the bundle be returned.
- *
- * @since 1.5
- * @see #getSignerCertificates(int)
- */
- public final static int SIGNERS_ALL = 1;
-
- /**
- * Request that only certificates used to sign the bundle that are trusted
- * by the framework be returned.
- *
- * @since 1.5
- * @see #getSignerCertificates(int)
- */
- public final static int SIGNERS_TRUSTED = 2;
-
- /**
- * Returns this bundle's current state.
- *
- * <p>
- * A bundle can be in only one state at any time.
- *
- * @return An element of <code>UNINSTALLED</code>,<code>INSTALLED</code>,
- * <code>RESOLVED</code>,<code>STARTING</code>,
- * <code>STOPPING</code>,<code>ACTIVE</code>.
- */
- public int getState();
-
- /**
- * Starts this bundle.
- *
- * <p>
- * If this bundle's state is <code>UNINSTALLED</code> then an
- * <code>IllegalStateException</code> is thrown.
- * <p>
- * If the Framework implements the optional Start Level service and the
- * current start level is less than this bundle's start level:
- * <ul>
- * <li>If the {@link #START_TRANSIENT} option is set, then a
- * <code>BundleException</code> is thrown indicating this bundle cannot be
- * started due to the Framework's current start level.
- *
- * <li>Otherwise, the Framework must set this bundle's persistent autostart
- * setting to <em>Started with declared activation</em> if the
- * {@link #START_ACTIVATION_POLICY} option is set or
- * <em>Started with eager activation</em> if not set.
- * </ul>
- * <p>
- * When the Framework's current start level becomes equal to or more than
- * this bundle's start level, this bundle will be started.
- * <p>
- * Otherwise, the following steps are required to start this bundle:
- * <ol>
- * <li>If this bundle is in the process of being activated or deactivated
- * then this method must wait for activation or deactivation to complete
- * before continuing. If this does not occur in a reasonable time, a
- * <code>BundleException</code> is thrown to indicate this bundle was unable
- * to be started.
- *
- * <li>If this bundle's state is <code>ACTIVE</code> then this method
- * returns immediately.
- *
- * <li>If the {@link #START_TRANSIENT} option is not set then set this
- * bundle's autostart setting to <em>Started with declared activation</em>
- * if the {@link #START_ACTIVATION_POLICY} option is set or
- * <em>Started with eager activation</em> if not set. When the Framework is
- * restarted and this bundle's autostart setting is not <em>Stopped</em>,
- * this bundle must be automatically started.
- *
- * <li>If this bundle's state is not <code>RESOLVED</code>, an attempt is
- * made to resolve this bundle. If the Framework cannot resolve this bundle,
- * a <code>BundleException</code> is thrown.
- *
- * <li>If the {@link #START_ACTIVATION_POLICY} option is set and this
- * bundle's declared activation policy is {@link Constants#ACTIVATION_LAZY
- * lazy} then:
- * <ul>
- * <li>If this bundle's state is <code>STARTING</code> then this method
- * returns immediately.
- * <li>This bundle's state is set to <code>STARTING</code>.
- * <li>A bundle event of type {@link BundleEvent#LAZY_ACTIVATION} is fired.
- * <li>This method returns immediately and the remaining steps will be
- * followed when this bundle's activation is later triggered.
- * </ul>
- * <i></i>
- * <li>This bundle's state is set to <code>STARTING</code>.
- *
- * <li>A bundle event of type {@link BundleEvent#STARTING} is fired.
- *
- * <li>The {@link BundleActivator#start} method of this bundle's
- * <code>BundleActivator</code>, if one is specified, is called. If the
- * <code>BundleActivator</code> is invalid or throws an exception then:
- * <ul>
- * <li>This bundle's state is set to <code>STOPPING</code>.
- * <li>A bundle event of type {@link BundleEvent#STOPPING} is fired.
- * <li>Any services registered by this bundle must be unregistered.
- * <li>Any services used by this bundle must be released.
- * <li>Any listeners registered by this bundle must be removed.
- * <li>This bundle's state is set to <code>RESOLVED</code>.
- * <li>A bundle event of type {@link BundleEvent#STOPPED} is fired.
- * <li>A <code>BundleException</code> is then thrown.
- * </ul>
- * <i></i>
- * <li>If this bundle's state is <code>UNINSTALLED</code>, because this
- * bundle was uninstalled while the <code>BundleActivator.start</code>
- * method was running, a <code>BundleException</code> is thrown.
- *
- * <li>This bundle's state is set to <code>ACTIVE</code>.
- *
- * <li>A bundle event of type {@link BundleEvent#STARTED} is fired.
- * </ol>
- *
- * <b>Preconditions </b>
- * <ul>
- * <li><code>getState()</code> in { <code>INSTALLED</code>,
- * <code>RESOLVED</code> } or { <code>INSTALLED</code>,
- * <code>RESOLVED</code>, <code>STARTING</code> } if this bundle has
- * a lazy activation policy.
- * </ul>
- * <b>Postconditions, no exceptions thrown </b>
- * <ul>
- * <li>Bundle autostart setting is modified unless the
- * {@link #START_TRANSIENT} option was set.
- * <li><code>getState()</code> in { <code>ACTIVE</code> }
- * unless the lazy activation policy was used.
- * <li><code>BundleActivator.start()</code> has been called and did not
- * throw an exception unless the lazy activation policy was used.
- * </ul>
- * <b>Postconditions, when an exception is thrown </b>
- * <ul>
- * <li>Depending on when the exception occurred, bundle autostart setting is
- * modified unless the {@link #START_TRANSIENT} option was set.
- * <li><code>getState()</code> not in { <code>STARTING</code>,
- * <code>ACTIVE</code> }.
- * </ul>
- *
- * @param options The options for starting this bundle. See
- * {@link #START_TRANSIENT} and {@link #START_ACTIVATION_POLICY}. The
- * Framework must ignore unrecognized options.
- * @throws BundleException If this bundle could not be started. This could
- * be because a code dependency could not be resolved or the
- * specified <code>BundleActivator</code> could not be loaded or
- * threw an exception or this bundle is a fragment.
- * @throws IllegalStateException If this bundle has been uninstalled or this
- * bundle tries to change its own state.
- * @throws SecurityException If the caller does not have the appropriate
- * <code>AdminPermission[this,EXECUTE]</code>, and the Java Runtime
- * Environment supports permissions.
- * @since 1.4
- */
- public void start(int options) throws BundleException;
-
- /**
- * Starts this bundle with no options.
- *
- * <p>
- * This method performs the same function as calling <code>start(0)</code>.
- *
- * @throws BundleException If this bundle could not be started. This could
- * be because a code dependency could not be resolved or the
- * specified <code>BundleActivator</code> could not be loaded or
- * threw an exception or this bundle is a fragment.
- * @throws IllegalStateException If this bundle has been uninstalled or this
- * bundle tries to change its own state.
- * @throws SecurityException If the caller does not have the appropriate
- * <code>AdminPermission[this,EXECUTE]</code>, and the Java Runtime
- * Environment supports permissions.
- * @see #start(int)
- */
- public void start() throws BundleException;
-
- /**
- * Stops this bundle.
- *
- * <p>
- * The following steps are required to stop a bundle:
- * <ol>
- * <li>If this bundle's state is <code>UNINSTALLED</code> then an
- * <code>IllegalStateException</code> is thrown.
- *
- * <li>If this bundle is in the process of being activated or deactivated
- * then this method must wait for activation or deactivation to complete
- * before continuing. If this does not occur in a reasonable time, a
- * <code>BundleException</code> is thrown to indicate this bundle was unable
- * to be stopped.
- * <li>If the {@link #STOP_TRANSIENT} option is not set then then set this
- * bundle's persistent autostart setting to to <em>Stopped</em>. When the
- * Framework is restarted and this bundle's autostart setting is
- * <em>Stopped</em>, this bundle must not be automatically started.
- *
- * <li>If this bundle's state is not <code>STARTING</code> or
- * <code>ACTIVE</code> then this method returns immediately.
- *
- * <li>This bundle's state is set to <code>STOPPING</code>.
- *
- * <li>A bundle event of type {@link BundleEvent#STOPPING} is fired.
- *
- * <li>If this bundle's state was <code>ACTIVE</code> prior to setting the
- * state to <code>STOPPING</code>, the {@link BundleActivator#stop} method
- * of this bundle's <code>BundleActivator</code>, if one is specified, is
- * called. If that method throws an exception, this method must continue to
- * stop this bundle and a <code>BundleException</code> must be thrown after
- * completion of the remaining steps.
- *
- * <li>Any services registered by this bundle must be unregistered.
- * <li>Any services used by this bundle must be released.
- * <li>Any listeners registered by this bundle must be removed.
- *
- * <li>If this bundle's state is <code>UNINSTALLED</code>, because this
- * bundle was uninstalled while the <code>BundleActivator.stop</code> method
- * was running, a <code>BundleException</code> must be thrown.
- *
- * <li>This bundle's state is set to <code>RESOLVED</code>.
- *
- * <li>A bundle event of type {@link BundleEvent#STOPPED} is fired.
- * </ol>
- *
- * <b>Preconditions </b>
- * <ul>
- * <li><code>getState()</code> in { <code>ACTIVE</code> }.
- * </ul>
- * <b>Postconditions, no exceptions thrown </b>
- * <ul>
- * <li>Bundle autostart setting is modified unless the
- * {@link #STOP_TRANSIENT} option was set.
- * <li><code>getState()</code> not in { <code>ACTIVE</code>,
- * <code>STOPPING</code> }.
- * <li><code>BundleActivator.stop</code> has been called and did not throw
- * an exception.
- * </ul>
- * <b>Postconditions, when an exception is thrown </b>
- * <ul>
- * <li>Bundle autostart setting is modified unless the
- * {@link #STOP_TRANSIENT} option was set.
- * </ul>
- *
- * @param options The options for stoping this bundle. See
- * {@link #STOP_TRANSIENT}. The Framework must ignore unrecognized
- * options.
- * @throws BundleException If this bundle's <code>BundleActivator</code>
- * threw an exception or this bundle is a fragment.
- * @throws IllegalStateException If this bundle has been uninstalled or this
- * bundle tries to change its own state.
- * @throws SecurityException If the caller does not have the appropriate
- * <code>AdminPermission[this,EXECUTE]</code>, and the Java Runtime
- * Environment supports permissions.
- * @since 1.4
- */
- public void stop(int options) throws BundleException;
-
- /**
- * Stops this bundle with no options.
- *
- * <p>
- * This method performs the same function as calling <code>stop(0)</code>.
- *
- * @throws BundleException If this bundle's <code>BundleActivator</code>
- * threw an exception or this bundle is a fragment.
- * @throws IllegalStateException If this bundle has been uninstalled or this
- * bundle tries to change its own state.
- * @throws SecurityException If the caller does not have the appropriate
- * <code>AdminPermission[this,EXECUTE]</code>, and the Java Runtime
- * Environment supports permissions.
- * @see #start(int)
- */
- public void stop() throws BundleException;
-
- /**
- * Updates this bundle from an <code>InputStream</code>.
- *
- * <p>
- * If the specified <code>InputStream</code> is <code>null</code>, the
- * Framework must create the <code>InputStream</code> from which to read the
- * updated bundle by interpreting, in an implementation dependent manner,
- * this bundle's {@link Constants#BUNDLE_UPDATELOCATION
- * Bundle-UpdateLocation} Manifest header, if present, or this bundle's
- * original location.
- *
- * <p>
- * If this bundle's state is <code>ACTIVE</code>, it must be stopped before
- * the update and started after the update successfully completes.
- *
- * <p>
- * If this bundle has exported any packages that are imported by another
- * bundle, these packages must not be updated. Instead, the previous package
- * version must remain exported until the
- * <code>PackageAdmin.refreshPackages</code> method has been has been called
- * or the Framework is relaunched.
- *
- * <p>
- * The following steps are required to update a bundle:
- * <ol>
- * <li>If this bundle's state is <code>UNINSTALLED</code> then an
- * <code>IllegalStateException</code> is thrown.
- *
- * <li>If this bundle's state is <code>ACTIVE</code>, <code>STARTING</code>
- * or <code>STOPPING</code>, this bundle is stopped as described in the
- * <code>Bundle.stop</code> method. If <code>Bundle.stop</code> throws an
- * exception, the exception is rethrown terminating the update.
- *
- * <li>The updated version of this bundle is read from the input stream and
- * installed. If the Framework is unable to install the updated version of
- * this bundle, the original version of this bundle must be restored and a
- * <code>BundleException</code> must be thrown after completion of the
- * remaining steps.
- *
- * <li>This bundle's state is set to <code>INSTALLED</code>.
- *
- * <li>If the updated version of this bundle was successfully installed, a
- * bundle event of type {@link BundleEvent#UPDATED} is fired.
- *
- * <li>If this bundle's state was originally <code>ACTIVE</code>, the
- * updated bundle is started as described in the <code>Bundle.start</code>
- * method. If <code>Bundle.start</code> throws an exception, a Framework
- * event of type {@link FrameworkEvent#ERROR} is fired containing the
- * exception.
- * </ol>
- *
- * <b>Preconditions </b>
- * <ul>
- * <li><code>getState()</code> not in { <code>UNINSTALLED</code>
- * }.
- * </ul>
- * <b>Postconditions, no exceptions thrown </b>
- * <ul>
- * <li><code>getState()</code> in { <code>INSTALLED</code>,
- * <code>RESOLVED</code>, <code>ACTIVE</code> }.
- * <li>This bundle has been updated.
- * </ul>
- * <b>Postconditions, when an exception is thrown </b>
- * <ul>
- * <li><code>getState()</code> in { <code>INSTALLED</code>,
- * <code>RESOLVED</code>, <code>ACTIVE</code> }.
- * <li>Original bundle is still used; no update occurred.
- * </ul>
- *
- * @param input The <code>InputStream</code> from which to read the new
- * bundle or <code>null</code> to indicate the Framework must create
- * the input stream from this bundle's
- * {@link Constants#BUNDLE_UPDATELOCATION Bundle-UpdateLocation}
- * Manifest header, if present, or this bundle's original location.
- * The input stream must always be closed when this method completes,
- * even if an exception is thrown.
- * @throws BundleException If the input stream cannot be read or the update
- * fails.
- * @throws IllegalStateException If this bundle has been uninstalled or this
- * bundle tries to change its own state.
- * @throws SecurityException If the caller does not have the appropriate
- * <code>AdminPermission[this,LIFECYCLE]</code> for both the current
- * bundle and the updated bundle, and the Java Runtime Environment
- * supports permissions.
- * @see #stop()
- * @see #start()
- */
- public void update(InputStream input) throws BundleException;
-
- /**
- * Updates this bundle.
- *
- * <p>
- * This method performs the same function as calling
- * {@link #update(InputStream)} with a <code>null</code> InputStream.
- *
- * @throws BundleException If the update fails.
- * @throws IllegalStateException If this bundle has been uninstalled or this
- * bundle tries to change its own state.
- * @throws SecurityException If the caller does not have the appropriate
- * <code>AdminPermission[this,LIFECYCLE]</code> for both the current
- * bundle and the updated bundle, and the Java Runtime Environment
- * supports permissions.
- * @see #update(InputStream)
- */
- public void update() throws BundleException;
-
- /**
- * Uninstalls this bundle.
- *
- * <p>
- * This method causes the Framework to notify other bundles that this bundle
- * is being uninstalled, and then puts this bundle into the
- * <code>UNINSTALLED</code> state. The Framework must remove any resources
- * related to this bundle that it is able to remove.
- *
- * <p>
- * If this bundle has exported any packages, the Framework must continue to
- * make these packages available to their importing bundles until the
- * <code>PackageAdmin.refreshPackages</code> method has been called or the
- * Framework is relaunched.
- *
- * <p>
- * The following steps are required to uninstall a bundle:
- * <ol>
- * <li>If this bundle's state is <code>UNINSTALLED</code> then an
- * <code>IllegalStateException</code> is thrown.
- *
- * <li>If this bundle's state is <code>ACTIVE</code>, <code>STARTING</code>
- * or <code>STOPPING</code>, this bundle is stopped as described in the
- * <code>Bundle.stop</code> method. If <code>Bundle.stop</code> throws an
- * exception, a Framework event of type {@link FrameworkEvent#ERROR} is
- * fired containing the exception.
- *
- * <li>This bundle's state is set to <code>UNINSTALLED</code>.
- *
- * <li>A bundle event of type {@link BundleEvent#UNINSTALLED} is fired.
- *
- * <li>This bundle and any persistent storage area provided for this bundle
- * by the Framework are removed.
- * </ol>
- *
- * <b>Preconditions </b>
- * <ul>
- * <li><code>getState()</code> not in { <code>UNINSTALLED</code>
- * }.
- * </ul>
- * <b>Postconditions, no exceptions thrown </b>
- * <ul>
- * <li><code>getState()</code> in { <code>UNINSTALLED</code>
- * }.
- * <li>This bundle has been uninstalled.
- * </ul>
- * <b>Postconditions, when an exception is thrown </b>
- * <ul>
- * <li><code>getState()</code> not in { <code>UNINSTALLED</code>
- * }.
- * <li>This Bundle has not been uninstalled.
- * </ul>
- *
- * @throws BundleException If the uninstall failed. This can occur if
- * another thread is attempting to change this bundle's state and
- * does not complete in a timely manner.
- * @throws IllegalStateException If this bundle has been uninstalled or this
- * bundle tries to change its own state.
- * @throws SecurityException If the caller does not have the appropriate
- * <code>AdminPermission[this,LIFECYCLE]</code>, and the Java
- * Runtime Environment supports permissions.
- * @see #stop()
- */
- public void uninstall() throws BundleException;
-
- /**
- * Returns this bundle's Manifest headers and values. This method returns
- * all the Manifest headers and values from the main section of this
- * bundle's Manifest file; that is, all lines prior to the first blank line.
- *
- * <p>
- * Manifest header names are case-insensitive. The methods of the returned
- * <code>Dictionary</code> object must operate on header names in a
- * case-insensitive manner.
- *
- * If a Manifest header value starts with "%", it must be
- * localized according to the default locale. If no localization is found
- * for a header value, the header value without the leading "%" is
- * returned.
- *
- * <p>
- * For example, the following Manifest headers and values are included if
- * they are present in the Manifest file:
- *
- * <pre>
- * Bundle-Name
- * Bundle-Vendor
- * Bundle-Version
- * Bundle-Description
- * Bundle-DocURL
- * Bundle-ContactAddress
- * </pre>
- *
- * <p>
- * This method must continue to return Manifest header information while
- * this bundle is in the <code>UNINSTALLED</code> state.
- *
- * @return A <code>Dictionary</code> object containing this bundle's
- * Manifest headers and values.
- * @throws SecurityException If the caller does not have the
- * appropriate <code>AdminPermission[this,METADATA]</code>, and
- * the Java Runtime Environment supports permissions.
- * @see Constants#BUNDLE_LOCALIZATION
- */
- public Dictionary/* <String,String> */getHeaders();
-
- /**
- * Returns this bundle's unique identifier. This bundle is assigned a unique
- * identifier by the Framework when it was installed in the OSGi
- * environment.
- *
- * <p>
- * A bundle's unique identifier has the following attributes:
- * <ul>
- * <li>Is unique and persistent.
- * <li>Is a <code>long</code>.
- * <li>Its value is not reused for another bundle, even after a bundle is
- * uninstalled.
- * <li>Does not change while a bundle remains installed.
- * <li>Does not change when a bundle is updated.
- * </ul>
- *
- * <p>
- * This method must continue to return this bundle's unique identifier while
- * this bundle is in the <code>UNINSTALLED</code> state.
- *
- * @return The unique identifier of this bundle.
- */
- public long getBundleId();
-
- /**
- * Returns this bundle's location identifier.
- *
- * <p>
- * The location identifier is the location passed to
- * <code>BundleContext.installBundle</code> when a bundle is installed.
- * The location identifier does not change while this bundle remains
- * installed, even if this bundle is updated.
- *
- * <p>
- * This method must continue to return this bundle's location identifier
- * while this bundle is in the <code>UNINSTALLED</code> state.
- *
- * @return The string representation of this bundle's location identifier.
- * @throws SecurityException If the caller does not have the
- * appropriate <code>AdminPermission[this,METADATA]</code>, and
- * the Java Runtime Environment supports permissions.
- */
- public String getLocation();
-
- /**
- * Returns this bundle's <code>ServiceReference</code> list for all
- * services it has registered or <code>null</code> if this bundle has no
- * registered services.
- *
- * <p>
- * If the Java runtime supports permissions, a <code>ServiceReference</code>
- * object to a service is included in the returned list only if the caller
- * has the <code>ServicePermission</code> to get the service using at
- * least one of the named classes the service was registered under.
- *
- * <p>
- * The list is valid at the time of the call to this method, however, as the
- * Framework is a very dynamic environment, services can be modified or
- * unregistered at anytime.
- *
- * @return An array of <code>ServiceReference</code> objects or
- * <code>null</code>.
- * @throws IllegalStateException If this bundle has been
- * uninstalled.
- * @see ServiceRegistration
- * @see ServiceReference
- * @see ServicePermission
- */
- public ServiceReference[] getRegisteredServices();
-
- /**
- * Returns this bundle's <code>ServiceReference</code> list for all
- * services it is using or returns <code>null</code> if this bundle is not
- * using any services. A bundle is considered to be using a service if its
- * use count for that service is greater than zero.
- *
- * <p>
- * If the Java Runtime Environment supports permissions, a
- * <code>ServiceReference</code> object to a service is included in the
- * returned list only if the caller has the <code>ServicePermission</code>
- * to get the service using at least one of the named classes the service
- * was registered under.
- * <p>
- * The list is valid at the time of the call to this method, however, as the
- * Framework is a very dynamic environment, services can be modified or
- * unregistered at anytime.
- *
- * @return An array of <code>ServiceReference</code> objects or
- * <code>null</code>.
- * @throws IllegalStateException If this bundle has been
- * uninstalled.
- * @see ServiceReference
- * @see ServicePermission
- */
- public ServiceReference[] getServicesInUse();
-
- /**
- * Determines if this bundle has the specified permissions.
- *
- * <p>
- * If the Java Runtime Environment does not support permissions, this method
- * always returns <code>true</code>.
- * <p>
- * <code>permission</code> is of type <code>Object</code> to avoid
- * referencing the <code>java.security.Permission</code> class directly.
- * This is to allow the Framework to be implemented in Java environments
- * which do not support permissions.
- *
- * <p>
- * If the Java Runtime Environment does support permissions, this bundle and
- * all its resources including embedded JAR files, belong to the same
- * <code>java.security.ProtectionDomain</code>; that is, they must share
- * the same set of permissions.
- *
- * @param permission The permission to verify.
- * @return <code>true</code> if this bundle has the specified permission
- * or the permissions possessed by this bundle imply the specified
- * permission; <code>false</code> if this bundle does not have the
- * specified permission or <code>permission</code> is not an
- * <code>instanceof</code> <code>java.security.Permission</code>.
- * @throws IllegalStateException If this bundle has been
- * uninstalled.
- */
- public boolean hasPermission(Object permission);
-
- /**
- * Find the specified resource from this bundle's class loader.
- *
- * This bundle's class loader is called to search for the specified
- * resource. If this bundle's state is <code>INSTALLED</code>, this method
- * must attempt to resolve this bundle before attempting to get the
- * specified resource. If this bundle cannot be resolved, then only this
- * bundle must be searched for the specified resource. Imported packages
- * cannot be searched when this bundle has not been resolved. If this bundle
- * is a fragment bundle then <code>null</code> is returned.
- * <p>
- * Note: Jar and zip files are not required to include directory entries.
- * URLs to directory entries will not be returned if the bundle contents do
- * not contain directory entries.
- *
- * @param name The name of the resource. See
- * <code>ClassLoader.getResource</code> for a description of the
- * format of a resource name.
- * @return A URL to the named resource, or <code>null</code> if the resource
- * could not be found or if this bundle is a fragment bundle or if
- * the caller does not have the appropriate
- * <code>AdminPermission[this,RESOURCE]</code>, and the Java Runtime
- * Environment supports permissions.
- * @throws IllegalStateException If this bundle has been uninstalled.
- * @see #getEntry
- * @see #findEntries
- * @since 1.1
- */
- public URL getResource(String name);
-
- /**
- * Returns this bundle's Manifest headers and values localized to the
- * specified locale.
- *
- * <p>
- * This method performs the same function as
- * <code>Bundle.getHeaders()</code> except the manifest header values are
- * localized to the specified locale.
- *
- * <p>
- * If a Manifest header value starts with "%", it must be
- * localized according to the specified locale. If a locale is specified and
- * cannot be found, then the header values must be returned using the
- * default locale. Localizations are searched for in the following order:
- *
- * <pre>
- * bn + "_" + Ls + "_" + Cs + "_" + Vs
- * bn + "_" + Ls + "_" + Cs
- * bn + "_" + Ls
- * bn + "_" + Ld + "_" + Cd + "_" + Vd
- * bn + "_" + Ld + "_" + Cd
- * bn + "_" + Ld
- * bn
- * </pre>
- *
- * Where <code>bn</code> is this bundle's localization basename,
- * <code>Ls</code>, <code>Cs</code> and <code>Vs</code> are the
- * specified locale (language, country, variant) and <code>Ld</code>,
- * <code>Cd</code> and <code>Vd</code> are the default locale (language,
- * country, variant).
- *
- * If <code>null</code> is specified as the locale string, the header
- * values must be localized using the default locale. If the empty string
- * ("") is specified as the locale string, the header values must
- * not be localized and the raw (unlocalized) header values, including any
- * leading "%", must be returned. If no localization is found for
- * a header value, the header value without the leading "%" is
- * returned.
- *
- * <p>
- * This method must continue to return Manifest header information while
- * this bundle is in the <code>UNINSTALLED</code> state, however the
- * header values must only be available in the raw and default locale
- * values.
- *
- * @param locale The locale name into which the header values are to be
- * localized. If the specified locale is <code>null</code> then the
- * locale returned by <code>java.util.Locale.getDefault</code> is
- * used. If the specified locale is the empty string, this method
- * will return the raw (unlocalized) manifest headers including any
- * leading "%".
- * @return A <code>Dictionary</code> object containing this bundle's
- * Manifest headers and values.
- * @throws SecurityException If the caller does not have the
- * appropriate <code>AdminPermission[this,METADATA]</code>, and
- * the Java Runtime Environment supports permissions.
- * @see #getHeaders()
- * @see Constants#BUNDLE_LOCALIZATION
- * @since 1.3
- */
- public Dictionary/* <String,String> */getHeaders(String locale);
-
- /**
- * Returns the symbolic name of this bundle as specified by its
- * <code>Bundle-SymbolicName</code> manifest header. The bundle symbolic
- * name together with a version must identify a unique bundle. The bundle
- * symbolic name should be based on the reverse domain name naming
- * convention like that used for java packages.
- *
- * <p>
- * This method must continue to return this bundle's symbolic name while
- * this bundle is in the <code>UNINSTALLED</code> state.
- *
- * @return The symbolic name of this bundle or <code>null</code> if this
- * bundle does not have a symbolic name.
- * @since 1.3
- */
- public String getSymbolicName();
-
- /**
- * Loads the specified class using this bundle's class loader.
- *
- * <p>
- * If this bundle is a fragment bundle then this method must throw a
- * <code>ClassNotFoundException</code>.
- *
- * <p>
- * If this bundle's state is <code>INSTALLED</code>, this method must
- * attempt to resolve this bundle before attempting to load the class.
- *
- * <p>
- * If this bundle cannot be resolved, a Framework event of type
- * {@link FrameworkEvent#ERROR} is fired containing a
- * <code>BundleException</code> with details of the reason this bundle
- * could not be resolved. This method must then throw a
- * <code>ClassNotFoundException</code>.
- *
- * <p>
- * If this bundle's state is <code>UNINSTALLED</code>, then an
- * <code>IllegalStateException</code> is thrown.
- *
- * @param name The name of the class to load.
- * @return The Class object for the requested class.
- * @throws ClassNotFoundException If no such class can be found or
- * if this bundle is a fragment bundle or if the caller does not
- * have the appropriate <code>AdminPermission[this,CLASS]</code>,
- * and the Java Runtime Environment supports permissions.
- * @throws IllegalStateException If this bundle has been
- * uninstalled.
- * @since 1.3
- */
- public Class loadClass(String name) throws ClassNotFoundException;
-
- /**
- * Find the specified resources from this bundle's class loader.
- *
- * This bundle's class loader is called to search for the specified
- * resources. If this bundle's state is <code>INSTALLED</code>, this method
- * must attempt to resolve this bundle before attempting to get the
- * specified resources. If this bundle cannot be resolved, then only this
- * bundle must be searched for the specified resources. Imported packages
- * cannot be searched when a bundle has not been resolved. If this bundle is
- * a fragment bundle then <code>null</code> is returned.
- * <p>
- * Note: Jar and zip files are not required to include directory entries.
- * URLs to directory entries will not be returned if the bundle contents do
- * not contain directory entries.
- *
- * @param name The name of the resource. See
- * <code>ClassLoader.getResources</code> for a description of the
- * format of a resource name.
- * @return An enumeration of URLs to the named resources, or
- * <code>null</code> if the resource could not be found or if this
- * bundle is a fragment bundle or if the caller does not have the
- * appropriate <code>AdminPermission[this,RESOURCE]</code>, and the
- * Java Runtime Environment supports permissions.
- * @throws IllegalStateException If this bundle has been uninstalled.
- * @throws IOException If there is an I/O error.
- * @since 1.3
- */
- public Enumeration/* <URL> */getResources(String name) throws IOException;
-
- /**
- * Returns an Enumeration of all the paths (<code>String</code> objects)
- * to entries within this bundle whose longest sub-path matches the
- * specified path. This bundle's class loader is not used to search for
- * entries. Only the contents of this bundle are searched.
- * <p>
- * The specified path is always relative to the root of this bundle and may
- * begin with a "/". A path value of "/" indicates the
- * root of this bundle.
- * <p>
- * Returned paths indicating subdirectory paths end with a "/".
- * The returned paths are all relative to the root of this bundle and must
- * not begin with "/".
- * <p>
- * Note: Jar and zip files are not required to include directory entries.
- * Paths to directory entries will not be returned if the bundle contents do
- * not contain directory entries.
- *
- * @param path The path name for which to return entry paths.
- * @return An Enumeration of the entry paths (<code>String</code>
- * objects) or <code>null</code> if no entry could be found or if
- * the caller does not have the appropriate
- * <code>AdminPermission[this,RESOURCE]</code> and the Java
- * Runtime Environment supports permissions.
- * @throws IllegalStateException If this bundle has been
- * uninstalled.
- * @since 1.3
- */
- public Enumeration/* <String> */getEntryPaths(String path);
-
- /**
- * Returns a URL to the entry at the specified path in this bundle. This
- * bundle's class loader is not used to search for the entry. Only the
- * contents of this bundle are searched for the entry.
- * <p>
- * The specified path is always relative to the root of this bundle and may
- * begin with "/". A path value of "/" indicates the
- * root of this bundle.
- * <p>
- * Note: Jar and zip files are not required to include directory entries.
- * URLs to directory entries will not be returned if the bundle contents do
- * not contain directory entries.
- *
- * @param path The path name of the entry.
- * @return A URL to the entry, or <code>null</code> if no entry could be
- * found or if the caller does not have the appropriate
- * <code>AdminPermission[this,RESOURCE]</code> and the Java
- * Runtime Environment supports permissions.
- * @throws IllegalStateException If this bundle has been
- * uninstalled.
- * @since 1.3
- */
- public URL getEntry(String path);
-
- /**
- * Returns the time when this bundle was last modified. A bundle is
- * considered to be modified when it is installed, updated or uninstalled.
- *
- * <p>
- * The time value is the number of milliseconds since January 1, 1970,
- * 00:00:00 GMT.
- *
- * @return The time when this bundle was last modified.
- * @since 1.3
- */
- public long getLastModified();
-
- /**
- * Returns entries in this bundle and its attached fragments. This bundle's
- * class loader is not used to search for entries. Only the contents of this
- * bundle and its attached fragments are searched for the specified entries.
- *
- * If this bundle's state is <code>INSTALLED</code>, this method must
- * attempt to resolve this bundle before attempting to find entries.
- *
- * <p>
- * This method is intended to be used to obtain configuration, setup,
- * localization and other information from this bundle. This method takes
- * into account that the "contents" of this bundle can be extended
- * with fragments. This "bundle space" is not a namespace with
- * unique members; the same entry name can be present multiple times. This
- * method therefore returns an enumeration of URL objects. These URLs can
- * come from different JARs but have the same path name. This method can
- * either return only entries in the specified path or recurse into
- * subdirectories returning entries in the directory tree beginning at the
- * specified path. Fragments can be attached after this bundle is resolved,
- * possibly changing the set of URLs returned by this method. If this bundle
- * is not resolved, only the entries in the JAR file of this bundle are
- * returned.
- * <p>
- * Examples:
- *
- * <pre>
- * // List all XML files in the OSGI-INF directory and below
- * Enumeration e = b.findEntries("OSGI-INF", "*.xml", true);
- *
- * // Find a specific localization file
- * Enumeration e = b
- * .findEntries("OSGI-INF/l10n", "bundle_nl_DU.properties", false);
- * if (e.hasMoreElements())
- * return (URL) e.nextElement();
- * </pre>
- *
- * <p>
- * Note: Jar and zip files are not required to include directory entries.
- * URLs to directory entries will not be returned if the bundle contents do
- * not contain directory entries.
- *
- * @param path The path name in which to look. The path is always relative
- * to the root of this bundle and may begin with "/". A
- * path value of "/" indicates the root of this bundle.
- * @param filePattern The file name pattern for selecting entries in the
- * specified path. The pattern is only matched against the last
- * element of the entry path. If the entry is a directory then the
- * trailing "/" is not used for pattern matching. Substring
- * matching is supported, as specified in the Filter specification,
- * using the wildcard character ("*"). If null is
- * specified, this is equivalent to "*" and matches all
- * files.
- * @param recurse If <code>true</code>, recurse into subdirectories.
- * Otherwise only return entries from the specified path.
- * @return An enumeration of URL objects for each matching entry, or
- * <code>null</code> if an entry could not be found or if the caller
- * does not have the appropriate
- * <code>AdminPermission[this,RESOURCE]</code>, and the Java Runtime
- * Environment supports permissions. The URLs are sorted such that
- * entries from this bundle are returned first followed by the
- * entries from attached fragments in ascending bundle id order. If
- * this bundle is a fragment, then only matching entries in this
- * fragment are returned.
- * @throws IllegalStateException If this bundle has been uninstalled.
- * @since 1.3
- */
- public Enumeration/* <URL> */findEntries(String path, String filePattern,
- boolean recurse);
-
- /**
- * Returns this bundle's {@link BundleContext}. The returned
- * <code>BundleContext</code> can be used by the caller to act on behalf
- * of this bundle.
- *
- * <p>
- * If this bundle is not in the {@link #STARTING}, {@link #ACTIVE}, or
- * {@link #STOPPING} states or this bundle is a fragment bundle, then this
- * bundle has no valid <code>BundleContext</code>. This method will
- * return <code>null</code> if this bundle has no valid
- * <code>BundleContext</code>.
- *
- * @return A <code>BundleContext</code> for this bundle or
- * <code>null</code> if this bundle has no valid
- * <code>BundleContext</code>.
- * @throws SecurityException If the caller does not have the
- * appropriate <code>AdminPermission[this,CONTEXT]</code>, and
- * the Java Runtime Environment supports permissions.
- * @since 1.4
- */
- public BundleContext getBundleContext();
-
- /**
- * Return the certificates for the signers of this bundle and the
- * certificate chains for those signers.
- *
- * @param signersType If {@link #SIGNERS_ALL} is specified, then information
- * on all signers of this bundle is returned. If
- * {@link #SIGNERS_TRUSTED} is specified, then only information on
- * the signers of this bundle trusted by the framework is returned.
- * @return The <code>X509Certificate</code>s for the signers of this bundle
- * and the <code>X509Certificate</code> chains for those signers.
- * The keys of the <code>Map</code> are the
- * <code>X509Certificate</code>s of the signers of this bundle. The
- * value for a key is a <code>List</code> containing the
- * <code>X509Certificate</code> chain for the signer. The first item
- * in the <code>List</code> is the signer's
- * <code>X509Certificate</code> which is then followed by the rest
- * of the <code>X509Certificate</code> chain. The returned
- * <code>Map</code> will be empty if there are no signers. The
- * returned <code>Map</code> is the property of the caller who is
- * free to modify it.
- * @throws IllegalArgumentException If the specified
- * <code>signersType</code> is not {@link #SIGNERS_ALL} or
- * {@link #SIGNERS_TRUSTED}.
- * @since 1.5
- */
- public Map/* <X509Certificate, List<X509Certificate>> */getSignerCertificates(
- int signersType);
-
- /**
- * Returns the version of this bundle as specified by its
- * <code>Bundle-Version</code> manifest header. If this bundle does not have a
- * specified version then {@link Version#emptyVersion} is returned.
- *
- * <p>
- * This method must continue to return this bundle's version while
- * this bundle is in the <code>UNINSTALLED</code> state.
- *
- * @return The version of this bundle.
- * @since 1.5
- */
- public Version getVersion();
-
- /**
- * Adapt this bundle to the specified type.
- *
- * <p>
- * Adapting this bundle to the specified type may require certain checks,
- * including security checks, to succeed. If a check does not succeed, then
- * this bundle cannot be adapted and {@code null} is returned.
- *
- * @param <A> The type to which this bundle is to be adapted.
- * @param type Class object for the type to which this bundle is to be
- * adapted.
- * @return The object, of the specified type, to which this bundle has been
- * adapted or {@code null} if this bundle cannot be adapted to the
- * specified type.
- * @throws SecurityException If the caller does not have the appropriate
- * {@code AdaptPermission[type,this,ADAPT]}, and the Java Runtime
- * Environment supports permissions.
- * @since 1.6
- */
- <A> A adapt(Class<A> type);
-}
diff --git a/src/main/java/org/osgi/framework/BundleReference.java b/src/main/java/org/osgi/framework/BundleReference.java
deleted file mode 100644
index e61bd3e..0000000
--- a/src/main/java/org/osgi/framework/BundleReference.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) OSGi Alliance (2009, 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.framework;
-
-/**
- * A reference to a Bundle.
- *
- * @since 1.5
- * @ThreadSafe
- * @noimplement
- * @version $Id$
- */
-public interface BundleReference {
- /**
- * Returns the {@code Bundle} object associated with this
- * {@code BundleReference}.
- *
- * @return The {@code Bundle} object associated with this
- * {@code BundleReference}.
- */
- public Bundle getBundle();
-}
diff --git a/src/main/java/org/osgi/framework/wiring/FrameworkWiring.java b/src/main/java/org/osgi/framework/wiring/FrameworkWiring.java
deleted file mode 100644
index bff4cdf..0000000
--- a/src/main/java/org/osgi/framework/wiring/FrameworkWiring.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (c) OSGi Alliance (2001, 2012). 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.framework.wiring;
-
-import java.util.Collection;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleReference;
-import org.osgi.framework.FrameworkListener;
-
-/**
- * Query and modify wiring information for the framework. The framework wiring
- * object for the framework can be obtained by calling
- * {@link Bundle#adapt(Class) bundle.adapt(FrameworkWiring.class)} on the system
- * bundle. Only the system bundle can be adapted to a FrameworkWiring object.
- *
- * <p>
- * The system bundle associated with this FrameworkWiring object can be obtained
- * by calling {@link BundleReference#getBundle()}.
- *
- * @ThreadSafe
- * @noimplement
- * @version $Id$
- */
-public interface FrameworkWiring extends BundleReference {
- /**
- * Refreshes the specified bundles. This forces the update (replacement) or
- * removal of packages exported by the specified bundles.
- *
- * <p>
- * The technique by which the framework refreshes bundles may vary among
- * different framework implementations. A permissible implementation is to
- * stop and restart the framework.
- *
- * <p>
- * This method returns to the caller immediately and then performs the
- * following steps on a separate thread:
- *
- * <ol>
- * <li>Compute the {@link #getDependencyClosure(Collection) dependency
- * closure} of the specified bundles. If no bundles are specified, compute
- * the dependency closure of the {@link #getRemovalPendingBundles() removal
- * pending} bundles.
- *
- * <li>Each bundle in the dependency closure that is in the {@code ACTIVE}
- * state will be stopped as described in the {@code Bundle.stop} method.
- *
- * <li>Each bundle in the dependency closure that is in the {@code RESOLVED}
- * state is unresolved and thus moved to the {@code INSTALLED} state. The
- * effect of this step is that bundles in the dependency closure are no
- * longer {@code RESOLVED}.
- *
- * <li>Each bundle in the dependency closure that is in the
- * {@code UNINSTALLED} state is removed from the dependency closure and is
- * now completely removed from the Framework.
- *
- * <li>Each bundle in the dependency closure that was in the {@code ACTIVE}
- * state prior to Step 2 is started as described in the {@code Bundle.start}
- * method, causing all bundles required for the restart to be resolved. It
- * is possible that, as a result of the previous steps, packages that were
- * previously exported no longer are. Therefore, some bundles may be
- * unresolvable until bundles satisfying the dependencies have been
- * installed in the Framework.
- * </ol>
- *
- * <p>
- * For any exceptions that are thrown during any of these steps, a framework
- * event of type {@code FrameworkEvent.ERROR} is fired containing the
- * exception. The source bundle for these events should be the specific
- * bundle to which the exception is related. If no specific bundle can be
- * associated with the exception then the System Bundle must be used as the
- * source bundle for the event. All framework events fired by this method
- * are also delivered to the specified {@code FrameworkListener}s in the
- * order they are specified.
- *
- * <p>
- * When this process completes after the bundles are refreshed, the
- * Framework will fire a Framework event of type
- * {@code FrameworkEvent.PACKAGES_REFRESHED} to announce it has completed
- * the bundle refresh. The specified {@code FrameworkListener}s are notified
- * in the order specified. Each specified {@code FrameworkListener} will be
- * called with a Framework event of type
- * {@code FrameworkEvent.PACKAGES_REFRESHED}.
- *
- * @param bundles The bundles to be refreshed, or {@code null} to refresh
- * the {@link #getRemovalPendingBundles() removal pending} bundles.
- * @param listeners Zero or more listeners to be notified when the bundle
- * refresh has been completed. The specified listeners do not need to
- * be otherwise registered with the framework. If a specified
- * listener is already registered with the framework, it will be
- * notified twice.
- * @throws IllegalArgumentException If the specified {@code Bundle}s were
- * not created by the same framework instance associated with this
- * FrameworkWiring.
- * @throws SecurityException If the caller does not have
- * {@code AdminPermission[System Bundle,RESOLVE]} and the Java
- * runtime environment supports permissions.
- */
- void refreshBundles(Collection<Bundle> bundles, FrameworkListener... listeners);
-
- /**
- * Resolves the specified bundles. The Framework must attempt to resolve the
- * specified bundles that are unresolved. Additional bundles that are not
- * included in the specified bundles may be resolved as a result of calling
- * this method. A permissible implementation of this method is to attempt to
- * resolve all unresolved bundles installed in the framework.
- *
- * <p>
- * If no bundles are specified, then the Framework will attempt to resolve
- * all unresolved bundles. This method must not cause any bundle to be
- * refreshed, stopped, or started. This method will not return until the
- * operation has completed.
- *
- * @param bundles The bundles to resolve or {@code null} to resolve all
- * unresolved bundles installed in the Framework.
- * @return {@code true} if all specified bundles are resolved; {@code false}
- * otherwise.
- * @throws IllegalArgumentException If the specified {@code Bundle}s were
- * not created by the same framework instance associated with this
- * FrameworkWiring.
- * @throws SecurityException If the caller does not have
- * {@code AdminPermission[System Bundle,RESOLVE]} and the Java
- * runtime environment supports permissions.
- */
- boolean resolveBundles(Collection<Bundle> bundles);
-
- /**
- * Returns the bundles that have {@link BundleWiring#isCurrent()
- * non-current}, {@link BundleWiring#isInUse() in use} bundle wirings. This
- * is typically the bundles which have been updated or uninstalled since the
- * last call to {@link #refreshBundles(Collection, FrameworkListener...)}.
- *
- * @return A collection containing a snapshot of the {@code Bundle}s which
- * have non-current, in use {@code BundleWiring}s, or an empty
- * collection if there are no such bundles.
- */
- Collection<Bundle> getRemovalPendingBundles();
-
- /**
- * Returns the dependency closure for the specified bundles.
- *
- * <p>
- * A graph of bundles is computed starting with the specified bundles. The
- * graph is expanded by adding any bundle that is either wired to a package
- * that is currently exported by a bundle in the graph or requires a bundle
- * in the graph. The graph is fully constructed when there is no bundle
- * outside the graph that is wired to a bundle in the graph. The graph may
- * contain {@code UNINSTALLED} bundles that are
- * {@link #getRemovalPendingBundles() removal pending}.
- *
- * @param bundles The initial bundles for which to generate the dependency
- * closure.
- * @return A collection containing a snapshot of the dependency closure of
- * the specified bundles, or an empty collection if there were no
- * specified bundles.
- * @throws IllegalArgumentException If the specified {@code Bundle}s were
- * not created by the same framework instance associated with this
- * FrameworkWiring.
- */
- Collection<Bundle> getDependencyClosure(Collection<Bundle> bundles);
-}
diff --git a/src/test/java/org/apache/sling/installer/core/impl/MockBundleContext.java b/src/test/java/org/apache/sling/installer/core/impl/MockBundleContext.java
index fd39fc1..103c537 100644
--- a/src/test/java/org/apache/sling/installer/core/impl/MockBundleContext.java
+++ b/src/test/java/org/apache/sling/installer/core/impl/MockBundleContext.java
@@ -34,7 +34,9 @@
import org.osgi.framework.Filter;
import org.osgi.framework.FrameworkListener;
import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceFactory;
import org.osgi.framework.ServiceListener;
+import org.osgi.framework.ServiceObjects;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
import org.osgi.framework.Version;
@@ -318,6 +320,18 @@
// TODO Auto-generated method stub
return null;
}
+
+ @Override
+ public int compareTo(Bundle o) {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public File getDataFile(String filename) {
+ // TODO Auto-generated method stub
+ return null;
+ }
};
}
@@ -383,4 +397,17 @@
// TODO Auto-generated method stub
}
+
+ @Override
+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory,
+ Dictionary<String, ?> properties) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
\ No newline at end of file
