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/07/03 15:22:19 UTC
svn commit: r790902 - in /commons/sandbox/runtime/trunk/src:
main/java/org/apache/commons/runtime/ main/native/os/darwin/
main/native/os/hpux/ main/native/os/linux/ main/native/os/solaris/
main/native/os/win32/ test/org/apache/commons/runtime/
Author: mturk
Date: Fri Jul 3 13:22:18 2009
New Revision: 790902
URL: http://svn.apache.org/viewvc?rev=790902&view=rev
Log:
Another big rename OS -> Os
Added:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Os.java
- copied, changed from r790895, commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/OS.java
Removed:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/OS.java
Modified:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ExecutableMemory.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/MbString.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Memory.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SystemId.java
commons/sandbox/runtime/trunk/src/main/native/os/darwin/os.c
commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c
commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c
commons/sandbox/runtime/trunk/src/main/native/os/solaris/os.c
commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c
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/TestOS.java
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestPrivate.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/ExecutableMemory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ExecutableMemory.java?rev=790902&r1=790901&r2=790902&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ExecutableMemory.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ExecutableMemory.java Fri Jul 3 13:22:18 2009
@@ -22,7 +22,6 @@
* <b>Warning:</b><br/>Using this class improperly may crash the running JVM.
* </p>
*
- * @see OS
* @since Runtime 1.0
*/
public final class ExecutableMemory
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/MbString.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/MbString.java?rev=790902&r1=790901&r2=790902&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/MbString.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/MbString.java Fri Jul 3 13:22:18 2009
@@ -28,7 +28,6 @@
* Use this class in performance critical code where extra character
* conversion and zero string termination is frequently used.
* </p>
- * @see OS
* @since Runtime 1.0
*/
public final class MbString
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Memory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Memory.java?rev=790902&r1=790901&r2=790902&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Memory.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Memory.java Fri Jul 3 13:22:18 2009
@@ -21,7 +21,6 @@
* <b>Warning:</b><br/>Using this class improperly may crash the running JVM.
* </p>
*
- * @see OS
* @since Runtime 1.0
*/
public final class Memory
Copied: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Os.java (from r790895, commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/OS.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Os.java?p2=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Os.java&p1=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/OS.java&r1=790895&r2=790902&rev=790902&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/OS.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Os.java Fri Jul 3 13:22:18 2009
@@ -23,10 +23,10 @@
* @since Runtime 1.0
*
*/
-public final class OS
+public final class Os
{
- private OS()
+ private Os()
{
// No class instance
}
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SystemId.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SystemId.java?rev=790902&r1=790901&r2=790902&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SystemId.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SystemId.java Fri Jul 3 13:22:18 2009
@@ -19,7 +19,7 @@
import java.util.Properties;
/**
- * Class that uses system properties to match {@link OS} class
+ * Class that uses system properties to match {@link Os} class
* for system name and processor.
* <p>
* Used when extracting the native libraries from the .jar to find
@@ -41,7 +41,7 @@
* </pre>
* </p>
*
- * @see OS
+ * @see Os
* @since Runtime 1.0
*/
public final class SystemId
Modified: commons/sandbox/runtime/trunk/src/main/native/os/darwin/os.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/darwin/os.c?rev=790902&r1=790901&r2=790902&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/darwin/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/darwin/os.c Fri Jul 3 13:22:18 2009
@@ -22,13 +22,13 @@
#define MAXSIZESYSSTRING 256
static const char unknown[] = "unknown";
-ACR_JNI_EXPORT_DECLARE(jint, OS, type)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jint, Os, type)(ACR_JNISTDARGS)
{
UNREFERENCED_STDARGS;
return ACR_OS_DARWIN;
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getSysname)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getSysname)(ACR_JNISTDARGS)
{
struct utsname sys;
if (!uname(&sys))
@@ -37,7 +37,7 @@
return NULL;
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getVersion)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getVersion)(ACR_JNISTDARGS)
{
struct utsname sys;
if (!uname(&sys))
@@ -46,13 +46,13 @@
return NULL;
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getRelease)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getRelease)(ACR_JNISTDARGS)
{
UNREFERENCED_STDARGS;
return CSTR_TO_JSTRING("darwin");
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getMachine)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getMachine)(ACR_JNISTDARGS)
{
struct utsname sys;
if (!uname(&sys))
@@ -61,7 +61,7 @@
return NULL;
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getNodename)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getNodename)(ACR_JNISTDARGS)
{
struct utsname sys;
if (!uname(&sys))
@@ -70,7 +70,7 @@
return CSTR_TO_JSTRING(unknown);
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getProcessor)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getProcessor)(ACR_JNISTDARGS)
{
char string[MAXSIZESYSSTRING];
size_t s = sizeof(string);
@@ -102,7 +102,7 @@
return CSTR_TO_JSTRING(string);
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getHardwarePlatform)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getHardwarePlatform)(ACR_JNISTDARGS)
{
char string[MAXSIZESYSSTRING];
size_t s = sizeof(string);
Modified: commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c?rev=790902&r1=790901&r2=790902&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c Fri Jul 3 13:22:18 2009
@@ -22,19 +22,19 @@
#define MAXSIZESYSSTRING 256
static const char unknown[] = "unknown";
-ACR_JNI_EXPORT_DECLARE(jint, OS, type)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jint, Os, type)(ACR_JNISTDARGS)
{
UNREFERENCED_STDARGS;
return ACR_OS_HPUX;
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getSysname)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getSysname)(ACR_JNISTDARGS)
{
UNREFERENCED_STDARGS;
return CSTR_TO_JSTRING("hpux");
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getVersion)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getVersion)(ACR_JNISTDARGS)
{
struct utsname sys;
if (!uname(&sys))
@@ -43,7 +43,7 @@
return CSTR_TO_JSTRING(unknown);
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getRelease)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getRelease)(ACR_JNISTDARGS)
{
struct utsname sys;
if (!uname(&sys))
@@ -52,7 +52,7 @@
return CSTR_TO_JSTRING(unknown);
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getMachine)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getMachine)(ACR_JNISTDARGS)
{
struct utsname sys;
if (!uname(&sys))
@@ -61,7 +61,7 @@
return CSTR_TO_JSTRING(unknown);
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getNodename)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getNodename)(ACR_JNISTDARGS)
{
struct utsname sys;
if (!uname(&sys))
@@ -70,7 +70,7 @@
return CSTR_TO_JSTRING(unknown);
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getProcessor)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getProcessor)(ACR_JNISTDARGS)
{
/* TODO: Figure out which API to use for that
* without defines
@@ -90,7 +90,7 @@
#endif
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getHardwarePlatform)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getHardwarePlatform)(ACR_JNISTDARGS)
{
char string[MAXSIZESYSSTRING];
struct utsname sys;
Modified: commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c?rev=790902&r1=790901&r2=790902&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c Fri Jul 3 13:22:18 2009
@@ -22,19 +22,19 @@
#define MAXSIZESYSSTRING 256
static const char unknown[] = "unknown";
-ACR_JNI_EXPORT_DECLARE(jint, OS, type)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jint, Os, type)(ACR_JNISTDARGS)
{
UNREFERENCED_STDARGS;
return ACR_OS_LINUX;
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getSysname)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getSysname)(ACR_JNISTDARGS)
{
UNREFERENCED_STDARGS;
return CSTR_TO_JSTRING("linux");
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getVersion)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getVersion)(ACR_JNISTDARGS)
{
struct utsname sys;
if (!uname(&sys))
@@ -43,7 +43,7 @@
return CSTR_TO_JSTRING(unknown);
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getRelease)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getRelease)(ACR_JNISTDARGS)
{
struct utsname sys;
if (!uname(&sys))
@@ -52,7 +52,7 @@
return CSTR_TO_JSTRING(unknown);
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getMachine)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getMachine)(ACR_JNISTDARGS)
{
struct utsname sys;
if (!uname(&sys))
@@ -61,7 +61,7 @@
return CSTR_TO_JSTRING(unknown);
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getNodename)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getNodename)(ACR_JNISTDARGS)
{
struct utsname sys;
if (!uname(&sys))
@@ -70,7 +70,7 @@
return CSTR_TO_JSTRING(unknown);
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getProcessor)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getProcessor)(ACR_JNISTDARGS)
{
char string[MAXSIZESYSSTRING];
struct utsname sys;
@@ -100,7 +100,7 @@
return CSTR_TO_JSTRING(unknown);
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getHardwarePlatform)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getHardwarePlatform)(ACR_JNISTDARGS)
{
return CSTR_TO_JSTRING(unknown);
}
Modified: commons/sandbox/runtime/trunk/src/main/native/os/solaris/os.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/solaris/os.c?rev=790902&r1=790901&r2=790902&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/solaris/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/solaris/os.c Fri Jul 3 13:22:18 2009
@@ -22,18 +22,18 @@
#define MAXSIZESYSSTRING 256
static const char unknown[] = "unknown";
-ACR_JNI_EXPORT_DECLARE(jint, OS, type)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jint, Os, type)(ACR_JNISTDARGS)
{
UNREFERENCED_STDARGS;
return ACR_OS_SOLARIS;
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getSysname)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getSysname)(ACR_JNISTDARGS)
{
return CSTR_TO_JSTRING("Solaris");
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getVersion)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getVersion)(ACR_JNISTDARGS)
{
char string[MAXSIZESYSSTRING];
if (sysinfo(SI_VERSION, string, sizeof(string)) < 0)
@@ -42,7 +42,7 @@
return CSTR_TO_JSTRING(string);
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getRelease)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getRelease)(ACR_JNISTDARGS)
{
char string[MAXSIZESYSSTRING];
if (sysinfo(SI_RELEASE, string, sizeof(string)) < 0)
@@ -51,7 +51,7 @@
return CSTR_TO_JSTRING(string);
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getMachine)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getMachine)(ACR_JNISTDARGS)
{
char string[MAXSIZESYSSTRING];
if (sysinfo(SI_MACHINE, string, sizeof(string)) < 0)
@@ -60,13 +60,13 @@
return CSTR_TO_JSTRING(string);
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getNodename)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getNodename)(ACR_JNISTDARGS)
{
UNREFERENCED_STDARGS;
return CSTR_TO_JSTRING("solaris");
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getProcessor)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getProcessor)(ACR_JNISTDARGS)
{
#if HAS_BIG_ENDIAN
#if CC_SIZEOF_VOIDP == 8
@@ -83,7 +83,7 @@
#endif
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getHardwarePlatform)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getHardwarePlatform)(ACR_JNISTDARGS)
{
char string[MAXSIZESYSSTRING];
if (sysinfo(SI_PLATFORM, string, sizeof(string)) < 0)
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c?rev=790902&r1=790901&r2=790902&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c Fri Jul 3 13:22:18 2009
@@ -25,7 +25,7 @@
static const char unknown[] = "unknown";
-ACR_JNI_EXPORT_DECLARE(jint, OS, type)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jint, Os, type)(ACR_JNISTDARGS)
{
#ifdef _WIN64
UNREFERENCED_STDARGS;
@@ -42,12 +42,12 @@
#endif
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getSysname)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getSysname)(ACR_JNISTDARGS)
{
return CSTR_TO_JSTRING("windows");
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getVersion)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getVersion)(ACR_JNISTDARGS)
{
char buf[ACR_SBUFF_SIZ] = { '\0' };
@@ -109,7 +109,7 @@
return CSTR_TO_JSTRING(buf);
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getRelease)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getRelease)(ACR_JNISTDARGS)
{
const char *prodver = "Generic";
char buf[64];
@@ -139,7 +139,7 @@
return CSTR_TO_JSTRING(buf);
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getMachine)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getMachine)(ACR_JNISTDARGS)
{
char buf[32];
@@ -171,7 +171,7 @@
return CSTR_TO_JSTRING(buf);
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getNodename)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getNodename)(ACR_JNISTDARGS)
{
char buf[MAX_COMPUTERNAME_LENGTH + 1] = { 0 };
DWORD len = MAX_COMPUTERNAME_LENGTH;
@@ -184,7 +184,7 @@
}
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getProcessor)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getProcessor)(ACR_JNISTDARGS)
{
char buf[32];
@@ -208,7 +208,7 @@
return CSTR_TO_JSTRING(buf);
}
-ACR_JNI_EXPORT_DECLARE(jstring, OS, getHardwarePlatform)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, Os, getHardwarePlatform)(ACR_JNISTDARGS)
{
BOOL isWoW64 = FALSE;
char buf[32];
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=790902&r1=790901&r2=790902&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 Fri Jul 3 13:22:18 2009
@@ -52,13 +52,13 @@
throws Exception
{
File f;
- if (OS.TYPE.contains(OsType.UNIX))
+ if (Os.TYPE.contains(OsType.UNIX))
f = new File("/etc/hosts");
else
f = new File("C:\\Windows\\win.ini");
FileType t = f.getFileType();
- if (OS.TYPE.contains(OsType.SOLARIS))
+ if (Os.TYPE.contains(OsType.SOLARIS))
assertEquals("Type", FileType.LNK, t);
else
assertEquals("Type", FileType.REG, t);
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=790902&r1=790901&r2=790902&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 Fri Jul 3 13:22:18 2009
@@ -66,7 +66,7 @@
{
Group g;
- if (OS.TYPE.contains(OsType.WINDOWS))
+ if (Os.TYPE.contains(OsType.WINDOWS))
g = Group.get("Users");
else
g = Group.get("bin");
@@ -120,7 +120,7 @@
System.out.println();
System.out.println("G Groups " + i);
} catch (UnsupportedOperationException ex) {
- if (OS.TYPE.contains(OsType.WINDOWS)) {
+ if (Os.TYPE.contains(OsType.WINDOWS)) {
fail("Unexpected exception");
}
// Not implemented
@@ -132,7 +132,7 @@
{
Group g;
- if (OS.TYPE.contains(OsType.WINDOWS))
+ if (Os.TYPE.contains(OsType.WINDOWS))
g = Group.get("Administrators");
else
g = Group.get("sys");
@@ -156,7 +156,7 @@
{
Group g;
- if (!OS.TYPE.contains(OsType.WINDOWS)) {
+ if (!Os.TYPE.contains(OsType.WINDOWS)) {
g = Group.get("nobody");
assertNotNull("Group", g);
assertTrue("Local", g.IsLocal());
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=790902&r1=790901&r2=790902&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 Fri Jul 3 13:22:18 2009
@@ -40,24 +40,24 @@
public void testOS()
throws Exception
{
- boolean win = OS.TYPE.contains(OsType.WINDOWS);
- boolean unx = OS.TYPE.contains(OsType.UNIX);
+ boolean win = Os.TYPE.contains(OsType.WINDOWS);
+ boolean unx = Os.TYPE.contains(OsType.UNIX);
assertTrue("Unix or Windows not defined", win | unx);
assertFalse("Unix and Windows defined", win & unx);
- assertNotNull("Sysname " + OS.getSysname());
+ assertNotNull("Sysname " + Os.getSysname());
/* The following are just for display purpose */
System.out.println("");
- System.out.println("Name " + OS.getSysname());
- System.out.println("Type " + OS.TYPE);
- System.out.println("Node " + OS.getNodename());
- System.out.println("Release " + OS.getRelease());
- System.out.println("Version " + OS.getVersion());
+ System.out.println("Name " + Os.getSysname());
+ System.out.println("Type " + Os.TYPE);
+ System.out.println("Node " + Os.getNodename());
+ System.out.println("Release " + Os.getRelease());
+ System.out.println("Version " + Os.getVersion());
- System.out.println("Machine " + OS.getMachine());
- System.out.println("Processor " + OS.getProcessor());
- System.out.println("Data Model " + OS.getDataModel());
- System.out.println("Hardware " + OS.getHardwarePlatform());
+ System.out.println("Machine " + Os.getMachine());
+ System.out.println("Processor " + Os.getProcessor());
+ System.out.println("Data Model " + Os.getDataModel());
+ System.out.println("Hardware " + Os.getHardwarePlatform());
System.out.println();
SystemId v = new SystemId();
System.out.println("System Id:");
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=790902&r1=790901&r2=790902&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 Fri Jul 3 13:22:18 2009
@@ -698,7 +698,7 @@
throws Throwable
{
File f = test029(0);
- if (OS.TYPE.contains(OsType.UNIX))
+ if (Os.TYPE.contains(OsType.UNIX))
assertEquals("Pathname", "/tmp/foo", f.getPath());
else
assertEquals("Pathname", "\\tmp\\foo", f.getPath());
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=790902&r1=790901&r2=790902&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 Fri Jul 3 13:22:18 2009
@@ -74,7 +74,7 @@
{
User u;
- if (OS.TYPE.contains(OsType.WINDOWS))
+ if (Os.TYPE.contains(OsType.WINDOWS))
u = User.get("Guest");
else
u = User.get("root");