geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r813067 [1/3] - in /geronimo/sandbox/djencks/osgi/framework: ./ buildsupport/car-maven-plugin/ buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo...
Date Wed, 09 Sep 2009 18:18:53 GMT
Author: djencks
Date: Wed Sep  9 18:18:48 2009
New Revision: 813067

URL: http://svn.apache.org/viewvc?rev=813067&view=rev
Log:
Add some bundle repackagings.  Add a dependency manager that works off geronimo-plugin.xml to install required bundles.  Many plugins now build.  Requires a servicemix xmlbeans bundle update, not yet committed

Added:
    geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginBootstrap2.java   (contents, props changed)
      - copied, changed from r811772, geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/PluginBootstrap2.java
    geronimo/sandbox/djencks/osgi/framework/bundles/plexus-archiver/
      - copied from r811773, geronimo/sandbox/djencks/osgi/framework/bundles/slf4j/
    geronimo/sandbox/djencks/osgi/framework/bundles/plexus-utils/
      - copied from r811773, geronimo/sandbox/djencks/osgi/framework/bundles/slf4j/
    geronimo/sandbox/djencks/osgi/framework/bundles/sxc-jaxb/
      - copied from r811773, geronimo/sandbox/djencks/osgi/framework/bundles/slf4j/
    geronimo/sandbox/djencks/osgi/framework/bundles/sxc-runtime/
      - copied from r811773, geronimo/sandbox/djencks/osgi/framework/bundles/slf4j/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java   (contents, props changed)
      - copied, changed from r811772, geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/ModuleConfigurer.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java   (with props)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/PluginXmlUtil.java   (contents, props changed)
      - copied, changed from r811772, geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginXmlUtil.java
Removed:
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/ModuleConfigurer.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/PluginBootstrap2.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginXmlUtil.java
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/CreatePluginListMojo.java
    geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.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/PluginMetadataGeneratorMojo.java
    geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/UpdatePluginListMojo.java
    geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/PluginMetadataTest.java
    geronimo/sandbox/djencks/osgi/framework/bundles/plexus-archiver/pom.xml
    geronimo/sandbox/djencks/osgi/framework/bundles/plexus-utils/pom.xml
    geronimo/sandbox/djencks/osgi/framework/bundles/sxc-jaxb/pom.xml
    geronimo/sandbox/djencks/osgi/framework/bundles/sxc-runtime/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/client-system/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/client-system/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/j2ee-security/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/jee-specs/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/plugin/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/shutdown/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/xmlbeans/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/xmlbeans/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/BaseDeploymentFactory.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryWithKernel.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java
    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/KernelConfigurationManager.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/classloading/MavenDependencyResolver.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/GeronimoSourceRepository.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/LocalSourceRepository.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/RemoteSourceRepository.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/AbstractTest.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/AbstractLoginModuleTest.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginKerberosNonGeronimoTest.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginKerberosTest.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/TimeoutTest.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/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=813067&r1=813066&r2=813067&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 Wed Sep  9 18:18:48 2009
@@ -50,7 +50,7 @@
         </dependency>
 
         <dependency>
-            <groupId>com.envoisolutions.sxc</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>sxc-jaxb</artifactId>
         </dependency>
 
@@ -158,7 +158,6 @@
         <dependency>
           <groupId>org.codehaus.plexus</groupId>
           <artifactId>plexus-utils</artifactId>
-          <version>1.5.6</version>
         </dependency>
 
         <dependency>

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=813067&r1=813066&r2=813067&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 Wed Sep  9 18:18:48 2009
@@ -401,8 +401,11 @@
     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));
+        Set<Artifact> artifactSet = localDependencies.get(artifact);
+        if (artifactSet != null) {
+            for (Artifact parent : artifactSet) {
+                dependency.getDependency().add(toDependencyType(parent, explicitDependencyMap, localDependencies, includeVersion, includeImport, dependencies));
+            }
         }
         dependencies.add(dependency);
         return dependency;
@@ -632,8 +635,13 @@
         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," +
+                        "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.apache.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," +
+                        "org.codehaus.plexus.component,org.codehaus.plexus.component.configurator," +
                         "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");

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=813067&r1=813066&r2=813067&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 Wed Sep  9 18:18:48 2009
@@ -224,12 +224,12 @@
             File configFile = new File(new File(getArtifactInRepositoryDir(), "META-INF"), "imports.txt");
 
             if (configFile.exists()) {
-                if (classpath != null) {
-                    archive.addManifestEntry("Class-Path", getClassPath());
-                    archive.addManifestEntry("Bundle-Activator", KernelActivator.class.getName());
-                } else {
+//                if (classpath != null) {
+//                    archive.addManifestEntry("Class-Path", getClassPath());
+//                    archive.addManifestEntry("Bundle-Activator", KernelActivator.class.getName());
+//                } else {
                     archive.addManifestEntry("Bundle-Activator", ConfigurationActivator.class.getName());
-                }
+//                }
                 archive.addManifestEntry("Bundle-Name", project.getName());
                 archive.addManifestEntry("Bundle-Vendor", project.getOrganization().getName());
                 ArtifactVersion version = project.getArtifact().getSelectedVersion();
@@ -245,7 +245,7 @@
                 archive.addManifestEntry("Bundle-SymbolicName", project.getGroupId() + "." + project.getArtifactId());
 //            Maven2Repository repo = new Maven2Repository(targetRepository);
                 Reader in = new FileReader(configFile);
-                StringBuilder imports = new StringBuilder();
+                StringBuilder imports = new StringBuilder("org.apache.geronimo.kernel.osgi,");
                 char[] buf = new char[1024];
                 try {
                     int i;

Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/CreatePluginListMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/CreatePluginListMojo.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/CreatePluginListMojo.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/CreatePluginListMojo.java Wed Sep  9 18:18:48 2009
@@ -27,8 +27,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.SortedSet;
-import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
@@ -41,14 +39,11 @@
 import org.apache.geronimo.kernel.repository.*;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.system.plugin.PluginInstallerGBean;
-import org.apache.geronimo.system.plugin.PluginXmlUtil;
+import org.apache.geronimo.system.plugin.model.PluginXmlUtil;
 import org.apache.geronimo.system.plugin.model.PluginListType;
 import org.apache.geronimo.system.plugin.model.PluginType;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.xml.sax.SAXException;
 
 /**

Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java Wed Sep  9 18:18:48 2009
@@ -38,7 +38,7 @@
 import javax.xml.bind.JAXBException;
 import javax.xml.stream.XMLStreamException;
 
-import org.apache.geronimo.system.plugin.PluginXmlUtil;
+import org.apache.geronimo.system.plugin.model.PluginXmlUtil;
 import org.apache.geronimo.system.plugin.model.DependencyType;
 import org.apache.geronimo.system.plugin.model.PluginArtifactType;
 import org.apache.maven.plugin.MojoExecutionException;

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=813067&r1=813066&r2=813067&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 Wed Sep  9 18:18:48 2009
@@ -27,8 +27,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import java.util.Collections;
+import java.util.Dictionary;
 
-import org.apache.geronimo.deployment.PluginBootstrap2;
+import org.apache.geronimo.mavenplugins.car.PluginBootstrap2;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanData;
@@ -44,10 +46,12 @@
 import org.apache.geronimo.kernel.config.KernelConfigurationManager;
 import org.apache.geronimo.kernel.config.LifecycleException;
 import org.apache.geronimo.kernel.config.RecordingLifecycleMonitor;
+import org.apache.geronimo.system.configuration.DependencyManager;
 import org.apache.geronimo.kernel.config.classloading.MavenDependencyResolver;
 import org.apache.geronimo.kernel.config.classloading.OneClassLoaderPerJarClassLoaderBuilder;
 import org.apache.geronimo.kernel.management.State;
 import org.apache.geronimo.kernel.repository.DefaultArtifactManager;
+import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.system.configuration.RepositoryConfigurationStore;
 import org.apache.geronimo.system.repository.Maven2Repository;
 import org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver;
@@ -56,6 +60,8 @@
 import org.apache.maven.plugin.MojoFailureException;
 import org.codehaus.plexus.util.FileUtils;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.framework.launch.Framework;
 
 /**
  * Build a Geronimo Configuration using the local Maven infrastructure.
@@ -256,7 +262,9 @@
         boot.setCarFile(getArtifactInRepositoryDir());
         boot.setLocalRepo(repository);
         boot.setPlan(planFile);
-        boot.setBundleContext(getFramework().getBundleContext());
+        Framework framework = getFramework();
+        BundleContext bundleContext = framework.getBundleContext();
+        boot.setBundleContext(bundleContext);
 
         // Generate expanded so we can use Maven to generate the archive
         boot.setExpanded(true);
@@ -359,8 +367,11 @@
 
         kernel = KernelFactory.newInstance(bundleContext).createKernel(KERNEL_NAME);
         kernel.boot();
-
-        bootDeployerSystem();
+        AbstractName sourceRepoName = bootDeployerSystem();
+        Repository sourceRepo = (Repository) kernel.getGBean(sourceRepoName);
+        bundleContext.addBundleListener(new DependencyManager(bundleContext, Collections.<Repository>singleton(sourceRepo)));
+        Dictionary dictionary = null;
+        ServiceRegistration kernelRegistration = bundleContext.registerService(Kernel.class.getName(), kernel, dictionary);
 
         return kernel;
     }
@@ -373,7 +384,7 @@
      * the local maven installation.
      * </p>
      */
-    private void bootDeployerSystem() throws Exception {
+    private AbstractName bootDeployerSystem() throws Exception {
         getLog().debug("Booting deployer system...");
 
         org.apache.geronimo.kernel.repository.Artifact baseId =
@@ -454,6 +465,7 @@
         URL artifactURL = targetFile.toURI().toURL();
         new MavenDependencyResolver().resolve(artifactURL, OneClassLoaderPerJarClassLoaderBuilder.GLOBAL_CL_REGISTER, mavenToGeronimoArtifact(getProject().getArtifact()));
 
+        return repoGBean.getAbstractName();
     }
 
     /**

Copied: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginBootstrap2.java (from r811772, geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/PluginBootstrap2.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginBootstrap2.java?p2=geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginBootstrap2.java&p1=geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/PluginBootstrap2.java&r1=811772&r2=813067&rev=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/PluginBootstrap2.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginBootstrap2.java Wed Sep  9 18:18:48 2009
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.deployment;
+package org.apache.geronimo.mavenplugins.car;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -27,6 +27,9 @@
 import org.apache.geronimo.deployment.service.GBeanBuilder;
 import org.apache.geronimo.deployment.xbeans.ModuleDocument;
 import org.apache.geronimo.deployment.xbeans.ModuleType;
+import org.apache.geronimo.deployment.NamespaceDrivenBuilder;
+import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.DeploymentContext;
 import org.apache.geronimo.kernel.Jsr77Naming;
 import org.apache.geronimo.kernel.config.ConfigurationAlreadyExistsException;
 import org.apache.geronimo.kernel.config.ConfigurationData;
@@ -39,6 +42,7 @@
 import org.apache.geronimo.kernel.repository.DefaultArtifactResolver;
 import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.system.configuration.ExecutableConfigurationUtil;
+import org.apache.geronimo.system.configuration.DependencyManager;
 import org.apache.geronimo.system.repository.Maven2Repository;
 import org.osgi.framework.BundleContext;
 
@@ -80,9 +84,11 @@
     public void bootstrap() throws Exception {
         System.out.println("Packaging module configuration: " + plan);
 
-        ModuleType config = ModuleDocument.Factory.parse(plan).getModule();
+//        ModuleType config = ModuleDocument.Factory.parse(plan).getModule();
 
         Maven2Repository repository = new Maven2Repository(localRepo);
+        bundleContext.addBundleListener(new DependencyManager(bundleContext, Collections.<Repository>singleton(repository)));
+
         GBeanBuilder gBeanBuilder = new GBeanBuilder(null, null);
         ServiceConfigBuilder builder = new ServiceConfigBuilder(null, Collections.<Repository>singleton(repository), Collections.<NamespaceDrivenBuilder>singleton(gBeanBuilder), new Jsr77Naming(), bundleContext);
         ConfigurationStore targetConfigurationStore = new NullConfigurationStore() {
@@ -93,6 +99,9 @@
 
         ArtifactManager artifactManager = new DefaultArtifactManager();
         ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager, repository);
+
+        Object config = builder.getDeploymentPlan(plan, null, new ModuleIDBuilder());
+
         DeploymentContext context = builder.buildConfiguration(
                 false,
                 builder.getConfigurationID(config, null, new ModuleIDBuilder()),
@@ -115,8 +124,7 @@
     private void writeConfiguration(final ConfigurationData configurationData) throws IOException {
         if (expanded) {
             ExecutableConfigurationUtil.writeConfiguration(configurationData, carFile);
-        }
-        else {
+        } else {
             JarOutputStream out = null;
             try {
                 out = new JarOutputStream(new FileOutputStream(carFile));

Propchange: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginBootstrap2.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginBootstrap2.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginBootstrap2.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java Wed Sep  9 18:18:48 2009
@@ -30,7 +30,7 @@
 
 import org.apache.geronimo.kernel.config.InvalidConfigException;
 import org.apache.geronimo.kernel.config.NoSuchConfigException;
-import org.apache.geronimo.system.plugin.PluginXmlUtil;
+import org.apache.geronimo.system.plugin.model.PluginXmlUtil;
 import org.apache.geronimo.system.plugin.model.ArtifactType;
 import org.apache.geronimo.system.plugin.model.LicenseType;
 import org.apache.geronimo.system.plugin.model.PluginArtifactType;

Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/UpdatePluginListMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/UpdatePluginListMojo.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/UpdatePluginListMojo.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/UpdatePluginListMojo.java Wed Sep  9 18:18:48 2009
@@ -30,7 +30,7 @@
 import org.apache.geronimo.kernel.config.NoSuchStoreException;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.system.plugin.PluginInstallerGBean;
-import org.apache.geronimo.system.plugin.PluginXmlUtil;
+import org.apache.geronimo.system.plugin.model.PluginXmlUtil;
 import org.apache.geronimo.system.plugin.model.PluginArtifactType;
 import org.apache.geronimo.system.plugin.model.PluginListType;
 import org.apache.geronimo.system.plugin.model.PluginType;

Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/PluginMetadataTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/PluginMetadataTest.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/PluginMetadataTest.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/PluginMetadataTest.java Wed Sep  9 18:18:48 2009
@@ -23,7 +23,7 @@
 import java.io.StringReader;
 
 import junit.framework.TestCase;
-import org.apache.geronimo.system.plugin.PluginXmlUtil;
+import org.apache.geronimo.system.plugin.model.PluginXmlUtil;
 import org.apache.geronimo.system.plugin.model.PluginArtifactType;
 
 /**

Modified: geronimo/sandbox/djencks/osgi/framework/bundles/plexus-archiver/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/bundles/plexus-archiver/pom.xml?rev=813067&r1=811773&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/bundles/plexus-archiver/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/bundles/plexus-archiver/pom.xml Wed Sep  9 18:18:48 2009
@@ -29,8 +29,8 @@
     </parent>
 
     <groupId>org.apache.geronimo.bundles</groupId>
-    <artifactId>slf4j</artifactId>
-    <version>1.5.5_1-SNAPSHOT</version>
+    <artifactId>plexus-archiver</artifactId>
+    <version>1.0.9_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
@@ -38,9 +38,9 @@
     </description>
 
     <properties>
-        <pkgGroupId>org.slf4j</pkgGroupId>
-        <pkgArtifactId>slf4j-api</pkgArtifactId>
-        <pkgVersion>1.5.5</pkgVersion>
+        <pkgGroupId>org.codehaus.plexus</pkgGroupId>
+        <pkgArtifactId>plexus-archiver</pkgArtifactId>
+        <pkgVersion>1.0-alpha-9</pkgVersion>
     </properties>
     <dependencies>
         <dependency>
@@ -50,16 +50,10 @@
             <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>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>plexus-utils</artifactId>
+            <version>1.4.5_1-SNAPSHOT</version>
+            <!--<optional>true</optional>-->
         </dependency>
     </dependencies>
 
@@ -113,9 +107,9 @@
                 <!--<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>
+                        <Export-Package>org.codehaus.plexus.archiver*;version="1.0",*</Export-Package>
+                        <Import-Package>junit.framework;resolution:=optional,org.codehaus.classworlds;resolution:=optional,org.codehaus.plexus.classworlds;resolution:=optional,org.codehaus.plexus.classworlds.realm;resolution:=optional,*</Import-Package>
+                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/sandbox/djencks/osgi/framework/bundles/plexus-utils/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/bundles/plexus-utils/pom.xml?rev=813067&r1=811773&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/bundles/plexus-utils/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/bundles/plexus-utils/pom.xml Wed Sep  9 18:18:48 2009
@@ -29,8 +29,8 @@
     </parent>
 
     <groupId>org.apache.geronimo.bundles</groupId>
-    <artifactId>slf4j</artifactId>
-    <version>1.5.5_1-SNAPSHOT</version>
+    <artifactId>plexus-utils</artifactId>
+    <version>1.4.5_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
@@ -38,9 +38,9 @@
     </description>
 
     <properties>
-        <pkgGroupId>org.slf4j</pkgGroupId>
-        <pkgArtifactId>slf4j-api</pkgArtifactId>
-        <pkgVersion>1.5.5</pkgVersion>
+        <pkgGroupId>org.codehaus.plexus</pkgGroupId>
+        <pkgArtifactId>plexus-utils</pkgArtifactId>
+        <pkgVersion>1.4.5</pkgVersion>
     </properties>
     <dependencies>
         <dependency>
@@ -49,18 +49,6 @@
             <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>
@@ -113,8 +101,8 @@
                 <!--<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>
+                        <Export-Package>org.plexus*;version="1.4.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>

Modified: geronimo/sandbox/djencks/osgi/framework/bundles/sxc-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/bundles/sxc-jaxb/pom.xml?rev=813067&r1=811773&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/bundles/sxc-jaxb/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/bundles/sxc-jaxb/pom.xml Wed Sep  9 18:18:48 2009
@@ -29,8 +29,8 @@
     </parent>
 
     <groupId>org.apache.geronimo.bundles</groupId>
-    <artifactId>slf4j</artifactId>
-    <version>1.5.5_1-SNAPSHOT</version>
+    <artifactId>sxc-jaxb</artifactId>
+    <version>0.7.2_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
@@ -38,9 +38,9 @@
     </description>
 
     <properties>
-        <pkgGroupId>org.slf4j</pkgGroupId>
-        <pkgArtifactId>slf4j-api</pkgArtifactId>
-        <pkgVersion>1.5.5</pkgVersion>
+        <pkgGroupId>com.envoisolutions.sxc</pkgGroupId>
+        <pkgArtifactId>sxc-jaxb</pkgArtifactId>
+        <pkgVersion>0.7.2</pkgVersion>
     </properties>
     <dependencies>
         <dependency>
@@ -50,72 +50,24 @@
             <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>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
+            <version>2.1.6_2-SNAPSHOT</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.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>
+                        <Export-Package>com.envoisolutions.sxc.jaxb*;version="0.7.2",*</Export-Package>
+                        <Import-Package>com.envoisolutions.sxc.builder*;resolution:=optional,com.envoisolutions.sxc.compiler*;resolution:=optional,com.sun.codemodel*;resolution:=optional,com.sun.xml.fastinfoset*;resolution:=optional,com.sun.xml.txw2*;resolution:=optional,org.jvnet.fastinfoset*;resolution:=optional,org.jvnet.staxex*;resolution:=optional,sun.misc*;resolution:=optional,*</Import-Package>
+                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/sandbox/djencks/osgi/framework/bundles/sxc-runtime/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/bundles/sxc-runtime/pom.xml?rev=813067&r1=811773&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/bundles/sxc-runtime/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/bundles/sxc-runtime/pom.xml Wed Sep  9 18:18:48 2009
@@ -29,8 +29,8 @@
     </parent>
 
     <groupId>org.apache.geronimo.bundles</groupId>
-    <artifactId>slf4j</artifactId>
-    <version>1.5.5_1-SNAPSHOT</version>
+    <artifactId>sxc-runtime</artifactId>
+    <version>0.7.2_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
@@ -38,9 +38,9 @@
     </description>
 
     <properties>
-        <pkgGroupId>org.slf4j</pkgGroupId>
-        <pkgArtifactId>slf4j-api</pkgArtifactId>
-        <pkgVersion>1.5.5</pkgVersion>
+        <pkgGroupId>com.envoisolutions.sxc</pkgGroupId>
+        <pkgArtifactId>sxc-runtime</pkgArtifactId>
+        <pkgVersion>0.7.2</pkgVersion>
     </properties>
     <dependencies>
         <dependency>
@@ -49,18 +49,6 @@
             <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>
@@ -113,9 +101,9 @@
                 <!--<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>
+                        <Export-Package>com.envoisolutions.sxc.runtime*;version="0.7.2",*</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>

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=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/client-system/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/client-system/pom.xml Wed Sep  9 18:18:48 2009
@@ -18,7 +18,8 @@
 
 <!-- $Rev$ $Date$ -->
 
-<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">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -40,7 +41,7 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-common</artifactId>
@@ -65,10 +66,10 @@
         </dependency>
 
         <dependency>
-            <groupId>jline</groupId>
-            <artifactId>jline</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.jline</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>commons-jexl</groupId>
             <artifactId>commons-jexl</artifactId>
@@ -79,25 +80,25 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jaxb_2.1_spec</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-stax-api_1.0_spec</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
         </dependency>
-        
+
         <!--<dependency>-->
-            <!--<groupId>org.slf4j</groupId>-->
-            <!--<artifactId>jul-to-slf4j</artifactId>-->
+        <!--<groupId>org.slf4j</groupId>-->
+        <!--<artifactId>jul-to-slf4j</artifactId>-->
         <!--</dependency>-->
 
         <dependency>
@@ -112,7 +113,7 @@
         <dependency>
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-reflect</artifactId>
-        </dependency> 
+        </dependency>
     </dependencies>
 
     <build>
@@ -130,7 +131,7 @@
                             <mainClass>org.apache.geronimo.cli.client.ClientCLI</mainClass>
                         </manifest>
                     </archive>
-                    
+
                     <!--
                     NOTE: This list of dependencies is non-transitive.
                     -->
@@ -175,20 +176,20 @@
                             <artifactId>cglib-nodep</artifactId>
                         </element>
                         <!--<element>-->
-                            <!--<groupId>org.slf4j</groupId>-->
-                            <!--<artifactId>slf4j-api</artifactId>-->
+                        <!--<groupId>org.slf4j</groupId>-->
+                        <!--<artifactId>slf4j-api</artifactId>-->
                         <!--</element>-->
                         <!--<element>-->
-                            <!--<groupId>org.slf4j</groupId>-->
-                            <!--<artifactId>slf4j-log4j12</artifactId>-->
+                        <!--<groupId>org.slf4j</groupId>-->
+                        <!--<artifactId>slf4j-log4j12</artifactId>-->
                         <!--</element>-->
                         <!--<element>-->
-                            <!--<groupId>org.slf4j</groupId>-->
-                            <!--<artifactId>jcl-over-slf4j</artifactId>-->
+                        <!--<groupId>org.slf4j</groupId>-->
+                        <!--<artifactId>jcl-over-slf4j</artifactId>-->
                         <!--</element>-->
                         <!--<element>-->
-                            <!--<groupId>log4j</groupId>-->
-                            <!--<artifactId>log4j</artifactId>-->
+                        <!--<groupId>log4j</groupId>-->
+                        <!--<artifactId>log4j</artifactId>-->
                         <!--</element>-->
                         <element>
                             <groupId>xpp3</groupId>
@@ -204,13 +205,18 @@
                         </element>
                     </classpath>
                     <classpathPrefix>../lib</classpathPrefix>
-                    
+
                     <category>Geronimo Core</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false" />
-                            <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-system//car">org.apache.geronimo.framework/client-system/${version}/car</artifact-alias>
-                            <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-system/${version}/car">org.apache.geronimo.framework/client-system/${version}/car</artifact-alias>
+                            <config-xml-content load="false"/>
+                            <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-system//car">
+                                org.apache.geronimo.framework/client-system/${version}/car
+                            </artifact-alias>
+                            <artifact-alias server="client"
+                                            key="org.apache.geronimo.framework/j2ee-system/${version}/car">
+                                org.apache.geronimo.framework/client-system/${version}/car
+                            </artifact-alias>
                         </plugin-artifact>
                     </instance>
 

Modified: geronimo/sandbox/djencks/osgi/framework/configs/client-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/client-system/src/main/history/dependencies.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/client-system/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/client-system/src/main/history/dependencies.xml Wed Sep  9 18:18:48 2009
@@ -3,97 +3,97 @@
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>client-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.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-impl</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
+        <groupId>com.thoughtworks.xstream</groupId>
+        <artifactId>xstream</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-logging</artifactId>
+        <groupId>commons-cli</groupId>
+        <artifactId>commons-cli</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm</artifactId>
+        <groupId>commons-jexl</groupId>
+        <artifactId>commons-jexl</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm-commons</artifactId>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>cglib</groupId>
-        <artifactId>cglib-nodep</artifactId>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.osgi.core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-reflect</artifactId>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>slf4j</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.thoughtworks.xstream</groupId>
-        <artifactId>xstream</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-cli</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>xpp3</groupId>
-        <artifactId>xpp3_min</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-common</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-system</artifactId>
+        <artifactId>geronimo-crypto</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-system</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-jexl</groupId>
-        <artifactId>commons-jexl</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-activation_1.1_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>
@@ -102,13 +102,13 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>jline</groupId>
-        <artifactId>jline</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.jline</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-impl</artifactId>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-reflect</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -117,13 +117,8 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jul-to-slf4j</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/geronimo-gbean-deployer-bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml Wed Sep  9 18:18:48 2009
@@ -33,31 +33,36 @@
     <packaging>car</packaging>
     
     <dependencies>
+        <!-- N.B. ordering is crucial until maven dependencies express the osgi dependencies. xmlbeans requires xml-resolver -->
+        <!-- required for environment dconfigbean support -->
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-common</artifactId>
-            <version>${version}</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         </dependency>
-        
-        <!-- needed by the plan -->
+
+        <!-- Thirdparty Dependencies -->
+
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-deployment</artifactId>
-            <version>${version}</version>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
         </dependency>
-        
+
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
-            <version>${version}</version>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
         </dependency>
-        
-        <!-- required for environment dconfigbean support -->
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
         </dependency>
 
+        <!-- needed by the plan -->
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-deployment</artifactId>
+            <version>${version}</version>
+        </dependency>
         <!-- jsr88 dconfigbean support base classes -->
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -65,17 +70,18 @@
             <version>${version}</version>
         </dependency>
 
-        <!-- Thirdparty Dependencies -->
-
         <dependency>
-            <groupId>org.apache.xmlbeans</groupId>
-            <artifactId>xmlbeans</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-common</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${version}</version>
         </dependency>
+
     </dependencies>
     
     <build>

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=813067&r1=813066&r2=813067&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 Wed Sep  9 18:18:48 2009
@@ -112,18 +112,23 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-reflect</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xmlbeans</groupId>
-        <artifactId>xmlbeans</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-reflect</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>xml-resolver</groupId>
-        <artifactId>xml-resolver</artifactId>
+        <groupId>stax</groupId>
+        <artifactId>stax-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/pom.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/pom.xml Wed Sep  9 18:18:48 2009
@@ -38,10 +38,8 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>xmlbeans</artifactId>
-            <version>${version}</version>
-            <type>car</type>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
         </dependency>
                 
         <dependency>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml Wed Sep  9 18:18:48 2009
@@ -77,8 +77,8 @@
         </dependency>
 
         <dependency>
-            <groupId>jline</groupId>
-            <artifactId>jline</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.jline</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml Wed Sep  9 18:18:48 2009
@@ -77,8 +77,8 @@
         </dependency>
 
         <dependency>
-            <groupId>jline</groupId>
-            <artifactId>jline</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.jline</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml Wed Sep  9 18:18:48 2009
@@ -3,13 +3,43 @@
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-gbean-deployer</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>cglib</groupId>
+        <artifactId>cglib-nodep</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>com.thoughtworks.xstream</groupId>
+        <artifactId>xstream</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>commons-cli</groupId>
+        <artifactId>commons-cli</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.osgi.core</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>slf4j</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>xmlbeans</artifactId>
-        <type>car</type>
+        <artifactId>geronimo-cli</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
@@ -17,8 +47,13 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>xml-resolver</groupId>
-        <artifactId>xml-resolver</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-kernel</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-logging</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -28,7 +63,47 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-system</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>plugin</artifactId>
         <type>car</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.specs</groupId>
+        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-reflect</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>stax</groupId>
+        <artifactId>stax-api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>xpp3</groupId>
+        <artifactId>xpp3_min</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/src/main/history/dependencies.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/src/main/history/dependencies.xml Wed Sep  9 18:18:48 2009
@@ -3,12 +3,12 @@
     <module-id>
         <groupId>org.apache.geronimo.plugins.classloaders</groupId>
         <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>slf4j</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -17,8 +17,8 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/j2ee-security/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/j2ee-security/src/main/history/dependencies.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/j2ee-security/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/j2ee-security/src/main/history/dependencies.xml Wed Sep  9 18:18:48 2009
@@ -3,17 +3,52 @@
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>j2ee-security</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>com.envoisolutions.sxc</groupId>
+        <artifactId>sxc-jaxb</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>com.envoisolutions.sxc</groupId>
+        <artifactId>sxc-runtime</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-impl</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>slf4j</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.components</groupId>
+        <artifactId>geronimo-jaspi</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-jmx-remoting</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-management</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-security</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-jmx-remoting</artifactId>
+        <artifactId>geronimo-system</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -22,8 +57,43 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.components</groupId>
-        <artifactId>geronimo-jaspi</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-ejb_3.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jacc_1.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaspic_1.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-servlet_3.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-reflect</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.codehaus.woodstox</groupId>
+        <artifactId>wstx-asl</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=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/j2ee-system/pom.xml Wed Sep  9 18:18:48 2009
@@ -82,8 +82,8 @@
         </dependency>
 
         <dependency>
-            <groupId>jline</groupId>
-            <artifactId>jline</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.jline</artifactId>
         </dependency>
 
         <dependency>
@@ -118,12 +118,12 @@
         </dependency>
 
         <dependency>
-            <groupId>com.envoisolutions.sxc</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>sxc-jaxb</artifactId>
         </dependency>
-        
+
         <dependency>
-            <groupId>com.envoisolutions.sxc</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>sxc-runtime</artifactId>
         </dependency>
 

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=813067&r1=813066&r2=813067&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 Wed Sep  9 18:18:48 2009
@@ -22,16 +22,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.envoisolutions.sxc</groupId>
-        <artifactId>sxc-jaxb</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>com.envoisolutions.sxc</groupId>
-        <artifactId>sxc-runtime</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>com.sun.xml.bind</groupId>
         <artifactId>jaxb-impl</artifactId>
         <type>jar</type>
@@ -52,11 +42,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>jline</groupId>
-        <artifactId>jline</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
         <type>jar</type>
@@ -72,6 +57,16 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>sxc-jaxb</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>sxc-runtime</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-cli</artifactId>
         <type>jar</type>
@@ -127,6 +122,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.jline</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-reflect</artifactId>
         <type>jar</type>



Mime
View raw message