geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r159005 [3/9] - in geronimo/trunk/modules: assembly/src/plan/ interop/ interop/src/idl/ interop/src/java/org/apache/geronimo/interop/ interop/src/java/org/apache/geronimo/interop/CosNaming/iiop_stubs/ interop/src/java/org/apache/geronimo/interop/adapter/ interop/src/java/org/apache/geronimo/interop/client/ interop/src/java/org/apache/geronimo/interop/generator/ interop/src/java/org/apache/geronimo/interop/naming/ interop/src/java/org/apache/geronimo/interop/properties/ interop/src/java/org/apache/geronimo/interop/repository/ interop/src/java/org/apache/geronimo/interop/rmi/iiop/ interop/src/java/org/apache/geronimo/interop/rmi/iiop/client/ interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler/ interop/src/java/org/apache/geronimo/interop/rmi/iiop/server/ interop/src/java/org/apache/geronimo/interop/server/ interop/src/java/org/apache/geronimo/interop/util/
Date Fri, 25 Mar 2005 11:54:52 GMT
Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JavaWriter.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JavaWriter.java?view=diff&r1=159004&r2=159005
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JavaWriter.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JavaWriter.java Fri Mar 25 03:54:30 2005
@@ -23,16 +23,13 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 
-
 public class JavaWriter extends CodeWriter {
-    protected GenOptions _genOptions;
-
-    protected PrintWriter _pw;
-
-    protected boolean _needIndent = true;
-    protected int _indentPos = 0;
-    protected String _indentStr = "";
-    protected String _spaces = "                                                        ";
+    private GenOptions      genOptions;
+    private PrintWriter     pw;
+    private boolean         needIndent = true;
+    private int             indentPos = 0;
+    private String          indentStr = "";
+    private String          spaces = "                                                        ";
 
     public JavaWriter(GenOptions genOptions, String fileName, String ext) {
         super(genOptions, fileName, ext);
@@ -45,15 +42,15 @@
         String fileName = getFileName() + getFileExt();
 
         try {
-            file = new File(go.getGenDir(), fileName);
+            file = new File(go.getGenSrcDir(), fileName);
 
             if (file.exists() && !go.isOverwrite()) {
                 fileName = fileName + ".new";
 
-                file = new File(go.getGenDir(), fileName);
+                file = new File(go.getGenSrcDir(), fileName);
             }
         } catch (Exception ex) {
-            throw new GenException("Error: Unable to open output dir: " + go.getGenDir() + ", file: " + fileName, ex);
+            throw new GenException("Error: Unable to open output dir: " + go.getGenSrcDir() + ", file: " + fileName, ex);
         }
 
         return file;
@@ -63,96 +60,96 @@
             throws GenException {
         OutputStream os = null;
 
-        if (_file != null) {
+        if (file != null) {
             //System.out.println( "Output file already opened" );
             return;
         }
 
-        _file = getFile();
+        file = getFile();
 
-        if (_file == null) {
+        if (file == null) {
             throw new GenException("Error: Unable to obtain output file.");
         }
 
         if (getGenOptions().isVerbose()) {
-            System.out.println("Generating: " + _file);
+            System.out.println("Generating: " + file);
         }
 
         os = null;
 
         //if (_file.isFile())
         //{
-        _file.getParentFile().mkdirs();
+        file.getParentFile().mkdirs();
         //}
 
-        if (_file.exists() && !_file.canWrite()) {
-            throw new GenException("Error: Unable to write to file: " + _file);
+        if (file.exists() && !file.canWrite()) {
+            throw new GenException("Error: Unable to write to file: " + file);
         }
 
-        if (!_file.exists() && !_file.getParentFile().canWrite()) {
-            throw new GenException("Error: Unable to write to directory: " + _file.getParentFile());
+        if (!file.exists() && !file.getParentFile().canWrite()) {
+            throw new GenException("Error: Unable to write to directory: " + file.getParentFile());
         }
 
         try {
-            os = new FileOutputStream(_file);
+            os = new FileOutputStream(file);
         } catch (Exception ex) {
-            throw new GenException("Error: Unable to init output file: " + _file, ex);
+            throw new GenException("Error: Unable to init output file: " + file, ex);
         }
 
         try {
-            _pw = new PrintWriter(new OutputStreamWriter(os));
+            pw = new PrintWriter(new OutputStreamWriter(os));
         } catch (Exception ex) {
-            throw new GenException("Error: Unable to init output file: " + _file, ex);
+            throw new GenException("Error: Unable to init output file: " + file, ex);
         }
     }
 
     public void closeFile()
             throws GenException {
-        if (_pw != null) {
+        if (pw != null) {
             try {
-                _pw.flush();
-                _pw.close();
+                pw.flush();
+                pw.close();
             } catch (Exception e) {
-                throw new GenException("Error: Unable to close output file: " + _file, e);
+                throw new GenException("Error: Unable to close output file: " + file, e);
             }
 
-            _pw = null;
+            pw = null;
         }
 
-        _file = null;
+        file = null;
     }
 
     public void indent() {
-        _indentPos += 4;
-        if (_indentPos > _spaces.length()) {
-            _indentPos -= 4;
+        indentPos += 4;
+        if (indentPos > spaces.length()) {
+            indentPos -= 4;
         }
-        _indentStr = _spaces.substring(0, _indentPos);
+        indentStr = spaces.substring(0, indentPos);
     }
 
     public void outdent() {
-        _indentPos -= 4;
-        if (_indentPos < 0) {
-            _indentPos = 0;
+        indentPos -= 4;
+        if (indentPos < 0) {
+            indentPos = 0;
         }
-        _indentStr = _spaces.substring(0, _indentPos);
+        indentStr = spaces.substring(0, indentPos);
     }
 
     public void begin() {
-        _needIndent = true;
+        needIndent = true;
         println("{");
         indent();
     }
 
     public void end() {
         outdent();
-        _needIndent = true;
+        needIndent = true;
         println("}");
     }
 
     public void newln() {
         println("");
-        _needIndent = true;
+        needIndent = true;
     }
 
     public void comment(String msg) {
@@ -160,21 +157,21 @@
     }
 
     public void println(String line) {
-        if (_needIndent) {
-            _needIndent = false;
-            _pw.print(_indentStr);
+        if (needIndent) {
+            needIndent = false;
+            pw.print(indentStr);
         }
 
-        _pw.println(line);
-        _needIndent = true;
+        pw.println(line);
+        needIndent = true;
     }
 
     public void print(String line) {
-        if (_needIndent) {
-            _needIndent = false;
-            _pw.print(_indentStr);
+        if (needIndent) {
+            needIndent = false;
+            pw.print(indentStr);
         }
 
-        _pw.print(line);
+        pw.print(line);
     }
 }

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/InitialContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/InitialContext.java?view=diff&r1=159004&r2=159005
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/InitialContext.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/InitialContext.java Fri Mar 25 03:54:30 2005
@@ -29,10 +29,10 @@
 
 public class InitialContext implements Context, java.io.Serializable {
     private static HashMap EMPTY_MAP = new HashMap();
-    private String _prefix;
+    private String prefix;
 
     InitialContext(String prefix) {
-        _prefix = prefix;
+        this.prefix = prefix;
     }
 
     public HashMap getMap() {
@@ -53,7 +53,7 @@
         if (namingContext == null) {
             namingContext = NamingContext.getInstance(NameService.class);
         }
-        return namingContext.lookup(name, _prefix);
+        return namingContext.lookup(name, prefix);
     }
 
     public Object lookupReturnNullIfNotFound(String name) {
@@ -61,7 +61,7 @@
         if (namingContext == null) {
             return null;
         } else {
-            return namingContext.lookupReturnNullIfNotFound(name, _prefix);
+            return namingContext.lookupReturnNullIfNotFound(name, prefix);
         }
     }
 

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/InitialContextFactory.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/InitialContextFactory.java?view=diff&r1=159004&r2=159005
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/InitialContextFactory.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/InitialContextFactory.java Fri Mar 25 03:54:30 2005
@@ -19,7 +19,6 @@
 
 import java.util.Hashtable;
 
-
 public class InitialContextFactory
         implements javax.naming.spi.InitialContextFactory {
     public javax.naming.Context getInitialContext(Hashtable env) {

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/NameService.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/NameService.java?view=diff&r1=159004&r2=159005
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/NameService.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/NameService.java Fri Mar 25 03:54:30 2005
@@ -21,25 +21,22 @@
 import javax.naming.NamingException;
 
 import org.apache.geronimo.interop.adapter.Adapter;
-
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 public class NameService {
-    protected static NameService _ns = null;
+    private static NameService ns = null;
+    private final Log log = LogFactory.getLog(NameService.class);
 
-    public static NameService getInstance() {
-        if (_ns == null) {
-            synchronized (NameService.class) {
-                if (_ns == null) {
-                    _ns = new NameService();
-                    _ns.init();
-                }
-            }
+    public static synchronized NameService getInstance() {
+        if (ns == null) {
+            ns = new NameService();
+            ns.init();
         }
-
-        return _ns;
+        return ns;
     }
 
-    private org.apache.geronimo.interop.naming.InitialContext _context;
+    private org.apache.geronimo.interop.naming.InitialContext context;
 
     /*
      * TODO: Do we need this method?
@@ -48,19 +45,23 @@
         NamingContext.getInstance(NameService.class).bindAdapter(adp);
     }
 
+    public void unbindAdapter(Adapter adp) {
+        NamingContext.getInstance(NameService.class).unbindAdapter(adp);
+    }
+
     public static org.apache.geronimo.interop.naming.InitialContext getInitialContext() {
-        return getInstance()._context;
+        return getInstance().context;
     }
 
     public HashMap getMap() {
-        return _context.getMap();
+        return context.getMap();
     }
 
     public Object lookup(String name) throws NamingException {
-        return _context.lookup(name);
+        return context.lookup(name);
     }
 
     protected void init() {
-        _context = new org.apache.geronimo.interop.naming.InitialContext(null);
+        context = new org.apache.geronimo.interop.naming.InitialContext(null);
     }
 }

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/NamingContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/NamingContext.java?view=diff&r1=159004&r2=159005
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/NamingContext.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/NamingContext.java Fri Mar 25 03:54:30 2005
@@ -22,48 +22,55 @@
 import javax.naming.NamingException;
 
 import org.apache.geronimo.interop.adapter.Adapter;
-
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 public class NamingContext {
+
+    private final Log log = LogFactory.getLog(NamingContext.class);
+
     public static final NamingContext getInstance(Class baseClass) {
         NamingContext context;
-        synchronized (_contextMap) {
-            context = (NamingContext) _contextMap.get(baseClass);
+        synchronized (contextMap) {
+            context = (NamingContext) contextMap.get(baseClass);
             if (context == null) {
                 context = new NamingContext();
-                _contextMap.put(baseClass, context);
+                contextMap.put(baseClass, context);
                 context.init(baseClass);
             }
         }
         return context;
     }
 
-    private static ThreadLocal _current = new ThreadLocal();
-    private static HashMap _contextMap = new HashMap();
-    private static boolean _quiet = false; // TODO: Configure
-    private static boolean _verbose = true; // TODO: Configure
-    private String _logContext;
-    private HashMap _map = new HashMap();
+    private static ThreadLocal      current = new ThreadLocal();
+    private static HashMap          contextMap = new HashMap();
+    private static boolean          quiet = false; // TODO: Configure
+    private static boolean          verbose = true; // TODO: Configure
+    private String                  logContext;
+    private HashMap                 map = new HashMap();
 
     public static final NamingContext getCurrent() {
-        return (NamingContext) _current.get();
+        return (NamingContext) current.get();
     }
 
     public static final NamingContext push(NamingContext that) {
         NamingContext restore = getCurrent();
-        _current.set(that);
+        current.set(that);
         return restore;
     }
 
     public static void pop(NamingContext restore) {
-        _current.set(restore);
+        current.set(restore);
     }
 
     public HashMap getMap() {
-        return _map;
+        return map;
     }
 
     public Object lookup(String name, String prefix) throws NamingException {
+
+        log.debug( "NameContext.lookup(): name = " + name + ", prefix = " + prefix );
+
         if (prefix != null) {
             name += prefix + "/" + name;
         }
@@ -74,19 +81,19 @@
         // be performed in 'init' so as to permit this method to be as
         // fast as possible (i.e. a simple unsynchronized HashMap lookup).
 
-        Object value = _map.get(name);
+        Object value = map.get(name);
 
         if (value == null) {
             value = dynamicLookup(name);
             if (value != null) {
-                _map.put(name, value); // TODO: allow refresh.
+                map.put(name, value); // TODO: allow refresh.
             }
         }
 
         if (value == null) {
             NameNotFoundException notFound = new NameNotFoundException(name.length() == 0 ? formatEmptyName() : name);
-            if (!_quiet) {
-                NameServiceLog.getInstance().warnNameNotFound(_logContext, notFound);
+            if (!quiet) {
+                NameServiceLog.getInstance().warnNameNotFound(logContext, notFound);
             }
             throw notFound;
         } else {
@@ -98,7 +105,7 @@
         if (prefix != null) {
             name += prefix + "/" + name;
         }
-        return _map.get(name);
+        return map.get(name);
     }
 
     protected void init(Class baseClass) {
@@ -106,42 +113,31 @@
         //       this logic isn't required for the CORBA container.
     }
 
-    protected void bindAdapter(Adapter adp) {
-        _map.put(adp.getBindName(), adp);
+    protected synchronized void bindAdapter(Adapter adp) {
+        String names[] = adp.getBindNames();
+        for( int i=0; i<names.length; i++ ) {
+            log.debug( "NameContext.bindAdapter(): name[" + i + "] = " + names[i] + ", adp = " + adp );
+            map.put(names[i], adp);
+        }
+    }
+
+    protected synchronized void unbindAdapter( Adapter adp ) {
+        String names[] = adp.getBindNames();
+        for( int i=0; i<names.length; i++ )
+        {
+            log.debug( "NameContext.bindAdapter(): name[" + i + "] = " + names[i] + ", adp = " + adp );
+            map.remove( names[i] );
+        }
     }
 
     protected boolean adapterExists(String name) {
         System.out.println("TODO: NamingComponent.componentExists(): name = " + name);
-
-        //String propsFileName = SystemProperties.getRepository() + "/Component/" + name.replace('.', '/') + ".properties";
-        //return new java.io.File(propsFileName).exists();
-
         return false;
     }
 
     protected Object dynamicLookup(String name) {
         return null;
     }
-
-    /*
-    protected List getComponentsForInterface(String interfaceName)
-    {
-        return null;
-    }
-    */
-
-    /*
-    protected String resolveComponent(String name, String pattern)
-    {
-        return "";
-    }
-    */
-
-    /*
-    protected void copyObjectsWithRemoteInterface(final HashMap intoMap)
-    {
-    }
-    */
 
     protected String formatEmptyName() {
         return "formatEmptyName:";

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/BooleanProperty.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/BooleanProperty.java?view=diff&r1=159004&r2=159005
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/BooleanProperty.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/BooleanProperty.java Fri Mar 25 03:54:30 2005
@@ -18,7 +18,7 @@
 package org.apache.geronimo.interop.properties;
 
 public class BooleanProperty extends PropertyType {
-    private boolean _defaultValue = false;
+    private boolean defaultValue = false;
 
     public BooleanProperty(Class componentClass, String propertyName) {
         super(componentClass, propertyName);
@@ -50,16 +50,16 @@
     }
 
     public BooleanProperty defaultValue(boolean defaultValue) {
-        _defaultValue = defaultValue;
+        defaultValue = defaultValue;
         return this;
     }
 
     public boolean getDefaultValue() {
-        return _defaultValue;
+        return defaultValue;
     }
 
     public String getDefaultValueAsString() {
-        return String.valueOf(_defaultValue);
+        return String.valueOf(defaultValue);
     }
 
     public boolean getBoolean() {
@@ -69,7 +69,7 @@
     public boolean getBoolean(String instanceName, PropertyMap props) {
         boolean b;
         boolean ok = true;
-        String value = props.getProperty(_propertyName, String.valueOf(_defaultValue));
+        String value = props.getProperty(getPropertyName(), String.valueOf(defaultValue));
         value = value.toLowerCase();
         if (value.equals("true")) {
             b = true;
@@ -82,7 +82,7 @@
         if (!ok) {
             badPropertyValue(instanceName, value, expectedTrueOrFalse());
         }
-        logPropertyValue(instanceName, value, b == _defaultValue);
+        logPropertyValue(instanceName, value, b == defaultValue);
         return b;
     }
 }

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/ByteProperty.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/ByteProperty.java?view=diff&r1=159004&r2=159005
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/ByteProperty.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/ByteProperty.java Fri Mar 25 03:54:30 2005
@@ -18,11 +18,9 @@
 package org.apache.geronimo.interop.properties;
 
 public class ByteProperty extends PropertyType {
-    private byte _defaultValue = 0;
-
-    private byte _minimumValue = 0;
-
-    private byte _maximumValue = Byte.MAX_VALUE;
+    private byte    defaultValue = 0;
+    private byte    minimumValue = 0;
+    private byte    maximumValue = Byte.MAX_VALUE;
 
     public ByteProperty(Class componentClass, String propertyName) {
         super(componentClass, propertyName);
@@ -54,34 +52,34 @@
     }
 
     public ByteProperty defaultValue(byte defaultValue) {
-        _defaultValue = defaultValue;
+        this.defaultValue = defaultValue;
         return this;
     }
 
     public ByteProperty minimumValue(byte minimumValue) {
-        _minimumValue = minimumValue;
+        this.minimumValue = minimumValue;
         return this;
     }
 
     public ByteProperty maximumValue(byte maximumValue) {
-        _maximumValue = maximumValue;
+        this.maximumValue = maximumValue;
         return this;
     }
 
     public byte getDefaultValue() {
-        return _defaultValue;
+        return defaultValue;
     }
 
     public String getDefaultValueAsString() {
-        return String.valueOf(_defaultValue);
+        return String.valueOf(defaultValue);
     }
 
     public byte getMinimumValue() {
-        return _minimumValue;
+        return minimumValue;
     }
 
     public byte getMaximumValue() {
-        return _maximumValue;
+        return maximumValue;
     }
 
     public byte getByte() {
@@ -91,20 +89,20 @@
     public byte getByte(String instanceName, PropertyMap props) {
         byte n;
         boolean ok = true;
-        String value = props.getProperty(_propertyName, String.valueOf(_defaultValue));
+        String value = props.getProperty(getPropertyName(), String.valueOf(defaultValue));
         try {
             n = Byte.parseByte(value);
         } catch (NumberFormatException ex) {
             ok = false;
             n = 0;
         }
-        if (n < _minimumValue || n > _maximumValue) {
+        if (n < minimumValue || n > maximumValue) {
             ok = false;
         }
         if (!ok) {
-            badPropertyValue(instanceName, value, expectedNumberInRange(_minimumValue, _maximumValue));
+            badPropertyValue(instanceName, value, expectedNumberInRange(minimumValue, maximumValue));
         }
-        logPropertyValue(instanceName, value, n == _defaultValue);
+        logPropertyValue(instanceName, value, n == defaultValue);
         return n;
     }
 }

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/DoubleProperty.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/DoubleProperty.java?view=diff&r1=159004&r2=159005
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/DoubleProperty.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/DoubleProperty.java Fri Mar 25 03:54:30 2005
@@ -17,15 +17,10 @@
  */
 package org.apache.geronimo.interop.properties;
 
-
-
-
 public class DoubleProperty extends PropertyType {
-    private double _defaultValue = 0;
-
-    private double _minimumValue = 0;
-
-    private double _maximumValue = Double.MAX_VALUE;
+    private double  defaultValue = 0;
+    private double  minimumValue = 0;
+    private double  maximumValue = Double.MAX_VALUE;
 
     public DoubleProperty(Class componentClass, String propertyName) {
         super(componentClass, propertyName);
@@ -57,34 +52,34 @@
     }
 
     public DoubleProperty defaultValue(double defaultValue) {
-        _defaultValue = defaultValue;
+        this.defaultValue = defaultValue;
         return this;
     }
 
     public DoubleProperty minimumValue(double minimumValue) {
-        _minimumValue = minimumValue;
+        this.minimumValue = minimumValue;
         return this;
     }
 
     public DoubleProperty maximumValue(double maximumValue) {
-        _maximumValue = maximumValue;
+        this.maximumValue = maximumValue;
         return this;
     }
 
     public double getDefaultValue() {
-        return _defaultValue;
+        return defaultValue;
     }
 
     public String getDefaultValueAsString() {
-        return String.valueOf(_defaultValue);
+        return String.valueOf(defaultValue);
     }
 
     public double getMinimumValue() {
-        return _minimumValue;
+        return minimumValue;
     }
 
     public double getMaximumValue() {
-        return _maximumValue;
+        return maximumValue;
     }
 
     public double getDouble() {
@@ -94,20 +89,20 @@
     public double getDouble(String instanceName, PropertyMap props) {
         double n;
         boolean ok = true;
-        String value = props.getProperty(_propertyName, String.valueOf(_defaultValue));
+        String value = props.getProperty(getPropertyName(), String.valueOf(defaultValue));
         try {
             n = Double.parseDouble(value);
         } catch (NumberFormatException ex) {
             ok = false;
             n = 0;
         }
-        if (n < _minimumValue || n > _maximumValue) {
+        if (n < minimumValue || n > maximumValue) {
             ok = false;
         }
         if (!ok) {
-            badPropertyValue(instanceName, value, expectedNumberInRange(_minimumValue, _maximumValue));
+            badPropertyValue(instanceName, value, expectedNumberInRange(minimumValue, maximumValue));
         }
-        logPropertyValue(instanceName, value, n == _defaultValue);
+        logPropertyValue(instanceName, value, n == defaultValue);
         return n;
     }
 }

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/FloatProperty.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/FloatProperty.java?view=diff&r1=159004&r2=159005
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/FloatProperty.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/FloatProperty.java Fri Mar 25 03:54:30 2005
@@ -18,11 +18,9 @@
 package org.apache.geronimo.interop.properties;
 
 public class FloatProperty extends PropertyType {
-    private float _defaultValue = 0;
-
-    private float _minimumValue = 0;
-
-    private float _maximumValue = Float.MAX_VALUE;
+    private float   defaultValue = 0;
+    private float   minimumValue = 0;
+    private float   maximumValue = Float.MAX_VALUE;
 
     public FloatProperty(Class componentClass, String propertyName) {
         super(componentClass, propertyName);
@@ -54,34 +52,34 @@
     }
 
     public FloatProperty defaultValue(float defaultValue) {
-        _defaultValue = defaultValue;
+        this.defaultValue = defaultValue;
         return this;
     }
 
     public FloatProperty minimumValue(float minimumValue) {
-        _minimumValue = minimumValue;
+        this.minimumValue = minimumValue;
         return this;
     }
 
     public FloatProperty maximumValue(float maximumValue) {
-        _maximumValue = maximumValue;
+        this.maximumValue = maximumValue;
         return this;
     }
 
     public float getDefaultValue() {
-        return _defaultValue;
+        return defaultValue;
     }
 
     public String getDefaultValueAsString() {
-        return String.valueOf(_defaultValue);
+        return String.valueOf(defaultValue);
     }
 
     public float getMinimumValue() {
-        return _minimumValue;
+        return minimumValue;
     }
 
     public float getMaximumValue() {
-        return _maximumValue;
+        return maximumValue;
     }
 
     public float getFloat() {
@@ -91,20 +89,20 @@
     public float getFloat(String instanceName, PropertyMap props) {
         float n;
         boolean ok = true;
-        String value = props.getProperty(_propertyName, String.valueOf(_defaultValue));
+        String value = props.getProperty(getPropertyName(), String.valueOf(defaultValue));
         try {
             n = Float.parseFloat(value);
         } catch (NumberFormatException ex) {
             ok = false;
             n = 0;
         }
-        if (n < _minimumValue || n > _maximumValue) {
+        if (n < minimumValue || n > maximumValue) {
             ok = false;
         }
         if (!ok) {
-            badPropertyValue(instanceName, value, expectedNumberInRange(_minimumValue, _maximumValue));
+            badPropertyValue(instanceName, value, expectedNumberInRange(minimumValue, maximumValue));
         }
-        logPropertyValue(instanceName, value, n == _defaultValue);
+        logPropertyValue(instanceName, value, n == defaultValue);
         return n;
     }
 }

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/IntProperty.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/IntProperty.java?view=diff&r1=159004&r2=159005
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/IntProperty.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/IntProperty.java Fri Mar 25 03:54:30 2005
@@ -18,11 +18,9 @@
 package org.apache.geronimo.interop.properties;
 
 public class IntProperty extends PropertyType {
-    private int _defaultValue = 0;
-
-    private int _minimumValue = 0;
-
-    private int _maximumValue = Integer.MAX_VALUE;
+    private int     defaultValue = 0;
+    private int     minimumValue = 0;
+    private int     maximumValue = Integer.MAX_VALUE;
 
     public IntProperty(Class componentClass, String propertyName) {
         super(componentClass, propertyName);
@@ -54,34 +52,34 @@
     }
 
     public IntProperty defaultValue(int defaultValue) {
-        _defaultValue = defaultValue;
+        this.defaultValue = defaultValue;
         return this;
     }
 
     public IntProperty minimumValue(int minimumValue) {
-        _minimumValue = minimumValue;
+        this.minimumValue = minimumValue;
         return this;
     }
 
     public IntProperty maximumValue(int maximumValue) {
-        _maximumValue = maximumValue;
+        this.maximumValue = maximumValue;
         return this;
     }
 
     public int getDefaultValue() {
-        return _defaultValue;
+        return defaultValue;
     }
 
     public String getDefaultValueAsString() {
-        return String.valueOf(_defaultValue);
+        return String.valueOf(defaultValue);
     }
 
     public int getMinimumValue() {
-        return _minimumValue;
+        return minimumValue;
     }
 
     public int getMaximumValue() {
-        return _maximumValue;
+        return maximumValue;
     }
 
     public int getInt() {
@@ -91,20 +89,20 @@
     public int getInt(String instanceName, PropertyMap props) {
         int n;
         boolean ok = true;
-        String value = props.getProperty(_propertyName, String.valueOf(_defaultValue));
+        String value = props.getProperty(getPropertyName(), String.valueOf(defaultValue));
         try {
             n = Integer.parseInt(value);
         } catch (NumberFormatException ex) {
             ok = false;
             n = 0;
         }
-        if (n < _minimumValue || n > _maximumValue) {
+        if (n < minimumValue || n > maximumValue) {
             ok = false;
         }
         if (!ok) {
-            badPropertyValue(instanceName, value, expectedNumberInRange(_minimumValue, _maximumValue));
+            badPropertyValue(instanceName, value, expectedNumberInRange(minimumValue, maximumValue));
         }
-        logPropertyValue(instanceName, value, n == _defaultValue);
+        logPropertyValue(instanceName, value, n == defaultValue);
         return n;
     }
 }

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/LongProperty.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/LongProperty.java?view=diff&r1=159004&r2=159005
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/LongProperty.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/LongProperty.java Fri Mar 25 03:54:30 2005
@@ -17,15 +17,10 @@
  */
 package org.apache.geronimo.interop.properties;
 
-
-
-
 public class LongProperty extends PropertyType {
-    private long _defaultValue = 0;
-
-    private long _minimumValue = 0;
-
-    private long _maximumValue = Integer.MAX_VALUE;
+    private long    defaultValue = 0;
+    private long    minimumValue = 0;
+    private long    maximumValue = Integer.MAX_VALUE;
 
     public LongProperty(Class componentClass, String propertyName) {
         super(componentClass, propertyName);
@@ -57,65 +52,57 @@
     }
 
     public LongProperty defaultValue(long defaultValue) {
-        _defaultValue = defaultValue;
+        this.defaultValue = defaultValue;
         return this;
     }
 
     public LongProperty minimumValue(long minimumValue) {
-        _minimumValue = minimumValue;
+        this.minimumValue = minimumValue;
         return this;
     }
 
     public LongProperty maximumValue(long maximumValue) {
-        _maximumValue = maximumValue;
+        this.maximumValue = maximumValue;
         return this;
     }
 
     public long getDefaultValue() {
-        return _defaultValue;
+        return defaultValue;
     }
 
     public String getDefaultValueAsString() {
-        return String.valueOf(_defaultValue);
+        return String.valueOf(defaultValue);
     }
 
     public long getMinimumValue() {
-        return _minimumValue;
+        return minimumValue;
     }
 
     public long getMaximumValue() {
-        return _maximumValue;
+        return maximumValue;
     }
 
     public long getLong() {
         return getLong(null, getComponentProperties());
     }
 
-    /*
-    public long getLong(Object instance)
-    {
-        return getLong(((Component.InstanceName)instance).getInstanceName(),
-            ((Component.InstanceProperties)instance).getInstanceProperties());
-    }
-    */
-
     public long getLong(String instanceName, PropertyMap props) {
         long n;
         boolean ok = true;
-        String value = props.getProperty(_propertyName, String.valueOf(_defaultValue));
+        String value = props.getProperty(getPropertyName(), String.valueOf(defaultValue));
         try {
             n = Long.parseLong(value);
         } catch (NumberFormatException ex) {
             ok = false;
             n = 0;
         }
-        if (n < _minimumValue || n > _maximumValue) {
+        if (n < minimumValue || n > maximumValue) {
             ok = false;
         }
         if (!ok) {
-            badPropertyValue(instanceName, value, expectedNumberInRange(_minimumValue, _maximumValue));
+            badPropertyValue(instanceName, value, expectedNumberInRange(minimumValue, maximumValue));
         }
-        logPropertyValue(instanceName, value, n == _defaultValue);
+        logPropertyValue(instanceName, value, n == defaultValue);
         return n;
     }
 }

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/PropertyLog.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/PropertyLog.java?view=diff&r1=159004&r2=159005
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/PropertyLog.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/PropertyLog.java Fri Mar 25 03:54:30 2005
@@ -24,14 +24,14 @@
         return log;
     }
 
-    private String _instanceName;
+    private String instanceName;
 
     public String getInstanceName() {
-        return _instanceName;
+        return instanceName;
     }
 
     protected void init(String instanceName) {
-        _instanceName = instanceName;
+        this.instanceName = instanceName;
     }
 
     public void debugUsingValue(String value) {

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/PropertyType.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/PropertyType.java?view=diff&r1=159004&r2=159005
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/PropertyType.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/PropertyType.java Fri Mar 25 03:54:30 2005
@@ -21,46 +21,38 @@
 
 import org.apache.geronimo.interop.util.ExceptionUtil;
 
-
 public abstract class PropertyType {
-    protected static boolean _debug;
+    protected static boolean debug;
 
     static {
         try {
-            _debug = Boolean.getBoolean("org.apache.geronimo.interop.debug:properties");
+            debug = Boolean.getBoolean("org.apache.geronimo.interop.debug:properties");
         } catch (Exception ignore) // e.g. SecurityException for Applet
         {
-            _debug = false;
+            debug = false;
         }
     }
 
-    protected Class _componentClass;
-
-    protected String _propertyName;
-
-    protected String _displayName;
-
-    protected String _displayOnlyIfOther;
-
-    protected String _displayOnlyIfValue;
-
-    protected String _description;
-
-    protected String _consoleHelp;
-
-    protected int _sortOrder;
+    private Class   componentClass;
+    private String  propertyName;
+    private String  displayName;
+    private String  displayOnlyIfOther;
+    private String  displayOnlyIfValue;
+    private String  description;
+    private String  consoleHelp;
+    private int     sortOrder;
 
     public PropertyType(Class componentClass, String propertyName) {
-        _componentClass = componentClass;
-        _propertyName = propertyName;
+        this.componentClass = componentClass;
+        this.propertyName = propertyName;
     }
 
     public Class getComponentClass() {
-        return _componentClass;
+        return componentClass;
     }
 
     public PropertyMap getComponentProperties() {
-        if (_componentClass == SystemProperties.class) {
+        if (componentClass == SystemProperties.class) {
             return SystemProperties.getInstance();
         } else {
             return null; // Component.forClass(_componentClass).getProperties();
@@ -68,31 +60,31 @@
     }
 
     public String getPropertyName() {
-        return _propertyName;
+        return propertyName;
     }
 
     public String getDisplayName() {
-        return _displayName;
+        return displayName;
     }
 
     public String getDisplayOnlyIfOther() {
-        return _displayOnlyIfOther;
+        return displayOnlyIfOther;
     }
 
     public String getDisplayOnlyIfValue() {
-        return _displayOnlyIfValue;
+        return displayOnlyIfValue;
     }
 
     public String getDescription() {
-        return _description;
+        return description;
     }
 
     public String getConsoleHelp() {
-        return _consoleHelp;
+        return consoleHelp;
     }
 
     public int getSortOrder() {
-        return _sortOrder;
+        return sortOrder;
     }
 
     public String getDefaultValueAsString() {
@@ -108,24 +100,24 @@
     }
 
     public void setDisplayName(String displayName) {
-        _displayName = displayName;
+        this.displayName = displayName;
     }
 
     public void setDisplayOnlyIf(PropertyType other, String value) {
-        _displayOnlyIfOther = other.getPropertyName();
-        _displayOnlyIfValue = value;
+        displayOnlyIfOther = other.getPropertyName();
+        displayOnlyIfValue = value;
     }
 
     public void setDescription(String description) {
-        _description = description;
+        this.description = description;
     }
 
     public void setConsoleHelp(String consoleHelp) {
-        _consoleHelp = consoleHelp;
+        this.consoleHelp = consoleHelp;
     }
 
     public void setSortOrder(int sortOrder) {
-        _sortOrder = sortOrder;
+        this.sortOrder = sortOrder;
     }
 
     public void badPropertyValue(String instanceName, String value) {
@@ -169,20 +161,20 @@
     }
 
     public void logPropertyValue(String instanceName, String value, boolean usingDefaultValue) {
-        if (_propertyName.toLowerCase().endsWith("password")) {
+        if (propertyName.toLowerCase().endsWith("password")) {
             value = "******";
         }
-        if (_debug) // TODO: allow for bootstrap
+        if (debug) // TODO: allow for bootstrap
         {
             if (usingDefaultValue) {
-                if (_componentClass == SystemProperties.class) {
-                    SystemPropertyLog.getInstance(_propertyName).debugUsingDefaultValue(value);
+                if (componentClass == SystemProperties.class) {
+                    SystemPropertyLog.getInstance(propertyName).debugUsingDefaultValue(value);
                 } else {
                     getLog(instanceName).debugUsingDefaultValue(value);
                 }
             } else {
-                if (_componentClass == SystemProperties.class) {
-                    SystemPropertyLog.getInstance(_propertyName).debugUsingValue(value);
+                if (componentClass == SystemProperties.class) {
+                    SystemPropertyLog.getInstance(propertyName).debugUsingValue(value);
                 } else {
                     getLog(instanceName).debugUsingValue(value);
                 }
@@ -200,6 +192,6 @@
     }
 
     public PropertyLog getLog(String instanceName) {
-        return PropertyLog.getInstance(_propertyName + ", " + getContext(instanceName));
+        return PropertyLog.getInstance(propertyName + ", " + getContext(instanceName));
     }
 }

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/ShortProperty.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/ShortProperty.java?view=diff&r1=159004&r2=159005
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/ShortProperty.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/ShortProperty.java Fri Mar 25 03:54:30 2005
@@ -18,11 +18,9 @@
 package org.apache.geronimo.interop.properties;
 
 public class ShortProperty extends PropertyType {
-    private short _defaultValue = 0;
-
-    private short _minimumValue = 0;
-
-    private short _maximumValue = Short.MAX_VALUE;
+    private short   defaultValue = 0;
+    private short   minimumValue = 0;
+    private short   maximumValue = Short.MAX_VALUE;
 
     public ShortProperty(Class componentClass, String propertyName) {
         super(componentClass, propertyName);
@@ -54,34 +52,34 @@
     }
 
     public ShortProperty defaultValue(short defaultValue) {
-        _defaultValue = defaultValue;
+        this.defaultValue = defaultValue;
         return this;
     }
 
     public ShortProperty minimumValue(short minimumValue) {
-        _minimumValue = minimumValue;
+        this.minimumValue = minimumValue;
         return this;
     }
 
     public ShortProperty maximumValue(short maximumValue) {
-        _maximumValue = maximumValue;
+        this.maximumValue = maximumValue;
         return this;
     }
 
     public short getDefaultValue() {
-        return _defaultValue;
+        return defaultValue;
     }
 
     public String getDefaultValueAsString() {
-        return String.valueOf(_defaultValue);
+        return String.valueOf(defaultValue);
     }
 
     public short getMinimumValue() {
-        return _minimumValue;
+        return minimumValue;
     }
 
     public short getMaximumValue() {
-        return _maximumValue;
+        return maximumValue;
     }
 
     public short getShort() {
@@ -91,20 +89,20 @@
     public short getShort(String instanceName, PropertyMap props) {
         short n;
         boolean ok = true;
-        String value = props.getProperty(_propertyName, String.valueOf(_defaultValue));
+        String value = props.getProperty(getPropertyName(), String.valueOf(defaultValue));
         try {
             n = Short.parseShort(value);
         } catch (NumberFormatException ex) {
             ok = false;
             n = 0;
         }
-        if (n < _minimumValue || n > _maximumValue) {
+        if (n < minimumValue || n > maximumValue) {
             ok = false;
         }
         if (!ok) {
-            badPropertyValue(instanceName, value, expectedNumberInRange(_minimumValue, _maximumValue));
+            badPropertyValue(instanceName, value, expectedNumberInRange(minimumValue, maximumValue));
         }
-        logPropertyValue(instanceName, value, n == _defaultValue);
+        logPropertyValue(instanceName, value, n == defaultValue);
         return n;
     }
 }

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/StringProperty.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/StringProperty.java?view=diff&r1=159004&r2=159005
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/StringProperty.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/StringProperty.java Fri Mar 25 03:54:30 2005
@@ -28,25 +28,16 @@
 import org.apache.geronimo.interop.util.ListUtil;
 import org.apache.geronimo.interop.util.StringUtil;
 
-
 public class StringProperty extends PropertyType {
-    private String _defaultValue = "";
-
-    private List _valueIsInList = null;
-
-    private Map _displayValues = null;
-
-    private Class _valueIsNameOf = null;
-
-    private boolean _isDirName = false;
-
-    private boolean _isFileName = false;
-
-    private boolean _isList = false;
-
-    private boolean _isReadOnly = false;
-
-    private boolean _isRequired = false;
+    private String      defaultValue = "";
+    private List        valueIsInList = null;
+    private Map         displayValues = null;
+    private Class       valueIsNameOf = null;
+    private boolean     isDirName = false;
+    private boolean     isFileName = false;
+    private boolean     isList = false;
+    private boolean     isReadOnly = false;
+    private boolean     isRequired = false;
 
     public StringProperty(Class componentClass, String propertyName) {
         super(componentClass, propertyName);
@@ -78,41 +69,41 @@
     }
 
     public StringProperty defaultValue(String defaultValue) {
-        _defaultValue = defaultValue;
+        this.defaultValue = defaultValue;
         return this;
     }
 
     public StringProperty legalValues(Class valueIsNameOf) {
-        _valueIsNameOf = valueIsNameOf;
+        this.valueIsNameOf = valueIsNameOf;
         return this;
     }
 
     public StringProperty legalValues(List valueIsInList) {
-        _valueIsInList = Collections.unmodifiableList(valueIsInList);
+        valueIsInList = Collections.unmodifiableList(valueIsInList);
         return this;
     }
 
     public StringProperty legalValues(String valueIsInList) {
         List list = ListUtil.getCommaSeparatedList(valueIsInList);
-        _valueIsInList = new ArrayList(list.size());
+        this.valueIsInList = new ArrayList(list.size());
         for (Iterator i = list.iterator(); i.hasNext();) {
             String value = (String) i.next();
             if (value.indexOf('=') != -1) {
                 String displayValue = StringUtil.afterFirst("=", value).trim();
                 value = StringUtil.beforeFirst("=", value).trim();
-                if (_displayValues == null) {
-                    _displayValues = new HashMap();
+                if (displayValues == null) {
+                    displayValues = new HashMap();
                 }
-                _displayValues.put(value, displayValue);
+                displayValues.put(value, displayValue);
             }
-            _valueIsInList.add(value);
+            this.valueIsInList.add(value);
         }
         return this;
     }
 
     public String getDisplayValue(String value) {
-        if (_displayValues != null) {
-            String displayValue = (String) _displayValues.get(value);
+        if (displayValues != null) {
+            String displayValue = (String) displayValues.get(value);
             if (displayValue != null) {
                 return displayValue;
             }
@@ -121,54 +112,54 @@
     }
 
     public StringProperty isDirName() {
-        _isDirName = true;
+        isDirName = true;
         return this;
     }
 
     public StringProperty isFileName() {
-        _isFileName = true;
+        isFileName = true;
         return this;
     }
 
     public StringProperty list() {
-        _isList = true;
+        isList = true;
         return this;
     }
 
     public StringProperty readOnly() {
-        _isReadOnly = true;
+        isReadOnly = true;
         return this;
     }
 
     public StringProperty required() {
-        _isRequired = true;
+        isRequired = true;
         return this;
     }
 
     public boolean isList() {
-        return _isList;
+        return isList;
     }
 
     public boolean isReadOnly() {
-        return _isReadOnly;
+        return isReadOnly;
     }
 
     public boolean isRequired() {
-        return _isRequired;
+        return isRequired;
     }
 
     public String getDefaultValue() {
-        return _defaultValue;
+        return defaultValue;
     }
 
     public String getDefaultValueAsString() {
-        return _defaultValue;
+        return defaultValue;
     }
 
     public List getLegalValues() {
-        if (_valueIsInList != null) {
-            return _valueIsInList;
-        } else if (_valueIsNameOf != null) {
+        if (valueIsInList != null) {
+            return valueIsInList;
+        } else if (valueIsNameOf != null) {
             //return Repository.getInstance().getInstanceNames(_valueIsNameOf);
             return null;
         } else {
@@ -182,7 +173,7 @@
 
     public String getString(String instanceName, PropertyMap props) {
         boolean ok = true, usingDefaultValue = false;
-        String s = props.getProperty(_propertyName, _defaultValue);
+        String s = props.getProperty(getPropertyName(), defaultValue);
         if (s != null && s.startsWith("${")) {
             // Value is contained in system property.
             s = StringUtil.removePrefix(s, "${");
@@ -191,7 +182,7 @@
             s = sp.getString();
             if (s == null || s.length() == 0) {
                 if (isRequired()) {
-                    String message = getLog(instanceName).errorMissingValueForRequiredSystemProperty(sp.getPropertyName(), _propertyName, getContext(instanceName));
+                    String message = getLog(instanceName).errorMissingValueForRequiredSystemProperty(sp.getPropertyName(), getPropertyName(), getContext(instanceName));
                     throw new MissingRequiredPropertyException(message);
                 }
             }
@@ -216,17 +207,17 @@
         if (!ok) {
             badPropertyValue(instanceName, s, expectedValueInList(legalValues));
         }
-        if (_isDirName || _isFileName) {
+        if (isDirName || isFileName) {
             s = FileUtil.expandHomeRelativePath(s);
             s = FileUtil.pretty(s);
         }
         if (s == null || s.length() == 0) {
             if (isRequired()) {
-                String message = getLog(instanceName).errorMissingValueForRequiredProperty(_propertyName, getContext(instanceName));
+                String message = getLog(instanceName).errorMissingValueForRequiredProperty(getPropertyName(), getContext(instanceName));
                 throw new MissingRequiredPropertyException(message);
             }
         }
-        logPropertyValue(instanceName, s, s != null && s.equals(_defaultValue));
+        logPropertyValue(instanceName, s, s != null && s.equals(defaultValue));
         return s;
     }
 }

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/SystemProperties.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/SystemProperties.java?view=diff&r1=159004&r2=159005
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/SystemProperties.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/SystemProperties.java Fri Mar 25 03:54:30 2005
@@ -68,23 +68,23 @@
 
     // privata data
 
-    private static SystemProperties _instance;
-    private boolean _canAccessFileSystem = true;
-    private boolean _rmiTrace;
-    private boolean _debug;
-    private boolean _quiet;
-    private boolean _verbose;
-    private String _home;
-    private String _repository;
-    private String _tempDir;
+    private static SystemProperties     instance;
+    private boolean                     canAccessFileSystem = true;
+    private boolean                     rmiTrace;
+    private boolean                     debug;
+    private boolean                     quiet;
+    private boolean                     verbose;
+    private String                      home;
+    private String                      repository;
+    private String                      tempDir;
 
     static {
-        _instance = new SystemProperties();
-        _instance.init();
+        instance = new SystemProperties();
+        instance.init();
     }
 
     public static SystemProperties getInstance() {
-        return _instance;
+        return instance;
     }
 
     // private methods
@@ -94,52 +94,52 @@
             putAll(System.getProperties());
         } catch (Exception ignore) // e.g. due to Applet Security Manager
         {
-            _canAccessFileSystem = false;
+            canAccessFileSystem = false;
         }
     }
 
     private void init() {
-        _debug = debugProperty.getBoolean();
-        _quiet = quietProperty.getBoolean();
-        _verbose = verboseProperty.getBoolean();
+        debug = debugProperty.getBoolean();
+        quiet = quietProperty.getBoolean();
+        verbose = verboseProperty.getBoolean();
 
-        if (_verbose) {
-            System.out.println("System Property org.apache.geronimo.interop.debug = " + _debug);
+        if (verbose) {
+            System.out.println("System Property org.apache.geronimo.interop.debug = " + debug);
             System.out.println("System Property org.apache.geronimo.interop.verbose = true");
         }
 
-        _rmiTrace = rmiTraceProperty.getBoolean();
+        rmiTrace = rmiTraceProperty.getBoolean();
 
         homeProperty.defaultValue("/org.apache.geronimo.interop");
-        _home = homeProperty.getString();
+        home = homeProperty.getString();
 
-        repositoryProperty.defaultValue(_home + "/Repository");
-        _repository = repositoryProperty.getString();
+        repositoryProperty.defaultValue(home + "/Repository");
+        repository = repositoryProperty.getString();
 
-        tempDirProperty.defaultValue(_home + "/temp");
-        _tempDir = tempDirProperty.getString();
+        tempDirProperty.defaultValue(home + "/temp");
+        tempDir = tempDirProperty.getString();
     }
 
     // public methods
 
     public static boolean rmiTrace() {
-        return getInstance()._rmiTrace;
+        return getInstance().rmiTrace;
     }
 
     public static boolean debug() {
-        return getInstance()._debug;
+        return getInstance().debug;
     }
 
     public static boolean quiet() {
-        return getInstance()._quiet;
+        return getInstance().quiet;
     }
 
     public static boolean verbose() {
-        return getInstance()._verbose;
+        return getInstance().verbose;
     }
 
     public static boolean canAccessFileSystem() {
-        return getInstance()._canAccessFileSystem;
+        return getInstance().canAccessFileSystem;
     }
 
     public static String logFile() {
@@ -156,14 +156,14 @@
     }
 
     public static String getHome() {
-        return getInstance()._home;
+        return getInstance().home;
     }
 
     public static String getRepository() {
-        return getInstance()._repository;
+        return getInstance().repository;
     }
 
     public static String getTempDir() {
-        return getInstance()._tempDir;
+        return getInstance().tempDir;
     }
 }

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/SystemPropertyLog.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/SystemPropertyLog.java?view=diff&r1=159004&r2=159005
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/SystemPropertyLog.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/SystemPropertyLog.java Fri Mar 25 03:54:30 2005
@@ -17,9 +17,6 @@
  */
 package org.apache.geronimo.interop.properties;
 
-
-
-
 public class SystemPropertyLog {
     public static SystemPropertyLog getInstance(String instanceName) {
         SystemPropertyLog log = new SystemPropertyLog();
@@ -27,31 +24,15 @@
         return log;
     }
 
-    // -----------------------------------------------------------------------
-    // private data
-    // -----------------------------------------------------------------------
-
-    private String _instanceName;
-
-    // -----------------------------------------------------------------------
-    // public methods
-    // -----------------------------------------------------------------------
+    private String  instanceName;
 
     public String getInstanceName() {
-        return _instanceName;
+        return instanceName;
     }
 
-    // -----------------------------------------------------------------------
-    // protected methods
-    // -----------------------------------------------------------------------
-
     protected void init(String instanceName) {
-        _instanceName = instanceName;
+        instanceName = instanceName;
     }
-
-    // -----------------------------------------------------------------------
-    // log methods
-    // -----------------------------------------------------------------------
 
     public void debugUsingValue(String value) {
         System.out.println("SystemPropertyLog.debugUsingValue(): value: " + value);

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/Any.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/Any.java?view=diff&r1=159004&r2=159005
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/Any.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/Any.java Fri Mar 25 03:54:30 2005
@@ -19,51 +19,85 @@
 
 import org.omg.CORBA.TCKind;
 
-
 /**
- * * An implementation of CORBA 'any' for the Sybase ORB.
+ * * An implementation of CORBA 'any'.
  */
-public class Any extends org.omg.CORBA.Any {
+public class Any
+    extends org.omg.CORBA.Any
+{
     private org.omg.CORBA.TypeCode _type;
 
     private byte[] _data;
 
-    private void extract_type(TCKind tk, String what) {
-        if (_type.kind().value() != tk.value()) {
+    /**
+     * @param tk
+     * @param what
+     */
+    private void extract_type(TCKind tk, String what)
+    {
+        if (_type.kind().value() != tk.value())
+        {
             throw new org.omg.CORBA.BAD_TYPECODE("com.sybase.CORBA.Any.extract_"
-                                                 + what + ": type = " + _type);
+                + what + ": type = " + _type);
         }
     }
 
-    public Any() {
+    /**
+     *
+     */
+    public Any()
+    {
         _type = TypeCode.NULL;
     }
 
-    public boolean equal(org.omg.CORBA.Any a) {
-        if (!_type.equal(a.type())) {
+    /**
+     * @param a
+     * @return
+     */
+    public boolean equal(org.omg.CORBA.Any a)
+    {
+        if (!_type.equal(a.type()))
+        {
             return false;
         }
-        if (a instanceof org.apache.geronimo.interop.rmi.iiop.Any) {
+        if (a instanceof org.apache.geronimo.interop.rmi.iiop.Any)
+        {
             org.apache.geronimo.interop.rmi.iiop.Any _that = (org.apache.geronimo.interop.rmi.iiop.Any) a;
             String x = org.apache.geronimo.interop.util.Base16Binary.toString(this._data);
             String y = org.apache.geronimo.interop.util.Base16Binary.toString(_that._data);
             return x.equals(y);
-        } else {
+        }
+        else
+        {
             // TODO: implement equality testing with other ORB's 'any' values
             throw new org.omg.CORBA.NO_IMPLEMENT("org.apache.geronimo.interop.rmi.iiop.Any.equal("
-                                                 + a.getClass().getName() + ")");
+                + a.getClass().getName() + ")");
         }
     }
 
-    public org.omg.CORBA.TypeCode type() {
+    /**
+     * @return
+     */
+    public org.omg.CORBA.TypeCode type()
+    {
         return _type;
     }
 
-    public void type(org.omg.CORBA.TypeCode type) {
+    /**
+     * @param type
+     */
+    public void type(org.omg.CORBA.TypeCode type)
+    {
         _type = type;
     }
 
-    public void read_value(org.omg.CORBA.portable.InputStream input, org.omg.CORBA.TypeCode type) {
+    /**
+     * @param input
+     * @param type
+     */
+    public void read_value(org.omg.CORBA.portable.InputStream input,
+                           org.omg.CORBA.TypeCode type)
+    {
         byte[] buffer = ((CdrInputStream) input)._buffer;
         int length = ((CdrInputStream) input)._length;
         _type = type;
@@ -71,247 +105,431 @@
         System.arraycopy(buffer, 0, _data, 0, length);
     }
 
-    public void write_value(org.omg.CORBA.portable.OutputStream output) {
+    /**
+     * @param output
+     */
+    public void write_value(org.omg.CORBA.portable.OutputStream output)
+    {
         // A no-op in this implementation.
     }
 
-    public org.omg.CORBA.portable.OutputStream create_output_stream() {
+    /**
+     * @return
+     */
+    public org.omg.CORBA.portable.OutputStream create_output_stream()
+    {
         _data = null;
         return CdrOutputStream.getInstance();
     }
 
-    public org.omg.CORBA.portable.InputStream create_input_stream() {
-        if (_data == null) {
-            throw new org.omg.CORBA.BAD_OPERATION("com.sybase.CORBA.Any.create_input_stream");
+    /**
+     * @return
+     */
+    public org.omg.CORBA.portable.InputStream create_input_stream()
+    {
+        if (_data == null)
+        {
+            throw new org.omg.CORBA.BAD_OPERATION(
+                "com.sybase.CORBA.Any.create_input_stream");
         }
         return CdrInputStream.getInstance();
     }
 
-    public short extract_short() {
+    /**
+     * @return
+     */
+    public short extract_short()
+    {
         extract_type(TCKind.tk_short, "short");
         return create_input_stream().read_short();
     }
 
-    public void insert_short(short value) {
+    /**
+     * @param value
+     */
+    public void insert_short(short value)
+    {
         org.omg.CORBA.portable.OutputStream output = create_output_stream();
         output.write_short(value);
         read_value(null, TypeCode.SHORT);
     }
 
-    public int extract_long() {
+    /**
+     * @return
+     */
+    public int extract_long()
+    {
         extract_type(TCKind.tk_long, "long");
         return create_input_stream().read_long();
     }
 
-    public void insert_long(int value) {
+    /**
+     * @param value
+     */
+    public void insert_long(int value)
+    {
         org.omg.CORBA.portable.OutputStream output = create_output_stream();
         output.write_long(value);
         read_value(null, TypeCode.LONG);
     }
 
-    public long extract_longlong() {
+    /**
+     * @return
+     */
+    public long extract_longlong()
+    {
         extract_type(TCKind.tk_longlong, "longlong");
         return create_input_stream().read_longlong();
     }
 
-    public void insert_longlong(long value) {
+    /**
+     * @param value
+     */
+    public void insert_longlong(long value)
+    {
         org.omg.CORBA.portable.OutputStream output = create_output_stream();
         output.write_longlong(value);
         read_value(null, TypeCode.LONGLONG);
     }
 
-    public short extract_ushort() {
+    /**
+     * @return
+     */
+    public short extract_ushort()
+    {
         extract_type(TCKind.tk_ushort, "ushort");
         return create_input_stream().read_ushort();
     }
 
-    public void insert_ushort(short value) {
+    /**
+     * @param value
+     */
+    public void insert_ushort(short value)
+    {
         org.omg.CORBA.portable.OutputStream output = create_output_stream();
         output.write_ushort(value);
         read_value(null, TypeCode.USHORT);
     }
 
-    public int extract_ulong() {
+    /**
+     * @return
+     */
+    public int extract_ulong()
+    {
         extract_type(TCKind.tk_ulong, "ulong");
         return create_input_stream().read_ulong();
     }
 
-    public void insert_ulong(int value) {
+    /**
+     * @param value
+     */
+    public void insert_ulong(int value)
+    {
         org.omg.CORBA.portable.OutputStream output = create_output_stream();
         output.write_ulong(value);
         read_value(null, TypeCode.ULONG);
     }
 
-    public long extract_ulonglong() {
+    /**
+     * @return
+     */
+    public long extract_ulonglong()
+    {
         extract_type(TCKind.tk_ulonglong, "ulonglong");
         return create_input_stream().read_ulonglong();
     }
 
-    public void insert_ulonglong(long value) {
+    /**
+     * @param value
+     */
+    public void insert_ulonglong(long value)
+    {
         org.omg.CORBA.portable.OutputStream output = create_output_stream();
         output.write_ulonglong(value);
         read_value(null, TypeCode.ULONGLONG);
     }
 
-    public float extract_float() {
+    /**
+     * @return
+     */
+    public float extract_float()
+    {
         extract_type(TCKind.tk_float, "float");
         return create_input_stream().read_float();
     }
 
-    public void insert_float(float value) {
+    /**
+     * @param value
+     */
+    public void insert_float(float value)
+    {
         org.omg.CORBA.portable.OutputStream output = create_output_stream();
         output.write_float(value);
         read_value(null, TypeCode.FLOAT);
     }
 
-    public double extract_double() {
+    /**
+     * @return
+     */
+    public double extract_double()
+    {
         extract_type(TCKind.tk_double, "double");
         return create_input_stream().read_double();
     }
 
-    public void insert_double(double value) {
+    /**
+     * @param value
+     */
+    public void insert_double(double value)
+    {
         org.omg.CORBA.portable.OutputStream output = create_output_stream();
         output.write_double(value);
         read_value(null, TypeCode.DOUBLE);
     }
 
-    public boolean extract_boolean() {
+    /**
+     * @return
+     */
+    public boolean extract_boolean()
+    {
         extract_type(TCKind.tk_boolean, "boolean");
         return create_input_stream().read_boolean();
     }
 
-    public void insert_boolean(boolean value) {
+    /**
+     * @param value
+     */
+    public void insert_boolean(boolean value)
+    {
         org.omg.CORBA.portable.OutputStream output = create_output_stream();
         output.write_boolean(value);
         read_value(null, TypeCode.BOOLEAN);
     }
 
-    public char extract_char() {
+    /**
+     * @return
+     */
+    public char extract_char()
+    {
         extract_type(TCKind.tk_char, "char");
         return create_input_stream().read_char();
     }
 
-    public void insert_char(char value) {
+    /**
+     * @param value
+     */
+    public void insert_char(char value)
+    {
         org.omg.CORBA.portable.OutputStream output = create_output_stream();
         output.write_char(value);
         read_value(null, TypeCode.CHAR);
     }
 
-    public char extract_wchar() {
+    /**
+     * @return
+     */
+    public char extract_wchar()
+    {
         extract_type(TCKind.tk_wchar, "wchar");
         return create_input_stream().read_wchar();
     }
 
-    public void insert_wchar(char value) {
+    /**
+     * @param value
+     */
+    public void insert_wchar(char value)
+    {
         org.omg.CORBA.portable.OutputStream output = create_output_stream();
         output.write_wchar(value);
         read_value(null, TypeCode.WCHAR);
     }
 
-    public byte extract_octet() {
+    /**
+     * @return
+     */
+    public byte extract_octet()
+    {
         extract_type(TCKind.tk_octet, "octet");
         return create_input_stream().read_octet();
     }
 
-    public void insert_octet(byte value) {
+    /**
+     * @param value
+     */
+    public void insert_octet(byte value)
+    {
         org.omg.CORBA.portable.OutputStream output = create_output_stream();
         output.write_octet(value);
         read_value(null, TypeCode.OCTET);
     }
 
-    public org.omg.CORBA.Any extract_any() {
+    /**
+     * @return
+     */
+    public org.omg.CORBA.Any extract_any()
+    {
         extract_type(TCKind.tk_any, "any");
         return create_input_stream().read_any();
     }
 
-    public void insert_any(org.omg.CORBA.Any value) {
+    /**
+     * @param value
+     */
+    public void insert_any(org.omg.CORBA.Any value)
+    {
         org.omg.CORBA.portable.OutputStream output = create_output_stream();
         output.write_any(value);
         read_value(null, TypeCode.ANY);
     }
 
-    public org.omg.CORBA.Object extract_Object() {
+    /**
+     * @return
+     */
+    public org.omg.CORBA.Object extract_Object()
+    {
         extract_type(TCKind.tk_objref, "Object");
         org.omg.CORBA.Object obj = create_input_stream().read_Object();
         return obj;
     }
 
-    public void insert_Object(org.omg.CORBA.Object value) {
+    /**
+     * @param value
+     */
+    public void insert_Object(org.omg.CORBA.Object value)
+    {
         org.omg.CORBA.portable.OutputStream output = create_output_stream();
         output.write_Object(value);
         read_value(null, TypeCode.OBJREF);
     }
 
-    public void insert_Object(org.omg.CORBA.Object value, org.omg.CORBA.TypeCode type) {
+    /**
+     * @param value
+     * @param type
+     */
+    public void insert_Object(org.omg.CORBA.Object value,
+                              org.omg.CORBA.TypeCode type)
+    {
         org.omg.CORBA.portable.OutputStream output = create_output_stream();
         output.write_Object(value);
         read_value(null, type);
     }
 
-    public java.io.Serializable extract_Value() {
+    /**
+     * @return
+     */
+    public java.io.Serializable extract_Value()
+    {
         throw new org.omg.CORBA.NO_IMPLEMENT();
     }
 
-    public void insert_Value(java.io.Serializable v) {
+    /**
+     * @param v
+     */
+    public void insert_Value(java.io.Serializable v)
+    {
         throw new org.omg.CORBA.NO_IMPLEMENT();
     }
 
-    public void insert_Value(java.io.Serializable v, org.omg.CORBA.TypeCode t) {
+    /**
+     * @param v
+     * @param t
+     */
+    public void insert_Value(java.io.Serializable v, org.omg.CORBA.TypeCode t)
+    {
         throw new org.omg.CORBA.NO_IMPLEMENT();
     }
 
-    public String extract_string() {
+    /**
+     * @return
+     */
+    public String extract_string()
+    {
         extract_type(TCKind.tk_string, "string");
         return create_input_stream().read_string();
     }
 
-    public void insert_string(String value) {
+    /**
+     * @param value
+     */
+    public void insert_string(String value)
+    {
         org.omg.CORBA.portable.OutputStream output = create_output_stream();
         output.write_string(value);
         read_value(null, TypeCode.STRING);
     }
 
-    public String extract_wstring() {
+    /**
+     * @return
+     */
+    public String extract_wstring()
+    {
         extract_type(TCKind.tk_wstring, "wstring");
         return create_input_stream().read_wstring();
     }
 
-    public void insert_wstring(String value) {
+    /**
+     * @param value
+     */
+    public void insert_wstring(String value)
+    {
         org.omg.CORBA.portable.OutputStream output = create_output_stream();
         output.write_wstring(value);
         read_value(null, TypeCode.WSTRING);
     }
 
-    public org.omg.CORBA.TypeCode extract_TypeCode() {
+    /**
+     * @return
+     */
+    public org.omg.CORBA.TypeCode extract_TypeCode()
+    {
         extract_type(TCKind.tk_TypeCode, "TypeCode");
         return create_input_stream().read_TypeCode();
     }
 
-    public void insert_TypeCode(org.omg.CORBA.TypeCode value) {
+    /**
+     * @param value
+     */
+    public void insert_TypeCode(org.omg.CORBA.TypeCode value)
+    {
         org.omg.CORBA.portable.OutputStream output = create_output_stream();
         output.write_TypeCode(value);
         read_value(null, TypeCode.TYPECODE);
     }
 
-    public org.omg.CORBA.Principal extract_Principal() {
-        throw new org.omg.CORBA.NO_IMPLEMENT("org.apache.geronimo.interop.rmi.iiop.Any.extract_Principal");
+    /**
+     * @return
+     */
+    public org.omg.CORBA.Principal extract_Principal()
+    {
+        throw new org.omg.CORBA.NO_IMPLEMENT(
+            "org.apache.geronimo.interop.rmi.iiop.Any.extract_Principal");
     }
 
-    public void insert_Principal(org.omg.CORBA.Principal value) {
-        throw new org.omg.CORBA.NO_IMPLEMENT("org.apache.geronimo.interop.rmi.iiop.Any.insert_Principal");
+    public void insert_Principal(org.omg.CORBA.Principal value)
+    {
+        throw new org.omg.CORBA.NO_IMPLEMENT(
+            "org.apache.geronimo.interop.rmi.iiop.Any.insert_Principal");
     }
 
     // Don't implement insert_Streamable and extract_Streamable since from
     // a TypeCode it appears to be impossible to determine the holder class
     // name (in the general case) in order to construct a Streamable object
     // for return from extract_Streamable.
-
+    /**
+     * @return
+     * @throws org.omg.CORBA.BAD_INV_ORDER
+     */
     public org.omg.CORBA.portable.Streamable extract_Streamable()
-            throws org.omg.CORBA.BAD_INV_ORDER {
+        throws org.omg.CORBA.BAD_INV_ORDER
+    {
         throw new org.omg.CORBA.NO_IMPLEMENT();
     }
 
-    public void insert_Streamable(org.omg.CORBA.portable.Streamable s) {
+    /**
+     * @param s
+     */
+    public void insert_Streamable(org.omg.CORBA.portable.Streamable s)
+    {
         throw new org.omg.CORBA.NO_IMPLEMENT();
     }
 
@@ -323,16 +541,28 @@
      * * Construct an Any from a TypeCode and a String value
      * * (supported for boolean and numeric primitive IDL types only).
      */
-    public Any(org.omg.CORBA.TypeCode type, String value) {
-        try {
+    /**
+     * @param type
+     * @param value
+     */
+    public Any(org.omg.CORBA.TypeCode type, String value)
+    {
+        try
+        {
             _type = type;
-            switch (_type.kind().value()) {
+            switch (_type.kind().value())
+            {
                 case TCKind._tk_boolean:
-                    if (value.equals("0")) {
+                    if (value.equals("0"))
+                    {
                         insert_boolean(false);
-                    } else if (value.equals("1")) {
+                    }
+                    else if (value.equals("1"))
+                    {
                         insert_boolean(true);
-                    } else {
+                    }
+                    else
+                    {
                         insert_boolean(Boolean.valueOf(value).booleanValue());
                     }
                     break;
@@ -371,22 +601,40 @@
                 default:
                     throw new org.omg.CORBA.BAD_PARAM(value);
             }
-        } catch (NumberFormatException nfe) {
+        }
+        catch (NumberFormatException nfe)
+        {
             throw new org.omg.CORBA.BAD_PARAM(value + " - " + nfe.toString());
         }
     }
 
-    private long parse(String value, long min, long max) throws NumberFormatException {
+    /**
+     * @param value
+     * @param min
+     * @param max
+     * @return
+     * @throws NumberFormatException
+     */
+    private long parse(String value, long min, long max)
+        throws NumberFormatException
+    {
         long n = Long.parseLong(value);
-        if (n < min || n > max) {
-            throw new NumberFormatException(value + " is not in range ["
-                                            + min + ".." + max + "]");
+        if (n < min || n > max)
+        {
+            throw new NumberFormatException(value +
+                " is not in range ["
+                + min + ".." + max + "]");
         }
         return n;
     }
 
-    public String toString() {
-        switch (_type.kind().value()) {
+    /**
+     * @return
+     */
+    public String toString()
+    {
+        switch (_type.kind().value())
+        {
             case TCKind._tk_any:
             case TCKind._tk_boolean:
             case TCKind._tk_char:
@@ -410,8 +658,13 @@
         }
     }
 
-    private String value() {
-        switch (_type.kind().value()) {
+    /**
+     * @return
+     */
+    private String value()
+    {
+        switch (_type.kind().value())
+        {
             case TCKind._tk_any:
                 return "" + extract_any();
             case TCKind._tk_boolean:

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ArrayHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ArrayHelper.java?view=diff&r1=159004&r2=159005
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ArrayHelper.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ArrayHelper.java Fri Mar 25 03:54:30 2005
@@ -17,42 +17,61 @@
  */
 package org.apache.geronimo.interop.rmi.iiop;
 
-import java.lang.reflect.Array;
-
-import org.apache.geronimo.interop.SystemException;
 import org.apache.geronimo.interop.util.ArrayUtil;
 
+import java.lang.reflect.*;
 
-public class ArrayHelper implements ObjectHelper {
+public class ArrayHelper implements ObjectHelper
+{
     private ValueType _element;
 
-    public ArrayHelper(Class elementClass) {
-        if (elementClass.isPrimitive()) {
-            throw new SystemException("TODO");
-        } else {
+    private ObjectHelper _primitive;
+
+    public ArrayHelper(Class elementClass)
+    {
+        if (elementClass.isPrimitive())
+        {
+            _primitive = PrimitiveType.getArrayHelper(elementClass);
+        }
+        else
+        {
             _element = ValueType.getInstance(elementClass);
         }
     }
 
-    public Object read(ObjectInputStream input) {
+    public Object read(ObjectInputStream input)
+    {
+        if (_primitive != null)
+        {
+            return _primitive.read(input);
+        }
         CdrInputStream cdrInput = input._cdrInput;
         int n = cdrInput.read_long();
-        Object[] array = (Object[]) Array.newInstance(_element._class, n);
-        for (int i = 0; i < n; i++) {
+        Object[] array = (Object[])Array.newInstance(_element._class, n);
+        for (int i = 0; i < n; i++)
+        {
             array[i] = input.readObject(_element);
         }
         return array;
     }
 
-    public void write(ObjectOutputStream output, Object value) {
+    public void write(ObjectOutputStream output, Object value)
+    {
+        if (_primitive != null)
+        {
+            _primitive.write(output, value);
+            return;
+        }
         CdrOutputStream cdrOutput = output._cdrOutput;
-        Object[] array = (Object[]) value;
-        if (array == null) {
+        Object[] array = (Object[])value;
+        if (array == null)
+        {
             array = ArrayUtil.EMPTY_OBJECT_ARRAY;
         }
         int n = array.length;
         cdrOutput.write_long(n);
-        for (int i = 0; i < n; i++) {
+        for (int i = 0; i < n; i++)
+        {
             output.writeObject(_element, array[i]);
         }
     }

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/BadMagicException.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/BadMagicException.java?view=diff&r1=159004&r2=159005
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/BadMagicException.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/BadMagicException.java Fri Mar 25 03:54:30 2005
@@ -17,8 +17,10 @@
  */
 package org.apache.geronimo.interop.rmi.iiop;
 
-public class BadMagicException extends RuntimeException {
-    public BadMagicException(String magic) {
+public class BadMagicException extends RuntimeException
+{
+    public BadMagicException(String magic)
+    {
         super(magic);
     }
 }



Mime
View raw message