geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r811773 [1/2] - in /geronimo/sandbox/djencks/osgi/framework: ./ buildsupport/car-maven-plugin/ buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ bundles/ bundles/slf4j/ configs/client-system/ configs/geronimo...
Date Sun, 06 Sep 2009 07:15:40 GMT
Author: djencks
Date: Sun Sep  6 07:15:38 2009
New Revision: 811773

URL: http://svn.apache.org/viewvc?rev=811773&view=rev
Log:
Get marginally farther in building plugins.  We need dependency management through a SynchronausBundleListener before bundles are resolved rather than through ConfigurationManager after they are resolved since the dependency management may install bundles needed for resolution

Added:
    geronimo/sandbox/djencks/osgi/framework/bundles/
    geronimo/sandbox/djencks/osgi/framework/bundles/slf4j/
    geronimo/sandbox/djencks/osgi/framework/bundles/slf4j/pom.xml
      - copied, changed from r811233, servicemix/smx4/bundles/trunk/openjpa-1.2.0/pom.xml
Modified:
    geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/pom.xml
    geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
    geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java
    geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
    geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java
    geronimo/sandbox/djencks/osgi/framework/configs/client-system/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/shutdown/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-core/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentConfigurationManager.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/test/java/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/ClassLoading.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ChildrenConfigurationClassLoader.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationManager.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/NoSuchConfigException.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/ChildrenConfigurationClassLoaderTest.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/ConfigurationManagerTest.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/MockConfigurationManager.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/EnvironmentBuilderTest.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/DependencyType.java
    geronimo/sandbox/djencks/osgi/framework/modules/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/testsupport-common/pom.xml
    geronimo/sandbox/djencks/osgi/framework/pom.xml

Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/pom.xml?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/pom.xml Sun Sep  6 07:15:38 2009
@@ -187,6 +187,40 @@
             <groupId>org.codehaus.groovy.maven.support</groupId>
             <artifactId>slf4j-gossip</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.framework</artifactId>
+            <version>1.9.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.osgi.compendium</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <version>1.2.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.osgi.foundation</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>javax.servlet</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>1.3.0-SNAPSHOT</version>
+        </dependency>
+
+
     </dependencies>
 
 </project>

Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java Sun Sep  6 07:15:38 2009
@@ -58,9 +58,15 @@
 import org.apache.maven.shared.filtering.MavenFileFilter;
 import org.apache.maven.shared.filtering.MavenFilteringException;
 import org.apache.maven.shared.filtering.MavenResourcesFiltering;
+import org.apache.felix.framework.FrameworkFactory;
+import org.apache.felix.framework.cache.BundleCache;
+import org.apache.felix.framework.util.FelixConstants;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.StringUtils;
+import org.osgi.framework.launch.Framework;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.Constants;
 
 /**
  * Support for <em>packaging</em> Mojos.
@@ -375,13 +381,14 @@
 
             getDependencies(project, useMavenDependencies.isUseTransitiveDependencies());
             for (Map.Entry<Artifact, Set<Artifact>> entry : localDependencies.entrySet()) {
-                Artifact artifact = entry.getKey();
-                DependencyType explicitDependency = explicitDependencyMap.get(getKey(artifact));
-                DependencyType dependency = toDependencyType(artifact, useMavenDependencies.isIncludeVersion(), explicitDependency, includeImport);
-                for (Artifact parent : entry.getValue()) {
-                    dependency.getDependency().add(toDependencyType(parent, true, null, false));
-                }
-                dependencies.add(dependency);
+                toDependencyType(entry.getKey(), explicitDependencyMap, localDependencies, useMavenDependencies.isIncludeVersion(), includeImport, dependencies);
+//                Artifact artifact = entry.getKey();
+//                DependencyType explicitDependency = explicitDependencyMap.get(getKey(artifact));
+//                DependencyType dependency = toDependencyType(artifact, useMavenDependencies.isIncludeVersion(), explicitDependency, includeImport);
+//                for (Artifact parent : entry.getValue()) {
+//                    dependency.getDependency().add(toDependencyType(parent, true, null, false));
+//                }
+//                dependencies.add(dependency);
 //            for (Artifact artifact : localDependencies) {
 //                Dependency explicitDependency = explicitDependencyMap.get(getKey(artifact));
 //                dependencies.add(toDependency(artifact, useMavenDependencies.isIncludeVersion(), explicitDependency, includeImport));
@@ -391,6 +398,16 @@
         return dependencies;
     }
 
+    DependencyType toDependencyType(Artifact artifact, Map<String, DependencyType> explicitDependencyMap, Map<Artifact, Set<Artifact>> localDependencies, boolean includeVersion, boolean includeImport, LinkedHashSet<DependencyType> dependencies) {
+        DependencyType explicitDependency = explicitDependencyMap.get(getKey(artifact));
+        DependencyType dependency = toDependencyType(artifact, includeVersion, explicitDependency, includeImport);
+        for (Artifact parent : localDependencies.get(artifact)) {
+            dependency.getDependency().add(toDependencyType(parent, explicitDependencyMap, localDependencies, includeVersion, includeImport, dependencies));
+        }
+        dependencies.add(dependency);
+        return dependency;
+    }
+
     DependencyType toDependencyType(Artifact artifact, boolean includeVersion, DependencyType explicitDependency, boolean includeImport) {
         DependencyType dependency = new DependencyType();
         dependency.setGroupId(artifact.getGroupId());
@@ -609,4 +626,20 @@
         }
     }
 
+    protected Framework getFramework() throws BundleException {
+        Map<String, String> properties = new HashMap<String, String>();
+//        properties.put(FelixConstants.EMBEDDED_EXECUTION_PROP, "true");
+        properties.put(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA,
+                "org.apache.geronimo.kernel,org.apache.geronimo.kernel.basic,org.apache.geronimo.kernel.classloader,org.apache.geronimo.kernel.config,org.apache.geronimo.kernel.lifecycle,org.apache.geronimo.kernel.management,org.apache.geronimo.kernel.osgi,org.apache.geronimo.kernel.proxy,org.apache.geronimo.kernel.repository,org.apache.geronimo.kernel.rmi,org.apache.geronimo.kernel.util," +
+                        "org.apache.geronimo.gbean,org.apache.geronimo.gbean.annotation,org.apache.geronimo.gbean.runtime," +
+                        "net.sf.cglib.asm,net.sf.cglib.core,net.sf.cglib.proxy,net.sf.cglib.reflect,org.apache.commons.jexl,org.apache.commons.jexl.context,org.apache.commons.jexl.resolver,org.apache.geronimo.cli,org.apache.geronimo.cli.client,org.apache.geronimo.cli.daemon,org.apache.geronimo.common,org.apache.geronimo.common.propertyeditor,org.apache.geronimo.crypto,org.apache.geronimo.gbean,org.apache.geronimo.gbean.annotation,org.apache.geronimo.kernel,org.apache.geronimo.kernel.basic,org.apache.geronimo.kernel.config,org.apache.geronimo.kernel.lifecycle,org.apache.geronimo.kernel.management,org.apache.geronimo.kernel.osgi,org.apache.geronimo.kernel.proxy,org.apache.geronimo.kernel.repository,org.apache.geronimo.kernel.util,org.apache.geronimo.system.configuration,org.apache.geronimo.system.configuration.cli,org.apache.geronimo.system.configuration.condition,org.apache.geronimo.system.jmx,org.apache.geronimo.system.logging,org.apache.geronimo.system.logging.jul,org.apach
 e.geronimo.system.logging.log4j,org.apache.geronimo.system.main,org.apache.geronimo.system.plugin.model,org.apache.geronimo.system.properties,org.apache.geronimo.system.repository,org.apache.geronimo.system.resolver,org.apache.geronimo.system.serverinfo,org.apache.geronimo.system.sharedlib,org.apache.geronimo.system.threads,org.apache.geronimo.system.util,org.apache.log4j,org.apache.log4j.helpers,org.apache.log4j.spi,org.apache.log4j.xml,org.osgi.framework;version=\"1.4\",org.slf4j;version=\"1.5\",org.slf4j.bridge," +
+                        "org.apache.geronimo.mavenplugins.car," +
+                        "com.thoughtworks.xstream,com.thoughtworks.xstream.alias,com.thoughtworks.xstream.converters,com.thoughtworks.xstream.converters.basic,com.thoughtworks.xstream.converters.reflection,com.thoughtworks.xstream.core,com.thoughtworks.xstream.io,com.thoughtworks.xstream.io.xml,com.thoughtworks.xstream.mapper,javax.management,javax.rmi.ssl,javax.xml.parsers,javax.xml.transform,net.sf.cglib.asm,net.sf.cglib.core,net.sf.cglib.proxy,net.sf.cglib.reflect,org.apache.geronimo.crypto,org.apache.geronimo.gbean,org.apache.geronimo.gbean.annotation,org.apache.geronimo.gbean.runtime,org.apache.geronimo.kernel,org.apache.geronimo.kernel.basic,org.apache.geronimo.kernel.classloader,org.apache.geronimo.kernel.config,org.apache.geronimo.kernel.config.classloading,org.apache.geronimo.kernel.config.xstream,org.apache.geronimo.kernel.lifecycle,org.apache.geronimo.kernel.management,org.apache.geronimo.kernel.osgi,org.apache.geronimo.kernel.proxy,org.apache.geronimo.kernel.repo
 sitory,org.apache.geronimo.kernel.rmi,org.apache.geronimo.kernel.util,org.apache.xbean.recipe;version=\"3.6\",org.objectweb.asm,org.objectweb.asm.commons,org.osgi.framework;version=\"1.4\",org.slf4j;version=\"1.5\",org.w3c.dom,org.xml.sax,org.xml.sax.helpers,sun.misc" +
+                        "sun.misc,org.apache.xmlbeans,org.apache.xml.resolver,org.apache.commons.cli,javax.enterprise.deploy,javax.enterprise.deploy.model,javax.enterprise.deploy.shared,javax.enterprise.deploy.spi");
+        properties.put(BundleCache.CACHE_ROOTDIR_PROP, basedir + "/target");
+        Framework framework = new FrameworkFactory().newFramework(properties);
+        framework.start();
+        return framework;
+    }
+
 }

Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java Sun Sep  6 07:15:38 2009
@@ -30,6 +30,7 @@
 import org.apache.maven.archiver.MavenArchiveConfiguration;
 import org.apache.maven.archiver.MavenArchiver;
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.model.License;
@@ -231,7 +232,12 @@
                 }
                 archive.addManifestEntry("Bundle-Name", project.getName());
                 archive.addManifestEntry("Bundle-Vendor", project.getOrganization().getName());
-                archive.addManifestEntry("Bundle-Version", project.getVersion().replace("-", "."));
+                ArtifactVersion version = project.getArtifact().getSelectedVersion();
+                String versionString =  "" + version.getMajorVersion() + "." + version.getMinorVersion() + "." + version.getIncrementalVersion();
+                if (version.getQualifier() != null) {
+                    versionString += "." + version.getQualifier();
+                }
+                archive.addManifestEntry("Bundle-Version", versionString);
                 archive.addManifestEntry("Bundle-ManifestVersion", "2");
                 archive.addManifestEntry("Bundle-Description", project.getDescription());
                 archive.addManifestEntry("Bundle-License", ((License)project.getLicenses().get(0)).getUrl());

Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java Sun Sep  6 07:15:38 2009
@@ -256,6 +256,7 @@
         boot.setCarFile(getArtifactInRepositoryDir());
         boot.setLocalRepo(repository);
         boot.setPlan(planFile);
+        boot.setBundleContext(getFramework().getBundleContext());
 
         // Generate expanded so we can use Maven to generate the archive
         boot.setExpanded(true);
@@ -354,6 +355,8 @@
         }
 
         // boot one ourselves
+        bundleContext = getFramework().getBundleContext();
+
         kernel = KernelFactory.newInstance(bundleContext).createKernel(KERNEL_NAME);
         kernel.boot();
 

Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java Sun Sep  6 07:15:38 2009
@@ -23,6 +23,7 @@
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.ArrayList;
 
 import javax.xml.namespace.QName;
 

Copied: geronimo/sandbox/djencks/osgi/framework/bundles/slf4j/pom.xml (from r811233, servicemix/smx4/bundles/trunk/openjpa-1.2.0/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/bundles/slf4j/pom.xml?p2=geronimo/sandbox/djencks/osgi/framework/bundles/slf4j/pom.xml&p1=servicemix/smx4/bundles/trunk/openjpa-1.2.0/pom.xml&r1=811233&r2=811773&rev=811773&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/openjpa-1.2.0/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/bundles/slf4j/pom.xml Sun Sep  6 07:15:38 2009
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <!--
 
@@ -21,34 +22,26 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-      <groupId>org.apache.servicemix.bundles</groupId>
-      <artifactId>bundles-pom</artifactId>
-      <version>3</version>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>framework</artifactId>
+        <version>3.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>org.apache.servicemix.bundles.openjpa</artifactId>
-    <version>1.2.0_2-SNAPSHOT</version>
+    <groupId>org.apache.geronimo.bundles</groupId>
+    <artifactId>slf4j</artifactId>
+    <version>1.5.5_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
     <properties>
-        <pkgGroupId>org.apache.openjpa</pkgGroupId>
-        <pkgArtifactId>openjpa-persistence</pkgArtifactId>
-        <pkgVersion>1.2.0</pkgVersion>
-        <servicemix.osgi.export.pkg>
-            org.apache.openjpa*
-        </servicemix.osgi.export.pkg>
-        <servicemix.osgi.import.pkg>
-            com.ibm*;resolution:=optional,
-            serp*;resolution:=optional,
-            *
-        </servicemix.osgi.import.pkg>
+        <pkgGroupId>org.slf4j</pkgGroupId>
+        <pkgArtifactId>slf4j-api</pkgArtifactId>
+        <pkgVersion>1.5.5</pkgVersion>
     </properties>
-
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
@@ -56,38 +49,75 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>${pkgVersion}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>jul-to-slf4j</artifactId>
+            <version>${pkgVersion}</version>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
         <plugins>
+            <!--<plugin>-->
+            <!--<groupId>org.apache.maven.plugins</groupId>-->
+            <!--<artifactId>maven-dependency-plugin</artifactId>-->
+            <!--<executions>-->
+            <!--<execution>-->
+            <!--<id>unpack-dependencies</id>-->
+            <!--<phase>package</phase>-->
+            <!--<goals>-->
+            <!--<goal>unpack-dependencies</goal>-->
+            <!--</goals>-->
+            <!--<configuration>-->
+            <!--<includes>**/*</includes>-->
+            <!--<excludes>**/*.properties</excludes>-->
+            <!--<outputDirectory>${project.build.directory}/classes</outputDirectory>-->
+            <!--<overWriteReleases>false</overWriteReleases>-->
+            <!--<overWriteSnapshots>true</overWriteSnapshots>-->
+            <!--</configuration>-->
+            <!--</execution>-->
+            <!--</executions>-->
+            <!--</plugin>-->
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-shade-plugin</artifactId>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<phase>package</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>shade</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<artifactSet>-->
+                                <!--<includes>-->
+                                    <!--<include>${pkgGroupId}:${pkgArtifactId}</include>-->
+                                    <!--<include>${pkgGroupId}:slf4j-log4j12</include>-->
+                                <!--</includes>-->
+                            <!--</artifactSet>-->
+                            <!--<promoteTransitiveDependencies>true</promoteTransitiveDependencies>-->
+                            <!--<createDependencyReducedPom>true</createDependencyReducedPom>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <includes>
-                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
-                                </includes>
-                            </artifactSet>
-                            <filters>
-                                <filter>
-                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <!--<version>2.0.1-SNAPSHOT</version>-->
+                <configuration>
+                    <instructions>
+                        <Export-Package>org.slf4*;version="1.5.5",*</Export-Package>
+                        <Import-Package>com.sun.jdmk.comm;resolution:=optional,javax.jms;resolution:=optional,javax.mail.*;resolution:=optional,org.slf4j.helpers;resolution:=optional,*</Import-Package>
+                        <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+                    </instructions>
+                </configuration>
             </plugin>
         </plugins>
     </build>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/client-system/pom.xml?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/client-system/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/client-system/pom.xml Sun Sep  6 07:15:38 2009
@@ -95,16 +95,20 @@
             <artifactId>wstx-asl</artifactId>
         </dependency>
         
+        <!--<dependency>-->
+            <!--<groupId>org.slf4j</groupId>-->
+            <!--<artifactId>jul-to-slf4j</artifactId>-->
+        <!--</dependency>-->
+
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jul-to-slf4j</artifactId>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>slf4j</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.1_spec</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-reflect</artifactId>
@@ -170,22 +174,22 @@
                             <groupId>cglib</groupId>
                             <artifactId>cglib-nodep</artifactId>
                         </element>
-                        <element>
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>slf4j-api</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>slf4j-log4j12</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>jcl-over-slf4j</artifactId>
-                        </element>
-                        <element>
-                            <groupId>log4j</groupId>
-                            <artifactId>log4j</artifactId>
-                        </element>
+                        <!--<element>-->
+                            <!--<groupId>org.slf4j</groupId>-->
+                            <!--<artifactId>slf4j-api</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>org.slf4j</groupId>-->
+                            <!--<artifactId>slf4j-log4j12</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>org.slf4j</groupId>-->
+                            <!--<artifactId>jcl-over-slf4j</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>log4j</groupId>-->
+                            <!--<artifactId>log4j</artifactId>-->
+                        <!--</element>-->
                         <element>
                             <groupId>xpp3</groupId>
                             <artifactId>xpp3_min</artifactId>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/pom.xml?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/pom.xml Sun Sep  6 07:15:38 2009
@@ -66,25 +66,29 @@
             <artifactId>commons-cli</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.slf4j</groupId>-->
+            <!--<artifactId>slf4j-api</artifactId>-->
+        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>slf4j</artifactId>
+        </dependency>
+
+        <!--<dependency>-->
+            <!--<groupId>org.slf4j</groupId>-->
+            <!--<artifactId>slf4j-log4j12</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.slf4j</groupId>-->
+            <!--<artifactId>jcl-over-slf4j</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>log4j</groupId>-->
+            <!--<artifactId>log4j</artifactId>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>xpp3</groupId>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml Sun Sep  6 07:15:38 2009
@@ -3,107 +3,107 @@
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-common</artifactId>
+        <groupId>asm</groupId>
+        <artifactId>asm</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-kernel</artifactId>
+        <groupId>asm</groupId>
+        <artifactId>asm-commons</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
+        <groupId>cglib</groupId>
+        <artifactId>cglib-nodep</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
+        <groupId>com.thoughtworks.xstream</groupId>
+        <artifactId>xstream</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
+        <groupId>commons-cli</groupId>
+        <artifactId>commons-cli</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-logging</artifactId>
+        <groupId>commons-jexl</groupId>
+        <artifactId>commons-jexl</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm</artifactId>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm-commons</artifactId>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.osgi.core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>cglib</groupId>
-        <artifactId>cglib-nodep</artifactId>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>slf4j</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-reflect</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-cli</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.thoughtworks.xstream</groupId>
-        <artifactId>xstream</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-common</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>xpp3</groupId>
-        <artifactId>xpp3_min</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-crypto</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deployment</artifactId>
+        <artifactId>geronimo-deploy-config</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-system</artifactId>
+        <artifactId>geronimo-deployment</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-cli</artifactId>
+        <artifactId>geronimo-kernel</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-cli</groupId>
-        <artifactId>commons-cli</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-logging</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-crypto</artifactId>
+        <artifactId>geronimo-service-builder</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-jexl</groupId>
-        <artifactId>commons-jexl</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-system</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jul-to-slf4j</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaxb_2.1_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -112,6 +112,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-reflect</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.xmlbeans</groupId>
         <artifactId>xmlbeans</artifactId>
         <type>jar</type>
@@ -122,18 +127,8 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-service-builder</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deploy-config</artifactId>
+        <groupId>xpp3</groupId>
+        <artifactId>xpp3_min</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/pom.xml?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/pom.xml Sun Sep  6 07:15:38 2009
@@ -128,19 +128,23 @@
         </dependency>
 
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jul-to-slf4j</artifactId>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>slf4j</artifactId>
         </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.slf4j</groupId>-->
+            <!--<artifactId>slf4j-log4j12</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.slf4j</groupId>-->
+            <!--<artifactId>jcl-over-slf4j</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.slf4j</groupId>-->
+            <!--<artifactId>jul-to-slf4j</artifactId>-->
+        <!--</dependency>-->
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -231,22 +235,22 @@
                             <groupId>cglib</groupId>
                             <artifactId>cglib-nodep</artifactId>
                         </element>
-                        <element>
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>slf4j-api</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>slf4j-log4j12</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>jcl-over-slf4j</artifactId>
-                        </element>
-                        <element>
-                            <groupId>log4j</groupId>
-                            <artifactId>log4j</artifactId>
-                        </element>
+                        <!--<element>-->
+                            <!--<groupId>org.slf4j</groupId>-->
+                            <!--<artifactId>slf4j-api</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>org.slf4j</groupId>-->
+                            <!--<artifactId>slf4j-log4j12</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>org.slf4j</groupId>-->
+                            <!--<artifactId>jcl-over-slf4j</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>log4j</groupId>-->
+                            <!--<artifactId>log4j</artifactId>-->
+                        <!--</element>-->
                         <element>
                             <groupId>xpp3</groupId>
                             <artifactId>xpp3_min</artifactId>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/src/main/history/dependencies.xml?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/src/main/history/dependencies.xml Sun Sep  6 07:15:38 2009
@@ -3,87 +3,87 @@
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>j2ee-system</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-common</artifactId>
+        <groupId>asm</groupId>
+        <artifactId>asm</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-kernel</artifactId>
+        <groupId>asm</groupId>
+        <artifactId>asm-commons</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
+        <groupId>cglib</groupId>
+        <artifactId>cglib-nodep</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-logging</artifactId>
+        <groupId>com.envoisolutions.sxc</groupId>
+        <artifactId>sxc-jaxb</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
+        <groupId>com.envoisolutions.sxc</groupId>
+        <artifactId>sxc-runtime</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm</artifactId>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-impl</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm-commons</artifactId>
+        <groupId>com.thoughtworks.xstream</groupId>
+        <artifactId>xstream</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>cglib</groupId>
-        <artifactId>cglib-nodep</artifactId>
+        <groupId>commons-cli</groupId>
+        <artifactId>commons-cli</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-reflect</artifactId>
+        <groupId>commons-jexl</groupId>
+        <artifactId>commons-jexl</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.thoughtworks.xstream</groupId>
-        <artifactId>xstream</artifactId>
+        <groupId>jline</groupId>
+        <artifactId>jline</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>xpp3</groupId>
-        <artifactId>xpp3_min</artifactId>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-config-groovy-transformer</artifactId>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.osgi.core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.groovy</groupId>
-        <artifactId>groovy-all-minimal</artifactId>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>slf4j</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-system</artifactId>
+        <artifactId>geronimo-cli</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-cli</artifactId>
+        <artifactId>geronimo-common</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-cli</groupId>
-        <artifactId>commons-cli</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-config-groovy-transformer</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -92,23 +92,18 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-jexl</groupId>
-        <artifactId>commons-jexl</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-kernel</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-logging</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-system</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -117,43 +112,38 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>jline</groupId>
-        <artifactId>jline</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-impl</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-activation_1.1_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.woodstox</groupId>
-        <artifactId>wstx-asl</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaxb_2.1_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.envoisolutions.sxc</groupId>
-        <artifactId>sxc-jaxb</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.envoisolutions.sxc</groupId>
-        <artifactId>sxc-runtime</artifactId>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-reflect</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jcl-over-slf4j</artifactId>
+        <groupId>org.codehaus.groovy</groupId>
+        <artifactId>groovy-all-minimal</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jul-to-slf4j</artifactId>
+        <groupId>org.codehaus.woodstox</groupId>
+        <artifactId>wstx-asl</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-activation_1.1_spec</artifactId>
+        <groupId>xpp3</groupId>
+        <artifactId>xpp3_min</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/pom.xml?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/pom.xml Sun Sep  6 07:15:38 2009
@@ -151,22 +151,22 @@
                             <groupId>cglib</groupId>
                             <artifactId>cglib-nodep</artifactId>
                         </element>
-                        <element>
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>slf4j-api</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>slf4j-log4j12</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>jcl-over-slf4j</artifactId>
-                        </element>
-                        <element>
-                            <groupId>log4j</groupId>
-                            <artifactId>log4j</artifactId>
-                        </element>
+                        <!--<element>-->
+                            <!--<groupId>org.slf4j</groupId>-->
+                            <!--<artifactId>slf4j-api</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>org.slf4j</groupId>-->
+                            <!--<artifactId>slf4j-log4j12</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>org.slf4j</groupId>-->
+                            <!--<artifactId>jcl-over-slf4j</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>log4j</groupId>-->
+                            <!--<artifactId>log4j</artifactId>-->
+                        <!--</element>-->
                         <element>
                             <groupId>xpp3</groupId>
                             <artifactId>xpp3_min</artifactId>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/pom.xml?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/pom.xml Sun Sep  6 07:15:38 2009
@@ -170,22 +170,22 @@
                             <groupId>cglib</groupId>
                             <artifactId>cglib-nodep</artifactId>
                         </element>
-                        <element>
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>slf4j-api</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>slf4j-log4j12</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>jcl-over-slf4j</artifactId>
-                        </element>
-                        <element>
-                            <groupId>log4j</groupId>
-                            <artifactId>log4j</artifactId>
-                        </element>
+                        <!--<element>-->
+                            <!--<groupId>org.slf4j</groupId>-->
+                            <!--<artifactId>slf4j-api</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>org.slf4j</groupId>-->
+                            <!--<artifactId>slf4j-log4j12</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>org.slf4j</groupId>-->
+                            <!--<artifactId>jcl-over-slf4j</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>log4j</groupId>-->
+                            <!--<artifactId>log4j</artifactId>-->
+                        <!--</element>-->
                         <element>
                             <groupId>xpp3</groupId>
                             <artifactId>xpp3_min</artifactId>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/shutdown/pom.xml?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/shutdown/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/shutdown/pom.xml Sun Sep  6 07:15:38 2009
@@ -110,22 +110,22 @@
                             <groupId>cglib</groupId>
                             <artifactId>cglib-nodep</artifactId>
                         </element>
-                        <element>
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>slf4j-api</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>slf4j-log4j12</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>jcl-over-slf4j</artifactId>
-                        </element>
-                        <element>
-                            <groupId>log4j</groupId>
-                            <artifactId>log4j</artifactId>
-                        </element>
+                        <!--<element>-->
+                            <!--<groupId>org.slf4j</groupId>-->
+                            <!--<artifactId>slf4j-api</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>org.slf4j</groupId>-->
+                            <!--<artifactId>slf4j-log4j12</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>org.slf4j</groupId>-->
+                            <!--<artifactId>jcl-over-slf4j</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>log4j</groupId>-->
+                            <!--<artifactId>log4j</artifactId>-->
+                        <!--</element>-->
                         <element>
                             <groupId>org.apache.xbean</groupId>
                             <artifactId>xbean-reflect</artifactId>

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-core/pom.xml?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-core/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-core/pom.xml Sun Sep  6 07:15:38 2009
@@ -54,9 +54,13 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
         </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.slf4j</groupId>-->
+            <!--<artifactId>slf4j-api</artifactId>-->
+        <!--</dependency>-->
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>slf4j</artifactId>
         </dependency>
     </dependencies>
     

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentConfigurationManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentConfigurationManager.java?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentConfigurationManager.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentConfigurationManager.java Sun Sep  6 07:15:38 2009
@@ -42,6 +42,7 @@
 import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.kernel.repository.Version;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.Bundle;
 
 /**
  * @version $Rev$ $Date$
@@ -82,6 +83,15 @@
         return configuration;
     }
 
+    @Override
+    public Bundle getBundle(Artifact id) {
+        Bundle bundle = configurationManager.getBundle(id);
+        if (bundle == null) {
+            bundle = super.getBundle(id);
+        }
+        return bundle;
+    }
+
     public ArtifactResolver getArtifactResolver() {
         return super.getArtifactResolver();
     }

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java Sun Sep  6 07:15:38 2009
@@ -53,10 +53,12 @@
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.config.NoSuchConfigException;
+import org.apache.geronimo.kernel.config.ConfigurationResolver;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.kernel.repository.ClassLoadingRules;
+import org.apache.geronimo.kernel.repository.Dependency;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.osgi.framework.Bundle;
@@ -160,17 +162,37 @@
     }
 
     private Configuration createTempConfiguration() throws DeploymentException {
+        LinkedHashSet<Artifact> resolvedParentIds = null;
         try {
             ConfigurationData configurationData = new ConfigurationData(moduleType, classPath, null, childConfigurationDatas, environment, baseDir, inPlaceConfigurationDir, naming);
-            URL[] urls = new URL[0];//crib code from ConfigurationResolver
-            Bundle[] parents = new Bundle[0]; //use ConfigurationManager to turn parent artifactIds into bundles
+            ConfigurationResolver configurationResolver = configurationManager.newConfigurationResolver(configurationData);
+            List<URL> urls = new ArrayList<URL>();
+            for (String path: classPath) {
+                urls.addAll(configurationResolver.resolve(path));
+            }
+            List<Bundle> parents = new ArrayList<Bundle>();
+             resolvedParentIds = configurationManager.resolveParentIds(configurationData);
+            for (Artifact artifact: resolvedParentIds) {
+                configurationManager.loadConfiguration(artifact);
+                Bundle bundle = configurationManager.getBundle(artifact);
+                if (bundle.getSymbolicName() != null) {
+                    parents.add(bundle);
+                }
+            }
+//            URL[] urls = new URL[0];//TODO crib code from ConfigurationResolver
+//            Bundle[] parents = new Bundle[] {bundleContext.getBundle()}; //TODO this is the "no parents" case, normally use ConfigurationManager to turn parent artifactIds into bundles
             ClassLoadingRules classLoadingRules = new ClassLoadingRules();
-            BundleContext bundleContext = new DeploymentBundleContext(this.bundleContext, baseDir.getAbsolutePath(), environment.getConfigId(), urls, parents, classLoadingRules);
+            BundleContext bundleContext = new DeploymentBundleContext(this.bundleContext,
+                    baseDir.getAbsolutePath(),
+                    environment.getConfigId(),
+                    urls.toArray(new URL[urls.size()]),
+                    parents.toArray(new Bundle[parents.size()]),
+                    classLoadingRules);
             configurationData.setBundleContext(bundleContext);
             configurationManager.loadConfiguration(configurationData);
             return configurationManager.getConfiguration(environment.getConfigId());
         } catch (Exception e) {
-            throw new DeploymentException("Unable to create configuration for deployment", e);
+            throw new DeploymentException("Unable to create configuration for deployment: dependencies: " + resolvedParentIds, e);
         }
     }
 

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/test/java/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/test/java/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/test/java/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/test/java/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java Sun Sep  6 07:15:38 2009
@@ -27,6 +27,7 @@
 
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.kernel.Jsr77Naming;
+import org.apache.geronimo.kernel.osgi.MockBundleContext;
 import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.config.ConfigurationInfo;
@@ -37,6 +38,7 @@
 import org.apache.geronimo.kernel.config.LifecycleResults;
 import org.apache.geronimo.kernel.config.NoSuchConfigException;
 import org.apache.geronimo.kernel.config.SimpleConfigurationManager;
+import org.apache.geronimo.kernel.config.ConfigurationResolver;
 import org.apache.geronimo.kernel.mock.MockConfigStore;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.ArtifactResolver;
@@ -79,6 +81,7 @@
 
     protected void setUp() throws Exception {
         super.setUp();
+        bundleContext = new MockBundleContext(getClass().getClassLoader(), BASEDIR.getAbsolutePath(), null, null);
 
         dir = new File(BASEDIR, "target/deployTest");
         dir.mkdirs();

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/pom.xml?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/pom.xml Sun Sep  6 07:15:38 2009
@@ -37,9 +37,13 @@
             <groupId>org.apache.felix</groupId>
             <artifactId>org.osgi.core</artifactId>
         </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.slf4j</groupId>-->
+            <!--<artifactId>slf4j-log4j12</artifactId>-->
+        <!--</dependency>-->
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>slf4j</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/ClassLoading.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/ClassLoading.java?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/ClassLoading.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/ClassLoading.java Sun Sep  6 07:15:38 2009
@@ -108,10 +108,10 @@
      * reflection class (e.g., "boolean" or "int"), or a type in method type signature
      * encoding.  Array classes in either encoding form are also processed.
      *
-     * @param className The name of the required class.
+     * @param className   The name of the required class.
      * @param classLoader The class loader used to resolve the class object.
      * @return The Class object resolved from "className".
-     * @throws ClassNotFoundException When unable to resolve the class object.
+     * @throws ClassNotFoundException   When unable to resolve the class object.
      * @throws IllegalArgumentException If either argument is null.
      */
     public static Class loadClass(String className, ClassLoader classLoader) throws ClassNotFoundException {
@@ -124,14 +124,14 @@
         if (classLoader == null) {
             throw new IllegalArgumentException("classLoader is null");
         }
-        
+
         // The second easiest version to resolve is a direct map to a primitive type name
         // or method signature.  Check our name-to-class map for one of those.
         Class resolvedClass = (Class) PRIMITIVE_CLASS_MAP.get(className);
         if (resolvedClass != null) {
             return resolvedClass;
         }
-        
+
         // The easiest case is a proper class name.  We just have the class loader resolve this.
         // If the class loader throws a ClassNotFoundException, then we need to check each of the
         // special name encodings we support.
@@ -215,6 +215,7 @@
         }
         throw new ClassNotFoundException("Could not load class " + className + " from unknown classloader; " + classLoader);
     }
+
     public static Class loadClass(String className, Bundle bundle) throws ClassNotFoundException {
 
         // the tests require IllegalArgumentExceptions for null values on either of these.
@@ -242,6 +243,12 @@
             // if not found, continue on to the other name forms.
         }
 
+        try {
+            return ClassLoading.class.getClassLoader().loadClass(className);
+        } catch (ClassNotFoundException ignore) {
+            // if not found, continue on to the other name forms.
+        }
+
         // Class names in method signature have the format "Lfully.resolved.name;",
         // so if it ends in a semicolon and begins with an "L", this must be in
         // this format.  Have the class loader try to load this.  There are no other
@@ -251,7 +258,13 @@
             // pick out the name portion
             String typeName = className.substring(1, className.length() - 1);
             // and delegate the loading to the class loader.
-            return bundle.loadClass(typeName);
+            try {
+                return bundle.loadClass(typeName);
+            } catch (ClassNotFoundException ignore) {
+                // if not found, continue on to the other name forms.
+            }
+
+            return ClassLoading.class.getClassLoader().loadClass(typeName);
         }
 
         // All we have left now are the array types.  Method signature array types
@@ -411,7 +424,7 @@
     /**
      * If there are multiple interfaces, and some of them extend each other,
      * eliminate the superclass in favor of the subclasses that extend them.
-     *
+     * <p/>
      * If one of the entries is a class (not an interface), make sure it's
      * the first one in the array.  If more than one of the entries is a
      * class, throws an IllegalArgumentException
@@ -423,22 +436,22 @@
         // use a copy of the sorce array
         source = (Class[]) source.clone();
 
-        for (int leftIndex = 0; leftIndex < source.length-1; leftIndex++) {
+        for (int leftIndex = 0; leftIndex < source.length - 1; leftIndex++) {
             Class left = source[leftIndex];
-            if(left == null) {
+            if (left == null) {
                 continue;
             }
 
-            for (int rightIndex = leftIndex +1; rightIndex < source.length; rightIndex++) {
+            for (int rightIndex = leftIndex + 1; rightIndex < source.length; rightIndex++) {
                 Class right = source[rightIndex];
-                if(right == null) {
+                if (right == null) {
                     continue;
                 }
 
-                if(left == right || right.isAssignableFrom(left)) {
+                if (left == right || right.isAssignableFrom(left)) {
                     // right is the same as class or a sub class of left
                     source[rightIndex] = null;
-                } else if(left.isAssignableFrom(right)) {
+                } else if (left.isAssignableFrom(right)) {
                     // left is the same as class or a sub class of right
                     source[leftIndex] = null;
 
@@ -462,7 +475,7 @@
         List list = new ArrayList(source.length);
         if (clazz != null) list.add(clazz);
         for (int i = 0; i < source.length; i++) {
-            if(source[i] != null) {
+            if (source[i] != null) {
                 list.add(source[i]);
             }
         }

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ChildrenConfigurationClassLoader.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ChildrenConfigurationClassLoader.java?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ChildrenConfigurationClassLoader.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ChildrenConfigurationClassLoader.java Sun Sep  6 07:15:38 2009
@@ -32,7 +32,7 @@
 import org.apache.geronimo.kernel.repository.ClassLoadingRules;
 import org.apache.geronimo.kernel.repository.Artifact;
 
-import sun.misc.CompoundEnumeration;
+//import sun.misc.CompoundEnumeration;
 
 /**
  *
@@ -107,9 +107,9 @@
 
     public Enumeration<URL> getResources(String name) throws IOException {
         ClassLoadingRule privateRule = rules.getPrivateRule();
-        if (privateRule.isFilteredResource(name)) {
-            return new CompoundEnumeration(new Enumeration[0]);
-        }
+//        if (privateRule.isFilteredResource(name)) {
+//            return new CompoundEnumeration(new Enumeration[0]);
+//        }
         return super.getResources(name);
     }
 

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationManager.java?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationManager.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationManager.java Sun Sep  6 07:15:38 2009
@@ -27,6 +27,7 @@
 import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.kernel.repository.MissingDependencyException;
 import org.apache.geronimo.gbean.AbstractName;
+import org.osgi.framework.Bundle;
 
 /**
  * Encapsulates logic for dealing with configurations.
@@ -504,4 +505,10 @@
     Collection<? extends Repository> getRepositories();
 
     LinkedHashSet<Artifact> sort(List<Artifact> ids, LifecycleMonitor monitor) throws InvalidConfigException, IOException, NoSuchConfigException, MissingDependencyException;
+
+    ConfigurationResolver newConfigurationResolver(ConfigurationData configurationData);
+
+    LinkedHashSet<Artifact> resolveParentIds(ConfigurationData configurationData) throws MissingDependencyException, InvalidConfigException;
+
+    Bundle getBundle(Artifact id);
 }

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java Sun Sep  6 07:15:38 2009
@@ -72,7 +72,7 @@
     private boolean online = true;
 
     public KernelConfigurationManager(@ParamSpecial(type= SpecialAttributeType.kernel)Kernel kernel,
-                                      @ParamReference(name = "ConfigurationStore")Collection<ConfigurationStore> stores,
+                                      @ParamReference(name = "Stores")Collection<ConfigurationStore> stores,
                                       @ParamReference(name = "AttributeStore")ManageableAttributeStore attributeStore,
                                       @ParamReference(name = "PersistentConfigurationList")PersistentConfigurationList configurationList,
                                       @ParamReference(name = "ArtifactManager")ArtifactManager artifactManager,

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/NoSuchConfigException.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/NoSuchConfigException.java?rev=811773&r1=811772&r2=811773&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/NoSuchConfigException.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/NoSuchConfigException.java Sun Sep  6 07:15:38 2009
@@ -40,4 +40,9 @@
     public Artifact getConfigId() {
         return configId;
     }
+
+    @Override
+    public String toString() {
+        return super.toString() + " (configId: " + configId + ")";
+    }
 }



Mime
View raw message