Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 40199 invoked from network); 5 Mar 2010 06:23:06 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 5 Mar 2010 06:23:06 -0000 Received: (qmail 44203 invoked by uid 500); 5 Mar 2010 06:22:53 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 44163 invoked by uid 500); 5 Mar 2010 06:22:53 -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 44155 invoked by uid 99); 5 Mar 2010 06:22:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Mar 2010 06:22:52 +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; Fri, 05 Mar 2010 06:22:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E4C5D23888FE; Fri, 5 Mar 2010 06:22:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r919308 - in /geronimo/server/trunk/framework/configs/karaf-framework: pom.xml src/main/filtered-resources/etc/startup.properties Date: Fri, 05 Mar 2010 06:22:25 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100305062225.E4C5D23888FE@eris.apache.org> Author: gawor Date: Fri Mar 5 06:22:25 2010 New Revision: 919308 URL: http://svn.apache.org/viewvc?rev=919308&view=rev Log: synch with karaf Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties 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=919308&r1=919307&r2=919308&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original) +++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Fri Mar 5 06:22:25 2010 @@ -45,7 +45,7 @@ 1.2.4 2.0.8 2.1.0-SNAPSHOT - 0.3.0-SNAPSHOT + 0.2.2 1.4.0 2.0.1 1.0.4 @@ -70,43 +70,6 @@ 0.3.0 - @@ -135,12 +98,6 @@ import - - - org.apache.mina - mina-core - ${mina.version} - org.apache.felix org.osgi.compendium @@ -344,12 +301,6 @@ ${felix.gogo.version} - org.apache.felix.gogo - org.apache.felix.gogo.commands - ${felix.gogo.version} - - - org.apache.felix org.apache.felix.fileinstall ${felix.fileinstall.version} @@ -454,38 +405,6 @@ org.apache.felix.karaf org.apache.felix.karaf.management - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.apache.felix org.apache.felix.bundlerepository 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=919308&r1=919307&r2=919308&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 Fri Mar 5 06:22:25 2010 @@ -41,9 +41,7 @@ org/apache/aries/blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.version}/org.apache.aries.blueprint.cm-${aries.blueprint.version}.jar=20 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/gogo/org.apache.felix.gogo.commands/${felix.gogo.version}/org.apache.felix.gogo.commands-${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.spring/${felix.karaf.version}/org.apache.felix.karaf.deployer.spring-${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/admin/org.apache.felix.karaf.admin.core/${felix.karaf.version}/org.apache.felix.karaf.admin.core-${felix.karaf.version}.jar=30