From scm-return-48327-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org  Wed Apr 18 05:07:30 2012
Return-Path: <scm-return-48327-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
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 3441C9E06
	for <apmail-geronimo-scm-archive@www.apache.org>; Wed, 18 Apr 2012 05:07:30 +0000 (UTC)
Received: (qmail 28081 invoked by uid 500); 18 Apr 2012 05:07:30 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 27836 invoked by uid 500); 18 Apr 2012 05:07:25 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 27809 invoked by uid 99); 18 Apr 2012 05:07:24 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Apr 2012 05:07:24 +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; Wed, 18 Apr 2012 05:07:22 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 4E896238897A;
	Wed, 18 Apr 2012 05:06:48 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1327375 - in /geronimo/server/branches/3.0-beta:
 framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java
 pom.xml
Date: Wed, 18 Apr 2012 05:06:48 -0000
To: scm@geronimo.apache.org
From: xiaming@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120418050648.4E896238897A@eris.apache.org>

Author: xiaming
Date: Wed Apr 18 05:06:47 2012
New Revision: 1327375

URL: http://svn.apache.org/viewvc?rev=1327375&view=rev
Log:
Use xbeanVersion for xbean-bundleutils

Modified:
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java
    geronimo/server/branches/3.0-beta/pom.xml

Modified: geronimo/server/branches/3.0-beta/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java?rev=1327375&r1=1327374&r2=1327375&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java (original)
+++ geronimo/server/branches/3.0-beta/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java Wed Apr 18 05:06:47 2012
@@ -208,7 +208,8 @@ public class FrameworkLauncher {
         if (bitMode == null) {
             bitMode = System.getProperty("com.ibm.vm.bitmode");
         }
-        System.setProperty("library.jansi.path", new File(geronimoBase, "var/native/jansi/" + osName + bitMode).getAbsolutePath());
+        // System.setProperty("library.jansi.path", new File(geronimoBase, "var/native/jansi/" + osName + bitMode).getAbsolutePath());
+        System.out.println(System.getProperties());
     }
 
     private void destroyFramework(boolean await) throws BundleException, InterruptedException {

Modified: geronimo/server/branches/3.0-beta/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/pom.xml?rev=1327375&r1=1327374&r2=1327375&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/pom.xml Wed Apr 18 05:06:47 2012
@@ -158,7 +158,7 @@
         <aries.jndi.version>0.3</aries.jndi.version>
         <aries.proxy.version>0.3</aries.proxy.version>
 
-        <xbean.bundleutils.version>3.10-SNAPSHOT</xbean.bundleutils.version>
+        <!--<xbean.bundleutils.version>3.10-SNAPSHOT</xbean.bundleutils.version>-->
     </properties>
 
     <dependencyManagement>
@@ -499,7 +499,7 @@
             <dependency>
                 <groupId>org.apache.xbean</groupId>
                 <artifactId>xbean-bundleutils</artifactId>
-                <version>${xbean.bundleutils.version}</version>
+                <version>${xbeanVersion}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.slf4j</groupId>