geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
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 GMT
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>



Mime
View raw message