Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 98965 invoked from network); 30 Nov 2010 06:35:56 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 30 Nov 2010 06:35:56 -0000 Received: (qmail 62269 invoked by uid 500); 30 Nov 2010 06:35:56 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 62213 invoked by uid 500); 30 Nov 2010 06:35:56 -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 62206 invoked by uid 99); 30 Nov 2010 06:35:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Nov 2010 06:35:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 30 Nov 2010 06:35:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 20860238890D; Tue, 30 Nov 2010 06:34:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1040418 [1/2] - in /geronimo/server/trunk: ./ framework/ framework/buildsupport/car-maven-plugin/ framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ framework/buildsupport/geronimo-osgi-plugin/src/m... Date: Tue, 30 Nov 2010 06:34:11 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101130063413.20860238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Tue Nov 30 06:34:09 2010 New Revision: 1040418 URL: http://svn.apache.org/viewvc?rev=1040418&view=rev Log: GERONIMO-5702: Update for Karaf 2.1.2. Based on patch from Viola Lu Added: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.karaf.log.cfg - copied, changed from r1040230, geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.felix.karaf.log.cfg geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.karaf.shell.cfg - copied unchanged from r1040230, geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/org.apache.karaf.features.cfg - copied, changed from r1040230, geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg geronimo/server/trunk/framework/modules/geronimo-shell/src/main/filtered-resources/org/apache/karaf/ - copied from r1040230, geronimo/server/trunk/framework/modules/geronimo-shell/src/main/filtered-resources/org/apache/felix/karaf/ Removed: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.felix.karaf.log.cfg geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg geronimo/server/trunk/framework/modules/geronimo-shell/src/main/filtered-resources/org/apache/felix/ 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/AbstractCarMojo.java geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile geronimo/server/trunk/framework/configs/client-system/pom.xml geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml geronimo/server/trunk/framework/configs/j2ee-system/pom.xml geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml geronimo/server/trunk/framework/configs/karaf-framework/pom.xml geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/windows-bin.xml geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/LICENSE geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/shell.init.script geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/features.xml geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml geronimo/server/trunk/framework/configs/online-deployer/pom.xml geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java geronimo/server/trunk/framework/modules/geronimo-security/pom.xml geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/credentialstore/SimpleCredentialStoreImplTest.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/NoLoginModuleReuseTest.java geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/TimeoutTest.java geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/BaseCommandSupport.java geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/completers/GeronimoCompleter.java geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/obr/RefreshCommand.java geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/resources/OSGI-INF/blueprint/shell-deploy.xml geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/resources/OSGI-INF/blueprint/shell-geronimo.xml geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/resources/OSGI-INF/blueprint/shell-obr.xml geronimo/server/trunk/framework/modules/geronimo-shell/pom.xml geronimo/server/trunk/framework/modules/geronimo-system/pom.xml geronimo/server/trunk/framework/pom.xml geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml geronimo/server/trunk/plugins/aries/geronimo-aries-shell/pom.xml geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/ApplicationCommandSupport.java geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java geronimo/server/trunk/pom.xml 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=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml (original) +++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml Tue Nov 30 06:34:09 2010 @@ -250,8 +250,8 @@ - org.apache.felix.karaf.jaas - org.apache.felix.karaf.jaas.boot + org.apache.karaf.jaas + org.apache.karaf.jaas.boot org.ops4j.pax.url Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java (original) +++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java Tue Nov 30 06:34:09 2010 @@ -847,7 +847,7 @@ public abstract class AbstractCarMojo "org.apache.geronimo.transformer," + "org.apache.geronimo.hook," + "org.apache.geronimo.mavenplugins.car," + - "org.apache.felix.karaf.jaas.boot;version=\"1.6.0\"," + + "org.apache.karaf.jaas.boot;version=\"2.1.2\"," + "org.apache.yoko," + "org.apache.yoko.osgi," + "org.apache.yoko.rmispec.util" Modified: geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile (original) +++ geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile Tue Nov 30 06:34:09 2010 @@ -142,7 +142,7 @@ org.osgi.framework.system.packages.extra sun.misc,\ sun.reflect,\ org.apache.geronimo.transformer,\ - org.apache.felix.karaf.jaas.boot;version=1.6.0 + org.apache.karaf.jaas.boot;version=2.1.2 org.osgi.framework.bootdelegation = \ javax.*,\ Modified: geronimo/server/trunk/framework/configs/client-system/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/pom.xml?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/client-system/pom.xml (original) +++ geronimo/server/trunk/framework/configs/client-system/pom.xml Tue Nov 30 06:34:09 2010 @@ -74,9 +74,10 @@ org.apache.servicemix.bundles org.apache.servicemix.bundles.commons-jexl + - org.apache.servicemix.bundles - org.apache.servicemix.bundles.commons-lang + commons-lang + commons-lang Modified: geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml Tue Nov 30 06:34:09 2010 @@ -17,6 +17,11 @@ jar + commons-lang + commons-lang + jar + + org.apache.felix org.apache.felix.bundlerepository jar @@ -103,11 +108,6 @@ org.apache.servicemix.bundles - org.apache.servicemix.bundles.commons-lang - jar - - - org.apache.servicemix.bundles org.apache.servicemix.bundles.jline jar Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml Tue Nov 30 06:34:09 2010 @@ -17,6 +17,11 @@ jar + commons-lang + commons-lang + jar + + org.apache.felix org.apache.felix.bundlerepository jar @@ -123,11 +128,6 @@ org.apache.servicemix.bundles - org.apache.servicemix.bundles.commons-lang - jar - - - org.apache.servicemix.bundles org.apache.servicemix.bundles.xmlbeans jar Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml (original) +++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml Tue Nov 30 06:34:09 2010 @@ -100,9 +100,10 @@ org.apache.servicemix.bundles org.apache.servicemix.bundles.commons-jexl + - org.apache.servicemix.bundles - org.apache.servicemix.bundles.commons-lang + commons-lang + commons-lang Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml (original) +++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml Tue Nov 30 06:34:09 2010 @@ -100,9 +100,10 @@ org.apache.servicemix.bundles org.apache.servicemix.bundles.commons-jexl + - org.apache.servicemix.bundles - org.apache.servicemix.bundles.commons-lang + commons-lang + commons-lang 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=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/j2ee-system/pom.xml (original) +++ geronimo/server/trunk/framework/configs/j2ee-system/pom.xml Tue Nov 30 06:34:09 2010 @@ -101,9 +101,10 @@ org.apache.servicemix.bundles org.apache.servicemix.bundles.commons-jexl + - org.apache.servicemix.bundles - org.apache.servicemix.bundles.commons-lang + commons-lang + commons-lang Modified: geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml Tue Nov 30 06:34:09 2010 @@ -17,6 +17,11 @@ jar + commons-lang + commons-lang + jar + + org.apache.felix org.apache.felix.bundlerepository jar @@ -118,11 +123,6 @@ org.apache.servicemix.bundles - org.apache.servicemix.bundles.commons-lang - jar - - - org.apache.servicemix.bundles org.apache.servicemix.bundles.jline jar Modified: geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml Tue Nov 30 06:34:09 2010 @@ -17,28 +17,18 @@ jar - org.apache.felix - org.apache.felix.bundlerepository + commons-lang + commons-lang jar org.apache.felix - org.apache.felix.configadmin - jar - - - org.apache.felix.gogo - org.apache.felix.gogo.commands - jar - - - org.apache.felix.gogo - org.apache.felix.gogo.runtime + org.apache.felix.bundlerepository jar - org.apache.felix.karaf.shell - org.apache.felix.karaf.shell.console + org.apache.felix + org.apache.felix.configadmin jar @@ -142,23 +132,23 @@ jar - org.apache.servicemix.bundles - org.apache.servicemix.bundles.ant + org.apache.karaf.shell + org.apache.karaf.shell.console jar org.apache.servicemix.bundles - org.apache.servicemix.bundles.cglib + org.apache.servicemix.bundles.ant jar org.apache.servicemix.bundles - org.apache.servicemix.bundles.commons-jexl + org.apache.servicemix.bundles.cglib jar org.apache.servicemix.bundles - org.apache.servicemix.bundles.commons-lang + org.apache.servicemix.bundles.commons-jexl jar 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=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml (original) +++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml Tue Nov 30 06:34:09 2010 @@ -80,9 +80,10 @@ org.apache.servicemix.bundles org.apache.servicemix.bundles.commons-jexl + - org.apache.servicemix.bundles - org.apache.servicemix.bundles.commons-lang + commons-lang + commons-lang Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml Tue Nov 30 06:34:09 2010 @@ -17,6 +17,11 @@ jar + commons-lang + commons-lang + jar + + org.apache.felix org.apache.felix.bundlerepository jar @@ -133,11 +138,6 @@ org.apache.servicemix.bundles - org.apache.servicemix.bundles.commons-lang - jar - - - org.apache.servicemix.bundles org.apache.servicemix.bundles.xpp3 jar Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original) +++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Tue Nov 30 06:34:09 2010 @@ -30,44 +30,38 @@ car Geronimo Assemblies :: Karaf Boilerplate Framework - - 1.6.0 - 1.6.0 - - - 1.0_3 - 2.1_3_4 + + + 1.0_4 + 2.1_3_6 1.1.1 1.0 2.4 - 1.6.4 1.2.0 - 3.0.0 - 0.4.0 + 3.0.2 1.4.0 2.1.0 1.0.4 1.0.2 - 0.2-incubating 1.2 4.7_1 0.9.95.20100209 1.2.16 2.0.9 2.0.0-RC1 - 1.2.0 - 1.4.0 + 1.2.2 + 1.5.0 0.4.0 - + - org.apache.felix.karaf + org.apache.karaf karaf pom - ${felix.karaf.version} + ${karaf.version} import @@ -126,9 +120,33 @@ - org.apache.felix.karaf.shell - org.apache.felix.karaf.shell.log - ${felix.karaf.version} + org.apache.karaf.shell + org.apache.karaf.shell.commands + ${karaf.version} + + + org.apache.felix.gogo + org.apache.felix.gogo.runtime + + + + + + org.apache.karaf.shell + org.apache.karaf.shell.obr + ${karaf.version} + + + commons-logging + commons-logging + + + + + + org.apache.karaf.shell + org.apache.karaf.shell.log + ${karaf.version} org.ops4j.pax.logging @@ -138,9 +156,21 @@ - org.apache.felix.karaf.deployer - org.apache.felix.karaf.deployer.blueprint - ${felix.karaf.version} + org.apache.karaf.shell + org.apache.karaf.shell.config + ${karaf.version} + + + org.apache.karaf + org.apache.karaf.util + + + + + + org.apache.karaf.deployer + org.apache.karaf.deployer.blueprint + ${karaf.version} commons-logging @@ -154,9 +184,9 @@ - org.apache.felix.karaf.deployer - org.apache.felix.karaf.deployer.features - ${felix.karaf.version} + org.apache.karaf.deployer + org.apache.karaf.deployer.features + ${karaf.version} commons-logging @@ -170,9 +200,9 @@ - org.apache.felix.karaf.jaas - org.apache.felix.karaf.jaas.config - ${felix.karaf.version} + org.apache.karaf.jaas + org.apache.karaf.jaas.config + ${karaf.version} commons-logging @@ -198,11 +228,6 @@ - org.apache.felix.gogo - org.apache.felix.gogo.runtime - ${felix.gogo.version} - - org.apache.felix org.apache.felix.fileinstall ${felix.fileinstall.version} @@ -223,8 +248,8 @@ - org.apache.felix.karaf.deployer - org.apache.felix.karaf.deployer.blueprint + org.apache.karaf.deployer + org.apache.karaf.deployer.blueprint org.apache.servicemix.bundles @@ -233,8 +258,8 @@ - org.apache.felix.karaf.deployer - org.apache.felix.karaf.deployer.features + org.apache.karaf.deployer + org.apache.karaf.deployer.features org.apache.servicemix.bundles @@ -243,56 +268,56 @@ - org.apache.felix.karaf.features - org.apache.felix.karaf.features.core + org.apache.karaf.features + org.apache.karaf.features.core - org.apache.felix.karaf.features - org.apache.felix.karaf.features.command + org.apache.karaf.features + org.apache.karaf.features.command - org.apache.felix.karaf.features - org.apache.felix.karaf.features.management + org.apache.karaf.features + org.apache.karaf.features.management - org.apache.felix.karaf.shell - org.apache.felix.karaf.shell.console + org.apache.karaf.shell + org.apache.karaf.shell.console - org.apache.felix.karaf.shell - org.apache.felix.karaf.shell.obr + org.apache.karaf.shell + org.apache.karaf.shell.obr - org.apache.felix.karaf.shell - org.apache.felix.karaf.shell.osgi + org.apache.karaf.shell + org.apache.karaf.shell.osgi - org.apache.felix.karaf.shell - org.apache.felix.karaf.shell.log + org.apache.karaf.shell + org.apache.karaf.shell.log - org.apache.felix.karaf.shell - org.apache.felix.karaf.shell.config + org.apache.karaf.shell + org.apache.karaf.shell.config - org.apache.felix.karaf.shell - org.apache.felix.karaf.shell.packages + org.apache.karaf.shell + org.apache.karaf.shell.packages - org.apache.felix.karaf.shell - org.apache.felix.karaf.shell.commands + org.apache.karaf.shell + org.apache.karaf.shell.commands - org.apache.felix.karaf.shell - org.apache.felix.karaf.shell.ssh + org.apache.karaf.shell + org.apache.karaf.shell.ssh - org.apache.felix.karaf.jaas - org.apache.felix.karaf.jaas.boot + org.apache.karaf.jaas + org.apache.karaf.jaas.boot - org.apache.felix.karaf.jaas - org.apache.felix.karaf.jaas.config + org.apache.karaf.jaas + org.apache.karaf.jaas.config org.apache.felix @@ -518,8 +543,8 @@ - org.apache.felix.karaf.jaas - org.apache.felix.karaf.jaas.boot + org.apache.karaf.jaas + org.apache.karaf.jaas.boot target/dependencies/lib karaf-jaas-boot.jar Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/windows-bin.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/windows-bin.xml?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/windows-bin.xml (original) +++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/windows-bin.xml Tue Nov 30 06:34:09 2010 @@ -106,8 +106,8 @@ ${basedir}/target/classes/features.xml - /system/org/apache/felix/karaf/apache-felix-karaf/${version} - apache-felix-karaf-${version}-features.xml + /system/org/apache/karaf/apache-karaf/${version} + apache-karaf-${version}-features.xml 0644 dos @@ -160,57 +160,57 @@ /system false false - org/apache/felix/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} + org/apache/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} - org.apache.felix.karaf:org.apache.felix.karaf.management + org.apache.karaf:org.apache.karaf.management /system false false - org/apache/felix/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} + org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} - org.apache.felix.karaf.features:org.apache.felix.karaf.features.core - org.apache.felix.karaf.features:org.apache.felix.karaf.features.command - org.apache.felix.karaf.features:org.apache.felix.karaf.features.management + org.apache.karaf.features:org.apache.karaf.features.core + org.apache.karaf.features:org.apache.karaf.features.command + org.apache.karaf.features:org.apache.karaf.features.management /system false false - org/apache/felix/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} + org/apache/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} - org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.spring - org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.blueprint - org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.features + org.apache.karaf.deployer:org.apache.karaf.deployer.spring + org.apache.karaf.deployer:org.apache.karaf.deployer.blueprint + org.apache.karaf.deployer:org.apache.karaf.deployer.features /system false false - org/apache/felix/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} + org/apache/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} - org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.console - org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.admin - org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.osgi - org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.log - org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.config - org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.packages - org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.ssh - org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.commands + org.apache.karaf.shell:org.apache.karaf.shell.console + org.apache.karaf.shell:org.apache.karaf.shell.admin + org.apache.karaf.shell:org.apache.karaf.shell.osgi + org.apache.karaf.shell:org.apache.karaf.shell.log + org.apache.karaf.shell:org.apache.karaf.shell.config + org.apache.karaf.shell:org.apache.karaf.shell.packages + org.apache.karaf.shell:org.apache.karaf.shell.ssh + org.apache.karaf.shell:org.apache.karaf.shell.commands /system false false - org/apache/felix/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} + org/apache/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} - org.apache.felix.karaf.jaas:org.apache.felix.karaf.jaas.config - org.apache.felix.karaf.jaas:org.apache.felix.karaf.jaas.modules + org.apache.karaf.jaas:org.apache.karaf.jaas.config + org.apache.karaf.jaas:org.apache.karaf.jaas.modules Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/LICENSE URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/LICENSE?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/LICENSE (original) +++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/LICENSE Tue Nov 30 06:34:09 2010 @@ -1138,22 +1138,22 @@ following licenses. ./repository/org/apache/commons/commons-jexl/2.0/commons-jexl-2.0.jar ./repository/org/apache/felix/gogo/org.apache.felix.gogo.commands/0.4.0/org.apache.felix.gogo.commands-0.4.0.jar ./repository/org/apache/felix/gogo/org.apache.felix.gogo.runtime/0.4.0/org.apache.felix.gogo.runtime-0.4.0.jar -./repository/org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.blueprint/1.6.0/org.apache.felix.karaf.deployer.blueprint-1.6.0.jar -./repository/org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.features/1.6.0/org.apache.felix.karaf.deployer.features-1.6.0.jar -./repository/org/apache/felix/karaf/features/org.apache.felix.karaf.features.command/1.6.0/org.apache.felix.karaf.features.command-1.6.0.jar -./repository/org/apache/felix/karaf/features/org.apache.felix.karaf.features.core/1.6.0/org.apache.felix.karaf.features.core-1.6.0.jar -./repository/org/apache/felix/karaf/features/org.apache.felix.karaf.features.management/1.6.0/org.apache.felix.karaf.features.management-1.6.0.jar -./repository/org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.boot/1.6.0/org.apache.felix.karaf.jaas.boot-1.6.0.jar -./repository/org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.config/1.6.0/org.apache.felix.karaf.jaas.config-1.6.0.jar -./repository/org/apache/felix/karaf/org.apache.felix.karaf.commons/1.6.0/org.apache.felix.karaf.commons-1.6.0.jar -./repository/org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.commands/1.6.0/org.apache.felix.karaf.shell.commands-1.6.0.jar -./repository/org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.config/1.6.0/org.apache.felix.karaf.shell.config-1.6.0.jar -./repository/org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.console/1.6.0/org.apache.felix.karaf.shell.console-1.6.0.jar -./repository/org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.log/1.6.0/org.apache.felix.karaf.shell.log-1.6.0.jar -./repository/org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.obr/1.6.0/org.apache.felix.karaf.shell.obr-1.6.0.jar -./repository/org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.osgi/1.6.0/org.apache.felix.karaf.shell.osgi-1.6.0.jar -./repository/org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.packages/1.6.0/org.apache.felix.karaf.shell.packages-1.6.0.jar -./repository/org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.ssh/1.6.0/org.apache.felix.karaf.shell.ssh-1.6.0.jar +./repository/org/apache/karaf/deployer/org.apache.karaf.deployer.blueprint/2.1.2/org.apache.karaf.deployer.blueprint-2.1.2.jar +./repository/org/apache/karaf/deployer/org.apache.karaf.deployer.features/2.1.2/org.apache.karaf.deployer.features-2.1.2.jar +./repository/org/apache/karaf/features/org.apache.karaf.features.command/2.1.2/org.apache.karaf.features.command-2.1.2.jar +./repository/org/apache/karaf/features/org.apache.karaf.features.core/2.1.2/org.apache.karaf.features.core-2.1.2.jar +./repository/org/apache/karaf/features/org.apache.karaf.features.management/2.1.2/org.apache.karaf.features.management-2.1.2.jar +./repository/org/apache/karaf/jaas/org.apache.karaf.jaas.boot/2.1.2/org.apache.karaf.jaas.boot-2.1.2.jar +./repository/org/apache/karaf/jaas/org.apache.karaf.jaas.config/2.1.2/org.apache.karaf.jaas.config-2.1.2.jar +./repository/org/apache/karaf/org.apache.karaf.commons/2.1.2/org.apache.karaf.commons-2.1.2.jar +./repository/org/apache/karaf/shell/org.apache.karaf.shell.commands/2.1.2/org.apache.karaf.shell.commands-2.1.2.jar +./repository/org/apache/karaf/shell/org.apache.karaf.shell.config/2.1.2/org.apache.karaf.shell.config-2.1.2.jar +./repository/org/apache/karaf/shell/org.apache.karaf.shell.console/2.1.2/org.apache.karaf.shell.console-2.1.2.jar +./repository/org/apache/karaf/shell/org.apache.karaf.shell.log/2.1.2/org.apache.karaf.shell.log-2.1.2.jar +./repository/org/apache/karaf/shell/org.apache.karaf.shell.obr/2.1.2/org.apache.karaf.shell.obr-2.1.2.jar +./repository/org/apache/karaf/shell/org.apache.karaf.shell.osgi/2.1.2/org.apache.karaf.shell.osgi-2.1.2.jar +./repository/org/apache/karaf/shell/org.apache.karaf.shell.packages/2.1.2/org.apache.karaf.shell.packages-2.1.2.jar +./repository/org/apache/karaf/shell/org.apache.karaf.shell.ssh/2.1.2/org.apache.karaf.shell.ssh-2.1.2.jar ./repository/org/apache/felix/org.apache.felix.bundlerepository/1.6.4/org.apache.felix.bundlerepository-1.6.4.jar ./repository/org/apache/felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-1.2.4.jar ./repository/org/apache/felix/org.apache.felix.fileinstall/3.0.0/org.apache.felix.fileinstall-3.0.0.jar Copied: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.karaf.log.cfg (from r1040230, geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.felix.karaf.log.cfg) URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.karaf.log.cfg?p2=geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.karaf.log.cfg&p1=geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.felix.karaf.log.cfg&r1=1040230&r2=1040418&rev=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.felix.karaf.log.cfg (original) +++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.karaf.log.cfg Tue Nov 30 06:34:09 2010 @@ -19,4 +19,4 @@ # size = 500 -pattern = %d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n +pattern = %d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/shell.init.script URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/shell.init.script?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/shell.init.script (original) +++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/shell.init.script Tue Nov 30 06:34:09 2010 @@ -23,3 +23,4 @@ ld = { log:display $args } ; lde = { log:display-exception $args } ; +la = { osgi:list -t 0 $args } ; Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties (original) +++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties Tue Nov 30 06:34:09 2010 @@ -43,8 +43,8 @@ org.osgi.framework.system.packages.extra sun.reflect, \ org.apache.yoko, \ org.apache.yoko.osgi, \ - org.apache.felix.karaf.jaas.boot; version=${karaf.osgi.version}, \ - org.apache.felix.karaf.version; version=${karaf.osgi.version}, \ + org.apache.karaf.jaas.boot; version=${karaf.osgi.version}, \ + org.apache.karaf.version; version=${karaf.osgi.version}, \ org.apache.geronimo.main, \ org.apache.geronimo.cli.daemon, \ org.apache.geronimo.cli.client, \ @@ -65,6 +65,7 @@ karaf.auto.start=startup.properties org.osgi.framework.startlevel.beginning=100 karaf.startlevel.bundle=60 +karaf.systemBundlesStartLevel=50 # # FileMonitor properties Copied: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (from r1040230, geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg) URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?p2=geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/org.apache.karaf.features.cfg&p1=geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg&r1=1040230&r2=1040418&rev=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg (original) +++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Tue Nov 30 06:34:09 2010 @@ -20,9 +20,9 @@ # # Comma separated list of features repositories to register by default # -featuresRepositories=mvn:org.apache.felix.karaf/apache-felix-karaf/${version}/xml/features +featuresRepositories=mvn:org.apache.karaf/apache-karaf/${project.version}/xml/features # # Comma separated list of features to install at startup # -featuresBoot=ssh,management +featuresBoot=config,ssh,management Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties (original) +++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties Tue Nov 30 06:34:09 2010 @@ -38,25 +38,24 @@ org/apache/aries/org.apache.aries.util/$ org/apache/aries/blueprint/org.apache.aries.blueprint/${aries.blueprint.version}/org.apache.aries.blueprint-${aries.blueprint.version}.jar=20 org/apache/geronimo/framework/geronimo-shell/${pom.version}/geronimo-shell-${pom.version}.jar=30 -org/apache/felix/gogo/org.apache.felix.gogo.runtime/${felix.gogo.version}/org.apache.felix.gogo.runtime-${felix.gogo.version}.jar=30 -org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.console/${felix.karaf.version}/org.apache.felix.karaf.shell.console-${felix.karaf.version}.jar=30 -org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.blueprint/${felix.karaf.version}/org.apache.felix.karaf.deployer.blueprint-${felix.karaf.version}.jar=30 -#org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.features/${felix.karaf.version}/org.apache.felix.karaf.deployer.features-${felix.karaf.version}.jar=30 -org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.osgi/${felix.karaf.version}/org.apache.felix.karaf.shell.osgi-${felix.karaf.version}.jar=30 -org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.log/${felix.karaf.version}/org.apache.felix.karaf.shell.log-${felix.karaf.version}.jar=30 -org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.config/${felix.karaf.version}/org.apache.felix.karaf.shell.config-${felix.karaf.version}.jar=30 -org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.packages/${felix.karaf.version}/org.apache.felix.karaf.shell.packages-${felix.karaf.version}.jar=30 -org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.commands/${felix.karaf.version}/org.apache.felix.karaf.shell.commands-${felix.karaf.version}.jar=30 -org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.obr/${felix.karaf.version}/org.apache.felix.karaf.shell.obr-${felix.karaf.version}.jar=30 -org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.config/${felix.karaf.version}/org.apache.felix.karaf.jaas.config-${felix.karaf.version}.jar=30 - -#org/apache/felix/karaf/features/org.apache.felix.karaf.features.core/${felix.karaf.version}/org.apache.felix.karaf.features.core-${felix.karaf.version}.jar=30 -#org/apache/felix/karaf/features/org.apache.felix.karaf.features.command/${felix.karaf.version}/org.apache.felix.karaf.features.command-${felix.karaf.version}.jar=30 -#org/apache/felix/karaf/features/org.apache.felix.karaf.features.management/${felix.karaf.version}/org.apache.felix.karaf.features.management-${felix.karaf.version}.jar=30 +org/apache/karaf/shell/org.apache.karaf.shell.console/${karaf.version}/org.apache.karaf.shell.console-${karaf.version}.jar=30 +org/apache/karaf/deployer/org.apache.karaf.deployer.blueprint/${karaf.version}/org.apache.karaf.deployer.blueprint-${karaf.version}.jar=30 +#org/apache/karaf/deployer/org.apache.karaf.deployer.features/${karaf.version}/org.apache.karaf.deployer.features-${karaf.version}.jar=30 +org/apache/karaf/shell/org.apache.karaf.shell.osgi/${karaf.version}/org.apache.karaf.shell.osgi-${karaf.version}.jar=30 +org/apache/karaf/shell/org.apache.karaf.shell.log/${karaf.version}/org.apache.karaf.shell.log-${karaf.version}.jar=30 +org/apache/karaf/shell/org.apache.karaf.shell.config/${karaf.version}/org.apache.karaf.shell.config-${karaf.version}.jar=30 +org/apache/karaf/shell/org.apache.karaf.shell.packages/${karaf.version}/org.apache.karaf.shell.packages-${karaf.version}.jar=30 +org/apache/karaf/shell/org.apache.karaf.shell.commands/${karaf.version}/org.apache.karaf.shell.commands-${karaf.version}.jar=30 +org/apache/karaf/shell/org.apache.karaf.shell.obr/${karaf.version}/org.apache.karaf.shell.obr-${karaf.version}.jar=30 +org/apache/karaf/jaas/org.apache.karaf.jaas.config/${karaf.version}/org.apache.karaf.jaas.config-${karaf.version}.jar=30 + +#org/apache/karaf/features/org.apache.karaf.features.core/${karaf.version}/org.apache.karaf.features.core-${karaf.version}.jar=30 +#org/apache/karaf/features/org.apache.karaf.features.command/${karaf.version}/org.apache.karaf.features.command-${karaf.version}.jar=30 +#org/apache/karaf/features/org.apache.karaf.features.management/${karaf.version}/org.apache.karaf.features.management-${karaf.version}.jar=30 org/apache/mina/mina-core/${mina.version}/mina-core-${mina.version}.jar=30 org/apache/sshd/sshd-core/${sshd.version}/sshd-core-${sshd.version}.jar=30 -org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.ssh/${felix.karaf.version}/org.apache.felix.karaf.shell.ssh-${felix.karaf.version}.jar=30 +org/apache/karaf/shell/org.apache.karaf.shell.ssh/${karaf.version}/org.apache.karaf.shell.ssh-${karaf.version}.jar=30 org/apache/geronimo/specs/geronimo-osgi-registry/1.0/geronimo-osgi-registry-1.0.jar=35 @@ -64,7 +63,7 @@ org/apache/servicemix/bundles/org.apache org/apache/servicemix/bundles/org.apache.servicemix.bundles.xpp3/1.1.4c_3/org.apache.servicemix.bundles.xpp3-1.1.4c_3.jar=40 org/apache/servicemix/bundles/org.apache.servicemix.bundles.cglib/2.1_3_4/org.apache.servicemix.bundles.cglib-2.1_3_4.jar=40 org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-jexl/1.1_3/org.apache.servicemix.bundles.commons-jexl-1.1_3.jar=40 -org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-lang/2.4_3/org.apache.servicemix.bundles.commons-lang-2.4_3.jar=40 +commons-lang/commons-lang/2.5/commons-lang-2.5.jar=40 org/apache/geronimo/bundles/jaxb-impl/2.2_1/jaxb-impl-2.2_1.jar=40 org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.1/geronimo-activation_1.1_spec-1.1.jar=40 org/apache/geronimo/specs/geronimo-jaxb_2.2_spec/1.0.1/geronimo-jaxb_2.2_spec-1.0.1.jar=40 Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/features.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/features.xml?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/features.xml (original) +++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/features.xml Tue Nov 30 06:34:09 2010 @@ -16,65 +16,95 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - - - - - - - - - - - - - - - - mvn:org.apache.felix.karaf.shell/org.apache.felix.karaf.shell.wrapper/${version} + + + + + mvn:org.apache.karaf.shell/org.apache.karaf.shell.wrapper/${project.version} + + mvn:org.apache.felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version} - mvn:org.apache.felix.karaf.shell/org.apache.felix.karaf.shell.obr/${version} + mvn:org.apache.karaf.shell/org.apache.karaf.shell.obr/${project.version} + mvn:org.apache.karaf.features/org.apache.karaf.features.obr/${project.version} + + + mvn:org.apache.karaf.shell/org.apache.karaf.shell.config/${project.version} - + - org.osgi.service.http.port=8181 + org.osgi.service.http.port=8181 - mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo.servlet.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version} - mvn:org.ops4j.pax.web/pax-web-bundle/${pax.web.version} - - - http - - username=karaf - password=karaf + mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty.bundle.version} + mvn:org.ops4j.pax.web/pax-web-api/${pax.web.version} + mvn:org.ops4j.pax.web/pax-web-spi/${pax.web.version} + mvn:org.ops4j.pax.web/pax-web-runtime/${pax.web.version} + mvn:org.ops4j.pax.web/pax-web-jetty/${pax.web.version} + + + http + mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version} + mvn:org.ops4j.pax.web/pax-web-extender-war/${pax.web.version} + mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/${pax.web.version} + mvn:org.ops4j.pax.url/pax-url-war/${pax.url.version} + mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.war/${project.version} + + + http + + realm=karaf mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version} - + mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.branding/${project.version} mvn:org.apache.felix/org.apache.felix.webconsole/${felix.webconsole.version} - mvn:org.apache.felix.karaf.webconsole/org.apache.felix.karaf.webconsole.admin/${version} - mvn:org.apache.felix.karaf.webconsole/org.apache.felix.karaf.webconsole.features/${version} - mvn:org.apache.felix.karaf.webconsole/org.apache.felix.karaf.webconsole.gogo/${version} - - + + webconsole-base + mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.admin/${project.version} + mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.features/${project.version} + mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.gogo/${project.version} + + + sshPort=8101 + sshHost=0.0.0.0 sshRealm=karaf + hostKey=${karaf.base}/etc/host.key mvn:org.apache.mina/mina-core/${mina.version} mvn:org.apache.sshd/sshd-core/${sshd.version} - mvn:org.apache.felix.karaf.shell/org.apache.felix.karaf.shell.ssh/${version} + mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/${project.version} - - mvn:org.apache.felix.karaf/org.apache.felix.karaf.management/${version} - mvn:org.osgi/org.osgi.impl.bundle.jmx/${osgi.jmx.version} + + mvn:org.apache.karaf/org.apache.karaf.management/${project.version} + mvn:org.apache.aries.jmx/org.apache.aries.jmx/${aries.jmx.version} + mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version} + + + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.bundle.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${jasypt.bundle.version} + mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.jasypt/${project.version} Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml Tue Nov 30 06:34:09 2010 @@ -17,6 +17,16 @@ jar + commons-collections + commons-collections + jar + + + commons-lang + commons-lang + jar + + org.apache.aries org.apache.aries.util jar @@ -57,96 +67,6 @@ jar - org.apache.felix.gogo - org.apache.felix.gogo.commands - jar - - - org.apache.felix.gogo - org.apache.felix.gogo.runtime - jar - - - org.apache.felix.karaf - org.apache.felix.karaf.commons - jar - - - org.apache.felix.karaf.deployer - org.apache.felix.karaf.deployer.blueprint - jar - - - org.apache.felix.karaf.deployer - org.apache.felix.karaf.deployer.features - jar - - - org.apache.felix.karaf.features - org.apache.felix.karaf.features.command - jar - - - org.apache.felix.karaf.features - org.apache.felix.karaf.features.core - jar - - - org.apache.felix.karaf.features - org.apache.felix.karaf.features.management - jar - - - org.apache.felix.karaf.jaas - org.apache.felix.karaf.jaas.boot - jar - - - org.apache.felix.karaf.jaas - org.apache.felix.karaf.jaas.config - jar - - - org.apache.felix.karaf.shell - org.apache.felix.karaf.shell.commands - jar - - - org.apache.felix.karaf.shell - org.apache.felix.karaf.shell.config - jar - - - org.apache.felix.karaf.shell - org.apache.felix.karaf.shell.console - jar - - - org.apache.felix.karaf.shell - org.apache.felix.karaf.shell.log - jar - - - org.apache.felix.karaf.shell - org.apache.felix.karaf.shell.obr - jar - - - org.apache.felix.karaf.shell - org.apache.felix.karaf.shell.osgi - jar - - - org.apache.felix.karaf.shell - org.apache.felix.karaf.shell.packages - jar - - - org.apache.felix.karaf.shell - org.apache.felix.karaf.shell.ssh - jar - - org.apache.geronimo.bundles jaxb-impl jar @@ -267,6 +187,86 @@ jar + org.apache.karaf + org.apache.karaf.management + jar + + + org.apache.karaf.deployer + org.apache.karaf.deployer.blueprint + jar + + + org.apache.karaf.deployer + org.apache.karaf.deployer.features + jar + + + org.apache.karaf.features + org.apache.karaf.features.command + jar + + + org.apache.karaf.features + org.apache.karaf.features.core + jar + + + org.apache.karaf.features + org.apache.karaf.features.management + jar + + + org.apache.karaf.jaas + org.apache.karaf.jaas.boot + jar + + + org.apache.karaf.jaas + org.apache.karaf.jaas.config + jar + + + org.apache.karaf.shell + org.apache.karaf.shell.commands + jar + + + org.apache.karaf.shell + org.apache.karaf.shell.config + jar + + + org.apache.karaf.shell + org.apache.karaf.shell.console + jar + + + org.apache.karaf.shell + org.apache.karaf.shell.log + jar + + + org.apache.karaf.shell + org.apache.karaf.shell.obr + jar + + + org.apache.karaf.shell + org.apache.karaf.shell.osgi + jar + + + org.apache.karaf.shell + org.apache.karaf.shell.packages + jar + + + org.apache.karaf.shell + org.apache.karaf.shell.ssh + jar + + org.apache.mina mina-core jar @@ -288,11 +288,6 @@ org.apache.servicemix.bundles - org.apache.servicemix.bundles.commons-lang - jar - - - org.apache.servicemix.bundles org.apache.servicemix.bundles.jline jar 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=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/online-deployer/pom.xml (original) +++ geronimo/server/trunk/framework/configs/online-deployer/pom.xml Tue Nov 30 06:34:09 2010 @@ -75,9 +75,10 @@ org.apache.servicemix.bundles org.apache.servicemix.bundles.commons-jexl + - org.apache.servicemix.bundles - org.apache.servicemix.bundles.commons-lang + commons-lang + commons-lang Modified: geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml Tue Nov 30 06:34:09 2010 @@ -17,6 +17,11 @@ jar + commons-lang + commons-lang + jar + + org.apache.felix org.apache.felix.bundlerepository jar @@ -113,11 +118,6 @@ org.apache.servicemix.bundles - org.apache.servicemix.bundles.commons-lang - jar - - - org.apache.servicemix.bundles org.apache.servicemix.bundles.jline jar Modified: geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml Tue Nov 30 06:34:09 2010 @@ -17,28 +17,18 @@ jar - org.apache.felix - org.apache.felix.bundlerepository + commons-lang + commons-lang jar org.apache.felix - org.apache.felix.configadmin - jar - - - org.apache.felix.gogo - org.apache.felix.gogo.commands - jar - - - org.apache.felix.gogo - org.apache.felix.gogo.runtime + org.apache.felix.bundlerepository jar - org.apache.felix.karaf.shell - org.apache.felix.karaf.shell.console + org.apache.felix + org.apache.felix.configadmin jar @@ -142,23 +132,23 @@ jar - org.apache.servicemix.bundles - org.apache.servicemix.bundles.ant + org.apache.karaf.shell + org.apache.karaf.shell.console jar org.apache.servicemix.bundles - org.apache.servicemix.bundles.cglib + org.apache.servicemix.bundles.ant jar org.apache.servicemix.bundles - org.apache.servicemix.bundles.commons-jexl + org.apache.servicemix.bundles.cglib jar org.apache.servicemix.bundles - org.apache.servicemix.bundles.commons-lang + org.apache.servicemix.bundles.commons-jexl jar Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml (original) +++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml Tue Nov 30 06:34:09 2010 @@ -58,8 +58,8 @@ - org.apache.felix.karaf.shell - org.apache.felix.karaf.shell.console + org.apache.karaf.shell + org.apache.karaf.shell.console Modified: geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java Tue Nov 30 06:34:09 2010 @@ -210,7 +210,7 @@ public class FrameworkLauncher { } private static void processSecurityProperties(Properties m_configProps) { - String prop = m_configProps.getProperty("org.apache.felix.karaf.security.providers"); + String prop = m_configProps.getProperty("org.apache.karaf.security.providers"); if (prop != null) { String[] providers = prop.split(","); for (String provider : providers) { Modified: geronimo/server/trunk/framework/modules/geronimo-security/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/pom.xml?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-security/pom.xml (original) +++ geronimo/server/trunk/framework/modules/geronimo-security/pom.xml Tue Nov 30 06:34:09 2010 @@ -66,8 +66,8 @@ - org.apache.felix.karaf.jaas - org.apache.felix.karaf.jaas.boot + org.apache.karaf.jaas + org.apache.karaf.jaas.boot provided Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java?rev=1040418&r1=1040417&r2=1040418&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java Tue Nov 30 06:34:09 2010 @@ -25,7 +25,7 @@ import java.util.Set; import javax.security.auth.login.AppConfigurationEntry; -import org.apache.felix.karaf.jaas.boot.ProxyLoginModule; +import org.apache.karaf.jaas.boot.ProxyLoginModule; import org.apache.geronimo.gbean.GBeanInfo; import org.apache.geronimo.gbean.GBeanInfoBuilder; import org.apache.geronimo.kernel.Kernel;