geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1102133 [1/2] - in /geronimo/server/branches/3.0-osgi/framework: buildsupport/car-maven-plugin/ buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/ buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenp...
Date Wed, 11 May 2011 23:17:45 GMT
Author: djencks
Date: Wed May 11 23:17:44 2011
New Revision: 1102133

URL: http://svn.apache.org/viewvc?rev=1102133&view=rev
Log:
Use features to start most of c-m-p karaf instance.  Does not yet work reliably

Added:
    geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg
    geronimo/server/branches/3.0-osgi/framework/features/core/
    geronimo/server/branches/3.0-osgi/framework/features/core/pom.xml
      - copied, changed from r1100682, geronimo/server/branches/3.0-osgi/framework/configs/jsr88-cli/pom.xml
    geronimo/server/branches/3.0-osgi/framework/features/core/src/
    geronimo/server/branches/3.0-osgi/framework/features/core/src/main/
    geronimo/server/branches/3.0-osgi/framework/features/core/src/main/history/
    geronimo/server/branches/3.0-osgi/framework/features/core/src/main/history/dependencies.xml   (with props)
Modified:
    geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/pom.xml
    geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/startup.properties
    geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractFrameworkMojo.java
    geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
    geronimo/server/branches/3.0-osgi/framework/configs/client-system/pom.xml
    geronimo/server/branches/3.0-osgi/framework/configs/j2ee-security/pom.xml
    geronimo/server/branches/3.0-osgi/framework/configs/j2ee-system/pom.xml
    geronimo/server/branches/3.0-osgi/framework/configs/jmx-security/pom.xml
    geronimo/server/branches/3.0-osgi/framework/configs/jsr88-cli/pom.xml
    geronimo/server/branches/3.0-osgi/framework/configs/jsr88-deploymentfactory/pom.xml
    geronimo/server/branches/3.0-osgi/framework/configs/offline-deployer/pom.xml
    geronimo/server/branches/3.0-osgi/framework/configs/online-deployer/pom.xml
    geronimo/server/branches/3.0-osgi/framework/configs/plugin/pom.xml
    geronimo/server/branches/3.0-osgi/framework/configs/rmi-naming/pom.xml
    geronimo/server/branches/3.0-osgi/framework/configs/server-security-config/pom.xml
    geronimo/server/branches/3.0-osgi/framework/configs/shutdown/pom.xml
    geronimo/server/branches/3.0-osgi/framework/features/j2ee-system/pom.xml
    geronimo/server/branches/3.0-osgi/framework/features/pom.xml

Modified: geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/pom.xml?rev=1102133&r1=1102132&r2=1102133&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/pom.xml Wed May 11 23:17:44 2011
@@ -407,6 +407,7 @@
                                   <include name="resources/etc/**"/>
                                   <exclude name="resources/etc/startup.properties"/>
                                   <exclude name="resources/etc/custom.properties"/>
+                                  <exclude name="resources/etc/org.apache.karaf.features.cfg"/>
                               </patternset>
                           </unzip>
 

Added: geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg?rev=1102133&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg (added)
+++ geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg Wed May 11 23:17:44 2011
@@ -0,0 +1,28 @@
+################################################################################
+#
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+################################################################################
+
+#
+# Comma separated list of features repositories to register by default
+#
+featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/3.0.0-SNAPSHOT/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/3.0.0-SNAPSHOT/xml/features,mvn:org.apache.geronimo.framework.feature/core/3.0-SNAPSHOT/xml/features
+
+#
+# Comma separated list of features to install at startup
+#
+featuresBoot=management,standard,kar,obr,config,jndi,declarative-services,core
\ No newline at end of file

Modified: geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/startup.properties?rev=1102133&r1=1102132&r2=1102133&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/startup.properties (original)
+++ geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/startup.properties Wed May 11 23:17:44 2011
@@ -19,41 +19,58 @@
 
 # This file allows you to control the start level of each bundle.
 #
-
+#mvn\:org.ops4j.pax.url/pax-url-aether/${pax.url.version} = 5
+mvn\:org.ops4j.pax.url/pax-url-mvn/${pax.url.version} = 5
+mvn\:org.ops4j.pax.url/pax-url-wrap/${pax.url.version} = 5
+mvn\:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version} = 8
+mvn\:org.ops4j.pax.logging/pax-logging-service/${pax.logging.version} = 8
+mvn\:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version} = 10
+mvn\:org.apache.felix/org.apache.felix.fileinstall/${felix.fileinstall.version} = 11
+mvn\:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version} = 20
+mvn\:org.apache.aries/org.apache.aries.util/${aries.util.version} = 20
+mvn\:org.apache.aries.proxy/org.apache.aries.proxy/${aries.proxy.version} = 20
+mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint/${aries.blueprint.version} = 20
+mvn\:org.apache.karaf.features/org.apache.karaf.features.core/${karaf.version} = 25
+mvn\:org.apache.karaf.shell/org.apache.karaf.shell.console/${karaf.version} = 30
+mvn\:org.apache.karaf.jaas/org.apache.karaf.jaas.modules/${karaf.version} = 30
+mvn\:org.apache.karaf.jaas/org.apache.karaf.jaas.config/${karaf.version} = 30
+mvn\:org.apache.karaf.shell/org.apache.karaf.shell.osgi/${karaf.version} = 30
+mvn\:org.apache.karaf.shell/org.apache.karaf.shell.commands/${karaf.version} = 30
+mvn\:org.apache.karaf.deployer/org.apache.karaf.deployer.kar/${karaf.version} = 30
 #
 # Startup core services like logging
 #
-org.ops4j.pax.url\:pax-url-mvn\:${pax.url.version}=5
-org.ops4j.pax.url\:pax-url-wrap\:${pax.url.version}=5
-org.ops4j.pax.logging\:pax-logging-api\:${pax.logging.version}=8
-org.ops4j.pax.logging\:pax-logging-service\:${pax.logging.version}=8
-org.apache.felix\:org.apache.felix.configadmin\:${felix.configadmin.version}=10
-org.apache.felix\:org.apache.felix.fileinstall\:${felix.fileinstall.version}=11
-
-#
-# The rest of the services..
-#
-org.apache.servicemix.bundles\:org.apache.servicemix.bundles.asm\:${asm.bundle.version}=20
-org.apache.aries\:org.apache.aries.util\:${aries.util.version}=20
-org.apache.aries.proxy\:org.apache.aries.proxy\:${aries.proxy.version}=20
-org.apache.aries.blueprint\:org.apache.aries.blueprint\:${aries.blueprint.version}=20
-
-org.apache.karaf.shell\:org.apache.karaf.shell.console\:${karaf.version}=30
-org.apache.karaf.shell\:org.apache.karaf.shell.osgi\:${karaf.version}=30
-org.apache.karaf.shell\:org.apache.karaf.shell.log\:${karaf.version}=30
-org.apache.karaf.shell\:org.apache.karaf.shell.packages\:${karaf.version}=30
-org.apache.karaf.shell\:org.apache.karaf.shell.commands\:${karaf.version}=30
-org.apache.karaf.shell\:org.apache.karaf.shell.dev\:${karaf.version}=30
-org.apache.karaf.jaas\:org.apache.karaf.jaas.config\:${karaf.version}=30
-org.apache.karaf.jaas\:org.apache.karaf.jaas.modules\:${karaf.version}=30
-org.apache.karaf.jaas\:org.apache.karaf.jaas.command\:${karaf.version}=30
-org.apache.karaf.features\:org.apache.karaf.features.core\:${karaf.version}=30
-org.apache.karaf.features\:org.apache.karaf.features.command\:${karaf.version}=30
+#org.ops4j.pax.url\:pax-url-mvn\:${pax.url.version}=5
+#org.ops4j.pax.url\:pax-url-wrap\:${pax.url.version}=5
+#org.ops4j.pax.logging\:pax-logging-api\:${pax.logging.version}=8
+#org.ops4j.pax.logging\:pax-logging-service\:${pax.logging.version}=8
+#org.apache.felix\:org.apache.felix.configadmin\:${felix.configadmin.version}=10
+#org.apache.felix\:org.apache.felix.fileinstall\:${felix.fileinstall.version}=11
+#
+##
+## The rest of the services..
+##
+#org.apache.servicemix.bundles\:org.apache.servicemix.bundles.asm\:${asm.bundle.version}=20
+#org.apache.aries\:org.apache.aries.util\:${aries.util.version}=20
+#org.apache.aries.proxy\:org.apache.aries.proxy\:${aries.proxy.version}=20
+#org.apache.aries.blueprint\:org.apache.aries.blueprint\:${aries.blueprint.version}=20
+#
+#org.apache.karaf.shell\:org.apache.karaf.shell.console\:${karaf.version}=30
+#org.apache.karaf.shell\:org.apache.karaf.shell.osgi\:${karaf.version}=30
+#org.apache.karaf.shell\:org.apache.karaf.shell.log\:${karaf.version}=30
+#org.apache.karaf.shell\:org.apache.karaf.shell.packages\:${karaf.version}=30
+#org.apache.karaf.shell\:org.apache.karaf.shell.commands\:${karaf.version}=30
+#org.apache.karaf.shell\:org.apache.karaf.shell.dev\:${karaf.version}=30
+#org.apache.karaf.jaas\:org.apache.karaf.jaas.config\:${karaf.version}=30
+#org.apache.karaf.jaas\:org.apache.karaf.jaas.modules\:${karaf.version}=30
+#org.apache.karaf.jaas\:org.apache.karaf.jaas.command\:${karaf.version}=30
+#org.apache.karaf.features\:org.apache.karaf.features.core\:${karaf.version}=30
+#org.apache.karaf.features\:org.apache.karaf.features.command\:${karaf.version}=30
 #org.apache.karaf.features\:org.apache.karaf.features.management\:${karaf.version}=30
 
-org.apache.karaf.diagnostic\:org.apache.karaf.diagnostic.core\:${karaf.version}=30
-org.apache.karaf.diagnostic\:org.apache.karaf.diagnostic.common\:${karaf.version}=30
-org.apache.karaf.diagnostic\:org.apache.karaf.diagnostic.command\:${karaf.version}=30
+#org.apache.karaf.diagnostic\:org.apache.karaf.diagnostic.core\:${karaf.version}=30
+#org.apache.karaf.diagnostic\:org.apache.karaf.diagnostic.common\:${karaf.version}=30
+#org.apache.karaf.diagnostic\:org.apache.karaf.diagnostic.command\:${karaf.version}=30
 #org.apache.karaf.diagnostic\:org.apache.karaf.diagnostic.management\:${karaf.version}=30
 
 #org.apache.karaf\:org.apache.karaf.management\:${karaf.version}=30
@@ -69,32 +86,32 @@ org.apache.karaf.diagnostic\:org.apache.
 #org.apache.karaf.shell\:org.apache.karaf.shell.ssh\:${karaf.version}=30
 
 #org.apache.karaf.deployer\:org.apache.karaf.deployer.spring\:${karaf.version}=30
-org.apache.karaf.deployer\:org.apache.karaf.deployer.blueprint\:${karaf.version}=30
-org.apache.karaf.deployer\:org.apache.karaf.deployer.features\:${karaf.version}=30
-org.apache.karaf.deployer\:org.apache.karaf.deployer.kar\:${karaf.version}=30
-org.apache.karaf.deployer\:org.apache.karaf.deployer.wrap\:${karaf.version}=30
+#org.apache.karaf.deployer\:org.apache.karaf.deployer.blueprint\:${karaf.version}=30
+#org.apache.karaf.deployer\:org.apache.karaf.deployer.features\:${karaf.version}=30
+#org.apache.karaf.deployer\:org.apache.karaf.deployer.kar\:${karaf.version}=30
+#org.apache.karaf.deployer\:org.apache.karaf.deployer.wrap\:${karaf.version}=30
 
 # geronimo additions
-org.apache.felix\:org.apache.felix.scr\:1.6.1-SNAPSHOT=35
-org.apache.felix\:org.apache.felix.shell\:1.5.0-SNAPSHOT=35
+#org.apache.felix\:org.apache.felix.scr\:1.6.1-SNAPSHOT=35
+#org.apache.felix\:org.apache.felix.shell\:1.5.0-SNAPSHOT=35
 #org.apache.geronimo.bundles\:jaxb-impl\:2.2.3_1-SNAPSHOT=15
 #org.apache.geronimo.specs\:geronimo-stax-api_1.2_spec\:1.1-SNAPSHOT=15
 #org.apache.geronimo.specs\:geronimo-jaxb_2.2_spec\:1.0.2-SNAPSHOT=15
 #org.apache.geronimo.specs\:geronimo-activation_1.1_spec\:1.1=15
 #org.apache.geronimo.bundles\:woodstox\:4.0.6_2-SNAPSHOT=15
-org.apache.geronimo.specs\:geronimo-osgi-registry\:1.1-SNAPSHOT=14
-
-org.apache.geronimo.framework\:geronimo-kernel\:${geronimo.version}=40
-org.apache.geronimo.framework\:geronimo-crypto\:${geronimo.version}=40
-org.apache.felix\:org.apache.felix.bundlerepository\:${felix.bundlerepository.version}=40
-org.apache.xbean\:xbean-reflect\:${xbeanVersion}=40
-
-org.apache.geronimo.framework\:geronimo-system\:${geronimo.version}=40
-org.apache.geronimo.framework\:geronimo-common\:${geronimo.version}=40
-#org.apache.geronimo.framework\:geronimo-pax-logging\:${geronimo.version}=40
-org.apache.geronimo.framework\:geronimo-main\:${geronimo.version}=40
-org.apache.servicemix.bundles\:org.apache.servicemix.bundles.commons-jexl\:1.1_3=40
-org.apache.xbean\:xbean-bundleutils\:${xbeanVersion}=40
-
-mvn\:org.apache.geronimo.framework/geronimo-deployment/${geronimo.version}=50
-mvn\:org.apache.geronimo.framework/geronimo-service-builder/${geronimo.version}=50
+#org.apache.geronimo.specs\:geronimo-osgi-registry\:1.1-SNAPSHOT=14
+#
+#org.apache.geronimo.framework\:geronimo-kernel\:${geronimo.version}=40
+#org.apache.geronimo.framework\:geronimo-crypto\:${geronimo.version}=40
+#org.apache.felix\:org.apache.felix.bundlerepository\:${felix.bundlerepository.version}=40
+#org.apache.xbean\:xbean-reflect\:${xbeanVersion}=40
+#
+#org.apache.geronimo.framework\:geronimo-system\:${geronimo.version}=40
+#org.apache.geronimo.framework\:geronimo-common\:${geronimo.version}=40
+##org.apache.geronimo.framework\:geronimo-pax-logging\:${geronimo.version}=40
+#org.apache.geronimo.framework\:geronimo-main\:${geronimo.version}=40
+#org.apache.servicemix.bundles\:org.apache.servicemix.bundles.commons-jexl\:1.1_3=40
+#org.apache.xbean\:xbean-bundleutils\:${xbeanVersion}=40
+#
+#mvn\:org.apache.geronimo.framework/geronimo-deployment/${geronimo.version}=50
+#mvn\:org.apache.geronimo.framework/geronimo-service-builder/${geronimo.version}=50

Modified: geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractFrameworkMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractFrameworkMojo.java?rev=1102133&r1=1102132&r2=1102133&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractFrameworkMojo.java (original)
+++ geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractFrameworkMojo.java Wed May 11 23:17:44 2011
@@ -30,6 +30,7 @@ import org.apache.geronimo.deployment.Co
 import org.apache.geronimo.deployment.Deployer;
 import org.apache.karaf.features.FeaturesService;
 import org.apache.karaf.tooling.features.DependencyHelper;
+import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -87,9 +88,9 @@ public class AbstractFrameworkMojo exten
     /**
      * how long to wait for a service
      *
-     * @parameter default-value="120000"
+     * @parameter default-value="20000"
      */
-    private long timeout = 120000L;
+    private long timeout = 20000L;
 
     private Framework framework;
     private List<ServiceReference> services = new ArrayList<ServiceReference>();
@@ -177,7 +178,7 @@ public class AbstractFrameworkMojo exten
     }
 
     protected Map<Artifact, String> getTransitiveDependencies(MavenProject project) throws MojoExecutionException {
-        DependencyHelper dependencyHelper = new DependencyHelper(remoteRepos, remoteRepos, repoSession, repoSystem);
+        DependencyHelper dependencyHelper = new DependencyHelper(remoteRepos, remoteRepos, repoSession, repoSystem, true);
         dependencyHelper.getDependencies(project, true);
         return dependencyHelper.getLocalDependencies();
     }

Modified: geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java?rev=1102133&r1=1102132&r2=1102133&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java (original)
+++ geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java Wed May 11 23:17:44 2011
@@ -28,6 +28,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.felix.fileinstall.ArtifactInstaller;
+import org.apache.geronimo.deployment.ConfigurationBuilder;
 import org.apache.geronimo.deployment.Deployer;
 import org.apache.karaf.features.FeaturesService;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -149,7 +150,6 @@ public class PackageMojo extends Abstrac
     public void doExecute() throws MojoExecutionException {
         try {
             try {
-                super.doExecute();
                 // We need to make sure to clean up any previous work first or this operation will fail
                 FileUtils.forceDelete(targetRepository);
                 FileUtils.forceMkdir(targetRepository);
@@ -204,10 +204,24 @@ public class PackageMojo extends Abstrac
                         }
                     }
                 }
-                if (features != null) {
-                    for (String featureName: features) {
-                        featuresInstallFeatureMethod.invoke(featuresService, featureName, org.apache.karaf.features.internal.model.Feature.DEFAULT_VERSION, options);
-                    }
+                if (features == null) {
+                    features = new ArrayList<String>();
+                }
+                if (!features.contains("standard")) {
+                    features.add("standard");
+                }
+                if (!features.contains("obr")) {
+                    features.add("obr");
+                }
+                if (!features.contains("declarative-services")) {
+                    features.add("declarative-services");
+                }
+                if (!features.contains("core")) {
+                    features.add("core");
+                }
+
+                for (String featureName: features) {
+                    featuresInstallFeatureMethod.invoke(featuresService, featureName, org.apache.karaf.features.internal.model.Feature.DEFAULT_VERSION, options);
                 }
                 for (Long id : ids) {
                     try {
@@ -218,6 +232,7 @@ public class PackageMojo extends Abstrac
                 }
                 listBundles();
                 Object deployer = getService(Deployer.class);
+                getService(ConfigurationBuilder.class);
                 invokeDeployer(deployer, null);
             } catch (Exception e) {
                 getLog().info("Exception, use console to investigate ", e);

Modified: geronimo/server/branches/3.0-osgi/framework/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/configs/client-system/pom.xml?rev=1102133&r1=1102132&r2=1102133&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/configs/client-system/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/framework/configs/client-system/pom.xml Wed May 11 23:17:44 2011
@@ -33,6 +33,28 @@
     <packaging>car</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.feature</groupId>
+            <artifactId>core</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -68,30 +90,30 @@
         </dependency>
 
         <!-- used by plugin installer -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>jaxb-impl</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.2_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>woodstox</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-jaxb_2.2_spec</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
+            <!--<artifactId>jaxb-impl</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-stax-api_1.2_spec</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
+            <!--<artifactId>woodstox</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-activation_1.1_spec</artifactId>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
@@ -121,88 +143,16 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <!--<boot>true</boot>-->
-                    <!--
-                    <archive>
-                        <manifestEntries>
-                            <Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>
-                            <Extension-Dirs>lib/ext</Extension-Dirs>
-                        </manifestEntries>
-                        <manifest>
-                            <mainClass>org.apache.geronimo.cli.client.ClientCLI</mainClass>
-                        </manifest>
-                    </archive>
-                    -->
-                    <!--
-                    NOTE: This list of dependencies is non-transitive.
-                    -->
-                    <!--<classpath>-->
-                        <!--<element>-->
-                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-                            <!--<artifactId>geronimo-cli</artifactId>-->
-                            <!--<version>${project.version}</version>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-                            <!--<artifactId>geronimo-crypto</artifactId>-->
-                            <!--<version>${project.version}</version>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-                            <!--<artifactId>geronimo-kernel</artifactId>-->
-                            <!--<version>${project.version}</version>-->
-                        <!--</element>-->
-                        <!--&lt;!&ndash;-->
-                        <!--NOTE: geronimo-transformer is on the system classpath to avoid a potential deadlock. See GERONIMO-3141.-->
-                        <!--&ndash;&gt;-->
-                        <!--&lt;!&ndash;<element>&ndash;&gt;-->
-                            <!--&lt;!&ndash;<groupId>org.apache.geronimo.framework</groupId>&ndash;&gt;-->
-                            <!--&lt;!&ndash;<artifactId>geronimo-transformer</artifactId>&ndash;&gt;-->
-                            <!--&lt;!&ndash;<version>${project.version}</version>&ndash;&gt;-->
-                        <!--&lt;!&ndash;</element>&ndash;&gt;-->
-                        <!--<element>-->
-                            <!--<groupId>asm</groupId>-->
-                            <!--<artifactId>asm-all</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>commons-cli</groupId>-->
-                            <!--<artifactId>commons-cli</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>cglib</groupId>-->
-                            <!--<artifactId>cglib-nodep</artifactId>-->
-                        <!--</element>-->
-                        <!--&lt;!&ndash;<element>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<groupId>org.slf4j</groupId>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<artifactId>slf4j-api</artifactId>&ndash;&gt;-->
-                        <!--&lt;!&ndash;</element>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<element>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<groupId>org.slf4j</groupId>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<artifactId>slf4j-log4j12</artifactId>&ndash;&gt;-->
-                        <!--&lt;!&ndash;</element>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<element>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<groupId>org.slf4j</groupId>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<artifactId>jcl-over-slf4j</artifactId>&ndash;&gt;-->
-                        <!--&lt;!&ndash;</element>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<element>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<groupId>log4j</groupId>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<artifactId>log4j</artifactId>&ndash;&gt;-->
-                        <!--&lt;!&ndash;</element>&ndash;&gt;-->
-                        <!--<element>-->
-                            <!--<groupId>xpp3</groupId>-->
-                            <!--<artifactId>xpp3_min</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>org.apache.xbean</groupId>-->
-                            <!--<artifactId>xbean-reflect</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>com.thoughtworks.xstream</groupId>-->
-                            <!--<artifactId>xstream</artifactId>-->
-                        <!--</element>-->
-                    <!--</classpath>-->
-                    <!--<classpathPrefix>../lib</classpathPrefix>-->
-
+                    <features>
+                        <feature>management</feature>
+                        <feature>standard</feature>
+                        <!--<feature>kar</feature>-->
+                        <feature>obr</feature>
+                        <feature>config</feature>
+                        <feature>jndi</feature>
+                        <feature>declarative-services</feature>
+                        <feature>core</feature>
+                    </features>
                     <category>Geronimo Core</category>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/branches/3.0-osgi/framework/configs/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/configs/j2ee-security/pom.xml?rev=1102133&r1=1102132&r2=1102133&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/configs/j2ee-security/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/framework/configs/j2ee-security/pom.xml Wed May 11 23:17:44 2011
@@ -36,6 +36,28 @@
     <description>Basic Geronimo server security infrastructure</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.feature</groupId>
+            <artifactId>core</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- parent -->
         <dependency>
@@ -113,6 +135,16 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
+                    <features>
+                        <feature>management</feature>
+                        <feature>standard</feature>
+                        <!--<feature>kar</feature>-->
+                        <feature>obr</feature>
+                        <feature>config</feature>
+                        <feature>jndi</feature>
+                        <feature>declarative-services</feature>
+                        <feature>core</feature>
+                    </features>
                     <category>Security</category>
                     <instance>
                         <!--<plugin-artifact>-->

Modified: geronimo/server/branches/3.0-osgi/framework/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/configs/j2ee-system/pom.xml?rev=1102133&r1=1102132&r2=1102133&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/framework/configs/j2ee-system/pom.xml Wed May 11 23:17:44 2011
@@ -36,6 +36,29 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.framework.feature</groupId>
+            <artifactId>core</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-common</artifactId>
             <version>${project.version}</version>
@@ -70,14 +93,14 @@
             <groupId>asm</groupId>
             <artifactId>asm-all</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>sxc-jaxb</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>sxc-runtime</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
+            <!--<artifactId>sxc-jaxb</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
+            <!--<artifactId>sxc-runtime</artifactId>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>commons-cli</groupId>
@@ -155,119 +178,16 @@
 
                 <configuration>
 
-                    <!--<dependencies>-->
-                        <!--<dependency>-->
-                            <!--<groupId>org.apache.geronimo.specs</groupId>-->
-                            <!--<artifactId>geronimo-jaxb_2.2_spec</artifactId>-->
-                            <!--<type>jar</type>-->
-                            <!--<eagerStart>true</eagerStart>-->
-                            <!--<start>false</start>-->
-                        <!--</dependency>-->
-                        <!---->
-                        <!--<dependency>-->
-                            <!--<groupId>org.apache.geronimo.specs</groupId>-->
-                            <!--<artifactId>geronimo-activation_1.1_spec</artifactId>-->
-                            <!--<type>jar</type>-->
-                            <!--<eagerStart>true</eagerStart>-->
-                            <!--<start>false</start>-->
-                        <!--</dependency>-->
-                        <!---->
-                        <!--<dependency>-->
-                            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
-                            <!--<artifactId>jaxb-impl</artifactId>-->
-                            <!--<type>jar</type>-->
-                            <!--<eagerStart>true</eagerStart>-->
-                            <!--<start>false</start>-->
-                        <!--</dependency>-->
-
-                        <!--<dependency>-->
-                            <!--<groupId>org.apache.geronimo.specs</groupId>-->
-                            <!--<artifactId>geronimo-stax-api_1.2_spec</artifactId>-->
-                            <!--<type>jar</type>-->
-                            <!--<eagerStart>true</eagerStart>-->
-                            <!--<start>false</start>-->
-                        <!--</dependency>-->
-
-                        <!--<dependency>-->
-                            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
-                            <!--<artifactId>woodstox</artifactId>-->
-                            <!--<type>jar</type>-->
-                            <!--<eagerStart>true</eagerStart>-->
-                            <!--<start>false</start>-->
-                        <!--</dependency>-->
-                    <!--</dependencies>-->
-                    <!--<archive>-->
-                        <!--<manifestEntries>-->
-                            <!--<Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>-->
-                            <!--<Extension-Dirs>lib/ext</Extension-Dirs>-->
-                        <!--</manifestEntries>-->
-                        <!--<manifest>-->
-                            <!--<mainClass>org.apache.geronimo.cli.daemon.DaemonCLI</mainClass>-->
-                        <!--</manifest>-->
-                    <!--</archive>-->
-
-                    <!--
-                    NOTE: This list of dependencies is non-transitive.
-                    -->
-                    <!--<classpath>-->
-                        <!--<element>-->
-                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-                            <!--<artifactId>geronimo-cli</artifactId>-->
-                            <!--<version>${project.version}</version>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-                            <!--<artifactId>geronimo-crypto</artifactId>-->
-                            <!--<version>${project.version}</version>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-                            <!--<artifactId>geronimo-kernel</artifactId>-->
-                            <!--<version>${project.version}</version>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-                            <!--<artifactId>geronimo-config-groovy-transformer</artifactId>-->
-                            <!--<version>${project.version}</version>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>org.codehaus.groovy</groupId>-->
-                            <!--<artifactId>groovy-all-minimal</artifactId>-->
-                        <!--</element>-->
-                        <!--&lt;!&ndash;-->
-                        <!--NOTE: geronimo-transformer needs to be on the system classpath to avoid a potential deadlock. See GERONIMO-3141.-->
-                        <!--&ndash;&gt;-->
-                        <!--<element>-->
-                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-                            <!--<artifactId>geronimo-transformer</artifactId>-->
-                            <!--<version>${project.version}</version>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>asm</groupId>-->
-                            <!--<artifactId>asm-all</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>commons-cli</groupId>-->
-                            <!--<artifactId>commons-cli</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>cglib</groupId>-->
-                            <!--<artifactId>cglib-nodep</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>xpp3</groupId>-->
-                            <!--<artifactId>xpp3_min</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>org.apache.xbean</groupId>-->
-                            <!--<artifactId>xbean-reflect</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>com.thoughtworks.xstream</groupId>-->
-                            <!--<artifactId>xstream</artifactId>-->
-                        <!--</element>-->
-                    <!--</classpath>-->
-                    <!--<classpathPrefix>../lib</classpathPrefix>-->
+                    <features>
+                        <feature>management</feature>
+                        <feature>standard</feature>
+                        <!--<feature>kar</feature>-->
+                        <feature>obr</feature>
+                        <feature>config</feature>
+                        <feature>jndi</feature>
+                        <feature>declarative-services</feature>
+                        <feature>core</feature>
+                    </features>
 
                     <category>Geronimo Core</category>
                     <config-xml-content load="false" />

Modified: geronimo/server/branches/3.0-osgi/framework/configs/jmx-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/configs/jmx-security/pom.xml?rev=1102133&r1=1102132&r2=1102133&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/configs/jmx-security/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/framework/configs/jmx-security/pom.xml Wed May 11 23:17:44 2011
@@ -36,13 +36,29 @@
 
     <dependencies>
 
-        <!-- parent -->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework.config</groupId>-->
-            <!--<artifactId>server-security-config</artifactId>-->
-            <!--<version>${project.version}</version>-->
-            <!--<type>car</type>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.geronimo.framework.feature</groupId>
+            <artifactId>core</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-jmx-remoting</artifactId>
@@ -90,6 +106,16 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
+                    <features>
+                        <feature>management</feature>
+                        <feature>standard</feature>
+                        <!--<feature>kar</feature>-->
+                        <feature>obr</feature>
+                        <feature>config</feature>
+                        <feature>jndi</feature>
+                        <feature>declarative-services</feature>
+                        <feature>core</feature>
+                    </features>
                     <category>Security</category>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/branches/3.0-osgi/framework/configs/jsr88-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/configs/jsr88-cli/pom.xml?rev=1102133&r1=1102132&r2=1102133&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/configs/jsr88-cli/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/framework/configs/jsr88-cli/pom.xml Wed May 11 23:17:44 2011
@@ -33,6 +33,28 @@
     <packaging>car</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.feature</groupId>
+            <artifactId>core</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
 
 
         <dependency>
@@ -130,6 +152,16 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
+                    <features>
+                        <feature>management</feature>
+                        <feature>standard</feature>
+                        <!--<feature>kar</feature>-->
+                        <feature>obr</feature>
+                        <feature>config</feature>
+                        <feature>jndi</feature>
+                        <feature>declarative-services</feature>
+                        <feature>core</feature>
+                    </features>
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/branches/3.0-osgi/framework/configs/jsr88-deploymentfactory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/configs/jsr88-deploymentfactory/pom.xml?rev=1102133&r1=1102132&r2=1102133&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/configs/jsr88-deploymentfactory/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/framework/configs/jsr88-deploymentfactory/pom.xml Wed May 11 23:17:44 2011
@@ -33,6 +33,28 @@
     <packaging>car</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.feature</groupId>
+            <artifactId>core</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -112,6 +134,16 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
+                    <features>
+                        <feature>management</feature>
+                        <feature>standard</feature>
+                        <!--<feature>kar</feature>-->
+                        <feature>obr</feature>
+                        <feature>config</feature>
+                        <feature>jndi</feature>
+                        <feature>declarative-services</feature>
+                        <feature>core</feature>
+                    </features>
                     <archive>
                         <manifestEntries>
                             <J2EE-DeploymentFactory-Implementation-Class>org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryBootstrapper</J2EE-DeploymentFactory-Implementation-Class>

Modified: geronimo/server/branches/3.0-osgi/framework/configs/offline-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/configs/offline-deployer/pom.xml?rev=1102133&r1=1102132&r2=1102133&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/configs/offline-deployer/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/framework/configs/offline-deployer/pom.xml Wed May 11 23:17:44 2011
@@ -35,6 +35,28 @@
     <description>Offline deployer</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.feature</groupId>
+            <artifactId>core</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework.config</groupId>
@@ -50,6 +72,16 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
+                    <features>
+                        <feature>management</feature>
+                        <feature>standard</feature>
+                        <!--<feature>kar</feature>-->
+                        <feature>obr</feature>
+                        <feature>config</feature>
+                        <feature>jndi</feature>
+                        <feature>declarative-services</feature>
+                        <feature>core</feature>
+                    </features>
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/branches/3.0-osgi/framework/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/configs/online-deployer/pom.xml?rev=1102133&r1=1102132&r2=1102133&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/framework/configs/online-deployer/pom.xml Wed May 11 23:17:44 2011
@@ -35,6 +35,28 @@
     <description>Geronimo Online Deployer</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.feature</groupId>
+            <artifactId>core</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -108,62 +130,16 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <boot>true</boot>
-                    <archive>
-                        <manifestEntries>
-                            <Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>
-                            <Extension-Dirs>lib/ext</Extension-Dirs>
-                        </manifestEntries>
-                        <manifest>
-                            <mainClass>org.apache.geronimo.cli.deployer.DeployerCLI</mainClass>
-                        </manifest>
-                    </archive>
-
-                    <!--
-                    NOTE: This list of dependencies is non-transitive.
-                    -->
-                    <classpath>
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-cli</artifactId>
-                            <version>${project.version}</version>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-crypto</artifactId>
-                            <version>${project.version}</version>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-kernel</artifactId>
-                            <version>${project.version}</version>
-                        </element>
-                        <element>
-                            <groupId>commons-cli</groupId>
-                            <artifactId>commons-cli</artifactId>
-                        </element>
-                        <element>
-                            <groupId>asm</groupId>
-                            <artifactId>asm-all</artifactId>
-                        </element>
-                        <element>
-                            <groupId>cglib</groupId>
-                            <artifactId>cglib-nodep</artifactId>
-                        </element>
-                        <!--<element>-->
-                            <!--<groupId>xpp3</groupId>-->
-                            <!--<artifactId>xpp3_min</artifactId>-->
-                        <!--</element>-->
-                        <element>
-                            <groupId>org.apache.xbean</groupId>
-                            <artifactId>xbean-reflect</artifactId>
-                        </element>
-                        <!--<element>-->
-                            <!--<groupId>com.thoughtworks.xstream</groupId>-->
-                            <!--<artifactId>xstream</artifactId>-->
-                        <!--</element>-->
-                    </classpath>
-                    <classpathPrefix>../lib</classpathPrefix>
+                    <features>
+                        <feature>management</feature>
+                        <feature>standard</feature>
+                        <!--<feature>kar</feature>-->
+                        <feature>obr</feature>
+                        <feature>config</feature>
+                        <feature>jndi</feature>
+                        <feature>declarative-services</feature>
+                        <feature>core</feature>
+                    </features>
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/branches/3.0-osgi/framework/configs/plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/configs/plugin/pom.xml?rev=1102133&r1=1102132&r2=1102133&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/configs/plugin/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/framework/configs/plugin/pom.xml Wed May 11 23:17:44 2011
@@ -35,6 +35,28 @@
     <description>Plugin management services including the installer.</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.feature</groupId>
+            <artifactId>core</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework.config</groupId>
@@ -111,24 +133,17 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
-                    </deploymentConfigs>
-                    <deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
-                    <category>Geronimo Core</category>
-                    <instance>
-                        <!--<plugin-artifact>-->
-                            <!--<config-xml-content>-->
-                                <!--<gbean name="DownloadedPluginRepos">-->
-                                    <!--<attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-3.0.txt</attribute>-->
-                                <!--</gbean>-->
-                            <!--</config-xml-content>-->
-                            <!--&lt;!&ndash;<artifact-alias key="org.apache.geronimo.framework/jsr88-cli//car">org.apache.geronimo.framework/plugin/${project.version}/car</artifact-alias>&ndash;&gt;-->
-                            <!--&lt;!&ndash;<artifact-alias key="org.apache.geronimo.framework/jsr88-cli/${project.version}/car">org.apache.geronimo.framework/plugin/${project.version}/car</artifact-alias>&ndash;&gt;-->
-                            <!--<copy-file dest-dir="schema">schema/xsd/</copy-file>-->
-                            <!--<copy-file dest-dir="var/config" relative-to="server">plugin-repositories.properties</copy-file>-->
-                        <!--</plugin-artifact>-->
-                    </instance>
+                    <features>
+                        <feature>management</feature>
+                        <feature>standard</feature>
+                        <!--<feature>kar</feature>-->
+                        <feature>obr</feature>
+                        <feature>config</feature>
+                        <feature>jndi</feature>
+                        <feature>declarative-services</feature>
+                        <feature>core</feature>
+                    </features>
+
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/branches/3.0-osgi/framework/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/configs/rmi-naming/pom.xml?rev=1102133&r1=1102132&r2=1102133&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/configs/rmi-naming/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/framework/configs/rmi-naming/pom.xml Wed May 11 23:17:44 2011
@@ -35,6 +35,28 @@
     <description>Fundamental geronimo services including the plugin installer.</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.feature</groupId>
+            <artifactId>core</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework.config</groupId>
@@ -123,6 +145,16 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
+                    <features>
+                        <feature>management</feature>
+                        <feature>standard</feature>
+                        <!--<feature>kar</feature>-->
+                        <feature>obr</feature>
+                        <feature>config</feature>
+                        <feature>jndi</feature>
+                        <feature>declarative-services</feature>
+                        <feature>core</feature>
+                    </features>
                     <category>Geronimo Core</category>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/branches/3.0-osgi/framework/configs/server-security-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/configs/server-security-config/pom.xml?rev=1102133&r1=1102132&r2=1102133&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/configs/server-security-config/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/framework/configs/server-security-config/pom.xml Wed May 11 23:17:44 2011
@@ -35,6 +35,28 @@
     <description>Sample security configuration for a demo geronimo server. Not suitable for production use.</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.feature</groupId>
+            <artifactId>core</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
         <!-- parent -->
         <dependency>
             <groupId>org.apache.geronimo.framework.config</groupId>
@@ -84,6 +106,16 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
+                    <features>
+                        <feature>management</feature>
+                        <feature>standard</feature>
+                        <!--<feature>kar</feature>-->
+                        <feature>obr</feature>
+                        <feature>config</feature>
+                        <feature>jndi</feature>
+                        <feature>declarative-services</feature>
+                        <feature>core</feature>
+                    </features>
                     <category>Security</category>
                     <instance>
                         <!--<plugin-artifact>-->

Modified: geronimo/server/branches/3.0-osgi/framework/configs/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/configs/shutdown/pom.xml?rev=1102133&r1=1102132&r2=1102133&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/configs/shutdown/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/framework/configs/shutdown/pom.xml Wed May 11 23:17:44 2011
@@ -33,6 +33,28 @@
     <packaging>car</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.feature</groupId>
+            <artifactId>core</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -98,40 +120,17 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>
-                            <Extension-Dirs>lib/ext</Extension-Dirs>
-                        </manifestEntries>
-                        <manifest>
-                            <mainClass>org.apache.geronimo.kernel.util.MainBootstrapper</mainClass>
-                        </manifest>
-                    </archive>
-
-                    <!--
-                    NOTE: This list of dependencies is non-transitive.
-                    -->
-                    <classpath>
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-crypto</artifactId>
-                            <version>${project.version}</version>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-kernel</artifactId>
-                            <version>${project.version}</version>
-                        </element>
-                        <element>
-                            <groupId>cglib</groupId>
-                            <artifactId>cglib-nodep</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.apache.xbean</groupId>
-                            <artifactId>xbean-reflect</artifactId>
-                        </element>
-                    </classpath>
-                    <classpathPrefix>../lib</classpathPrefix>
+                    <features>
+                        <feature>management</feature>
+                        <feature>standard</feature>
+                        <!--<feature>kar</feature>-->
+                        <feature>obr</feature>
+                        <feature>config</feature>
+                        <feature>jndi</feature>
+                        <feature>declarative-services</feature>
+                        <feature>core</feature>
+                    </features>
+
                     <category>Geronimo Core</category>
                     <instance>
                         <plugin-artifact>

Copied: geronimo/server/branches/3.0-osgi/framework/features/core/pom.xml (from r1100682, geronimo/server/branches/3.0-osgi/framework/configs/jsr88-cli/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/features/core/pom.xml?p2=geronimo/server/branches/3.0-osgi/framework/features/core/pom.xml&p1=geronimo/server/branches/3.0-osgi/framework/configs/jsr88-cli/pom.xml&r1=1100682&r2=1102133&rev=1102133&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/configs/jsr88-cli/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/framework/features/core/pom.xml Wed May 11 23:17:44 2011
@@ -23,24 +23,30 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.framework.config</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.framework.feature</groupId>
+        <artifactId>feature</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>jsr88-cli</artifactId>
-    <name>Geronimo Framework, Configs :: JSR-88 CLI</name>
-    <packaging>car</packaging>
-
-    <dependencies>
+    <artifactId>core</artifactId>
+    <name>Geronimo Framework, Feature :: J2EE System</name>
+    <packaging>feature</packaging>
 
+    <description>Base geronimo server that sets up the kernel.</description>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.feature</groupId>
+            <artifactId>declarative-services</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-common</artifactId>
             <version>${project.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-system</artifactId>
@@ -55,90 +61,101 @@
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <artifactId>geronimo-obr</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-cli</artifactId>
+            <artifactId>geronimo-plugin</artifactId>
             <version>${project.version}</version>
         </dependency>
+
         <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-deploy-tool</artifactId>
             <version>${project.version}</version>
+
+            <!-- exclude transitive deps -->
+            <!--<exclusions>-->
+                <!--<exclusion>-->
+                    <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                    <!--<artifactId>geronimo-crypto</artifactId>-->
+                <!--</exclusion>-->
+                <!--<exclusion>-->
+                    <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                    <!--<artifactId>geronimo-deploy-jsr88</artifactId>-->
+                <!--</exclusion>-->
+            <!--</exclusions>-->
         </dependency>
 
+        <!-- Used by TemporaryClassLoader in kernel -->
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-deploy-config</artifactId>
-            <version>${project.version}</version>
+            <groupId>asm</groupId>
+            <artifactId>asm-all</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-plugin</artifactId>
-            <version>${project.version}</version>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.ant</artifactId>
+            <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>commons-cli</groupId>-->
-            <!--<artifactId>commons-cli</artifactId>-->
-        <!--</dependency>-->
 
-        <!-- used by plugin installer -->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.specs</groupId>-->
-            <!--<artifactId>geronimo-jaxb_2.2_spec</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
-            <!--<artifactId>jaxb-impl</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.specs</groupId>-->
-            <!--<artifactId>geronimo-stax-api_1.2_spec</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
-            <!--<artifactId>woodstox</artifactId>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.1_spec</artifactId>
         </dependency>
 
+        <!-- TODO figure out if this is the best way to implement what we want. Consider a fragment? -->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-pax-logging</artifactId>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
+
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
                 <configuration>
-                    <category>Deployment</category>
-                    <instance>
-                        <plugin-artifact>
-                            <config-xml-content server="jsr88" />
-                        </plugin-artifact>
-                    </instance>
+                    <startLevel>40</startLevel>
+                    <features>
+                        <feature>declarative-services</feature>
+                    </features>
+                    <aggregateFeatures>true</aggregateFeatures>
+
+                    <checkDependencyChange>true</checkDependencyChange>
+                    <warnOnDependencyChange>true</warnOnDependencyChange>
+                    <logDependencyChanges>true</logDependencyChanges>
+                    <!--<overwriteChangedDependencies>true</overwriteChangedDependencies>-->
                 </configuration>
             </plugin>
         </plugins>
     </build>
-</project>
 
+
+</project>

Added: geronimo/server/branches/3.0-osgi/framework/features/core/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/features/core/src/main/history/dependencies.xml?rev=1102133&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/features/core/src/main/history/dependencies.xml (added)
+++ geronimo/server/branches/3.0-osgi/framework/features/core/src/main/history/dependencies.xml Wed May 11 23:17:44 2011
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="&lt;unnamed&gt;">
+    <feature>
+        <bundle>mvn:asm/asm-all/3.2</bundle>
+        <bundle>mvn:commons-cli/commons-cli/1.2</bundle>
+        <bundle>mvn:commons-lang/commons-lang/2.5</bundle>
+        <bundle>mvn:org.apache.aries.blueprint/org.apache.aries.blueprint/0.3</bundle>
+        <bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/0.3</bundle>
+        <bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx/0.3</bundle>
+        <bundle>mvn:org.apache.aries.jndi/org.apache.aries.jndi/0.3</bundle>
+        <bundle>mvn:org.apache.aries.proxy/org.apache.aries.proxy.api/0.3</bundle>
+        <bundle>mvn:org.apache.aries/org.apache.aries.util/0.3</bundle>
+        <bundle>mvn:org.apache.felix/org.apache.felix.bundlerepository/1.6.4</bundle>
+        <bundle>mvn:org.apache.felix/org.apache.felix.configadmin/1.2.8</bundle>
+        <bundle>mvn:org.apache.felix/org.apache.felix.scr.annotations/1.4.0</bundle>
+        <bundle>mvn:org.apache.felix/org.apache.felix.scr/1.6.1-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.bundles/sxc-jaxb/0.7.3_2-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.bundles/sxc-runtime/0.7.3_2-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.components/geronimo-jaspi/1.1.2-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework.config/j2ee-security/3.0-SNAPSHOT/car</bundle>
+        <bundle>mvn:org.apache.geronimo.framework.config/j2ee-system/3.0-SNAPSHOT/car</bundle>
+        <bundle>mvn:org.apache.geronimo.framework.config/plugin/3.0-SNAPSHOT/car</bundle>
+        <bundle>mvn:org.apache.geronimo.framework.config/rmi-naming/3.0-SNAPSHOT/car</bundle>
+        <bundle>mvn:org.apache.geronimo.framework.config/server-security-config/3.0-SNAPSHOT/car</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-blueprint/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-cli/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-common/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-core/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-crypto/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-deploy-config/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-deploy-jsr88/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-deploy-tool/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-deployment/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-interceptor/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-jmx-remoting/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-kernel/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-management/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-naming/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-obr/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-pax-logging/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-plugin/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-security/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-service-builder/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.framework/geronimo-system/3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/1.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-ejb_3.1_spec/1.0.2</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jacc_1.4_spec/1.0</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/1.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-javaee-deployment_1.1MR3_spec/1.0.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jaxrpc_1.1_spec/2.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.0</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-saaj_1.3_spec/1.1</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/1.0</bundle>
+        <bundle>mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.config/3.0.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.modules/3.0.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.console/3.0.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_3</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/2.1_3_4</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-jexl/1.1_3</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/2.4.0_3</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/1.2_2</bundle>
+        <bundle>mvn:org.apache.xbean/xbean-bundleutils/3.8-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.xbean/xbean-finder/3.8-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.xbean/xbean-naming/3.8-SNAPSHOT</bundle>
+        <bundle>mvn:org.apache.xbean/xbean-reflect/3.8-SNAPSHOT</bundle>
+        <bundle>mvn:org.ops4j.pax.logging/pax-logging-api/1.6.1</bundle>
+    </feature>
+</features>

Propchange: geronimo/server/branches/3.0-osgi/framework/features/core/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-osgi/framework/features/core/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-osgi/framework/features/core/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message