You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by oz...@apache.org on 2009/10/22 17:26:32 UTC
svn commit: r828744 -
/incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
Author: ozzy
Date: Thu Oct 22 15:26:32 2009
New Revision: 828744
URL: http://svn.apache.org/viewvc?rev=828744&view=rev
Log:
ARIES-25 Undo override list processing.
Modified:
incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
Modified: incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java?rev=828744&r1=828743&r2=828744&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java Thu Oct 22 15:26:32 2009
@@ -18,15 +18,12 @@
*/
package org.apache.aries.blueprint.container;
-import java.io.File;
-import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Enumeration;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
@@ -41,8 +38,8 @@
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
import org.osgi.framework.Constants;
-import org.osgi.framework.ServiceReference;
import org.osgi.framework.SynchronousBundleListener;
+import org.osgi.framework.ServiceReference;
import org.osgi.service.blueprint.container.BlueprintContainer;
import org.osgi.service.blueprint.container.BlueprintEvent;
import org.slf4j.Logger;
@@ -175,18 +172,6 @@
}
}
- private String getFilePart(URL url)
- {
- String path = url.getPath();
- int index = path.lastIndexOf('/');
- return path.substring(index+1);
- }
-
- private String cachePath(Bundle bundle, String filePath)
- {
- return bundle.getSymbolicName() + "/" + bundle.getVersion() + "/" + filePath;
- }
-
private void checkBundle(Bundle bundle) {
LOGGER.debug("Scanning bundle {} for blueprint application", bundle.getSymbolicName());
try {
@@ -217,45 +202,7 @@
addEntry(bundle, name, pathList);
}
}
- }
-
- //Override bundle specified blueprint XML with
- //XML already in the private storage.
- Iterator<Object> pathIter = pathList.iterator();
- List<Object> overridden = new ArrayList<Object>();
- while (pathIter.hasNext()) {
- Object path = pathIter.next();
- if (path instanceof URL) {
- URL url = (URL) path;
- File privateDataVersion = context.getDataFile(cachePath(
- bundle, "OSGI-INF/blueprint/" + getFilePart(url)));
- if (privateDataVersion != null && privateDataVersion.exists()) {
- try {
- overridden.add(privateDataVersion.toURL());
- pathIter.remove();
- } catch (MalformedURLException e) {
- LOGGER.error("Unexpected URL Conversion Issue", e);
- }
- }
- } else if (path instanceof String) {
- String s = (String) path;
- File privateDataVersion = context.getDataFile(cachePath(
- bundle, s));
- if (privateDataVersion != null && privateDataVersion.exists()) {
- try {
- overridden.add(privateDataVersion.toURL());
- pathIter.remove();
- } catch (MalformedURLException e) {
- LOGGER.error("Unexpected URL Conversion Issue", e);
- }
- }
- } else {
- throw new IllegalArgumentException("Unexpected path type: "
- + path.getClass());
- }
- }
- pathList.addAll(overridden);
-
+ }
if (!pathList.isEmpty()) {
LOGGER.debug("Found blueprint application in bundle {} with paths: {}", bundle.getSymbolicName(), pathList);
// Check compatibility