svn commit: r1094496 - in /commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime: OsType.java SystemId.java

[mturk]

Author: mturk
Date: Mon Apr 18 11:33:11 2011
New Revision: 1094496

URL: http://svn.apache.org/viewvc?rev=1094496&view=rev
Log:
Axe AIX support

Modified:
    
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/OsType.java
    
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SystemId.java

Modified: 
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/OsType.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/OsType.java?rev=1094496&r1=1094495&r2=1094496&view=diff
==============================================================================
--- 
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/OsType.java
 (original)
+++ 
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/OsType.java
 Mon Apr 18 11:33:11 2011
@@ -76,13 +76,7 @@ public enum OsType
      * Operating system is Hewlett Packard HP-UX.
      * <br/>Defined integer value is: {@code 0x20800}
      */
-    HPUX(       0x21000),
-
-    /**
-     * Operating system is IBM AIX.
-     * <br/>Defined integer value is: {@code 0x21000}
-     */
-    AIX(        0x22000);
+    HPUX(       0x21000);
 
     private int value;
     private OsType(int v)

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=1094496&r1=1094495&r2=1094496&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
 Mon Apr 18 11:33:11 2011
@@ -72,8 +72,6 @@ public final class SystemId
             sys = "solaris";
         else if (name.equals("HP-UX"))
             sys = "hpux";
-        else if (name.equals("AIX"))
-            sys = "aix";
         else
             sys = "unknown";
 
@@ -90,10 +88,6 @@ public final class SystemId
         if (sdm != null)
             return sdm;
         sdm = props.getProperty("sun.arch.data.model");
-
-        if (sdm == null) {
-            sdm = props.getProperty("com.ibm.vm.bitmode");
-        }
         if (sdm == null) {
             String arch = props.getProperty("os.arch");
             if (arch.indexOf("64") < 0) {
@@ -215,12 +209,6 @@ public final class SystemId
             else
                 pid = 0x21012;
         }
-        else if (sys.equals("aix")) {
-            if (cpu.equals("ppc"))
-                pid = 0x22000;
-            else
-                pid = 0x22010;
-        }
         return pid;
     }