You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2009/09/22 19:06:16 UTC
svn commit: r817734 - in /commons/sandbox/runtime/trunk/src:
main/java/org/apache/commons/runtime/
main/java/org/apache/commons/runtime/platform/windows/
test/org/apache/commons/runtime/
Author: mturk
Date: Tue Sep 22 17:06:13 2009
New Revision: 817734
URL: http://svn.apache.org/viewvc?rev=817734&view=rev
Log:
Get rid of System.loadLibrary and use our Library.load
Modified:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Default.properties
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/Default.properties
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestChildMain.java
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestFile.java
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestGroup.java
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestMemory.java
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestMemoryMap.java
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestNative.java
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestNioByteBuffer.java
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestOS.java
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestObserver.java
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestPrivate.java
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSemaphore.java
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSharedMemory.java
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSignal.java
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestStatus.java
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestStrings.java
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSyslog.java
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSystem.java
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestUUID.java
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestUser.java
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Default.properties
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Default.properties?rev=817734&r1=817733&r2=817734&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Default.properties (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Default.properties Tue Sep 22 17:06:13 2009
@@ -45,3 +45,4 @@
# that has to be loaded before this library
#
library.load = acr
+library.load.ssl = acrssl
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/Default.properties
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/Default.properties?rev=817734&r1=817733&r2=817734&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/Default.properties (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/Default.properties Tue Sep 22 17:06:13 2009
@@ -24,3 +24,7 @@
# Maximum number of opened OS descriptors
os.open.max = 65536
+
+# Windows platform needs explicit 'lib' prefix
+library.load = libacr
+library.load.ssl = libacrssl
Modified: commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestChildMain.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestChildMain.java?rev=817734&r1=817733&r2=817734&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestChildMain.java (original)
+++ commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestChildMain.java Tue Sep 22 17:06:13 2009
@@ -38,7 +38,7 @@
protected void setUp()
throws Exception
{
- System.loadLibrary("acr");
+ Loader.load();
if (OpenSSL.SUPPORTED) {
// Load the ssl library if compiled in
System.loadLibrary("acrssl");
Modified: commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestFile.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestFile.java?rev=817734&r1=817733&r2=817734&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestFile.java (original)
+++ commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestFile.java Tue Sep 22 17:06:13 2009
@@ -38,7 +38,7 @@
protected void setUp()
throws Exception
{
- System.loadLibrary("acr");
+ Loader.load();
}
public void testFileClassLoad()
Modified: commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestGroup.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestGroup.java?rev=817734&r1=817733&r2=817734&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestGroup.java (original)
+++ commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestGroup.java Tue Sep 22 17:06:13 2009
@@ -36,7 +36,7 @@
protected void setUp()
throws Exception
{
- System.loadLibrary("acr");
+ Loader.load();
}
public void testPrimaryGroup()
Modified: commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestMemory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestMemory.java?rev=817734&r1=817733&r2=817734&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestMemory.java (original)
+++ commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestMemory.java Tue Sep 22 17:06:13 2009
@@ -38,7 +38,7 @@
protected void setUp()
throws Exception
{
- System.loadLibrary("acr");
+ Loader.load();
initp0(0);
}
Modified: commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestMemoryMap.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestMemoryMap.java?rev=817734&r1=817733&r2=817734&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestMemoryMap.java (original)
+++ commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestMemoryMap.java Tue Sep 22 17:06:13 2009
@@ -38,7 +38,7 @@
protected void setUp()
throws Exception
{
- System.loadLibrary("acr");
+ Loader.load();
}
public void testTestMemoryMapOpen()
Modified: commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestNative.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestNative.java?rev=817734&r1=817733&r2=817734&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestNative.java (original)
+++ commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestNative.java Tue Sep 22 17:06:13 2009
@@ -35,7 +35,7 @@
protected void setUp()
throws Exception
{
- System.loadLibrary("acr");
+ Loader.load();
}
public void testNativeInit()
Modified: commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestNioByteBuffer.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestNioByteBuffer.java?rev=817734&r1=817733&r2=817734&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestNioByteBuffer.java (original)
+++ commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestNioByteBuffer.java Tue Sep 22 17:06:13 2009
@@ -35,7 +35,7 @@
protected void setUp()
throws Exception
{
- System.loadLibrary("acr");
+ Loader.load();
}
Modified: commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestOS.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestOS.java?rev=817734&r1=817733&r2=817734&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestOS.java (original)
+++ commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestOS.java Tue Sep 22 17:06:13 2009
@@ -35,7 +35,7 @@
protected void setUp()
throws Exception
{
- System.loadLibrary("acr");
+ Loader.load();
}
public void testOS()
Modified: commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestObserver.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestObserver.java?rev=817734&r1=817733&r2=817734&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestObserver.java (original)
+++ commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestObserver.java Tue Sep 22 17:06:13 2009
@@ -49,7 +49,7 @@
protected void setUp()
throws Exception
{
- System.loadLibrary("acr");
+ Loader.load();
}
public void testSimpleUpdate()
Modified: commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestPrivate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestPrivate.java?rev=817734&r1=817733&r2=817734&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestPrivate.java (original)
+++ commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestPrivate.java Tue Sep 22 17:06:13 2009
@@ -129,7 +129,7 @@
protected void setUp()
throws Exception
{
- System.loadLibrary("acr");
+ Loader.load();
for (int i = 0; i < longStrSize; i++) {
longChar[i] = (char)('A' + (i % 20));
}
Modified: commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSemaphore.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSemaphore.java?rev=817734&r1=817733&r2=817734&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSemaphore.java (original)
+++ commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSemaphore.java Tue Sep 22 17:06:13 2009
@@ -41,7 +41,7 @@
protected void setUp()
throws Exception
{
- System.loadLibrary("acr");
+ Loader.load();
}
public void testTestSemaphoreCreate()
Modified: commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSharedMemory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSharedMemory.java?rev=817734&r1=817733&r2=817734&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSharedMemory.java (original)
+++ commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSharedMemory.java Tue Sep 22 17:06:13 2009
@@ -37,7 +37,7 @@
protected void setUp()
throws Exception
{
- System.loadLibrary("acr");
+ Loader.load();
}
public void testSharedMemoryCreate()
Modified: commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSignal.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSignal.java?rev=817734&r1=817733&r2=817734&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSignal.java (original)
+++ commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSignal.java Tue Sep 22 17:06:13 2009
@@ -35,7 +35,7 @@
protected void setUp()
throws Exception
{
- System.loadLibrary("acr");
+ Loader.load();
}
private static final class Handler implements SignalHandler
Modified: commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestStatus.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestStatus.java?rev=817734&r1=817733&r2=817734&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestStatus.java (original)
+++ commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestStatus.java Tue Sep 22 17:06:13 2009
@@ -35,7 +35,7 @@
protected void setUp()
throws Exception
{
- System.loadLibrary("acr");
+ Loader.load();
}
public void testStatus()
Modified: commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestStrings.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestStrings.java?rev=817734&r1=817733&r2=817734&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestStrings.java (original)
+++ commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestStrings.java Tue Sep 22 17:06:13 2009
@@ -39,7 +39,7 @@
protected void setUp()
throws Exception
{
- System.loadLibrary("acr");
+ Loader.load();
}
public void testMbString()
Modified: commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSyslog.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSyslog.java?rev=817734&r1=817733&r2=817734&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSyslog.java (original)
+++ commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSyslog.java Tue Sep 22 17:06:13 2009
@@ -36,7 +36,7 @@
protected void setUp()
throws Exception
{
- System.loadLibrary("acr");
+ Loader.load();
}
public void testSyslog()
Modified: commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSystem.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSystem.java?rev=817734&r1=817733&r2=817734&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSystem.java (original)
+++ commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestSystem.java Tue Sep 22 17:06:13 2009
@@ -39,7 +39,7 @@
protected void setUp()
throws Exception
{
- System.loadLibrary("acr");
+ Loader.load();
}
class MySecurityManager extends SecurityManager {
Modified: commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestUUID.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestUUID.java?rev=817734&r1=817733&r2=817734&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestUUID.java (original)
+++ commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestUUID.java Tue Sep 22 17:06:13 2009
@@ -35,7 +35,7 @@
protected void setUp()
throws Exception
{
- System.loadLibrary("acr");
+ Loader.load();
}
public void testUUID()
Modified: commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestUser.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestUser.java?rev=817734&r1=817733&r2=817734&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestUser.java (original)
+++ commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestUser.java Tue Sep 22 17:06:13 2009
@@ -36,7 +36,7 @@
protected void setUp()
throws Exception
{
- System.loadLibrary("acr");
+ Loader.load();
}
public void testCurrentUser()