geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1096952 [1/4] - in /geronimo/server/trunk: ./ framework/ framework/buildsupport/car-maven-plugin/ framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ framework/configs/j2ee-system/ framework/configs/...
Date Tue, 26 Apr 2011 23:19:34 GMT
Author: djencks
Date: Tue Apr 26 23:19:31 2011
New Revision: 1096952

URL: http://svn.apache.org/viewvc?rev=1096952&view=rev
Log:
remove some xpp cruft. reduce use of ConfigurationManager.  Split configuration startup into load gbeans and start gbeans so loaded gbean metadatas are available in kernel

Added:
    geronimo/server/trunk/31-3-2011.bundle
    geronimo/server/trunk/framework/features/declarative-services/
    geronimo/server/trunk/framework/features/declarative-services/pom.xml   (with props)
    geronimo/server/trunk/framework/features/declarative-services/src/
    geronimo/server/trunk/framework/features/declarative-services/src/main/
    geronimo/server/trunk/framework/features/declarative-services/src/main/history/
    geronimo/server/trunk/framework/features/declarative-services/src/main/history/dependencies.xml
      - copied, changed from r1096951, geronimo/server/trunk/framework/features/j2ee-system/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationExtender.java   (contents, props changed)
      - copied, changed from r1096951, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationExtender.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/WrappingServerInfo.java   (with props)
Removed:
    geronimo/server/trunk/framework/configs/j2ee-system/src/main/resources/META-INF/startup-jar
    geronimo/server/trunk/framework/features/j2ee-system/src/main/plan/plan.xml
    geronimo/server/trunk/framework/features/j2ee-system/src/main/resources/META-INF/startup-jar
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/AbstractNameConverter.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/AbstractNameQueryConverter.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/ConfigurationDataConverter.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/ConfigurationModuleTypeConverter.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/DomConverter.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/GBeanDataConverter.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/ImportTypeConverter.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/QNameConverter.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/URIConverter.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/VersionConverter.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/XStreamConfigurationMarshaler.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/XStreamGBeanState.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/XStreamGBeanStateConverter.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/xstream/XStreamUtil.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationExtender.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java
Modified:
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/FrameworkHelper.java
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
    geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
    geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml
    geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
    geronimo/server/trunk/framework/configs/online-deployer/pom.xml
    geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml
    geronimo/server/trunk/framework/features/j2ee-system/pom.xml
    geronimo/server/trunk/framework/features/j2ee-system/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/features/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-blueprint/src/main/java/org/apache/geronimo/blueprint/WaitForBlueprintGBean.java
    geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-full/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryBootstrapper.java
    geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java
    geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/Kernel.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/KernelGBean.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicKernel.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/EditableKernelConfigurationManager.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainConfigurationBootstrapper.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/gbean/Speed.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/gbean/runtime/GBeanAttributeTest.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/gbean/runtime/GBeanDependencyTest.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/ConfigTest.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/GBeanTest.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/SimpleGBeanTest.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/ConfigurationManagerTest.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/ConfigurationUtilTest.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java
    geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/JavaCompGBeanTest.java
    geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/KernelContextGBeanTest.java
    geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/GBeanBindingTest.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/SecurityServiceImpl.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/AbstractTest.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/AbstractLoginModuleTest.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginKerberosNonGeronimoTest.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginKerberosTest.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/TimeoutTest.java
    geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/KernelDelegate.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/RealMBeanServerReference.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/CommandLine.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/Daemon.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java
    geronimo/server/trunk/framework/modules/testsupport-common/src/main/java/org/apache/geronimo/testsupport/TestSupport.java
    geronimo/server/trunk/framework/pom.xml
    geronimo/server/trunk/pom.xml

Added: geronimo/server/trunk/31-3-2011.bundle
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/31-3-2011.bundle?rev=1096952&view=auto
==============================================================================
Files geronimo/server/trunk/31-3-2011.bundle (added) and geronimo/server/trunk/31-3-2011.bundle Tue Apr 26 23:19:31 2011 differ

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml Tue Apr 26 23:19:31 2011
@@ -233,16 +233,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.sonatype.gossip</groupId>
             <artifactId>gossip</artifactId>
         </dependency>

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java Tue Apr 26 23:19:31 2011
@@ -29,7 +29,6 @@ import java.util.Map;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 
-import org.apache.geronimo.system.osgi.BootActivator;
 import org.apache.maven.archiver.MavenArchiveConfiguration;
 import org.apache.maven.archiver.MavenArchiver;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
@@ -120,7 +119,7 @@ public class ArchiveCarMojo
     /**
      * The Geronimo repository where modules will be packaged up from.
      *
-     * @parameter expression="${project.build.directory}/repository"
+     * @parameter expression="${project.build.directory}/karaf/local-repo"
      * @required
      */
     private File targetRepository = null;

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/FrameworkHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/FrameworkHelper.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/FrameworkHelper.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/FrameworkHelper.java Tue Apr 26 23:19:31 2011
@@ -43,6 +43,7 @@ import java.security.Security;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -101,6 +102,12 @@ public class FrameworkHelper {
 
     public Framework start() throws Exception {
 //        ThreadLocalProperties.install();
+        for (Iterator<Map.Entry<Object, Object>> it = System.getProperties().entrySet().iterator(); it.hasNext(); ) {
+            Map.Entry<Object, Object> entry = it.next();
+            if (((String)entry.getKey()).startsWith("karaf.")) {
+                it.remove();
+            }
+        }
         System.setProperty(PROP_KARAF_HOME, karafHomeString);
         System.setProperty(PROP_KARAF_BASE, karafHomeString);
         launch();

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java Tue Apr 26 23:19:31 2011
@@ -23,6 +23,7 @@ import java.io.File;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URI;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Dictionary;
 import java.util.HashSet;
@@ -213,17 +214,25 @@ public class PackageMojo extends Abstrac
                 if (!planFile.exists()) {
                     return;
                 }
+                List<Long> ids = new ArrayList<Long>();
                 for (Artifact dependency : (Set<Artifact>) project.getDependencyArtifacts()) {
                     if ("compile".equals(dependency.getScope()) || "runtime".equals(dependency.getScope())) {
                         getLog().info("starting dependency: " + dependency);
                         File file = dependency.getFile();
                         try {
-                            getFramework().getBundleContext().installBundle("reference:" + file.toURI().toURL());
+                            ids.add(getFramework().getBundleContext().installBundle("reference:" + file.toURI().toURL()).getBundleId());
                         } catch (BundleException e) {
                             getLog().info("Can't start " + dependency + " due to " + e.getMessage());
                         }
                     }
                 }
+                for (Long id: ids) {
+                    try {
+                        getFramework().getBundleContext().getBundle(id).start();
+                    } catch (BundleException e) {
+                        getLog().info("Can't start " + id + " due to " + e.getMessage());
+                    }
+                }
                 listBundles();
                 Object deployer = getService(Deployer.class);
                 invokeDeployer(deployer, null);

Modified: geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/pom.xml?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/pom.xml Tue Apr 26 23:19:31 2011
@@ -84,10 +84,10 @@
             <artifactId>commons-cli</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.servicemix.bundles</groupId>-->
+            <!--<artifactId>org.apache.servicemix.bundles.xstream</artifactId>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
@@ -104,35 +104,25 @@
         </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.bundles</groupId>
-            <artifactId>sxc-jaxb</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>sxc-runtime</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>
@@ -165,47 +155,47 @@
 
                 <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>
+                    <!--<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>-->

Modified: geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml Tue Apr 26 23:19:31 2011
@@ -29,9 +29,9 @@ specific services - those should be prov
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
 
     <!-- ServerInfo service -->
-    <!--<gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo">-->
+    <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.WrappingServerInfo">
         <!--<attribute name="useSystemProperties">true</attribute>-->
-    <!--</gbean>-->
+    </gbean>
 
     <!--Repository-->
     <!--<gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">-->
@@ -60,9 +60,9 @@ specific services - those should be prov
 
     <!--User-editable attribute service-->
     <gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
-        <!--<reference name="ServerInfo">-->
-            <!--<name>ServerInfo</name>-->
-        <!--</reference>-->
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
         <attribute name="configFile">var/config/config.xml</attribute>
         <attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>
         <attribute name="substitutionPrefix">org.apache.geronimo.config.substitution.</attribute>
@@ -127,18 +127,18 @@ specific services - those should be prov
     <!--<gbean name="Logger" class="org.apache.geronimo.system.logging.OSGILogServiceWrapper">       -->
     <!--</gbean>    -->
 
-    <gbean name="GeronimoOBR" class="org.apache.geronimo.obr.GeronimoOBRGBean">
-        <!--<reference name="Repository">-->
-            <!--<name>Repository</name>-->
-        <!--</reference>-->
-        <!--<reference name="ServerInfo">-->
-            <!--<name>ServerInfo</name>-->
-        <!--</reference>-->
-        <attribute name="exclusions">
-             org.apache.felix/org.apache.felix.framework//,
-             org.eclipse/osgi//
-        </attribute>
-    </gbean>
+    <!--<gbean name="GeronimoOBR" class="org.apache.geronimo.obr.GeronimoOBRGBean">-->
+        <!--&lt;!&ndash;<reference name="Repository">&ndash;&gt;-->
+            <!--&lt;!&ndash;<name>Repository</name>&ndash;&gt;-->
+        <!--&lt;!&ndash;</reference>&ndash;&gt;-->
+        <!--&lt;!&ndash;<reference name="ServerInfo">&ndash;&gt;-->
+            <!--&lt;!&ndash;<name>ServerInfo</name>&ndash;&gt;-->
+        <!--&lt;!&ndash;</reference>&ndash;&gt;-->
+        <!--<attribute name="exclusions">-->
+             <!--org.apache.felix/org.apache.felix.framework//,-->
+             <!--org.eclipse/osgi//-->
+        <!--</attribute>-->
+    <!--</gbean>-->
 
     <!--<gbean name="EmbeddedDaemon" class="org.apache.geronimo.system.main.EmbeddedDaemon"/>-->
 

Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml Tue Apr 26 23:19:31 2011
@@ -145,18 +145,18 @@
                             <groupId>cglib</groupId>
                             <artifactId>cglib-nodep</artifactId>
                         </element>
-                        <element>
-                            <groupId>xpp3</groupId>
-                            <artifactId>xpp3_min</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>
+                        <!--<element>-->
+                            <!--<groupId>com.thoughtworks.xstream</groupId>-->
+                            <!--<artifactId>xstream</artifactId>-->
+                        <!--</element>-->
                     </classpath>
                     <classpathPrefix>../lib</classpathPrefix>
 

Modified: geronimo/server/trunk/framework/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/pom.xml?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/pom.xml Tue Apr 26 23:19:31 2011
@@ -150,18 +150,18 @@
                             <groupId>cglib</groupId>
                             <artifactId>cglib-nodep</artifactId>
                         </element>
-                        <element>
-                            <groupId>xpp3</groupId>
-                            <artifactId>xpp3_min</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>
+                        <!--<element>-->
+                            <!--<groupId>com.thoughtworks.xstream</groupId>-->
+                            <!--<artifactId>xstream</artifactId>-->
+                        <!--</element>-->
                     </classpath>
                     <classpathPrefix>../lib</classpathPrefix>
                     <category>Deployment</category>

Modified: geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml Tue Apr 26 23:19:31 2011
@@ -30,9 +30,9 @@
         <reference name="ConfigStore">
             <name>Local</name>
         </reference>
-        <reference name="ConfigManager">
-            <name>ConfigurationManager</name>
-        </reference>
+        <!--<reference name="ConfigManager">-->
+            <!--<name>ConfigurationManager</name>-->
+        <!--</reference>-->
         <reference name="ServerInfo">
             <name>ServerInfo</name>
         </reference>
@@ -68,9 +68,9 @@
         <reference name="AttributeStore">
             <name>AttributeManager</name>
         </reference>
-        <reference name="ArtifactResolver">
-            <name>ArtifactResolver</name>
-        </reference>
+        <!--<reference name="ArtifactResolver">-->
+            <!--<name>ArtifactResolver</name>-->
+        <!--</reference>-->
     </gbean>
 
     <gbean name="Offline" class="org.apache.geronimo.system.plugin.ServerInstanceData">
@@ -115,9 +115,9 @@
         <reference name="PluginInstallerGBean">
             <name>PluginInstaller</name>
         </reference>
-        <reference name="ConfigManager">
-            <name>ConfigurationManager</name>
-        </reference>
+        <!--<reference name="ConfigManager">-->
+            <!--<name>ConfigurationManager</name>-->
+        <!--</reference>-->
         <reference name="PersistentConfigurationList">
             <type>AttributeStore</type>
             <name>AttributeManager</name>

Added: geronimo/server/trunk/framework/features/declarative-services/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/declarative-services/pom.xml?rev=1096952&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/declarative-services/pom.xml (added)
+++ geronimo/server/trunk/framework/features/declarative-services/pom.xml Tue Apr 26 23:19:31 2011
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.framework.feature</groupId>
+        <artifactId>feature</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>declarative-services</artifactId>
+    <name>Geronimo Framework, Feature :: DS and Metatype</name>
+    <packaging>feature</packaging>
+
+    <description>DS and Metatype support</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.shell</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.metatype</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+                <configuration>
+                    <startLevel>30</startLevel>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>

Propchange: geronimo/server/trunk/framework/features/declarative-services/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/declarative-services/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/declarative-services/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: geronimo/server/trunk/framework/features/declarative-services/src/main/history/dependencies.xml (from r1096951, geronimo/server/trunk/framework/features/j2ee-system/src/main/history/dependencies.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/declarative-services/src/main/history/dependencies.xml?p2=geronimo/server/trunk/framework/features/declarative-services/src/main/history/dependencies.xml&p1=geronimo/server/trunk/framework/features/j2ee-system/src/main/history/dependencies.xml&r1=1096951&r2=1096952&rev=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/j2ee-system/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/features/declarative-services/src/main/history/dependencies.xml Tue Apr 26 23:19:31 2011
@@ -4,18 +4,19 @@
         <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.2-incubating</bundle>
-        <bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/0.2-incubating</bundle>
-        <bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx/0.2-incubating</bundle>
-        <bundle>mvn:org.apache.aries.jndi/org.apache.aries.jndi/0.2-incubating</bundle>
-        <bundle>mvn:org.apache.aries/org.apache.aries.util/0.2-incubating</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.4</bundle>
-        <bundle>mvn:org.apache.geronimo.bundles/jaxb-impl/2.2.3_1-SNAPSHOT</bundle>
-        <bundle>mvn:org.apache.geronimo.bundles/sxc-jaxb/0.7.3_1</bundle>
-        <bundle>mvn:org.apache.geronimo.bundles/sxc-runtime/0.7.3_1</bundle>
-        <bundle>mvn:org.apache.geronimo.bundles/woodstox/3.2.9_1</bundle>
-        <bundle>mvn:org.apache.geronimo.components/geronimo-jaspi/1.1.1</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>
@@ -26,6 +27,8 @@
         <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>
@@ -45,25 +48,23 @@
         <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-jaxb_2.2_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.geronimo.specs/geronimo-stax-api_1.2_spec/1.0</bundle>
-        <bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.console/2.1.2</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.servicemix.bundles/org.apache.servicemix.bundles.xpp3/1.1.4c_3</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/1.3_3</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.5.3</bundle>
+        <bundle>mvn:org.ops4j.pax.logging/pax-logging-api/1.6.1</bundle>
     </feature>
 </features>

Modified: geronimo/server/trunk/framework/features/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/j2ee-system/pom.xml?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/framework/features/j2ee-system/pom.xml Tue Apr 26 23:19:31 2011
@@ -36,6 +36,13 @@
 
     <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>
@@ -114,10 +121,10 @@
             <artifactId>commons-cli</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.servicemix.bundles</groupId>-->
+            <!--<artifactId>org.apache.servicemix.bundles.xstream</artifactId>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
@@ -134,35 +141,25 @@
         </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.bundles</groupId>
-            <artifactId>sxc-jaxb</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>sxc-runtime</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>
@@ -227,6 +224,9 @@
                     <startLevel>50</startLevel>
                     <checkDependencyChange>true</checkDependencyChange>
                     <warnOnDependencyChange>true</warnOnDependencyChange>
+                    <logDependencyChanges>true</logDependencyChanges>
+                    <!--<overwriteChangedDependencies>true</overwriteChangedDependencies>-->
+                    <aggregateFeatures>true</aggregateFeatures>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/framework/features/j2ee-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/j2ee-system/src/main/history/dependencies.xml?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/j2ee-system/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/features/j2ee-system/src/main/history/dependencies.xml Tue Apr 26 23:19:31 2011
@@ -4,18 +4,19 @@
         <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.2-incubating</bundle>
-        <bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/0.2-incubating</bundle>
-        <bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx/0.2-incubating</bundle>
-        <bundle>mvn:org.apache.aries.jndi/org.apache.aries.jndi/0.2-incubating</bundle>
-        <bundle>mvn:org.apache.aries/org.apache.aries.util/0.2-incubating</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.4</bundle>
-        <bundle>mvn:org.apache.geronimo.bundles/jaxb-impl/2.2.3_1-SNAPSHOT</bundle>
-        <bundle>mvn:org.apache.geronimo.bundles/sxc-jaxb/0.7.3_1</bundle>
-        <bundle>mvn:org.apache.geronimo.bundles/sxc-runtime/0.7.3_1</bundle>
-        <bundle>mvn:org.apache.geronimo.bundles/woodstox/3.2.9_1</bundle>
-        <bundle>mvn:org.apache.geronimo.components/geronimo-jaspi/1.1.1</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>
@@ -26,6 +27,8 @@
         <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>
@@ -45,25 +48,23 @@
         <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-jaxb_2.2_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.geronimo.specs/geronimo-stax-api_1.2_spec/1.0</bundle>
-        <bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.console/2.1.2</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.servicemix.bundles/org.apache.servicemix.bundles.xpp3/1.1.4c_3</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/1.3_3</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.5.3</bundle>
+        <bundle>mvn:org.ops4j.pax.logging/pax-logging-api/1.6.1</bundle>
     </feature>
 </features>

Modified: geronimo/server/trunk/framework/features/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/pom.xml?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/pom.xml (original)
+++ geronimo/server/trunk/framework/features/pom.xml Tue Apr 26 23:19:31 2011
@@ -38,6 +38,7 @@
         <!--<module>geronimo-gbean-deployer-bootstrap</module>-->
         <!--<module>client-system</module>-->
         <!--<module>j2ee-security</module>-->
+        <module>declarative-services</module>
         <module>j2ee-system</module>
         <!--<module>jsr88-cli</module>-->
         <!--<module>jsr88-deploymentfactory</module>-->

Modified: geronimo/server/trunk/framework/modules/geronimo-blueprint/src/main/java/org/apache/geronimo/blueprint/WaitForBlueprintGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-blueprint/src/main/java/org/apache/geronimo/blueprint/WaitForBlueprintGBean.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-blueprint/src/main/java/org/apache/geronimo/blueprint/WaitForBlueprintGBean.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-blueprint/src/main/java/org/apache/geronimo/blueprint/WaitForBlueprintGBean.java Tue Apr 26 23:19:31 2011
@@ -49,10 +49,10 @@ public class WaitForBlueprintGBean {
     private volatile BlueprintEvent event;
     private CountDownLatch latch = new CountDownLatch(1);
 
-    public WaitForBlueprintGBean(@ParamSpecial(type = SpecialAttributeType.bundleContext) BundleContext bundleContext,
+    public WaitForBlueprintGBean(@ParamSpecial(type = SpecialAttributeType.bundle) Bundle thsBundle,
                                  @ParamAttribute(name = "packageName") String packageName,
                                  @ParamAttribute(name = "symbolicName") String symbolicName) throws Exception {        
-        final Bundle bundle = getBundle(bundleContext, symbolicName, packageName);
+        final Bundle bundle = getBundle(thsBundle.getBundleContext(), symbolicName, packageName);
         BlueprintListener listener = new BlueprintListener() {
 
             @Override
@@ -65,7 +65,7 @@ public class WaitForBlueprintGBean {
                 }
             }
         };
-        ServiceRegistration registration = bundleContext.registerService(BlueprintListener.class.getName(), listener, new Hashtable());
+        ServiceRegistration registration = thsBundle.getBundleContext().registerService(BlueprintListener.class.getName(), listener, new Hashtable());
         latch.await();
         registration.unregister();
         if (event.getType() == BlueprintEvent.FAILURE) {

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-full/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryBootstrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-full/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryBootstrapper.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-full/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryBootstrapper.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-full/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryBootstrapper.java Tue Apr 26 23:19:31 2011
@@ -65,6 +65,7 @@ public class DeploymentFactoryBootstrapp
     }
     
     protected Kernel newKernel() throws DeploymentManagerCreationException {
+        if (true) throw new DeploymentManagerCreationException("use ConfigurationExtender");
 //        ClassLoader classLoader = DeploymentFactoryBootstrapper.class.getClassLoader();
         BundleContext bundleContext = null;
         MainBootstrapper bootstrapper = new MainBootstrapper();

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java Tue Apr 26 23:19:31 2011
@@ -49,8 +49,8 @@ public class OfflineDeployerStarter {
             "car");
     
     private final Kernel kernel;
-    private final AbstractName onlineDeployerConfigurationManagerName;
-    private final ConfigurationManager onlineDeployerConfigurationManager;
+    private  AbstractName onlineDeployerConfigurationManagerName;
+    private  ConfigurationManager onlineDeployerConfigurationManager;
     private final Set<AbstractName> onlineDeployerConfigStores;
 
     public OfflineDeployerStarter(Kernel kernel) throws GBeanNotFoundException {
@@ -59,8 +59,8 @@ public class OfflineDeployerStarter {
         }
         this.kernel = kernel;
         
-        onlineDeployerConfigurationManagerName = ConfigurationUtil.getConfigurationManagerName(kernel);
-        onlineDeployerConfigurationManager = ConfigurationUtil.getConfigurationManager(kernel);
+//        onlineDeployerConfigurationManagerName = ConfigurationUtil.getConfigurationManagerName(kernel);
+//        onlineDeployerConfigurationManager = ConfigurationUtil.getConfigurationManager(kernel);
         onlineDeployerConfigStores = kernel.listGBeans(new AbstractNameQuery(ConfigurationStore.class.getName()));
     }
     

Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml Tue Apr 26 23:19:31 2011
@@ -36,6 +36,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java Tue Apr 26 23:19:31 2011
@@ -553,18 +553,18 @@ public class DeploymentContext {
 
         OSGiMetaDataBuilder osgiMetaDataBuilder = null;
         //TODO Import package calculation is only used for deployed applications, should be use the same way for car package later
-        if (System.getProperty("geronimo.build.car") == null) {
-            osgiMetaDataBuilder = new OSGiMetaDataBuilder(bundleContext);
-            //Hack Codes Here For RAR module, will remove while the connector refactoring is done
-            if (configuration.getModuleType() == ConfigurationModuleType.RAR) {
-                environment.addDynamicImportPackage("*");
-            }
-        } else {
+//        if (System.getProperty("geronimo.build.car") == null) {
+//            osgiMetaDataBuilder = new OSGiMetaDataBuilder(bundleContext);
+//            //Hack Codes Here For RAR module, will remove while the connector refactoring is done
+//            if (configuration.getModuleType() == ConfigurationModuleType.RAR) {
+//                environment.addDynamicImportPackage("*");
+//            }
+//        }// else {
             LinkedHashSet<String> imports = getImports(gbeans);
             environment.addImportPackages(imports);
             environment.addDynamicImportPackage("*");
             osgiMetaDataBuilder = new OSGiMetaDataBuilder(bundleContext, new DummyExportPackagesSelector());
-        }
+//        }
 
 //        try {
 //            osgiMetaDataBuilder.build(environment, configuration.getModuleType() == ConfigurationModuleType.CAR);

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml Tue Apr 26 23:19:31 2011
@@ -36,6 +36,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -51,6 +52,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-crypto</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
         </dependency>
@@ -74,16 +81,6 @@
             <artifactId>xbean-reflect</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
-        </dependency>
-
         <!--<dependency>-->
             <!--<groupId>org.apache.geronimo.specs</groupId>-->
             <!--<artifactId>geronimo-stax-api_1.2_spec</artifactId>-->
@@ -96,11 +93,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-crypto</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>junit</groupId>
@@ -119,7 +111,6 @@
                     <instructions>
                         <Import-Package>
                             net.sf.cglib.*;resolution:=optional,
-                            com.thoughtworks.xstream.*;resolution:=optional,
                             *
                         </Import-Package>
                     </instructions>

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java Tue Apr 26 23:19:31 2011
@@ -168,7 +168,7 @@ public final class GBeanInstance impleme
      */
     private final ClassLoader classLoader;
 
-    private final BundleContext bundleContext;
+    private final Bundle bundle;
 
     /**
      * Metadata describing the attributes, operations and references of this GBean
@@ -227,24 +227,24 @@ public final class GBeanInstance impleme
      * Construct a GBeanMBean using the supplied GBeanData and bundle
      *
      * @param gbeanData     the data for the new GBean including GBeanInfo, intial attribute values, and reference patterns
-     * @param bundleContext
+     * @param bundle bundle for loading gbean class.  Note the bundle context may not be available at all times.
      * @throws org.apache.geronimo.gbean.InvalidConfigurationException
      *          if the gbeanInfo is inconsistent with the actual java classes, such as
      *          mismatched attribute types or the intial data cannot be set
      */
-    public GBeanInstance(GBeanData gbeanData, Kernel kernel, DependencyManager dependencyManager, LifecycleBroadcaster lifecycleBroadcaster, BundleContext bundleContext) throws InvalidConfigurationException {
+    public GBeanInstance(GBeanData gbeanData, Kernel kernel, DependencyManager dependencyManager, LifecycleBroadcaster lifecycleBroadcaster, Bundle bundle) throws InvalidConfigurationException {
         this.abstractName = gbeanData.getAbstractName();
         this.kernel = kernel;
         this.lifecycleBroadcaster = lifecycleBroadcaster;
         this.gbeanInstanceState = new GBeanInstanceState(abstractName, kernel, dependencyManager, this, lifecycleBroadcaster);
-        this.bundleContext = bundleContext;
-        this.classLoader = new BundleClassLoader(bundleContext.getBundle());
+        this.bundle = bundle;
+        this.classLoader = new BundleClassLoader(bundle);
 
         GBeanInfo gbeanInfo = gbeanData.getGBeanInfo();
         try {
-            type = bundleContext.getBundle().loadClass(gbeanInfo.getClassName());
+            type = this.bundle.loadClass(gbeanInfo.getClassName());
         } catch (ClassNotFoundException e) {
-            throw new InvalidConfigurationException("Could not load GBeanInfo class from classloader: " + bundleContext +
+            throw new InvalidConfigurationException("Could not load GBeanInfo class from classloader: " + this.bundle +
                     " className=" + gbeanInfo.getClassName(), e);
         }
 
@@ -435,7 +435,7 @@ public final class GBeanInstance impleme
      * @return the bundle used to build this gbean
      */
     public Bundle getBundle() {
-        return bundleContext.getBundle();
+        return bundle;
     }
 
     /**
@@ -1009,7 +1009,7 @@ public final class GBeanInstance impleme
                     if (serviceProperties.get(OSGI_JNDI_NAME_PROPERTY) == null) {
                         serviceProperties.put(OSGI_JNDI_NAME_PROPERTY, kernel.getNaming().toOsgiJndiName(abstractName));
                     }
-                    serviceRegistration = bundleContext.registerService(serviceInterfaces, instance, serviceProperties);
+                    serviceRegistration = bundle.getBundleContext().registerService(serviceInterfaces, instance, serviceProperties);
                     log.debug("Registered gbean " + abstractName + " as osgi service under interfaces " + Arrays.asList(serviceInterfaces) + " with properties " + serviceProperties);
                 }
                 instanceState = RUNNING;
@@ -1236,13 +1236,13 @@ public final class GBeanInstance impleme
                         this,
                         "bundle",
                         Bundle.class,
-                        bundleContext.getBundle()));
+                        bundle));
         attributesMap.put("bundleContext",
                 GBeanAttribute.createSpecialAttribute(attributesMap.get("bundleContext"),
                         this,
                         "bundleContext",
                         BundleContext.class,
-                        bundleContext));
+                        bundle.getBundleContext()));
 
         attributesMap.put("kernel",
                 GBeanAttribute.createSpecialAttribute(attributesMap.get("kernel"),

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/Kernel.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/Kernel.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/Kernel.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/Kernel.java Tue Apr 26 23:19:31 2011
@@ -30,7 +30,6 @@ import org.apache.geronimo.kernel.lifecy
 import org.apache.geronimo.kernel.proxy.ProxyManager;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
 
 /**
  * @version $Rev:386515 $ $Date$
@@ -77,12 +76,13 @@ public interface Kernel {
      * Load a specific GBean into this kernel.
      * This is intended for applications that are embedding the kernel.
      *
+     *
      * @param gbeanData the GBean to load
-     * @param bundleContext
+     * @param bundle
      * @throws org.apache.geronimo.kernel.GBeanAlreadyExistsException if the name is already used
      * @throws org.apache.geronimo.kernel.InternalKernelException if there is a problem during registration
      */
-    void loadGBean(GBeanData gbeanData, BundleContext bundleContext) throws GBeanAlreadyExistsException, InternalKernelException;
+    void loadGBean(GBeanData gbeanData, Bundle bundle) throws GBeanAlreadyExistsException, InternalKernelException;
 
     /**
      * Is there a GBean registered with the kernel under the specified name?

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/KernelGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/KernelGBean.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/KernelGBean.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/KernelGBean.java Tue Apr 26 23:19:31 2011
@@ -29,7 +29,6 @@ import org.apache.geronimo.gbean.Abstrac
 import org.apache.geronimo.kernel.lifecycle.LifecycleMonitor;
 import org.apache.geronimo.kernel.proxy.ProxyManager;
 import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
 
 /**
  * @version $Rev:386515 $ $Date$
@@ -61,8 +60,8 @@ public class KernelGBean implements Kern
         return kernel.getProxyManager();
     }
 
-    public void loadGBean(GBeanData gbeanData, BundleContext bundleContext) throws GBeanAlreadyExistsException, InternalKernelException {
-        kernel.loadGBean(gbeanData, bundleContext);
+    public void loadGBean(GBeanData gbeanData, Bundle bundle) throws GBeanAlreadyExistsException, InternalKernelException {
+        kernel.loadGBean(gbeanData, bundle);
     }
 
     public boolean isLoaded(AbstractName name) {

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicKernel.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicKernel.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicKernel.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicKernel.java Tue Apr 26 23:19:31 2011
@@ -161,7 +161,7 @@ public class
 
         // load and start the kernel gbean
         GBeanData kernelGBeanData = new GBeanData(KERNEL_NAME, KernelGBean.GBEAN_INFO);
-        loadGBean(kernelGBeanData, bundleContext);
+        loadGBean(kernelGBeanData, bundleContext.getBundle());
         startGBean(KERNEL_NAME);
 
         running = true;
@@ -415,11 +415,11 @@ public class
         return gbeanInstance.getGBeanData();
     }
 
-    public void loadGBean(GBeanData gbeanData, BundleContext bundleContext) throws GBeanAlreadyExistsException, InternalKernelException {
+    public void loadGBean(GBeanData gbeanData, Bundle bundle) throws GBeanAlreadyExistsException, InternalKernelException {
         AbstractName abstractName = gbeanData.getAbstractName();
         Set interfaces = gbeanData.getGBeanInfo().getInterfaces();
         LifecycleBroadcaster lifecycleBroadcaster = lifecycleMonitor.createLifecycleBroadcaster(abstractName, interfaces);
-        GBeanInstance gbeanInstance = new GBeanInstance(gbeanData, this, dependencyManager, lifecycleBroadcaster, bundleContext);
+        GBeanInstance gbeanInstance = new GBeanInstance(gbeanData, this, dependencyManager, lifecycleBroadcaster, bundle);
         registry.register(gbeanInstance);
         lifecycleBroadcaster.fireLoadedEvent();
     }

Copied: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationExtender.java (from r1096951, geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationExtender.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationExtender.java?p2=geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationExtender.java&p1=geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationExtender.java&r1=1096951&r2=1096952&rev=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationExtender.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationExtender.java Tue Apr 26 23:19:31 2011
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.system.configuration;
+package org.apache.geronimo.kernel.config;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -35,11 +35,6 @@ import org.apache.geronimo.gbean.GBeanDa
 import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
 import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.config.Configuration;
-import org.apache.geronimo.kernel.config.ConfigurationData;
-import org.apache.geronimo.kernel.config.ConfigurationUtil;
-import org.apache.geronimo.kernel.config.InvalidConfigException;
-import org.apache.geronimo.kernel.config.ManageableAttributeStore;
 import org.apache.geronimo.kernel.util.IOUtils;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -175,9 +170,10 @@ public class ConfigurationExtender {
             data.setBundle(bundle);
             Configuration configuration = new Configuration(data, manageableAttributeStore);
             configurationMap.put(bundle.getBundleId(), configuration);
-            for (GBeanData gBeanData: configuration.getGBeans().values()) {
-                kernel.loadGBean(gBeanData, configuration.getBundle().getBundleContext());
-            }
+            ConfigurationUtil.loadConfigurationGBeans(configuration, kernel);
+//            for (GBeanData gBeanData: configuration.getGBeans().values()) {
+//                kernel.loadGBean(gBeanData, configuration.getBundle());
+//            }
             return configuration;
 
 //            configurationManager.loadConfiguration(data);
@@ -188,8 +184,8 @@ public class ConfigurationExtender {
             logger.error("Could not load required classes from bundle " + bundle.getLocation(), e);
         } catch (InvalidConfigException e) {
             logger.error("Could not load Configuration from bundle " + bundle.getLocation(), e);
-        } catch (GBeanAlreadyExistsException e) {
-            logger.error("Duplicate gbean in bundle " + bundle.getLocation(), e);
+//        } catch (GBeanAlreadyExistsException e) {
+//            logger.error("Duplicate gbean in bundle " + bundle.getLocation(), e);
         } finally {
             IOUtils.close(in);
         }
@@ -200,7 +196,7 @@ public class ConfigurationExtender {
         Configuration configuration = configurationMap.get(bundle.getBundleId());
         if (configuration != null) {
             try {
-                ConfigurationUtil.startConfigurationGBeans(configuration.getAbstractName(), configuration, kernel);
+                ConfigurationUtil.startConfigurationGBeans(configuration, kernel);
             } catch (InvalidConfigException e) {
                 logger.error("Could not start Configuration from bundle " + bundle.getLocation(), e);
             }

Propchange: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationExtender.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationExtender.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationExtender.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message