You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2012/04/18 07:11:12 UTC
svn commit: r1327376 - in /geronimo/server/branches/3.0-beta:
framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java
pom.xml
Author: xiaming
Date: Wed Apr 18 05:11:11 2012
New Revision: 1327376
URL: http://svn.apache.org/viewvc?rev=1327376&view=rev
Log:
Revert the accidental local change to FrameworkLauncher
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=1327376&r1=1327375&r2=1327376&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:11:11 2012
@@ -208,8 +208,7 @@ 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.out.println(System.getProperties());
+ System.setProperty("library.jansi.path", new File(geronimoBase, "var/native/jansi/" + osName + bitMode).getAbsolutePath());
}
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=1327376&r1=1327375&r2=1327376&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/pom.xml Wed Apr 18 05:11:11 2012
@@ -156,9 +156,7 @@
<aries.jmx.version>0.3</aries.jmx.version>
<aries.util.version>0.3</aries.util.version>
<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>-->
+ <aries.proxy.version>0.3</aries.proxy.version>
</properties>
<dependencyManagement>