Author: mturk Date: Thu Jun 7 02:37:54 2007 New Revision: 545128 URL: http://svn.apache.org/viewvc?view=rev&rev=545128 Log: Oops. Made an unwanted commit. Revert the changes to Apr.java
Modified: tomcat/connectors/trunk/jni/java/org/apache/tomcat/Apr.java Modified: tomcat/connectors/trunk/jni/java/org/apache/tomcat/Apr.java URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/java/org/apache/tomcat/Apr.java?view=diff&rev=545128&r1=545127&r2=545128 ============================================================================== --- tomcat/connectors/trunk/jni/java/org/apache/tomcat/Apr.java (original) +++ tomcat/connectors/trunk/jni/java/org/apache/tomcat/Apr.java Thu Jun 7 02:37:54 2007 @@ -22,51 +22,9 @@ import java.util.Properties; public class Apr { - public static String Platform = null; - public static String Cpu = null; - public static String[] Libraries = null; + private static String aprInfo = null; static { - String prop = System.getProperty("os.name"); - String platform = "unknown"; - - if (name.startsWith("Windows")) - Platform = "windows"; - else if (name.equals("Linux")) - Platform = "linux2"; - else if (name.equals("SunOS")) - Platform = "solaris"; - else if (name.equals("HP-UX")) - Platform = "hpux"; - else - Platform = "unknown"; - prop = System.getProperty("os.arch"); - - if (Platform.equals("windows")) { - if (prop.equals("x86")) - Cpu = "i686"; - else - Cpu = prop; - } - else if (Platform.equals("linux2")) { - if (prop.equals("x86")) - Cpu = "i686"; - else - Cpu = prop; - } - else if (Platform.equals("solaris")) { - Cpu = prop; - } - else if (Platform.equals("hpux")) { - if (prop.startsWith("PA_RISC")) - Cpu = "parisc2"; - else if (prop.startsWith("IA64")) - Cpu = "ia64"; - else - Cpu = prop; - } - else - Cpu = "unknown"; try { InputStream is = Apr.class.getResourceAsStream @@ -74,11 +32,7 @@ Properties props = new Properties(); props.load(is); is.close(); - int count = Integer.parseInt(props.getProperty(Platform + ".count")); - Libraries = new String[count]; - for (int i = 0; i < count; i++) { - Libraries[i] = props.getProperty(Platfrom + "." + i); - } + aprInfo = props.getProperty("tcn.info"); } catch (Throwable t) { ; // Nothing --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]