geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r817108 [1/2] - in /geronimo/sandbox/djencks/osgi/framework: ./ buildsupport/car-maven-plugin/ buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ configs/geronimo-boilerplate/src/main/assembly/ configs/geronim...
Date Sun, 20 Sep 2009 21:49:14 GMT
Author: djencks
Date: Sun Sep 20 21:49:12 2009
New Revision: 817108

URL: http://svn.apache.org/viewvc?rev=817108&view=rev
Log:
it all builds

Added:
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Manifest.java
      - copied, changed from r816862, ant/core/tags/ANT_171/src/main/org/apache/tools/ant/taskdefs/Manifest.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/ManifestException.java
      - copied, changed from r816862, ant/core/tags/ANT_171/src/main/org/apache/tools/ant/taskdefs/ManifestException.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java   (contents, props changed)
      - copied, changed from r815988, geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/plugin/DConfigBeanRootSupport.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java   (contents, props changed)
      - copied, changed from r815988, geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/plugin/DConfigBeanSupport.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java   (contents, props changed)
      - copied, changed from r815988, geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/plugin/DeploymentConfigurationSupport.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java   (contents, props changed)
      - copied, changed from r815988, geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/plugin/XmlBeanSupport.java
Removed:
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/plugin/
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/xmlbeans/
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/InstallModulesMojo.java
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/assembly/boilerplate.xml
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/gshell-framework/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/gshell-remote/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/jmx-security/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/offline-deployer/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/shutdown/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/transformer-agent/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/upgrade-cli/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/upgrade/src/main/history/dependencies.xml
    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-tool/src/main/java/org/apache/geronimo/deployment/cli/StopServer.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentBundle.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/src/main/java/org/apache/geronimo/gbean/MultiGBeanInfoFactory.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/AnnotationGBeanInfoBuilder.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/ConfigurationManagerTest.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.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/src/main/java/org/apache/geronimo/deployment/service/jsr88/Artifact.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/jsr88/EnvironmentData.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ArtifactType.java
    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/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ImportType.java
    geronimo/sandbox/djencks/osgi/framework/plugingroups/framework/src/main/history/dependencies.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=817108&r1=817107&r2=817108&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 20 21:49:12 2009
@@ -190,7 +190,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
-            <version>1.9.0-SNAPSHOT</version>
+            <version>2.1.0-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.felix</groupId>
@@ -201,7 +201,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.osgi.compendium</artifactId>
-            <version>1.2.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.felix</groupId>
@@ -216,7 +215,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
         </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=817108&r1=817107&r2=817108&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 20 21:49:12 2009
@@ -633,17 +633,97 @@
         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," +
+                        "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.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.repository," +
+                        "org.apache.geronimo.kernel.rmi," +
+                        "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," +
+                        "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");
+                        "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.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," +
+                        "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();

Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java?rev=817108&r1=817107&r2=817108&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java Sun Sep 20 21:49:12 2009
@@ -44,6 +44,7 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
 
 /**
  * Installs Geronimo module CAR files into a target repository to support assembly.
@@ -148,6 +149,12 @@
     private BundleContext bundleContext;
 
     public void execute() throws MojoExecutionException, MojoFailureException {
+        // boot one ourselves
+        try {
+            bundleContext = getFramework().getBundleContext();
+        } catch (BundleException e) {
+            throw new MojoExecutionException("Could not create osqi framework", e);
+        }
         getDependencies(project, false);
         Maven2RepositoryAdapter.ArtifactLookup lookup = new ArtifactLookupImpl();
         SourceRepository sourceRepo = new Maven2RepositoryAdapter(dependencyArtifacts, lookup);

Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/assembly/boilerplate.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/assembly/boilerplate.xml?rev=817108&r1=817107&r2=817108&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/assembly/boilerplate.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/assembly/boilerplate.xml Sun Sep 20 21:49:12 2009
@@ -65,9 +65,9 @@
                 <include>asm:asm-commons</include>
                 <include>cglib:cglib-nodep</include>
                 <include>commons-cli:commons-cli</include>
-                <include>org.slf4j:slf4j-api</include>
-                <include>org.slf4j:slf4j-log4j12</include>
-                <include>org.slf4j:jcl-over-slf4j</include>
+                <include>org.apache.geronimo.bundles:slf4j</include>
+                <!--<include>org.slf4j:slf4j-log4j12</include>-->
+                <!--<include>org.slf4j:jcl-over-slf4j</include>-->
                 <include>log4j:log4j</include>
                 <include>xpp3:xpp3_min</include>
                 <include>org.apache.xbean:xbean-reflect</include>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/history/dependencies.xml?rev=817108&r1=817107&r2=817108&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/history/dependencies.xml Sun Sep 20 21:49:12 2009
@@ -3,33 +3,33 @@
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-boilerplate</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.gshell</groupId>
-        <artifactId>gshell-bootstrap</artifactId>
+        <groupId>cglib</groupId>
+        <artifactId>cglib-nodep</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-classworlds</artifactId>
+        <groupId>com.thoughtworks.xstream</groupId>
+        <artifactId>xstream</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>xpp3</groupId>
-        <artifactId>xpp3_min</artifactId>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>slf4j</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.thoughtworks.xstream</groupId>
-        <artifactId>xstream</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>client-system</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
@@ -38,12 +38,12 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>jsr88-deploymentfactory</artifactId>
+        <artifactId>j2ee-system</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>client-system</artifactId>
+        <artifactId>jsr88-deploymentfactory</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
@@ -52,8 +52,18 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.yoko</groupId>
-        <artifactId>yoko-spec-corba</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>shutdown</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>transformer-agent</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.gshell</groupId>
+        <artifactId>gshell-bootstrap</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -62,18 +72,18 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>j2ee-system</artifactId>
-        <type>car</type>
+        <groupId>org.apache.yoko</groupId>
+        <artifactId>yoko-spec-corba</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>shutdown</artifactId>
-        <type>car</type>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-classworlds</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>transformer-agent</artifactId>
-        <type>car</type>
+        <groupId>xpp3</groupId>
+        <artifactId>xpp3_min</artifactId>
+        <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/gshell-framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/gshell-framework/src/main/history/dependencies.xml?rev=817108&r1=817107&r2=817108&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/gshell-framework/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/gshell-framework/src/main/history/dependencies.xml Sun Sep 20 21:49:12 2009
@@ -3,107 +3,107 @@
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>gshell-framework</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>commons-jexl</groupId>
-        <artifactId>commons-jexl</artifactId>
+        <groupId>com.thoughtworks.xstream</groupId>
+        <artifactId>xstream</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.gshell.support</groupId>
-        <artifactId>gshell-ansi</artifactId>
+        <groupId>commons-jexl</groupId>
+        <artifactId>commons-jexl</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-classworlds</artifactId>
+        <groupId>jline</groupId>
+        <artifactId>jline</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-container-default</artifactId>
+        <groupId>org.apache.geronimo.gshell</groupId>
+        <artifactId>gshell-cli</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.gshell.commands</groupId>
-        <artifactId>gshell-builtins</artifactId>
+        <groupId>org.apache.geronimo.gshell</groupId>
+        <artifactId>gshell-command-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.gshell.support</groupId>
-        <artifactId>gshell-common</artifactId>
+        <groupId>org.apache.geronimo.gshell</groupId>
+        <artifactId>gshell-core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>jline</groupId>
-        <artifactId>jline</artifactId>
+        <groupId>org.apache.geronimo.gshell</groupId>
+        <artifactId>gshell-parser</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>xpp3</groupId>
-        <artifactId>xpp3_min</artifactId>
+        <groupId>org.apache.geronimo.gshell.commands</groupId>
+        <artifactId>gshell-builtins</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.gshell.support</groupId>
-        <artifactId>gshell-i18n</artifactId>
+        <artifactId>gshell-ansi</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-api</artifactId>
+        <groupId>org.apache.geronimo.gshell.support</groupId>
+        <artifactId>gshell-clp</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-annotations</artifactId>
+        <groupId>org.apache.geronimo.gshell.support</groupId>
+        <artifactId>gshell-common</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-utils</artifactId>
+        <groupId>org.apache.geronimo.gshell.support</groupId>
+        <artifactId>gshell-i18n</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.gshell</groupId>
-        <artifactId>gshell-core</artifactId>
+        <groupId>org.apache.geronimo.gshell.support</groupId>
+        <artifactId>gshell-prefs</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.gshell.support</groupId>
-        <artifactId>gshell-prefs</artifactId>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-classworlds</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-annotations</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.gshell</groupId>
-        <artifactId>gshell-command-api</artifactId>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.thoughtworks.xstream</groupId>
-        <artifactId>xstream</artifactId>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-container-default</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.gshell</groupId>
-        <artifactId>gshell-cli</artifactId>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-utils</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.gshell.support</groupId>
-        <artifactId>gshell-clp</artifactId>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.gshell</groupId>
-        <artifactId>gshell-parser</artifactId>
+        <groupId>xpp3</groupId>
+        <artifactId>xpp3_min</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/src/main/history/dependencies.xml?rev=817108&r1=817107&r2=817108&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/src/main/history/dependencies.xml Sun Sep 20 21:49:12 2009
@@ -3,27 +3,37 @@
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>gshell-geronimo</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>gshell-framework</artifactId>
-        <type>car</type>
+        <groupId>asm</groupId>
+        <artifactId>asm</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-commands</artifactId>
+        <groupId>asm</groupId>
+        <artifactId>asm-commons</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-kernel</artifactId>
+        <groupId>cglib</groupId>
+        <artifactId>cglib-nodep</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
+        <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>commons-jexl</groupId>
+        <artifactId>commons-jexl</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -32,48 +42,53 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-logging</artifactId>
+        <groupId>org.apache.ant</groupId>
+        <artifactId>ant</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm</artifactId>
+        <groupId>org.apache.ant</groupId>
+        <artifactId>ant-launcher</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>org.codehaus.groovy</groupId>
-        <artifactId>groovy-all-minimal</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-commands</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.ant</groupId>
-        <artifactId>ant</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-common</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-cli</artifactId>
+        <artifactId>geronimo-crypto</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-cli</groupId>
-        <artifactId>commons-cli</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-config</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-jsr88</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -82,18 +97,28 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deployment</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-service-builder</artifactId>
+        <artifactId>geronimo-kernel</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deployment</artifactId>
+        <artifactId>geronimo-logging</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-plugin</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-service-builder</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -102,48 +127,58 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xmlbeans</groupId>
-        <artifactId>xmlbeans</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>gshell-framework</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.gshell</groupId>
+        <artifactId>gshell-command-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>xml-resolver</groupId>
-        <artifactId>xml-resolver</artifactId>
+        <groupId>org.apache.geronimo.gshell</groupId>
+        <artifactId>gshell-core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deploy-jsr88</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaxb_2.1_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-common</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-crypto</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.jline</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jul-to-slf4j</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-plugin</artifactId>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-reflect</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.codehaus.groovy</groupId>
+        <artifactId>groovy-all-minimal</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -152,13 +187,18 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deploy-config</artifactId>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-container-default</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.ant</groupId>
-        <artifactId>ant-launcher</artifactId>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-utils</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>stax</groupId>
+        <artifactId>stax-api</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/gshell-remote/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/gshell-remote/src/main/history/dependencies.xml?rev=817108&r1=817107&r2=817108&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/gshell-remote/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/gshell-remote/src/main/history/dependencies.xml Sun Sep 20 21:49:12 2009
@@ -3,12 +3,32 @@
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>gshell-remote</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>commons-vfs</groupId>
+        <artifactId>commons-vfs</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>gshell-framework</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.gshell</groupId>
+        <artifactId>gshell-core</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.gshell</groupId>
+        <artifactId>gshell-whisper</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.gshell.remote</groupId>
-        <artifactId>gshell-remote-server</artifactId>
+        <artifactId>gshell-remote-client</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -18,7 +38,17 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.gshell.remote</groupId>
-        <artifactId>gshell-remote-client</artifactId>
+        <artifactId>gshell-remote-server</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.gshell.support</groupId>
+        <artifactId>gshell-common</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.mina</groupId>
+        <artifactId>mina-core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -27,23 +57,23 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.gshell</groupId>
-        <artifactId>gshell-whisper</artifactId>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-annotations</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-vfs</groupId>
-        <artifactId>commons-vfs</artifactId>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>gshell-framework</artifactId>
-        <type>car</type>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-utils</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.mina</groupId>
-        <artifactId>mina-core</artifactId>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/jmx-security/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/jmx-security/src/main/history/dependencies.xml?rev=817108&r1=817107&r2=817108&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/jmx-security/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/jmx-security/src/main/history/dependencies.xml Sun Sep 20 21:49:12 2009
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>jmx-security</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml?rev=817108&r1=817107&r2=817108&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml Sun Sep 20 21:49:12 2009
@@ -3,67 +3,67 @@
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>jsr88-deploymentfactory</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>
@@ -73,87 +73,82 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-system</artifactId>
+        <artifactId>geronimo-deploy-config</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-cli</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>commons-cli</groupId>
-        <artifactId>commons-cli</artifactId>
+        <artifactId>geronimo-deploy-jsr88</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-jexl</groupId>
-        <artifactId>commons-jexl</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jul-to-slf4j</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-plugin</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deploy-jsr88</artifactId>
+        <artifactId>geronimo-system</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-plugin</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-activation_1.1_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-archiver</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-utils</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaxb_2.1_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-container-default</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-api</artifactId>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-reflect</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deploy-config</artifactId>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-archiver</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-container-default</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-impl</artifactId>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-utils</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -162,8 +157,8 @@
         <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/offline-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/offline-deployer/src/main/history/dependencies.xml?rev=817108&r1=817107&r2=817108&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/offline-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/offline-deployer/src/main/history/dependencies.xml Sun Sep 20 21:49:12 2009
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>offline-deployer</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/src/main/history/dependencies.xml?rev=817108&r1=817107&r2=817108&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/src/main/history/dependencies.xml Sun Sep 20 21:49:12 2009
@@ -3,102 +3,107 @@
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>online-deployer</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>plexus-utils</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.thoughtworks.xstream</groupId>
-        <artifactId>xstream</artifactId>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>slf4j</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>xpp3</groupId>
-        <artifactId>xpp3_min</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-cli</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-system</artifactId>
+        <artifactId>geronimo-common</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-cli</artifactId>
+        <artifactId>geronimo-crypto</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-cli</groupId>
-        <artifactId>commons-cli</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-kernel</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-crypto</artifactId>
+        <artifactId>geronimo-logging</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-jexl</groupId>
-        <artifactId>commons-jexl</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-plugin</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jul-to-slf4j</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-system</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-activation_1.1_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>
@@ -107,13 +112,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>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-plugin</artifactId>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-reflect</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -123,7 +128,7 @@
     </dependency>
     <dependency>
         <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-utils</artifactId>
+        <artifactId>plexus-component-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -133,12 +138,7 @@
     </dependency>
     <dependency>
         <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-impl</artifactId>
+        <artifactId>plexus-utils</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -147,8 +147,8 @@
         <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/server-security-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/pom.xml?rev=817108&r1=817107&r2=817108&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/pom.xml Sun Sep 20 21:49:12 2009
@@ -50,6 +50,11 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-security</artifactId>
+            <version>${version}</version>
+        </dependency>
     </dependencies>
     
     <build>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/src/main/history/dependencies.xml?rev=817108&r1=817107&r2=817108&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/src/main/history/dependencies.xml Sun Sep 20 21:49:12 2009
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>server-security-config</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/shutdown/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/shutdown/src/main/history/dependencies.xml?rev=817108&r1=817107&r2=817108&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/shutdown/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/shutdown/src/main/history/dependencies.xml Sun Sep 20 21:49:12 2009
@@ -3,52 +3,52 @@
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>shutdown</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-deploy-tool</artifactId>
+        <groupId>asm</groupId>
+        <artifactId>asm</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+        <groupId>asm</groupId>
+        <artifactId>asm-commons</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-service-builder</artifactId>
+        <groupId>cglib</groupId>
+        <artifactId>cglib-nodep</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deployment</artifactId>
+        <groupId>com.thoughtworks.xstream</groupId>
+        <artifactId>xstream</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-system</artifactId>
+        <groupId>commons-cli</groupId>
+        <artifactId>commons-cli</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xmlbeans</groupId>
-        <artifactId>xmlbeans</artifactId>
+        <groupId>commons-jexl</groupId>
+        <artifactId>commons-jexl</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>xml-resolver</groupId>
-        <artifactId>xml-resolver</artifactId>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.osgi.core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>slf4j</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -58,87 +58,87 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-kernel</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-crypto</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deploy-jsr88</artifactId>
+        <artifactId>geronimo-deploy-config</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-common</artifactId>
+        <artifactId>geronimo-deploy-jsr88</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-plugin</artifactId>
+        <artifactId>geronimo-deploy-tool</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-archiver</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deployment</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-utils</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-kernel</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-container-default</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-logging</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-api</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-plugin</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deploy-config</artifactId>
+        <artifactId>geronimo-service-builder</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>jline</groupId>
-        <artifactId>jline</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-system</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaxb_2.1_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-logging</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.jline</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm-commons</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>cglib</groupId>
-        <artifactId>cglib-nodep</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -147,33 +147,33 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.thoughtworks.xstream</groupId>
-        <artifactId>xstream</artifactId>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-archiver</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>xpp3</groupId>
-        <artifactId>xpp3_min</artifactId>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-crypto</artifactId>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-container-default</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-jexl</groupId>
-        <artifactId>commons-jexl</artifactId>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-utils</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jul-to-slf4j</artifactId>
+        <groupId>stax</groupId>
+        <artifactId>stax-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
+        <groupId>xpp3</groupId>
+        <artifactId>xpp3_min</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/transformer-agent/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/transformer-agent/src/main/history/dependencies.xml?rev=817108&r1=817107&r2=817108&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/transformer-agent/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/transformer-agent/src/main/history/dependencies.xml Sun Sep 20 21:49:12 2009
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>transformer-agent</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
 </plugin-artifact>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/upgrade-cli/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/upgrade-cli/src/main/history/dependencies.xml?rev=817108&r1=817107&r2=817108&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/upgrade-cli/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/upgrade-cli/src/main/history/dependencies.xml Sun Sep 20 21:49:12 2009
@@ -3,12 +3,12 @@
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>upgrade-cli</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-upgrade</artifactId>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>slf4j</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -16,4 +16,14 @@
         <artifactId>geronimo-gbean-deployer</artifactId>
         <type>car</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-service-builder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-upgrade</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/upgrade/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/upgrade/src/main/history/dependencies.xml?rev=817108&r1=817107&r2=817108&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/upgrade/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/upgrade/src/main/history/dependencies.xml Sun Sep 20 21:49:12 2009
@@ -3,12 +3,12 @@
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>upgrade</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-upgrade</artifactId>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>slf4j</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -16,4 +16,14 @@
         <artifactId>geronimo-gbean-deployer</artifactId>
         <type>car</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-service-builder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-upgrade</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryWithKernel.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryWithKernel.java?rev=817108&r1=817107&r2=817108&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryWithKernel.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryWithKernel.java Sun Sep 20 21:49:12 2009
@@ -31,6 +31,9 @@
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.annotation.GBean;
+import org.apache.geronimo.gbean.annotation.ParamSpecial;
+import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
 import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Kernel;
 
@@ -38,11 +41,12 @@
  *
  * @version $Rev: 503905 $ $Date: 2007-02-06 09:20:49 +1100 (Tue, 06 Feb 2007) $
  */
+@GBean(j2eeType = "DeploymentFactory")
 public class DeploymentFactoryWithKernel extends BaseDeploymentFactory {
     private final Kernel kernel;
     private final RemoteDeploymentManager remoteDeploymentManager;
     
-    public DeploymentFactoryWithKernel(Kernel kernel) {
+    public DeploymentFactoryWithKernel(@ParamSpecial(type = SpecialAttributeType.kernel)Kernel kernel) {
         this(kernel, null);
     }
 
@@ -80,20 +84,4 @@
         }
     }
 
-    public static final GBeanInfo GBEAN_INFO;
-    
-    static {
-        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(DeploymentFactoryWithKernel.class, "DeploymentFactory");
-
-        infoBuilder.addInterface(DeploymentFactory.class);
-        
-        infoBuilder.setConstructor(new String[] {"kernel"});
-        
-        GBEAN_INFO = infoBuilder.getBeanInfo();
-    }
-    
-    public static GBeanInfo getGBeanInfo() {
-        return GBEAN_INFO;
-    }
-
 }

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StopServer.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StopServer.java?rev=817108&r1=817107&r2=817108&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StopServer.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StopServer.java Sun Sep 20 21:49:12 2009
@@ -215,7 +215,7 @@
 
         infoBuilder.addInterface(Main.class);
 
-        infoBuilder.setConstructor(new String[0]);
+//        infoBuilder.setConstructor(new String[0]);
 
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/pom.xml?rev=817108&r1=817107&r2=817108&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/pom.xml Sun Sep 20 21:49:12 2009
@@ -43,6 +43,10 @@
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
         </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
+            <!--<artifactId>plexus-archiver</artifactId>-->
+        <!--</dependency>-->
 
         <!--<dependency>-->
             <!--<groupId>org.apache.geronimo.specs</groupId>-->

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentBundle.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentBundle.java?rev=817108&r1=817107&r2=817108&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentBundle.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentBundle.java Sun Sep 20 21:49:12 2009
@@ -24,12 +24,14 @@
 import java.io.IOException;
 import java.util.Dictionary;
 import java.util.Enumeration;
+import java.util.Map;
 import java.net.URL;
 
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.Version;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.ClassLoadingRules;
 
@@ -136,4 +138,12 @@
     public BundleContext getBundleContext() {
         return bundleContext;
     }
+
+    public Map getSignerCertificates(int signersType) {
+        return null;
+    }
+
+    public Version getVersion() {
+        return new Version(0, 0, 0, "DEPLOYMENT");
+    }
 }



Mime
View raw message