Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8E7722CEB for ; Sat, 7 May 2011 03:48:17 +0000 (UTC) Received: (qmail 68225 invoked by uid 500); 7 May 2011 03:48:16 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 68177 invoked by uid 500); 7 May 2011 03:48:15 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 68168 invoked by uid 99); 7 May 2011 03:48:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 May 2011 03:48:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 May 2011 03:48:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 12AF12388A60; Sat, 7 May 2011 03:47:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1100440 [4/4] - in /geronimo/server/branches/3.0-osgi: framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ plugi... Date: Sat, 07 May 2011 03:47:50 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110507034752.12AF12388A60@eris.apache.org> Modified: geronimo/server/branches/3.0-osgi/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java?rev=1100440&r1=1100439&r2=1100440&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java (original) +++ geronimo/server/branches/3.0-osgi/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java Sat May 7 03:47:48 2011 @@ -158,7 +158,6 @@ public class WebApplication implements R // send out a broadcast alert that we're going to do this deploying(); - ConfigurationManager configurationManager = extender.getConfigurationManager(); File configSer = bundle.getBundleContext().getDataFile("config.ser"); if (configSer.exists() && configSer.lastModified() == bundle.getLastModified()) { @@ -187,7 +186,6 @@ public class WebApplication implements R webModule.getEnvironment(), ConfigurationModuleType.WAB, naming, - configurationManager, bundle.getBundleContext(), extender.getServerName(), webModule.getModuleName(), @@ -234,8 +232,8 @@ public class WebApplication implements R configurationData.setUseEnvironment(true); configurationData.setBundle(bundle); - configurationManager.loadConfiguration(configurationData); - configurationManager.startConfiguration(configurationData.getId()); +// configurationManager.loadConfiguration(configurationData); +// configurationManager.startConfiguration(configurationData.getId()); deployedArtifact = configurationData.getId(); Modified: geronimo/server/branches/3.0-osgi/plugins/wab/web-extender/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/wab/web-extender/pom.xml?rev=1100440&r1=1100439&r2=1100440&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/plugins/wab/web-extender/pom.xml (original) +++ geronimo/server/branches/3.0-osgi/plugins/wab/web-extender/pom.xml Sat May 7 03:47:48 2011 @@ -36,6 +36,41 @@ + org.apache.geronimo.framework.feature + j2ee-system + ${project.version} + xml + features + + + + + + + + + org.apache.geronimo.feature + org.apache.geronimo.javaee-specs + ${project.version} + xml + features + + + org.apache.xbean + xbean-naming + + + org.apache.geronimo.modules + geronimo-j2ee + ${project.version} + + + org.apache.geronimo.modules + geronimo-j2ee-builder + ${project.version} + + + org.apache.geronimo.configs j2ee-server ${project.version} @@ -65,6 +100,13 @@ org.apache.geronimo.buildsupport car-maven-plugin + + declarative-services + org.apache.geronimo.jaxb-support + org.apache.geronimo.javaee-specs + j2ee-system + + Geronimo Core