geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1096952 [4/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
Modified: geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/KernelContextGBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/KernelContextGBeanTest.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/KernelContextGBeanTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/KernelContextGBeanTest.java Tue Apr 26 23:19:31 2011
@@ -33,6 +33,7 @@ import org.apache.geronimo.gbean.annotat
 import org.apache.geronimo.gjndi.binding.ResourceBinding;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.basic.BasicKernel;
+import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
@@ -50,7 +51,7 @@ import org.apache.xbean.naming.context.I
 public class KernelContextGBeanTest extends AbstractContextTest {
     private MockBundleContext bundleContext = new MockBundleContext(getClass().getClassLoader(), "", new HashMap<Artifact, ConfigurationData>(), null);
     private Kernel kernel;
-    private ConfigurationManager configurationManager;
+//    private ConfigurationManager configurationManager;
     private ConfigurationData configurationData;
     private GBeanInfo immutableContextGBeanInfo;
 
@@ -80,8 +81,9 @@ public class KernelContextGBeanTest exte
         Map testBindings = getNestedBindings(globalBindings, "test/");
         test.setAttribute("bindings", testBindings);
 
-        configurationManager.loadConfiguration(configurationData);
-        configurationManager.startConfiguration(configurationData.getId());
+        Configuration configuration = new Configuration(configurationData, null);
+        ConfigurationUtil.loadConfigurationGBeans(configuration, kernel);
+        ConfigurationUtil.startConfigurationGBeans(configuration, kernel);
 
         InitialContext ctx = new InitialContext();
         assertEq(globalBindings, ctx);
@@ -118,8 +120,9 @@ public class KernelContextGBeanTest exte
 
     public void testGBeanFormatBinding() throws Exception {
         setUpJcaContext();
-        configurationManager.loadConfiguration(configurationData);
-        configurationManager.startConfiguration(configurationData.getId());
+        Configuration configuration = new Configuration(configurationData, null);
+        ConfigurationUtil.loadConfigurationGBeans(configuration, kernel);
+        ConfigurationUtil.startConfigurationGBeans(configuration, kernel);
 
         InitialContext ctx = new InitialContext();
         Context fooCtx = ctx.createSubcontext("jca:foo");
@@ -178,20 +181,20 @@ public class KernelContextGBeanTest exte
 //        kernel = KernelFactory.newInstance(bundleContext).createKernel("test");
 //        kernel.boot();
 
-        ConfigurationData bootstrap = new ConfigurationData(new Artifact("bootstrap", "bootstrap", "", "car"), kernel.getNaming());
-
-        GBeanData artifactManagerData = bootstrap.addGBean("ArtifactManager", DefaultArtifactManager.GBEAN_INFO);
-
-        GBeanData artifactResolverData = bootstrap.addGBean("ArtifactResolver", DefaultArtifactResolver.class);
-        artifactResolverData.setReferencePattern("ArtifactManager", artifactManagerData.getAbstractName());
-
-        GBeanData configurationManagerData = bootstrap.addGBean("ConfigurationManager", KernelConfigurationManager.class);
-        configurationManagerData.setReferencePattern("ArtifactManager", artifactManagerData.getAbstractName());
-        configurationManagerData.setReferencePattern("ArtifactResolver", artifactResolverData.getAbstractName());
-
-        ConfigurationUtil.loadBootstrapConfiguration(kernel, bootstrap, bundleContext);
-
-        configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
+//        ConfigurationData bootstrap = new ConfigurationData(new Artifact("bootstrap", "bootstrap", "", "car"), kernel.getNaming());
+//
+//        GBeanData artifactManagerData = bootstrap.addGBean("ArtifactManager", DefaultArtifactManager.GBEAN_INFO);
+//
+//        GBeanData artifactResolverData = bootstrap.addGBean("ArtifactResolver", DefaultArtifactResolver.class);
+//        artifactResolverData.setReferencePattern("ArtifactManager", artifactManagerData.getAbstractName());
+//
+//        GBeanData configurationManagerData = bootstrap.addGBean("ConfigurationManager", KernelConfigurationManager.class);
+//        configurationManagerData.setReferencePattern("ArtifactManager", artifactManagerData.getAbstractName());
+//        configurationManagerData.setReferencePattern("ArtifactResolver", artifactResolverData.getAbstractName());
+//
+//        ConfigurationUtil.loadBootstrapConfiguration(kernel, bootstrap, bundleContext);
+//
+//        configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
 
         configurationData = new ConfigurationData(new Artifact("test", "test", "", "car"), kernel.getNaming());
         configurationData.setBundle(bundleContext.getBundle());

Modified: geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/GBeanBindingTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/GBeanBindingTest.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/GBeanBindingTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/GBeanBindingTest.java Tue Apr 26 23:19:31 2011
@@ -31,6 +31,7 @@ import org.apache.geronimo.gjndi.GlobalC
 import org.apache.geronimo.gjndi.WritableContextGBean;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.basic.BasicKernel;
+import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
@@ -96,20 +97,20 @@ public class GBeanBindingTest extends Ab
 //        kernel = KernelFactory.newInstance(bundleContext).createKernel("test");
 //        kernel.boot();
 
-        ConfigurationData bootstrap = new ConfigurationData(new Artifact("bootstrap", "bootstrap", "", "car"), kernel.getNaming());
-
-        GBeanData artifactManagerData = bootstrap.addGBean("ArtifactManager", DefaultArtifactManager.GBEAN_INFO);
-
-        GBeanData artifactResolverData = bootstrap.addGBean("ArtifactResolver", DefaultArtifactResolver.class);
-        artifactResolverData.setReferencePattern("ArtifactManager", artifactManagerData.getAbstractName());
-
-        GBeanData configurationManagerData = bootstrap.addGBean("ConfigurationManager", KernelConfigurationManager.class);
-        configurationManagerData.setReferencePattern("ArtifactManager", artifactManagerData.getAbstractName());
-        configurationManagerData.setReferencePattern("ArtifactResolver", artifactResolverData.getAbstractName());
-
-        ConfigurationUtil.loadBootstrapConfiguration(kernel, bootstrap, bundleContext);
-
-        ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
+//        ConfigurationData bootstrap = new ConfigurationData(new Artifact("bootstrap", "bootstrap", "", "car"), kernel.getNaming());
+//
+//        GBeanData artifactManagerData = bootstrap.addGBean("ArtifactManager", DefaultArtifactManager.GBEAN_INFO);
+//
+//        GBeanData artifactResolverData = bootstrap.addGBean("ArtifactResolver", DefaultArtifactResolver.class);
+//        artifactResolverData.setReferencePattern("ArtifactManager", artifactManagerData.getAbstractName());
+//
+//        GBeanData configurationManagerData = bootstrap.addGBean("ConfigurationManager", KernelConfigurationManager.class);
+//        configurationManagerData.setReferencePattern("ArtifactManager", artifactManagerData.getAbstractName());
+//        configurationManagerData.setReferencePattern("ArtifactResolver", artifactResolverData.getAbstractName());
+//
+//        ConfigurationUtil.loadBootstrapConfiguration(kernel, bootstrap, bundleContext);
+//
+//        ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
 
         ConfigurationData configurationData = new ConfigurationData(new Artifact("test", "test", "", "car"), kernel.getNaming());
         configurationData.setBundle(bundleContext.getBundle());
@@ -148,8 +149,9 @@ public class GBeanBindingTest extends Ab
                 Collections.singletonMap("name", "ds2"),
                 DataSource.class.getName()));
 
-        configurationManager.loadConfiguration(configurationData);
-        configurationManager.startConfiguration(configurationData.getId());
+        Configuration configuration = new Configuration(configurationData, null);
+        ConfigurationUtil.loadConfigurationGBeans(configuration, kernel);
+        ConfigurationUtil.startConfigurationGBeans(configuration, kernel);
 
         DataSource ds1 = (DataSource) kernel.getGBean(ds1Name);
         DataSource ds2 = (DataSource) kernel.getGBean(ds2Name);

Modified: geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml Tue Apr 26 23:19:31 2011
@@ -47,20 +47,20 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>jaxb-impl</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
+            <!--<artifactId>jaxb-impl</artifactId>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.1_spec</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>woodstox</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
+            <!--<artifactId>woodstox</artifactId>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.ant</artifactId>

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/SecurityServiceImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/SecurityServiceImpl.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/SecurityServiceImpl.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/SecurityServiceImpl.java Tue Apr 26 23:19:31 2011
@@ -96,10 +96,11 @@ public class SecurityServiceImpl impleme
                 currentThread.setContextClassLoader(oldClassLoader);
             }
         }
-        if (keyStore != null) sysOverRide(serverInfo.resolveServerPath(keyStore), KEYSTORE);
+        //TODO OSGI serverInfo is a service now
+//        if (keyStore != null) sysOverRide(serverInfo.resolveServerPath(keyStore), KEYSTORE);
         if (keyStorePassword != null) sysOverRide(keyStorePassword, KEYSTORE_PASSWORD);
 
-        if (trustStore != null) sysOverRide(serverInfo.resolveServerPath(trustStore), TRUSTSTORE);
+//        if (trustStore != null) sysOverRide(serverInfo.resolveServerPath(trustStore), TRUSTSTORE);
         if (trustStorePassword != null) sysOverRide(trustStorePassword, TRUSTSTORE_PASSWORD);
 
         log.debug(KEYSTORE + ": " + System.getProperty(KEYSTORE));

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/AbstractTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/AbstractTest.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/AbstractTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/AbstractTest.java Tue Apr 26 23:19:31 2011
@@ -63,7 +63,7 @@ public abstract class AbstractTest exten
     protected boolean needLoginConfiguration = true;
 
     protected void setUp() throws Exception {
-        bundleContext = new MockBundleContext(getClass().getClassLoader(), BASEDIR.getAbsolutePath(), null, null);
+        setBundleContext(new MockBundleContext(getClass().getClassLoader(), BASEDIR.getAbsolutePath(), null, null));
 
         kernel = new BasicKernel();
 //        kernel = KernelFactory.newInstance(bundleContext).createKernel("test.kernel");
@@ -79,7 +79,7 @@ public abstract class AbstractTest exten
             gbean = buildGBeanData("name", "LoginConfiguration", GeronimoLoginConfiguration.class);
             loginConfiguration = gbean.getAbstractName();
             gbean.setReferencePattern("Configurations", new AbstractNameQuery(ConfigurationEntryFactory.class.getName()));
-            kernel.loadGBean(gbean, bundleContext);
+            kernel.loadGBean(gbean, bundle);
             kernel.startGBean(loginConfiguration);
         }
 

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/AbstractLoginModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/AbstractLoginModuleTest.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/AbstractLoginModuleTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/AbstractLoginModuleTest.java Tue Apr 26 23:19:31 2011
@@ -48,13 +48,13 @@ public abstract class AbstractLoginModul
 
         gbean = setupTestLoginModule();
         testCE = gbean.getAbstractName();
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
 
         gbean = buildGBeanData("name", "PropertiesLoginModuleUse", JaasLoginModuleUse.class);
         AbstractName testUseName = gbean.getAbstractName();
         gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
         gbean.setReferencePattern("LoginModule", testCE);
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
 
         gbean = buildGBeanData("name", "PropertiesSecurityRealm", GenericSecurityRealm.class);
         testRealm = gbean.getAbstractName();
@@ -63,7 +63,7 @@ public abstract class AbstractLoginModul
         gbean.setReferencePattern("LoginModuleConfiguration", testUseName);
 //        gbean.setReferencePattern("ServerInfo", serverInfo);
         gbean.setAttribute("global", Boolean.TRUE);
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
 
         gbean = buildGBeanData("name", "NeverFailLoginModule", LoginModuleGBean.class);
         neverFailModule = gbean.getAbstractName();
@@ -71,14 +71,14 @@ public abstract class AbstractLoginModul
         gbean.setAttribute("options", null);
         gbean.setAttribute("loginDomainName", "NeverFailDomain");
         gbean.setAttribute("wrapPrincipals", Boolean.TRUE);
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
         kernel.startGBean(neverFailModule);
 
         gbean = buildGBeanData("name", "PropertiesLoginModuleUse2", JaasLoginModuleUse.class);
         AbstractName propsUseName = gbean.getAbstractName();
         gbean.setAttribute("controlFlag", LoginModuleControlFlag.OPTIONAL);
         gbean.setReferencePattern("LoginModule", testCE);
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
         kernel.startGBean(propsUseName);
 
         gbean = buildGBeanData("name", "NeverFailLoginModuleUse", JaasLoginModuleUse.class);
@@ -86,7 +86,7 @@ public abstract class AbstractLoginModul
         gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
         gbean.setReferencePattern("LoginModule", neverFailModule);
         gbean.setReferencePattern("Next", propsUseName);
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
         kernel.startGBean(neverFailUseName);
 
         gbean = buildGBeanData("name", "PropertiesSecurityRealm2", GenericSecurityRealm.class);
@@ -95,7 +95,7 @@ public abstract class AbstractLoginModul
         gbean.setAttribute("wrapPrincipals", Boolean.TRUE);
         gbean.setReferencePattern("LoginModuleConfiguration", neverFailUseName);
         gbean.setAttribute("global", Boolean.TRUE);
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
 
         kernel.startGBean(loginConfiguration);
         kernel.startGBean(testCE);

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java Tue Apr 26 23:19:31 2011
@@ -111,7 +111,7 @@ public class ConfigurationEntryTest exte
 
     protected void setUp() throws Exception {
 //        super.setUp();
-        bundleContext = new MockBundleContext(getClass().getClassLoader(), BASEDIR.getAbsolutePath(), null, null);
+        setBundleContext(new MockBundleContext(getClass().getClassLoader(), BASEDIR.getAbsolutePath(), null, null));
         kernel = new BasicKernel();
 //        kernel = KernelFactory.newInstance(bundleContext).createKernel("test.kernel");
 //        kernel.boot();
@@ -123,13 +123,13 @@ public class ConfigurationEntryTest exte
         gbean = buildGBeanData("name", "ServerInfo", BasicServerInfo.class);
         serverInfo = gbean.getAbstractName();
         gbean.setAttribute("baseDirectory", BASEDIR.getAbsolutePath());
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
         kernel.startGBean(serverInfo);
 
         gbean = buildGBeanData("new", "LoginConfiguration", GeronimoLoginConfiguration.class);
         loginConfiguration = gbean.getAbstractName();
         gbean.setReferencePattern("Configurations", new AbstractNameQuery(ConfigurationEntryFactory.class.getName()));
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
 
         gbean = buildGBeanData("name", "PropertiesLoginModule", LoginModuleGBean.class);
         testProperties = gbean.getAbstractName();
@@ -140,13 +140,13 @@ public class ConfigurationEntryTest exte
         gbean.setAttribute("options", props);
         gbean.setAttribute("loginDomainName", "TestProperties");
         gbean.setAttribute("wrapPrincipals", Boolean.TRUE);
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
 
         gbean = buildGBeanData("name", "GeronimoPasswordCredentialLoginModule", LoginModuleGBean.class);
         testUPCred = gbean.getAbstractName();
         gbean.setAttribute("loginModuleClass", "org.apache.geronimo.security.realm.providers.GeronimoPasswordCredentialLoginModule");
         gbean.setAttribute("options", new HashMap<String, Object>());
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
 
         gbean = buildGBeanData    ("name", "AuditLoginModule", LoginModuleGBean.class);
         testCE = gbean.getAbstractName();
@@ -154,27 +154,27 @@ public class ConfigurationEntryTest exte
         props = new HashMap<String, Object>();
         props.put("file", new File(BASEDIR, "target/login-audit.log").getPath());
         gbean.setAttribute("options", props);
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
 
         gbean = buildGBeanData("name", "GeronimoPasswordCredentialLoginModuleUse", JaasLoginModuleUse.class);
         AbstractName testUseName3 = gbean.getAbstractName();
         gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
         gbean.setReferencePattern("LoginModule", testUPCred);
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
 
         gbean = buildGBeanData("name", "AuditLoginModuleUse", JaasLoginModuleUse.class);
         AbstractName testUseName2 = gbean.getAbstractName();
         gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
         gbean.setReferencePattern("LoginModule", testCE);
         gbean.setReferencePattern("Next", testUseName3);
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
 
         gbean = buildGBeanData("name", "PropertiesLoginModuleUse", JaasLoginModuleUse.class);
         AbstractName testUseName1 = gbean.getAbstractName();
         gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
         gbean.setReferencePattern("LoginModule", testProperties);
         gbean.setReferencePattern("Next", testUseName2);
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
 
         gbean = buildGBeanData("name", "PropertiesSecurityRealm", GenericSecurityRealm.class);
         testRealm = gbean.getAbstractName();
@@ -182,7 +182,7 @@ public class ConfigurationEntryTest exte
         gbean.setReferencePattern("LoginModuleConfiguration", testUseName1);
         gbean.setReferencePattern("ServerInfo", serverInfo);
         gbean.setAttribute("global", Boolean.TRUE);
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
 
         kernel.startGBean(loginConfiguration);
         kernel.startGBean(testCE);

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginKerberosNonGeronimoTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginKerberosNonGeronimoTest.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginKerberosNonGeronimoTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginKerberosNonGeronimoTest.java Tue Apr 26 23:19:31 2011
@@ -64,14 +64,14 @@ public class LoginKerberosNonGeronimoTes
         props.put("useTicketCache", "true");
         props.put("doNotPrompt", "true");
         gbean.setAttribute("options", props);
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
 
         gbean = buildGBeanData("name", "kerberosConfigurationEntry", DirectConfigurationEntry.class);
         kerberosCE = gbean.getAbstractName();
         gbean.setAttribute("applicationConfigName", "kerberos-foobar");
         gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
         gbean.setReferencePattern("Module", kerberosLM);
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
 
         kernel.startGBean(loginConfiguration);
         kernel.startGBean(kerberosLM);

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginKerberosTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginKerberosTest.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginKerberosTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginKerberosTest.java Tue Apr 26 23:19:31 2011
@@ -52,20 +52,20 @@ public class LoginKerberosTest extends A
         props.put("useTicketCache", "true");
         props.put("doNotPrompt", "true");
         gbean.setAttribute("options", props);
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
 
         gbean = buildGBeanData("name", "KerberosLoginModuleUse", JaasLoginModuleUse.class);
         AbstractName testUseName = gbean.getAbstractName();
         gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
         gbean.setReferencePattern("LoginModule", kerberosLM);
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
 
         gbean = buildGBeanData("name", "KerberosSecurityRealm", GenericSecurityRealm.class);
         kerberosRealm = gbean.getAbstractName();
         gbean.setAttribute("realmName", "TOOLAZYDOGS.COM");
         gbean.setAttribute("global", true);
         gbean.setReferencePattern("LoginModuleConfiguration", testUseName);
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
         kernel.startGBean(kerberosLM);
         kernel.startGBean(testUseName);
         kernel.startGBean(kerberosRealm);

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/TimeoutTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/TimeoutTest.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/TimeoutTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/TimeoutTest.java Tue Apr 26 23:19:31 2011
@@ -65,20 +65,20 @@ public class TimeoutTest extends Abstrac
         gbean.setAttribute("options", props);
         gbean.setAttribute("loginDomainName", "PropertiesDomain");
         gbean.setAttribute("wrapPrincipals", Boolean.TRUE);
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
 
         gbean = buildGBeanData("name", "PropertiesLoginModuleUse", JaasLoginModuleUse.class);
         AbstractName testUseName = gbean.getAbstractName();
         gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
         gbean.setReferencePattern("LoginModule", testCE);
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
 
         gbean = buildGBeanData("name", "PropertiesSecurityRealm", GenericSecurityRealm.class);
         testRealm = gbean.getAbstractName();
         gbean.setAttribute("realmName", "properties-realm");
         gbean.setReferencePattern("LoginModuleConfiguration", testUseName);
         gbean.setAttribute("global", Boolean.TRUE);
-        kernel.loadGBean(gbean, bundleContext);
+        kernel.loadGBean(gbean, bundle);
 
         kernel.startGBean(loginConfiguration);
         kernel.startGBean(testCE);

Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml Tue Apr 26 23:19:31 2011
@@ -52,6 +52,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <!-- g-kernel, g-common is coming from this via geronimo-system -->

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

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/KernelDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/KernelDelegate.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/KernelDelegate.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/KernelDelegate.java Tue Apr 26 23:19:31 2011
@@ -41,7 +41,6 @@ import org.apache.geronimo.kernel.Naming
 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$ $Date$
@@ -136,9 +135,9 @@ public class KernelDelegate implements K
         }
     }
 
-    public void loadGBean(GBeanData gbeanData, BundleContext bundleContext) throws GBeanAlreadyExistsException {
+    public void loadGBean(GBeanData gbeanData, Bundle bundle) throws GBeanAlreadyExistsException {
         try {
-            invokeKernel("loadGBean", new Object[] {gbeanData, bundleContext}, new String[] {GBeanData.class.getName(), ClassLoader.class.getName()});
+            invokeKernel("loadGBean", new Object[] {gbeanData, bundle}, new String[] {GBeanData.class.getName(), ClassLoader.class.getName()});
         } catch (GBeanAlreadyExistsException e) {
             throw e;
         } catch (RuntimeException e) {

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/RealMBeanServerReference.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/RealMBeanServerReference.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/RealMBeanServerReference.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/RealMBeanServerReference.java Tue Apr 26 23:19:31 2011
@@ -27,7 +27,7 @@ import org.apache.geronimo.gbean.annotat
 import org.apache.geronimo.gbean.annotation.ParamAttribute;
 import org.apache.geronimo.gbean.annotation.ParamSpecial;
 import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
-import org.osgi.framework.BundleContext;
+import org.osgi.framework.Bundle;
 
 /**
  * Creates a real mbean server of finds an existing one with the specified mbeanServerId
@@ -38,13 +38,13 @@ import org.osgi.framework.BundleContext;
 public class RealMBeanServerReference implements MBeanServerReference, GBeanLifecycle {
     private static final String GERONIMO_DEFAULT_DOMAIN = "geronimo";
 
-    private BundleContext bundleContext;
+    private Bundle bundle;
     private MBeanServer mbeanServer;
 
-    public RealMBeanServerReference(@ParamSpecial(type = SpecialAttributeType.bundleContext) BundleContext bundleContext,
+    public RealMBeanServerReference(@ParamSpecial(type = SpecialAttributeType.bundle) Bundle bundle,
                                     @ParamAttribute(name="usePlatformMBeanServer") boolean usePlatformMBeanServer,
                                     @ParamAttribute(name="mbeanServerId")String mbeanServerId) throws MBeanServerNotFound {
-        this.bundleContext = bundleContext;
+        this.bundle = bundle;
         if (usePlatformMBeanServer) {
             mbeanServer = ManagementFactory.getPlatformMBeanServer();
         } else {
@@ -88,7 +88,7 @@ public class RealMBeanServerReference im
 
     public void doStart() throws Exception {
         if (mbeanServer != null) {
-            bundleContext.registerService(MBeanServer.class.getName(), mbeanServer, null);
+            bundle.getBundleContext().registerService(MBeanServer.class.getName(), mbeanServer, null);
         }       
     }
 

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/CommandLine.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/CommandLine.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/CommandLine.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/CommandLine.java Tue Apr 26 23:19:31 2011
@@ -131,12 +131,13 @@ public class CommandLine {
     }
 
     protected void loadBootstrapConfiguration() throws Exception {
+        if (true) throw new Exception("use COnfigurationExtender");
 //        ClassLoader classLoader = CommandLine.class.getClassLoader();
         BundleContext bundleContext = null;
         InputStream in = bundleContext.getBundle().getResource("META-INF/config.ser").openStream();
         try {
             // load the configuration
-            configurationName = ConfigurationUtil.loadBootstrapConfiguration(kernel, in, bundleContext);
+//            configurationName = ConfigurationUtil.loadBootstrapConfiguration(kernel, in, bundleContext);
         } finally {
             if (in != null) {
                 try {
@@ -157,6 +158,7 @@ public class CommandLine {
     }
 
     protected void startKernel(Artifact moduleId) throws Exception {
+        if (true) throw new IllegalStateException("don't call this");
         getBootedKernel();
 //        ClassLoader classLoader = CommandLine.class.getClassLoader();
         BundleContext bundleContext = null;
@@ -167,7 +169,7 @@ public class CommandLine {
                 ConfigurationData moduleData = ConfigurationUtil.readConfigurationData(in);
                 if (moduleId.matches(moduleData.getId())) {
                     // load the configuration
-                    configurationName = ConfigurationUtil.loadBootstrapConfiguration(kernel, moduleData, bundleContext);
+//                    configurationName = ConfigurationUtil.loadBootstrapConfiguration(kernel, moduleData, bundleContext);
                     return;
                 }
             } finally {

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/Daemon.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/Daemon.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/Daemon.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/Daemon.java Tue Apr 26 23:19:31 2011
@@ -39,6 +39,7 @@ public class Daemon extends EmbeddedDaem
 
     @Override
     protected int initializeKernel() throws Exception {
+        if (true) throw new Exception("use ConfigurationExtener");
         ClassLoader classLoader = EmbeddedDaemon.class.getClassLoader();
         BundleContext bundleContext = null;
 
@@ -63,7 +64,7 @@ public class Daemon extends EmbeddedDaem
         // load this configuration
         InputStream in = classLoader.getResourceAsStream("META-INF/config.ser");
         try {
-            ConfigurationUtil.loadBootstrapConfiguration(kernel, in, bundleContext);
+//            ConfigurationUtil.loadBootstrapConfiguration(kernel, in, bundleContext);
         } finally {
             if (in != null) {
                 try {

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java Tue Apr 26 23:19:31 2011
@@ -21,6 +21,7 @@ import java.io.File;
 import java.net.URI;
 
 import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Service;
 import org.apache.geronimo.gbean.annotation.ParamAttribute;
 import org.apache.geronimo.system.properties.JvmVendor;
@@ -94,6 +95,12 @@ public class BasicServerInfo implements 
         logEnvInfo();
     }
 
+    @Deactivate
+    public void stop() {
+        System.getProperties().remove(HOME_DIR_SYS_PROP);
+        System.getProperties().remove(SERVER_DIR_SYS_PROP);
+    }
+
     public BasicServerInfo(String baseDirectory, String serverName) {
         this.baseDirectory = baseDirectory;
         this.base = new File(baseDirectory);

Added: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/WrappingServerInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/WrappingServerInfo.java?rev=1096952&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/WrappingServerInfo.java (added)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/WrappingServerInfo.java Tue Apr 26 23:19:31 2011
@@ -0,0 +1,125 @@
+/*
+ * 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.
+ */
+
+
+package org.apache.geronimo.system.serverinfo;
+
+import java.io.File;
+import java.net.URI;
+
+import org.apache.geronimo.gbean.annotation.GBean;
+import org.apache.geronimo.gbean.annotation.ParamSpecial;
+import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.util.tracker.ServiceTracker;
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+@GBean
+public class WrappingServerInfo implements ServerInfo {
+
+    private ServerInfo serverInfo;
+
+    public WrappingServerInfo(@ParamSpecial(type = SpecialAttributeType.bundle)final Bundle bundle) {
+        final BundleContext bundleContext = bundle.getBundleContext();
+        ServiceTracker t = new ServiceTracker(bundleContext, ServerInfo.class.getName(), new ServiceTrackerCustomizer() {
+
+            @Override
+            public Object addingService(ServiceReference serviceReference) {
+                serverInfo = (ServerInfo) bundleContext.getService(serviceReference);
+                return null;
+            }
+
+            @Override
+            public void modifiedService(ServiceReference serviceReference, Object o) {
+            }
+
+            @Override
+            public void removedService(ServiceReference serviceReference, Object o) {
+                serverInfo = null;
+            }
+        });
+        t.open();
+    }
+
+
+    @Override
+    public String getBaseDirectory() {
+        return serverInfo.getBaseDirectory();
+    }
+
+    @Override
+    public String getBuildDate() {
+        return serverInfo.getBuildDate();
+    }
+
+    @Override
+    public String getBuildTime() {
+        return serverInfo.getBuildTime();
+    }
+
+    @Override
+    public String getCopyright() {
+        return serverInfo.getCopyright();
+    }
+
+    @Override
+    public String getCurrentBaseDirectory() {
+        return serverInfo.getCurrentBaseDirectory();
+    }
+
+    @Override
+    public String getVersion() {
+        return serverInfo.getVersion();
+    }
+
+    @Override
+    public File resolve(String filename) {
+        return serverInfo.resolve(filename);
+    }
+
+    @Override
+    public URI resolve(URI uri) {
+        return serverInfo.resolve(uri);
+    }
+
+    @Override
+    public String resolvePath(String filename) {
+        return serverInfo.resolvePath(filename);
+    }
+
+    @Override
+    public File resolveServer(String filename) {
+        return serverInfo.resolveServer(filename);
+    }
+
+    @Override
+    public URI resolveServer(URI uri) {
+        return serverInfo.resolveServer(uri);
+    }
+
+    @Override
+    public String resolveServerPath(String filename) {
+        return serverInfo.resolveServerPath(filename);
+    }
+}

Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/WrappingServerInfo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/WrappingServerInfo.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/WrappingServerInfo.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/framework/modules/testsupport-common/src/main/java/org/apache/geronimo/testsupport/TestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/testsupport-common/src/main/java/org/apache/geronimo/testsupport/TestSupport.java?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/testsupport-common/src/main/java/org/apache/geronimo/testsupport/TestSupport.java (original)
+++ geronimo/server/trunk/framework/modules/testsupport-common/src/main/java/org/apache/geronimo/testsupport/TestSupport.java Tue Apr 26 23:19:31 2011
@@ -23,6 +23,7 @@ import java.io.File;
 
 import junit.framework.TestCase;
 
+import org.osgi.framework.Bundle;
 import org.slf4j.Logger;
 import org.osgi.framework.BundleContext;
 
@@ -36,7 +37,7 @@ public abstract class TestSupport
 {
 //    @Inject
     protected BundleContext bundleContext;
-
+    protected Bundle bundle;
 
     private final TestUtil testUtil;
     
@@ -87,6 +88,11 @@ public abstract class TestSupport
         log.info("Initialized");
     }
 
+    public void setBundleContext(BundleContext bundleContext) {
+        this.bundleContext = bundleContext;
+        this.bundle = bundleContext.getBundle();
+    }
+
     public BundleContext getBundleContext() {
         return bundleContext;
     }

Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Tue Apr 26 23:19:31 2011
@@ -144,23 +144,23 @@
                 </exclusions>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
-                <version>1.1.4c_3</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
-                <version>1.3_3</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>xpp3</groupId>
-                        <artifactId>xpp3_min</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
+            <!--<dependency>-->
+                <!--<groupId>org.apache.servicemix.bundles</groupId>-->
+                <!--<artifactId>org.apache.servicemix.bundles.xpp3</artifactId>-->
+                <!--<version>1.1.4c_3</version>-->
+            <!--</dependency>-->
+
+            <!--<dependency>-->
+                <!--<groupId>org.apache.servicemix.bundles</groupId>-->
+                <!--<artifactId>org.apache.servicemix.bundles.xstream</artifactId>-->
+                <!--<version>1.3_3</version>-->
+                <!--<exclusions>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>xpp3</groupId>-->
+                        <!--<artifactId>xpp3_min</artifactId>-->
+                    <!--</exclusion>-->
+                <!--</exclusions>-->
+            <!--</dependency>-->
 
             <dependency>
                 <groupId>org.apache.maven</groupId>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1096952&r1=1096951&r2=1096952&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Apr 26 23:19:31 2011
@@ -1776,6 +1776,48 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.shell</artifactId>
+                <version>1.5.0-SNAPSHOT</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.osgi</groupId>
+                        <artifactId>org.osgi.core</artifactId>
+                     </exclusion>
+                    <exclusion>
+                        <groupId>org.osgi</groupId>
+                        <artifactId>org.osgi.compendium</artifactId>
+                     </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>org.osgi.core</artifactId>
+                     </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>org.osgi.compendium</artifactId>
+                     </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.metatype</artifactId>
+                <version>${felix.metatype.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>org.osgi.core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>org.osgi.compendium</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>net.sf.kxml</groupId>
+                        <artifactId>kxml2</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.bundlerepository</artifactId>
                 <version>${felix.bundlerepository.version}</version>
                 <exclusions>



Mime
View raw message