Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 83182 invoked from network); 23 Mar 2005 17:57:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 23 Mar 2005 17:57:17 -0000 Received: (qmail 10551 invoked by uid 500); 23 Mar 2005 17:57:09 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 10355 invoked by uid 500); 23 Mar 2005 17:57:08 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 9987 invoked by uid 99); 23 Mar 2005 17:57:05 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 23 Mar 2005 09:57:00 -0800 Received: (qmail 82895 invoked by uid 65534); 23 Mar 2005 17:56:59 -0000 Message-ID: <20050323175659.82893.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Wed, 23 Mar 2005 17:56:59 -0000 Subject: svn commit: r158814 [2/9] - in geronimo/trunk/modules: assembly/ 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/ To: scm@geronimo.apache.org From: adc@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/CosNaming/iiop_stubs/NamingContext_Stub.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/CosNaming/iiop_stubs/NamingContext_Stub.java?vi= ew=3Ddiff&r1=3D158813&r2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/Cos= Naming/iiop_stubs/NamingContext_Stub.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/Cos= Naming/iiop_stubs/NamingContext_Stub.java Wed Mar 23 09:56:34 2005 @@ -1,392 +0,0 @@ -/** - * - * Copyright 2004-2005 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implie= d=2E - * - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.geronimo.interop.CosNaming.iiop_stubs; - -import org.apache.geronimo.interop.rmi.iiop.ObjectRef; - - -public class NamingContext_Stub - extends ObjectRef - implements org.apache.geronimo.interop.CosNaming.NamingContext { - //=20 - // Fields - //=20 - public java.lang.String[] _ids =3D {"org.apache.geronimo.interop.CosNa= ming.NamingContext", "RMI:org.apache.geronimo.interop.CosNaming.NamingConte= xt:0000000000000000"}; - private static final org.apache.geronimo.interop.rmi.iiop.ValueType vt= $0 =3D org.apache.geronimo.interop.rmi.iiop.ValueType.getInstance(java.lang= .String.class); - private static final org.apache.geronimo.interop.rmi.iiop.ValueType vt= $1 =3D org.apache.geronimo.interop.rmi.iiop.ValueType.getInstance(org.apach= e=2Egeronimo.interop.CosNaming.BindingListHolder.class); - private static final org.apache.geronimo.interop.rmi.iiop.ValueType vt= $2 =3D org.apache.geronimo.interop.rmi.iiop.ValueType.getInstance(org.apach= e=2Egeronimo.interop.CosNaming.BindingIteratorHolder.class); - private static final org.apache.geronimo.interop.rmi.iiop.ValueType vt= $3 =3D org.apache.geronimo.interop.rmi.iiop.ValueType.getInstance(org.apach= e=2Egeronimo.interop.CosNaming.NameComponent[].class); - private static final org.apache.geronimo.interop.rmi.iiop.ValueType vt= $4 =3D org.apache.geronimo.interop.rmi.iiop.ValueType.getInstance(org.omg.C= ORBA.Object.class); - private static final org.apache.geronimo.interop.rmi.iiop.ValueType vt= $5 =3D org.apache.geronimo.interop.rmi.iiop.ValueType.getInstance(org.apach= e=2Egeronimo.interop.CosNaming.NamingContext.class); - - // - // Constructors - //=20 - public NamingContext_Stub() { - super(); - } - =20 - //=20 - // Methods - //=20 - =20 - public boolean _is_a(java.lang.String id) { - java.lang.Object $key =3D $getRequestKey(); - int $retry; - - for ($retry =3D 0 - ; ; $retry++ - ) { - - try { - org.apache.geronimo.interop.rmi.iiop.client.Connection $co= nn; - org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream $o= ut; - java.lang.String $et; - boolean $rc; - org.apache.geronimo.interop.rmi.iiop.ObjectInputStream $in= ; - $conn =3D this.$connect(); - $out =3D $conn.getSimpleOutputStream(); - $out.writeObject(vt$0, id); - $conn.invoke(this, "_is_a", $key, $retry); - $in =3D $conn.getSimpleInputStream(); - $conn.forget($key); - $conn.close(); - $et =3D $conn.getExceptionType(); - - if ($et !=3D null) { - throw org.apache.geronimo.interop.rmi.iiop.SystemExcep= tionFactory.getException($conn.getException()); - } - $rc =3D $in.readBoolean(); - return $rc; - } catch (org.apache.geronimo.interop.rmi.iiop.client.RetryInvo= keException $ex) { - - if ($retry =3D=3D 3) { - throw $ex.getRuntimeException(); - } - } - } - } - - public void list(int p0, org.apache.geronimo.interop.CosNaming.Binding= ListHolder p1, org.apache.geronimo.interop.CosNaming.BindingIteratorHolder = p2) { - java.lang.Object $key =3D $getRequestKey(); - int $retry; - - for ($retry =3D 0 - ; ; $retry++ - ) { - - try { - org.apache.geronimo.interop.rmi.iiop.client.Connection $co= nn; - org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream $o= ut; - java.lang.String $et; - $conn =3D this.$connect(); - $out =3D $conn.getSimpleOutputStream(); - $out.writeInt(p0); - $out.writeObject(vt$1, p1); - $out.writeObject(vt$2, p2); - $conn.invoke(this, "list", $key, $retry); - $conn.forget($key); - $conn.close(); - $et =3D $conn.getExceptionType(); - - if ($et !=3D null) { - throw org.apache.geronimo.interop.rmi.iiop.SystemExcep= tionFactory.getException($conn.getException()); - } - } catch (org.apache.geronimo.interop.rmi.iiop.client.RetryInvo= keException $ex) { - - if ($retry =3D=3D 3) { - throw $ex.getRuntimeException(); - } - } - } - } - - public org.omg.CORBA.Object resolve(org.apache.geronimo.interop.CosNam= ing.NameComponent[] p0) throws org.apache.geronimo.interop.CosNaming.Naming= ContextPackage.NotFound, org.apache.geronimo.interop.CosNaming.NamingContex= tPackage.CannotProceed, org.apache.geronimo.interop.CosNaming.NamingContext= Package.InvalidName { - java.lang.Object $key =3D $getRequestKey(); - int $retry; - - for ($retry =3D 0 - ; ; $retry++ - ) { - - try { - org.apache.geronimo.interop.rmi.iiop.client.Connection $co= nn; - org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream $o= ut; - java.lang.String $et; - org.omg.CORBA.Object $rc; - org.apache.geronimo.interop.rmi.iiop.ObjectInputStream $in= ; - $conn =3D this.$connect(); - $out =3D $conn.getSimpleOutputStream(); - $out.writeObject(vt$3, p0); - $conn.invoke(this, "resolve", $key, $retry); - $in =3D $conn.getSimpleInputStream(); - $conn.forget($key); - $conn.close(); - $et =3D $conn.getExceptionType(); - - if ($et !=3D null) { - throw org.apache.geronimo.interop.rmi.iiop.SystemExcep= tionFactory.getException($conn.getException()); - } - $rc =3D (org.omg.CORBA.Object) $in.readObject(vt$4); - return $rc; - } catch (org.apache.geronimo.interop.rmi.iiop.client.RetryInvo= keException $ex) { - - if ($retry =3D=3D 3) { - throw $ex.getRuntimeException(); - } - } - } - } - - public void bind(org.apache.geronimo.interop.CosNaming.NameComponent[]= p0, org.omg.CORBA.Object p1) throws org.apache.geronimo.interop.CosNaming.= NamingContextPackage.NotFound, org.apache.geronimo.interop.CosNaming.Naming= ContextPackage.CannotProceed, org.apache.geronimo.interop.CosNaming.NamingC= ontextPackage.InvalidName, org.apache.geronimo.interop.CosNaming.NamingCont= extPackage.AlreadyBound { - java.lang.Object $key =3D $getRequestKey(); - int $retry; - - for ($retry =3D 0 - ; ; $retry++ - ) { - - try { - org.apache.geronimo.interop.rmi.iiop.client.Connection $co= nn; - org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream $o= ut; - java.lang.String $et; - $conn =3D this.$connect(); - $out =3D $conn.getSimpleOutputStream(); - $out.writeObject(vt$3, p0); - $out.writeObject(vt$4, p1); - $conn.invoke(this, "bind", $key, $retry); - $conn.forget($key); - $conn.close(); - $et =3D $conn.getExceptionType(); - - if ($et !=3D null) { - throw org.apache.geronimo.interop.rmi.iiop.SystemExcep= tionFactory.getException($conn.getException()); - } - } catch (org.apache.geronimo.interop.rmi.iiop.client.RetryInvo= keException $ex) { - - if ($retry =3D=3D 3) { - throw $ex.getRuntimeException(); - } - } - } - } - - public void bind_context(org.apache.geronimo.interop.CosNaming.NameCom= ponent[] p0, org.apache.geronimo.interop.CosNaming.NamingContext p1) throws= org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound, org.a= pache.geronimo.interop.CosNaming.NamingContextPackage.CannotProceed, org.ap= ache.geronimo.interop.CosNaming.NamingContextPackage.InvalidName, org.apach= e=2Egeronimo.interop.CosNaming.NamingContextPackage.AlreadyBound { - java.lang.Object $key =3D $getRequestKey(); - int $retry; - - for ($retry =3D 0 - ; ; $retry++ - ) { - - try { - org.apache.geronimo.interop.rmi.iiop.client.Connection $co= nn; - org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream $o= ut; - java.lang.String $et; - $conn =3D this.$connect(); - $out =3D $conn.getSimpleOutputStream(); - $out.writeObject(vt$3, p0); - $out.writeObject(vt$5, p1); - $conn.invoke(this, "bind_context", $key, $retry); - $conn.forget($key); - $conn.close(); - $et =3D $conn.getExceptionType(); - - if ($et !=3D null) { - throw org.apache.geronimo.interop.rmi.iiop.SystemExcep= tionFactory.getException($conn.getException()); - } - } catch (org.apache.geronimo.interop.rmi.iiop.client.RetryInvo= keException $ex) { - - if ($retry =3D=3D 3) { - throw $ex.getRuntimeException(); - } - } - } - } - - public void rebind(org.apache.geronimo.interop.CosNaming.NameComponent= [] p0, org.omg.CORBA.Object p1) throws org.apache.geronimo.interop.CosNamin= g=2ENamingContextPackage.NotFound, org.apache.geronimo.interop.CosNaming.Na= mingContextPackage.CannotProceed, org.apache.geronimo.interop.CosNaming.Nam= ingContextPackage.InvalidName { - java.lang.Object $key =3D $getRequestKey(); - int $retry; - - for ($retry =3D 0 - ; ; $retry++ - ) { - - try { - org.apache.geronimo.interop.rmi.iiop.client.Connection $co= nn; - org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream $o= ut; - java.lang.String $et; - $conn =3D this.$connect(); - $out =3D $conn.getSimpleOutputStream(); - $out.writeObject(vt$3, p0); - $out.writeObject(vt$4, p1); - $conn.invoke(this, "rebind", $key, $retry); - $conn.forget($key); - $conn.close(); - $et =3D $conn.getExceptionType(); - - if ($et !=3D null) { - throw org.apache.geronimo.interop.rmi.iiop.SystemExcep= tionFactory.getException($conn.getException()); - } - } catch (org.apache.geronimo.interop.rmi.iiop.client.RetryInvo= keException $ex) { - - if ($retry =3D=3D 3) { - throw $ex.getRuntimeException(); - } - } - } - } - - public void rebind_context(org.apache.geronimo.interop.CosNaming.NameC= omponent[] p0, org.apache.geronimo.interop.CosNaming.NamingContext p1) thro= ws org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound, org= .apache.geronimo.interop.CosNaming.NamingContextPackage.CannotProceed, org.= apache.geronimo.interop.CosNaming.NamingContextPackage.InvalidName { - java.lang.Object $key =3D $getRequestKey(); - int $retry; - - for ($retry =3D 0 - ; ; $retry++ - ) { - - try { - org.apache.geronimo.interop.rmi.iiop.client.Connection $co= nn; - org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream $o= ut; - java.lang.String $et; - $conn =3D this.$connect(); - $out =3D $conn.getSimpleOutputStream(); - $out.writeObject(vt$3, p0); - $out.writeObject(vt$5, p1); - $conn.invoke(this, "rebind_context", $key, $retry); - $conn.forget($key); - $conn.close(); - $et =3D $conn.getExceptionType(); - - if ($et !=3D null) { - throw org.apache.geronimo.interop.rmi.iiop.SystemExcep= tionFactory.getException($conn.getException()); - } - } catch (org.apache.geronimo.interop.rmi.iiop.client.RetryInvo= keException $ex) { - - if ($retry =3D=3D 3) { - throw $ex.getRuntimeException(); - } - } - } - } - - public void unbind(org.apache.geronimo.interop.CosNaming.NameComponent= [] p0) throws org.apache.geronimo.interop.CosNaming.NamingContextPackage.No= tFound, org.apache.geronimo.interop.CosNaming.NamingContextPackage.CannotPr= oceed, org.apache.geronimo.interop.CosNaming.NamingContextPackage.InvalidNa= me { - java.lang.Object $key =3D $getRequestKey(); - int $retry; - - for ($retry =3D 0 - ; ; $retry++ - ) { - - try { - org.apache.geronimo.interop.rmi.iiop.client.Connection $co= nn; - org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream $o= ut; - java.lang.String $et; - $conn =3D this.$connect(); - $out =3D $conn.getSimpleOutputStream(); - $out.writeObject(vt$3, p0); - $conn.invoke(this, "unbind", $key, $retry); - $conn.forget($key); - $conn.close(); - $et =3D $conn.getExceptionType(); - - if ($et !=3D null) { - throw org.apache.geronimo.interop.rmi.iiop.SystemExcep= tionFactory.getException($conn.getException()); - } - } catch (org.apache.geronimo.interop.rmi.iiop.client.RetryInvo= keException $ex) { - - if ($retry =3D=3D 3) { - throw $ex.getRuntimeException(); - } - } - } - } - - public org.apache.geronimo.interop.CosNaming.NamingContext new_context= () { - java.lang.Object $key =3D $getRequestKey(); - int $retry; - - for ($retry =3D 0 - ; ; $retry++ - ) { - - try { - org.apache.geronimo.interop.rmi.iiop.client.Connection $co= nn; - org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream $o= ut; - java.lang.String $et; - org.apache.geronimo.interop.CosNaming.NamingContext $rc; - org.apache.geronimo.interop.rmi.iiop.ObjectInputStream $in= ; - $conn =3D this.$connect(); - $out =3D $conn.getSimpleOutputStream(); - $conn.invoke(this, "new_context", $key, $retry); - $in =3D $conn.getSimpleInputStream(); - $conn.forget($key); - $conn.close(); - $et =3D $conn.getExceptionType(); - - if ($et !=3D null) { - throw org.apache.geronimo.interop.rmi.iiop.SystemExcep= tionFactory.getException($conn.getException()); - } - $rc =3D (org.apache.geronimo.interop.CosNaming.NamingConte= xt) $in.readObject(vt$5); - return $rc; - } catch (org.apache.geronimo.interop.rmi.iiop.client.RetryInvo= keException $ex) { - - if ($retry =3D=3D 3) { - throw $ex.getRuntimeException(); - } - } - } - } - - public org.apache.geronimo.interop.CosNaming.NamingContext bind_new_co= ntext(org.apache.geronimo.interop.CosNaming.NameComponent[] p0) throws org.= apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound, org.apache= .geronimo.interop.CosNaming.NamingContextPackage.AlreadyBound, org.apache.g= eronimo.interop.CosNaming.NamingContextPackage.CannotProceed, org.apache.ge= ronimo.interop.CosNaming.NamingContextPackage.InvalidName { - java.lang.Object $key =3D $getRequestKey(); - int $retry; - - for ($retry =3D 0 - ; ; $retry++ - ) { - - try { - org.apache.geronimo.interop.rmi.iiop.client.Connection $co= nn; - org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream $o= ut; - java.lang.String $et; - org.apache.geronimo.interop.CosNaming.NamingContext $rc; - org.apache.geronimo.interop.rmi.iiop.ObjectInputStream $in= ; - $conn =3D this.$connect(); - $out =3D $conn.getSimpleOutputStream(); - $out.writeObject(vt$3, p0); - $conn.invoke(this, "bind_new_context", $key, $retry); - $in =3D $conn.getSimpleInputStream(); - $conn.forget($key); - $conn.close(); - $et =3D $conn.getExceptionType(); - - if ($et !=3D null) { - throw org.apache.geronimo.interop.rmi.iiop.SystemExcep= tionFactory.getException($conn.getException()); - } - $rc =3D (org.apache.geronimo.interop.CosNaming.NamingConte= xt) $in.readObject(vt$5); - return $rc; - } catch (org.apache.geronimo.interop.rmi.iiop.client.RetryInvo= keException $ex) { - - if ($retry =3D=3D 3) { - throw $ex.getRuntimeException(); - } - } - } - } -} Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/InteropGBean.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/InteropGBean.java?view=3Ddiff&r1=3D158813&r2=3D= 158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/Int= eropGBean.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/Int= eropGBean.java Wed Mar 23 09:56:34 2005 @@ -39,17 +39,17 @@ =20 private IOR ior; =20 - private Properties properties; - private String strprop; - private String objectName; + private Properties properties; + private String strprop; + private String name; =20 /** * Construct an instance of InteropGBean * * @param strprop some strprop */ - public InteropGBean(String objectName, String strprop, Properties prop= erties) { - this.objectName =3D objectName; + public InteropGBean(String name, String strprop, Properties properties= ) { + this.name =3D name; this.strprop =3D strprop; this.properties =3D (properties =3D=3D null ? new Properties() : p= roperties); } @@ -89,15 +89,15 @@ /** * Returns the object name of this protocol GBean */ - public String getObjectName() { - return objectName; + public String getName() { + return name; } =20 /** * Add the overrides from the member variables to the properties file. */ public void echo(String msg) { - log.info(getObjectName() + ": Echo " + msg); + log.info(getName() + ": Echo " + msg); } =20 =20 /*=20 @@ -105,15 +105,15 @@ */ =20 public void doStart() throws Exception { - log.info("Started " + getObjectName()); + log.info("Started " + getName()); } =20 public void doStop() throws Exception { - log.info("Stopped " + getObjectName()); + log.info("Stopped " + getName()); } =20 public void doFail() { - log.info("Failed " + getObjectName()); + log.info("Failed " + getName()); } =20 /*=20 @@ -125,13 +125,13 @@ static { GBeanInfoBuilder infoFactory =3D new GBeanInfoBuilder(InteropGBean= .class); =20 - infoFactory.addAttribute("objectName", String.class, false); + infoFactory.addAttribute("name", String.class, true); infoFactory.addAttribute("strprop", String.class, true); infoFactory.addAttribute("properties", Properties.class, true); =20 infoFactory.addOperation("echo", new Class[]{String.class}); =20 - infoFactory.setConstructor(new String[]{"objectName", "strprop", "= properties"}); + infoFactory.setConstructor(new String[]{"name", "strprop", "proper= ties"}); =20 GBEAN_INFO =3D infoFactory.getBeanInfo(); } Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/SystemException.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/SystemException.java?view=3Ddiff&r1=3D158813&r2= =3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/Sys= temException.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/Sys= temException.java Wed Mar 23 09:56:34 2005 @@ -17,6 +17,24 @@ */ package org.apache.geronimo.interop; =20 +/* + * This class is used to help marshall server side exceptions back to the = client. + * A server exception is caught and then set as a cause of the system exce= ption. + * + * Originally there were two different implementations of the this cause, = one for=20 + * JDK 1.3 (which didn't have the cause object on an Exception) and this o= ne for JDK 1.4 + * The JDK 1.3 class has been removed. + * + * In the stubs/skeletons, they check to see if the marshalled exception i= s an instance of + * SystemException and then it take appropriate actions. + * + * Its possible that this could change to use the JDK 1.4 RuntimeException= . This may=20 + * cause some troubles with identification of specific server side excepti= ons vs. a + * general runtime exception. + * + * For now, I am going to leave this class in place. A future TODO would = be to investigate + * this situation more carefully. + */ =20 public class SystemException extends RuntimeException { public SystemException(String message) { @@ -34,17 +52,4 @@ && cause.getMessage() =3D=3D null ? cause.getCause() : cause); } - - /* -Constructor Summary=20 -RuntimeException()=20 - Constructs a new runtime exception with null as its detail messa= ge.=20 -RuntimeException(String message)=20 - Constructs a new runtime exception with the specified detail mes= sage.=20 -RuntimeException(String message, Throwable cause)=20 - Constructs a new runtime exception with the specified detail mes= sage and cause.=20 -RuntimeException(Throwable cause)=20 - Constructs a new runtime exception with the specified cause and = a detail message of (cause=3D=3Dnull ? null : cause.toString()) (which typi= cally contains the class and detail message of cause).=20 - */ - } Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/adapter/Adapter.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/adapter/Adapter.java?view=3Ddiff&r1=3D158813&r2= =3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/ada= pter/Adapter.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/ada= pter/Adapter.java Wed Mar 23 09:56:34 2005 @@ -17,236 +17,39 @@ */ package org.apache.geronimo.interop.adapter; =20 -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Vector; - +import org.apache.geronimo.interop.rmi.iiop.ObjectRef; import org.apache.geronimo.interop.rmi.iiop.RemoteInterface; +import org.openejb.EJBContainer; =20 +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; =20 -public class Adapter { - // - // Public Accessible Properties - // - protected String _bindName; - protected String _remoteClassName; - protected String _remoteInterfaceName; - protected Vector _idVector; - protected boolean _shared; - protected ClassLoader _cl; - protected RemoteInterface _ri; - - // - // Internal Properrties - // - - protected Object _sharedObject; - protected HashMap _objects; - protected Class _remoteClassClass; - protected Class _remoteInterfaceClass; - - public Adapter() { - _objects =3D new HashMap(); - _idVector =3D new Vector(); - } - - /* - * BindName is the name that will be registered with the INS (Inter-op= erable Name Service) - */ - public String getBindName() { - return _bindName; - } - - public void setBindName(String bindName) { - _bindName =3D bindName; - } - - /* - * Is this a shared component? If so this will invoke the getInstance= method on - * the component ... - */ - public boolean isShared() { - return _shared; - } - - public void setShared(boolean shared) { - _shared =3D shared; - } - - /* - * The classloader that will load any dependancies of the adapter or c= orba skel interfaces. - * Its should be set by the ejb container - */ - public ClassLoader getClassLoader() { - return _cl; - } - - public void setClassLoader(ClassLoader cl) { - _cl =3D cl; - } - - /* - * This is the name of the remote class that implements the remote int= erface. - * - * This is only used if this adapter is going to directly invoke an ob= ject. For the - * EJB Container, the adapter will pass through the method invocations= . - */ - public String getRemoteClassName() { - return _remoteClassName; - } - - public void setRemoteClassName(String rcName) { - _remoteClassName =3D rcName; - } - - /* - * The remote interface name for the remote object. This will most li= kely be the name - * of the EJB's RemoteInterface and RemoteHomeInterface - * - * The stub/skel generator will use this interface name. - */ - public String getRemoteInterfaceName() { - return _remoteInterfaceName; - } - - public void setRemoteInterfaceName(String riName) { - _remoteInterfaceName =3D riName; - } - - /* - * A list of public IDs that the remote object implements: - * - * IDL:....:1.0 - * RMI:....:X:Y - */ - public Vector getIds() { - return _idVector; - } - - public void addId(String id) { - _idVector.add(id); - } - - public void removeId(String id) { - _idVector.remove(id); - } - - /* - * Return the skeleton implemention for the remote interface. This in= terface has the - * invoke method to handle the rmi/iiop messages. - */ - public RemoteInterface getRemoteInterface() { - if (_ri =3D=3D null) { - synchronized (this) { - String riName =3D _remoteInterfaceName + "_Skeleton"; - _remoteInterfaceClass =3D loadClass(riName); - - try { - _ri =3D (RemoteInterface) _remoteInterfaceClass.newIns= tance(); - } catch (InstantiationException e) { - e.printStackTrace(); //To change body of catch statem= ent use File | Settings | File Templates. - } catch (IllegalAccessException e) { - e.printStackTrace(); //To change body of catch statem= ent use File | Settings | File Templates. - } - } - } - - return _ri; - } - - /* - * Get an object instance to invoke based on the object key. - * - * The objectKey could probably be passed to the EJB container so that= the - * container can directly invoke the ejb object as required. - */ - public Object getInstance(byte[] objectKey) { - String key =3D new String(objectKey); - return getInstance(key); - } - - public Object getInstance(String key) { - Object o =3D _objects.get(key); - - if (o =3D=3D null) { - o =3D newInstance(key); - } - - return o; - } - - public Object newInstance(byte[] objectKey) { - String key =3D new String(objectKey); - return newInstance(key); - } +public abstract class Adapter +{ + public abstract Object getAdapterID(); + public abstract String[] getBindNames(); =20 - public Object newInstance(String key) { - Object o =3D null; + public abstract void start(); + public abstract void stop(); =20 - if (_remoteClassClass =3D=3D null) { - synchronized (this) { - _remoteClassClass =3D loadClass(_remoteClassName); - } - - try { - if (_shared) { - synchronized (this) { - Method m =3D _remoteClassClass.getMethod("getInsta= nce", (Class[]) null); - o =3D m.invoke(_remoteClassClass, (Object[]) null)= ; - - if (o !=3D null) { - _objects.put(key, o); - } - } - } else { - o =3D _remoteClassClass.newInstance(); - _objects.put(key, o); - } - } catch (InstantiationException e) { - e.printStackTrace(); //To change body of catch statement = use File | Settings | File Templates. - } catch (IllegalAccessException e) { - e.printStackTrace(); //To change body of catch statement = use File | Settings | File Templates. - } catch (NoSuchMethodException e) { - e.printStackTrace(); - } catch (InvocationTargetException e) { - e.printStackTrace(); - } - } + public abstract ObjectRef getObjectRef(); =20 - return o; - } + public abstract Object getServant(); + public abstract EJBContainer getEJBContainer(); + public abstract Object getEJBHome(); =20 - /* - * Invoke method from the IIOP Message Handler. The adapter is bound = to the INS name service. - * When an RMI/IIOP message is processed by the server, the message ha= ndler will perform a lookup - * on the name service to get the Adapter, then the invocation will be= passed to the adapter - * The adapter will obtain the object key and then determine which obj= ect instance to pass the - * invocation to. - */ - public void invoke(java.lang.String methodName, byte[] objectKey, org.= apache.geronimo.interop.rmi.iiop.ObjectInputStream input, org.apache.geroni= mo.interop.rmi.iiop.ObjectOutputStream output) { - RemoteInterface skeleton =3D getRemoteInterface(); - Object instance =3D getInstance(objectKey); - - if (instance !=3D null) { - skeleton.$invoke(methodName, objectKey, instance, input, outpu= t); - } else { - throw new org.omg.CORBA.OBJECT_NOT_EXIST(new String(objectKey)= ); - } - } + public abstract void invoke(java.lang.String methodName, byte[] object= Key, org.apache.geronimo.interop.rmi.iiop.ObjectInputStream input, org.apac= he.geronimo.interop.rmi.iiop.ObjectOutputStream output); =20 - /* - * Helper function to load a class. This uses classloader for the ada= pter. - */ - protected Class loadClass(String name) { - Class c =3D null; =20 + protected Class loadClass( String className, ClassLoader cl ) + { + Class rc =3D null; try { - c =3D _cl.loadClass(name); - } catch (Exception e) { - e.printStackTrace(); + rc =3D cl.loadClass(className); + } catch (ClassNotFoundException e) { + e.printStackTrace(); =20 } - - return c; + return rc; } + } Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/adapter/AdapterManager.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/adapter/AdapterManager.java?view=3Ddiff&r1=3D15= 8813&r2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/ada= pter/AdapterManager.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/ada= pter/AdapterManager.java Wed Mar 23 09:56:34 2005 @@ -17,27 +17,176 @@ */ package org.apache.geronimo.interop.adapter; =20 -import java.util.Hashtable; +import org.openejb.EJBContainer; +import org.openejb.EJBComponentType; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.geronimo.gbean.*; +import org.apache.geronimo.interop.naming.NameService; + +import java.util.HashMap; +import java.util.Collection; +import java.util.Collections; + +public class AdapterManager implements ReferenceCollectionListener { + + private final Log log =3D LogFactory.getLog(AdapterManager.class= ); + private HashMap homeAdapters; + private HashMap remoteAdapters; + private Collection containers =3D Collections.EMPTY_SET; + private ClassLoader classLoader; + + private NameService nameService =3D NameService.getInstance(); + + /* + * This is a singleton GBean. Do not reference it directly, but use a + * GBean reference to get it. + */ + public AdapterManager() + { + this.homeAdapters =3D null; + this.remoteAdapters =3D null; + this.containers =3D null; + this.classLoader =3D null; + } + + public AdapterManager( ClassLoader classLoader, Collection containers = ) { + log.debug( "AdapterManager(): containers =3D " + containers ); + + this.classLoader =3D classLoader; + + ReferenceCollection ref =3D (ReferenceCollection) containers; + ref.addReferenceCollectionListener(this); + + this.containers =3D containers; + + int len =3D ( containers !=3D null ? containers.size() : 20 ); + homeAdapters =3D new HashMap( len ); + remoteAdapters =3D new HashMap( len ); + + // Todo: Add the containers .. invoke memberAdded for each element= in containers. + + registerNameServer(); + } + + protected void registerNameServer() + { + // + // NameService + // + + String bindNames[] =3D new String[] { "NameService" }; + String remoteClassName =3D "org.apache.geronimo.interop.rmi.iiop.s= erver.ServerNamingContext"; + //String remoteInterfaceName =3D "org.apache.geronimo.interop.rmi.= iiop.NameService"; + String remoteInterfaceName =3D "org.apache.geronimo.interop.CosNam= ing.NamingContext"; + String ids[] =3D new String[] { "IDL:omg.org/CosNaming/NamingConte= xt:1.0", + "IDL:omg.org/CosNaming/NamingContext= Ext:1.0" }; =20 + ClassLoader cl =3D this.getClass().getClassLoader(); + + CorbaAdapter a =3D new CorbaAdapter( bindNames, ids, remoteClassNa= me, remoteInterfaceName, cl ); + a.start(); + registerRemoteAdapter(a); + } + + protected Adapter getAdapter( Object adapterID ) { + // more likely to be using the remoteadapter... + Adapter rc =3D getRemoteAdapter( adapterID ); + if (rc =3D=3D null) + { + rc =3D getHomeAdapter( adapterID ); + } + return rc; + } + + protected Adapter getHomeAdapter( Object adapterID ) + { + return (Adapter)homeAdapters.get( adapterID ); + } =20 + protected Adapter getRemoteAdapter( Object adapterID ) + { + return (Adapter)remoteAdapters.get( adapterID ); + } + + protected void registerHomeAdapter( Adapter adapter ) + { + homeAdapters.put( adapter.getAdapterID(), adapter ); + } + + protected void registerRemoteAdapter( Adapter adapter ) + { + remoteAdapters.put( adapter.getAdapterID(), adapter ); + } =20 -public class AdapterManager { - protected Hashtable _adapters; - protected static AdapterManager _me =3D new AdapterManager(); + protected void unregisterHomeAdapter( Adapter adapter ) + { + homeAdapters.remove( adapter.getAdapterID() ); + } =20 - protected AdapterManager() { - _adapters =3D new Hashtable(); + protected void unregisterRemoteAdapter( Adapter adapter ) + { + remoteAdapters.remove( adapter.getAdapterID() ); } =20 - public static AdapterManager getInstance() { - return _me; + public void memberAdded(ReferenceCollectionEvent event) { + EJBContainer container =3D (EJBContainer) event.getMember(); + + log.debug( "AdapterManager.memberAdded(): container =3D " + contai= ner ); + log.debug( "AdapterManager.memberAdded(): containerID =3D " + cont= ainer.getContainerID() ); + + switch (container.getProxyInfo().getComponentType()) { + case EJBComponentType.STATELESS: + //generator =3D new AdapterStateless(container, orb, poa, = tieLoader); + break; + case EJBComponentType.STATEFUL: + //generator =3D new AdapterStateful(container, orb, poa, t= ieLoader); + break; + case EJBComponentType.BMP_ENTITY: + case EJBComponentType.CMP_ENTITY: + //generator =3D new AdapterEntity(container, orb, poa, tie= Loader); + break; + default: + // throw new CORBAException("CORBA HomeAdapter does not ha= ndle MDB containers"); + } + + Adapter adapter =3D new HomeAdapter( container ); + adapter.start(); + registerHomeAdapter( adapter ); + + adapter =3D new RemoteAdapter( container ); + adapter.start(); + registerRemoteAdapter( adapter ); } =20 - public void registerAdapter(Adapter a) { + public void memberRemoved(ReferenceCollectionEvent event) { + EJBContainer container =3D (EJBContainer) event.getMember(); + + log.debug( "AdapterManager.memberRemoved(): container =3D " + cont= ainer ); + log.debug( "AdapterManager.memberRemoved(): containerID =3D " + co= ntainer.getContainerID() ); + + Adapter adapter =3D getHomeAdapter( container.getContainerID() ); + adapter.stop(); + unregisterHomeAdapter( adapter ); + + adapter =3D getRemoteAdapter( container.getContainerID() ); + adapter.stop(); + unregisterRemoteAdapter( adapter ); + } + + public static final GBeanInfo GBEAN_INFO; + + static { + GBeanInfoBuilder infoFactory =3D new GBeanInfoBuilder(AdapterManag= er.class); + + infoFactory.addAttribute("classLoader", ClassLoader.class, false); + infoFactory.addReference("containers", EJBContainer.class); + + infoFactory.setConstructor(new String[]{"classLoader", "containers= "}); =20 - _adapters.put(a.getBindName(), a); + GBEAN_INFO =3D infoFactory.getBeanInfo(); } =20 - public Adapter getAdapter(String objectName) { - return (Adapter) _adapters.get(objectName); + public static GBeanInfo getGBeanInfo() { + return GBEAN_INFO; } } Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/client/InitialContextFactory.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/client/InitialContextFactory.java?view=3Ddiff&r= 1=3D158813&r2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/cli= ent/InitialContextFactory.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/cli= ent/InitialContextFactory.java Wed Mar 23 09:56:34 2005 @@ -21,10 +21,9 @@ import javax.naming.Context; import javax.naming.NamingException; =20 - public class InitialContextFactory implements javax.naming.spi.InitialContextFactory { - private HashMap _startMap =3D new HashMap(); + private HashMap startMap =3D new HashMap(); =20 public Context getInitialContext(java.util.Hashtable env) throws Namin= gException { return org.apache.geronimo.interop.rmi.iiop.client.ClientNamingCon= text.getInstance(env); Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/generator/CodeWriter.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/generator/CodeWriter.java?view=3Ddiff&r1=3D1588= 13&r2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/CodeWriter.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/CodeWriter.java Wed Mar 23 09:56:34 2005 @@ -19,43 +19,41 @@ =20 import java.io.File; =20 - public abstract class CodeWriter { - protected GenOptions _genOptions; - - protected File _file; + private GenOptions genOptions; =20 + private String fileName; + private String fileExt =3D ".java"; =20 - protected String _fileName; - protected String _fileExt =3D ".java"; + protected File file; =20 public CodeWriter(GenOptions genOptions, String fileName, String ext) = { - _genOptions =3D genOptions; - _fileName =3D fileName; - _fileExt =3D ext; + this.genOptions =3D genOptions; + this.fileName =3D fileName; + fileExt =3D ext; } =20 public GenOptions getGenOptions() { - return _genOptions; + return genOptions; } =20 public void setGenOptions(GenOptions genOptions) { - _genOptions =3D genOptions; + this.genOptions =3D genOptions; } =20 public void setFileName(String val) { - _fileName =3D val; + fileName =3D val; } =20 public String getFileName() { - return _fileName; + return fileName; } =20 public void setFileExt(String val) { - _fileExt =3D val; + fileExt =3D val; } =20 public String getFileExt() { - return _fileExt; + return fileExt; } =20 public abstract void openFile() throws GenException; Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/generator/GenException.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/generator/GenException.java?view=3Ddiff&r1=3D15= 8813&r2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/GenException.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/GenException.java Wed Mar 23 09:56:34 2005 @@ -17,12 +17,6 @@ */ package org.apache.geronimo.interop.generator; =20 -/** - * User: Mark - * Date: Dec 21, 2004 - * Time: 3:49:45 PM - */ - public class GenException extends Exception { public GenException() { Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/generator/GenOptions.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/generator/GenOptions.java?view=3Ddiff&r1=3D1588= 13&r2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/GenOptions.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/GenOptions.java Wed Mar 23 09:56:34 2005 @@ -17,42 +17,134 @@ */ package org.apache.geronimo.interop.generator; =20 -public class GenOptions { - protected String _genDir =3D "./"; - protected boolean _overwrite =3D false; - protected boolean _verbose =3D false; +import org.apache.geronimo.interop.rmi.iiop.compiler.StubCompiler; =20 - public GenOptions() { - } +import java.util.List; +import java.util.LinkedList; +import java.util.Iterator; =20 - public GenOptions(String genDir, boolean overwrite, boolean verbose) { - _genDir =3D genDir; - _overwrite =3D overwrite; - _verbose =3D verbose; +public class GenOptions { + // -gs genSrcDir + // -gc genClassDir + // -o overwrite + // -v verbose + // -s simpleidl + // -cp classpath + // -g generate + // -c compile + // -cd compiledebug + // -lc loadclass + + private String genSrcDir =3D "./src"; + private String genClassDir =3D "./classes"; + private boolean overwrite =3D false; + private boolean verbose =3D false; + private boolean simpleidl =3D false; + private String classpath =3D ""; + private boolean generate =3D true; + private boolean compile =3D false; + private boolean compileDebug =3D false; + private boolean loadclass =3D false; + + private List interfaces =3D new LinkedList(); + + public GenOptions( String defaultSrcDir, String args[] ) + throws GenWarning, GenException { + genSrcDir =3D defaultSrcDir; + parseOptions( args ); } =20 - public String getGenDir() { - return _genDir; + public String getGenSrcDir() { + return genSrcDir; } =20 - public void setGenDir(String genDir) { - _genDir =3D genDir; + public String getGenClassDir() { + return genClassDir; } =20 public boolean isOverwrite() { - return _overwrite; - } - - public void setOverwrite(boolean overwrite) { - _overwrite =3D overwrite; + return overwrite; } =20 public boolean isVerbose() { - return _verbose; + return verbose; } =20 - public void setVerbose(boolean verbose) { - _verbose =3D verbose; + public boolean isSimpleIdl() { + return simpleidl; } =20 + public String getClasspath() { + return classpath; + } + + public boolean isGenerate() { + return generate; + } + + public boolean isCompile() { + return compile; + } + + public boolean isCompileDebug() { + return compileDebug; + } + + public boolean isLoadclass() { + return loadclass; + } + + public List getInterfaces() { + return interfaces; + } + + protected void parseOptions(String args[]) throws GenException, GenWar= ning { + GenWarning genWarning =3D null; + + for (int i =3D 0; i < args.length; i++) { + if (args[i].equals("-g")) { + generate =3D true; + } else if (args[i].equals("-c")) { + compile =3D true; + } else if (args[i].equals("-cd")) { + compileDebug =3D true; + } else if (args[i].equals("-l")) { + loadclass =3D true; + } else if (args[i].equals("-s")) { + simpleidl =3D true; + } else if (args[i].equals("-gs")) { + if ((i + 1) < args.length) { + genSrcDir =3D args[++i]; + } else { + throw new GenException( "-gs requires an source output= diretory." ); + } + } else if (args[i].equals("-cp")) { + if ((i + 1) < args.length) { + classpath =3D args[++i]; + } else { + throw new GenException( "-cp requires a classpath dire= ctory." ); + } + } else if (args[i].equals("-gc")) { + if ((i + 1) < args.length) { + genClassDir =3D args[++i]; + } else { + throw new GenException( "-gc requires an class output = diretory." ); + } + } else if (args[i].equals("-v")) { + verbose =3D true; + } else if (args[i].equals("-o")) { + overwrite =3D true; + } else if (args[i].startsWith("-")) { + String msg =3D "Ignoring unrecognized options: '" + args[i= ] + "'"; + if (genWarning !=3D null) { + // just a cheap way of chaining the warnings... + genWarning =3D new GenWarning( msg, genWarning); + } else { + genWarning =3D new GenWarning( msg ); + } + } else { + interfaces.add(args[i]); + } + } + } } Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/generator/JBlockStatement.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/generator/JBlockStatement.java?view=3Ddiff&r1= =3D158813&r2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JBlockStatement.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JBlockStatement.java Wed Mar 23 09:56:34 2005 @@ -19,22 +19,21 @@ =20 import java.util.Vector; =20 - public class JBlockStatement extends JStatement { - protected Vector _localVars; - protected Vector _statements; + private Vector localVars; + private Vector statements; =20 public JBlockStatement() { - _localVars =3D new Vector(); - _statements =3D new Vector(); + localVars =3D new Vector(); + statements =3D new Vector(); } =20 public boolean hasVariables() { - return _localVars.size() > 0; + return localVars.size() > 0; } =20 public boolean hasStatements() { - return _statements.size() > 0; + return statements.size() > 0; } =20 public JLocalVariable newLocalVariable(Class type, String name) { @@ -46,26 +45,26 @@ =20 v.setInitExpression(initExpr); =20 - _localVars.add(v); + localVars.add(v); =20 return v; } =20 public void deleteLocalVariable(JLocalVariable f) { - _localVars.remove(f); + localVars.remove(f); } =20 public Vector getLocalVariables() { - return _localVars; + return localVars; } =20 public void addStatement(JStatement s) { if (s !=3D this) { - _statements.add(s); + statements.add(s); } } =20 public Vector getStatements() { - return _statements; + return statements; } } Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/generator/JCaseStatement.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/generator/JCaseStatement.java?view=3Ddiff&r1=3D= 158813&r2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JCaseStatement.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JCaseStatement.java Wed Mar 23 09:56:34 2005 @@ -17,33 +17,30 @@ */ package org.apache.geronimo.interop.generator; =20 - - - public class JCaseStatement extends JStatement { - protected JExpression _expr; - protected JBlockStatement _statements; + private JExpression expr; + private JBlockStatement statements; =20 public JCaseStatement(JExpression e) { super(); =20 - _expr =3D e; - _statements =3D new JBlockStatement(); + expr =3D e; + statements =3D new JBlockStatement(); } =20 public void setExpression(JExpression e) { - _expr =3D e; + expr =3D e; } =20 public JExpression getExpression() { - return _expr; + return expr; } =20 public void addStatement(JStatement s) { - _statements.addStatement(s); + statements.addStatement(s); } =20 public JBlockStatement getStatement() { - return _statements; + return statements; } } Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/generator/JCatchStatement.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/generator/JCatchStatement.java?view=3Ddiff&r1= =3D158813&r2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JCatchStatement.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JCatchStatement.java Wed Mar 23 09:56:34 2005 @@ -18,19 +18,19 @@ package org.apache.geronimo.interop.generator; =20 public class JCatchStatement extends JBlockStatement { - protected JVariable _var; + private JVariable var; =20 public JCatchStatement(JVariable v) { super(); - _var =3D v; + var =3D v; } =20 public JVariable getVariable() { - return _var; + return var; } =20 public int hashCode() { - return _var.hashCode(); + return var.hashCode(); } =20 public boolean equals(Object other) { @@ -41,13 +41,13 @@ } else if (other instanceof JCatchStatement) { JCatchStatement cs =3D (JCatchStatement) other; =20 - if (cs._var.getType().equals(_var.getType())) { + if (cs.var.getType().equals(var.getType())) { rc =3D true; } } else if (other instanceof JVariable) { JVariable v =3D (JVariable) other; =20 - if (v.getType().equals(_var.getType())) { + if (v.getType().equals(var.getType())) { rc =3D true; } } @@ -56,69 +56,3 @@ return rc; } } - -/* -public class JCatchStatement extends JStatement -{ - protected JVariable _var; - protected JBlockStatement _statements; - - public JCatchStatement( JVariable v ) - { - _var =3D v; - _statements =3D new JBlockStatement(); - } - - public void addStatement( JStatement s ) - { - _statements.addStatement( s ); - } - - public JBlockStatement getStatement() - { - return _statements; - } - - public JVariable getVariable() - { - return _var; - } - - public int hashCode() - { - return _var.hashCode(); - } - - public boolean equals( Object other ) - { - boolean rc =3D false; - - if (this =3D=3D other) - { - rc =3D true; - } - else if (other instanceof JCatchStatement) - { - JCatchStatement cs =3D (JCatchStatement)other; - - if (cs._var.getType().equals(_var.getType())) - { - rc =3D true; - } - } - else if (other instanceof JVariable) - { - JVariable v =3D (JVariable)other; - - if (v.getType().equals( _var.getType() )) - { - rc =3D true; - } - } - - - return rc; - } -} - -*/ \ No newline at end of file Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/generator/JClass.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/generator/JClass.java?view=3Ddiff&r1=3D158813&r= 2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JClass.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JClass.java Wed Mar 23 09:56:34 2005 @@ -20,31 +20,27 @@ import java.lang.reflect.Modifier; import java.util.Vector; =20 - public class JClass extends JEntity { - protected JPackage _pkg; - - protected Vector _imports; - protected Vector _implements; - protected String _baseClassName; - - protected Vector _constructors; - protected Vector _methods; - protected Vector _fields; - - protected Vector _classes =3D new Vector(); - protected JClass _parent; + private JPackage pkg; + private Vector imports; + private Vector impls; + private String baseClassName; + private Vector constructors; + private Vector methods; + private Vector fields; + private Vector classes =3D new Vector(); + private JClass parent; =20 protected JClass(String name) { super(name, Modifier.PUBLIC); =20 - _imports =3D new Vector(); - _implements =3D new Vector(); - _baseClassName =3D ""; - - _constructors =3D new Vector(); - _methods =3D new Vector(); - _fields =3D new Vector(); + imports =3D new Vector(); + impls =3D new Vector(); + baseClassName =3D ""; + + constructors =3D new Vector(); + methods =3D new Vector(); + fields =3D new Vector(); } =20 protected JClass(String name, JPackage pkg) { @@ -54,63 +50,43 @@ pkg =3D new JPackage(""); } =20 - _pkg =3D pkg; + this.pkg =3D pkg; } =20 protected JClass(String name, JClass parent) { this(name); =20 - _parent =3D parent; + this.parent =3D parent; } =20 public JConstructor newConstructor(JParameter parms[], Class thrown[])= { JConstructor c =3D new JConstructor(parms, thrown); c.setParent(this); - _constructors.add(c); + constructors.add(c); return c; } =20 - /* - public JConstructor newConstructor( JParameter parms[], String thrown[= ] ) - { - JConstructor c =3D new JConstructor( parms, thrown ); - c.setParent( this ); - _constructors.add( c ); - return c; - } - */ - public void deleteConstructor(JConstructor m) { - _constructors.removeElement(m); + constructors.removeElement(m); } =20 public Vector getConstructors() { - return _constructors; + return constructors; } =20 public JMethod newMethod(JReturnType rt, String name, JParameter parms= [], Class thrown[]) { JMethod m =3D new JMethod(rt, name, parms, thrown); m.setParent(this); - _methods.add(m); - return m; - } - - /* - public JMethod newMethod( JReturnType rt, String name, JParameter parm= s[], String thrown[] ) - { - JMethod m =3D new JMethod( rt, name, parms, thrown ); - m.setParent( this ); - _methods.add( m ); + methods.add(m); return m; } - */ =20 public void deleteMethod(JMethod m) { - _methods.removeElement(m); + methods.removeElement(m); } =20 public Vector getMethods() { - return _methods; + return methods; } =20 protected void setFieldParentAndModifier(JField f) { @@ -143,36 +119,36 @@ setFieldParentAndModifier(f); f.setInitExpression(initExpr); =20 - _fields.add(f); + fields.add(f); =20 return f; } =20 public void deleteField(JField f) { - _fields.remove(f); + fields.remove(f); } =20 public Vector getFields() { - return _fields; + return fields; } =20 public JClass newClass(String name) { JClass c =3D new JClass(name, this); - _classes.add(c); + classes.add(c); return c; } =20 public JPackage getPackage() { - if (_parent !=3D null) { - return _parent.getPackage(); + if (parent !=3D null) { + return parent.getPackage(); } else { - return _pkg; + return pkg; } } =20 public String getName() { - if (_parent !=3D null) { - return _parent.getName() + "$" + super.getName(); + if (parent !=3D null) { + return parent.getName() + "$" + super.getName(); } else { return super.getName(); } @@ -187,23 +163,23 @@ } =20 public void setBaseClassName(String bcl) { - _baseClassName =3D bcl; + baseClassName =3D bcl; } =20 public String getBaseClassName() { - return _baseClassName; + return baseClassName; } =20 public void addImplements(String className) { - _implements.add(className); + impls.add(className); } =20 public void removeImplements(String className) { - _implements.remove(className); + impls.remove(className); } =20 public Vector getImplements() { - return _implements; + return impls; } =20 /* @@ -226,7 +202,7 @@ } =20 public void addImport(String fqName) { - _imports.add(fqName); + imports.add(fqName); } =20 public void removeImport(Package pkg, String itemName) { @@ -246,10 +222,10 @@ } =20 public void removeImport(String name) { - _imports.remove(name); + imports.remove(name); } =20 public Vector getImports() { - return _imports; + return imports; } } Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/generator/JCodeStatement.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/generator/JCodeStatement.java?view=3Ddiff&r1=3D= 158813&r2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JCodeStatement.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JCodeStatement.java Wed Mar 23 09:56:34 2005 @@ -17,17 +17,14 @@ */ package org.apache.geronimo.interop.generator; =20 - - - public class JCodeStatement extends JStatement { - protected String _code; + private String code; =20 public JCodeStatement(String code) { - _code =3D code; + this.code =3D code; } =20 public String getCode() { - return _code; + return code; } } Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/generator/JConstructor.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/generator/JConstructor.java?view=3Ddiff&r1=3D15= 8813&r2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JConstructor.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JConstructor.java Wed Mar 23 09:56:34 2005 @@ -17,9 +17,6 @@ */ package org.apache.geronimo.interop.generator; =20 - - - public class JConstructor extends JMethod { protected JConstructor(String name) { super(name); @@ -28,11 +25,4 @@ protected JConstructor(JParameter parms[], Class thrown[]) { super((JReturnType) null, (String) null, parms, thrown); } - - /* - protected JConstructor( JParameter parms[], String thrownType[] ) - { - super( (JReturnType)null, (String)null, parms, thrownType ); - } - */ } Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/generator/JDeclareStatement.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/generator/JDeclareStatement.java?view=3Ddiff&r1= =3D158813&r2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JDeclareStatement.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JDeclareStatement.java Wed Mar 23 09:56:34 2005 @@ -18,31 +18,31 @@ package org.apache.geronimo.interop.generator; =20 public class JDeclareStatement extends JStatement { - protected JVariable _v; - protected JExpression _initExpr; + private JVariable v; + private JExpression initExpr; =20 public JDeclareStatement(JVariable v) { this(v, null); } =20 public JDeclareStatement(JVariable v, JExpression initExpr) { - _v =3D v; - _initExpr =3D initExpr; + this.v =3D v; + this.initExpr =3D initExpr; } =20 public void setVariable(JVariable s) { - _v =3D s; + v =3D s; } =20 public JVariable getVariable() { - return _v; + return v; } =20 public void setInitExpression(JExpression initExpr) { - _initExpr =3D initExpr; + this.initExpr =3D initExpr; } =20 public JExpression getInitExpression() { - return _initExpr; + return initExpr; } } Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/generator/JEntity.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/generator/JEntity.java?view=3Ddiff&r1=3D158813&= r2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JEntity.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JEntity.java Wed Mar 23 09:56:34 2005 @@ -17,55 +17,72 @@ */ package org.apache.geronimo.interop.generator; =20 +import java.lang.reflect.Modifier; + public class JEntity { - protected String _name; - protected int _modifiers; - protected JEntity _parent; + private String name; + private int modifiers; + private JEntity parent; =20 public JEntity(String name) { - this(name, 0); + this(name, Modifier.PUBLIC); } =20 public JEntity(String name, int modifiers) { - _name =3D name; - _modifiers =3D modifiers; + this.name =3D name; + this.modifiers =3D modifiers; } =20 public JEntity getParent() { - return _parent; + return parent; } =20 public void setParent(JEntity parent) { - _parent =3D parent; + this.parent =3D parent; } =20 public String getName() { - return _name; + return name; } =20 public void setName(String val) { - _name =3D val; + name =3D val; } =20 /* * if value is true, then the modifier will be set, * if value is false, then the modifier will be unset. */ - public void setModifier(int modifier, boolean value) { + protected void adjustModifier(int modifier, boolean value) { if (value) { - _modifiers =3D (_modifiers | modifier); + modifiers =3D (modifiers | modifier); } else { - if ((_modifiers & modifier) =3D=3D modifier) { - _modifiers =3D (_modifiers ^ modifier); + if ((modifiers & modifier) =3D=3D modifier) { + modifiers =3D (modifiers ^ modifier); } } } =20 + public void setModifier( int modifier ) + { + adjustModifier( modifier, true ); + } + + public void unsetModifier( int modifier ) + { + adjustModifier( modifier, false ); + } + + /* + * Sets all the modifiers in one set + * + * Example: setModifiers(Modifier.PRIVATE | Modifier.STATIC | Modifier= .FINAL); + */ public void setModifiers(int modifiers) { - _modifiers =3D modifiers; + this.modifiers =3D modifiers; } =20 public int getModifiers() { - return _modifiers; + return modifiers; } } Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/generator/JExpression.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/generator/JExpression.java?view=3Ddiff&r1=3D158= 813&r2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JExpression.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JExpression.java Wed Mar 23 09:56:34 2005 @@ -18,17 +18,17 @@ package org.apache.geronimo.interop.generator; =20 public class JExpression extends JStatement { - protected JStatement _statement; + private JStatement statement; =20 public JExpression(JStatement s) { - _statement =3D s; + statement =3D s; } =20 public void setStatement(JStatement s) { - _statement =3D s; + statement =3D s; } =20 public JStatement getStatement() { - return _statement; + return statement; } } Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/generator/JFinallyStatement.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/generator/JFinallyStatement.java?view=3Ddiff&r1= =3D158813&r2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JFinallyStatement.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JFinallyStatement.java Wed Mar 23 09:56:34 2005 @@ -17,27 +17,24 @@ */ package org.apache.geronimo.interop.generator; =20 - - - public class JFinallyStatement extends JStatement { - protected JBlockStatement _finallyStatements; - protected boolean _hasStatements =3D false; + private JBlockStatement finallyStatements; + private boolean hasStatements =3D false; =20 public JFinallyStatement() { - _finallyStatements =3D new JBlockStatement(); + finallyStatements =3D new JBlockStatement(); } =20 public void addStatement(JStatement s) { - _finallyStatements.addStatement(s); - _hasStatements =3D true; + finallyStatements.addStatement(s); + hasStatements =3D true; } =20 public JBlockStatement getStatement() { - return _finallyStatements; + return finallyStatements; } =20 public boolean hasStatements() { - return _hasStatements; + return hasStatements; } } Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/generator/JForStatement.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/generator/JForStatement.java?view=3Ddiff&r1=3D1= 58813&r2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JForStatement.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JForStatement.java Wed Mar 23 09:56:34 2005 @@ -17,30 +17,27 @@ */ package org.apache.geronimo.interop.generator; =20 - - - public class JForStatement extends JBlockStatement { - protected JStatement _initStmt; - protected JExpression _loopExpr; - protected JStatement _iterStmt; + private JStatement initStmt; + private JExpression loopExpr; + private JStatement iterStmt; =20 public JForStatement(JStatement init, JExpression loop, JStatement ite= r) { super(); - _initStmt =3D init; - _loopExpr =3D loop; - _iterStmt =3D iter; + initStmt =3D init; + loopExpr =3D loop; + iterStmt =3D iter; } =20 public JStatement getInitStatement() { - return _initStmt; + return initStmt; } =20 public JExpression getLoopExpression() { - return _loopExpr; + return loopExpr; } =20 public JStatement getIterStatement() { - return _iterStmt; + return iterStmt; } } Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/generator/JIfElseIfElseStatement.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/generator/JIfElseIfElseStatement.java?view=3Ddi= ff&r1=3D158813&r2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JIfElseIfElseStatement.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JIfElseIfElseStatement.java Wed Mar 23 09:56:34 2005 @@ -19,48 +19,47 @@ =20 import java.util.Vector; =20 - public class JIfElseIfElseStatement extends JStatement { - protected JIfStatement _ifStatement; - protected Vector _elseifStatements; - protected JElseStatement _elseStatement; + private JIfStatement ifStatement; + private Vector elseifStatements; + private JElseStatement elseStatement; =20 public JIfElseIfElseStatement(JExpression if_expr) { - _ifStatement =3D new JIfStatement(if_expr); - _elseifStatements =3D new Vector(); - _elseStatement =3D new JElseStatement(); + ifStatement =3D new JIfStatement(if_expr); + elseifStatements =3D new Vector(); + elseStatement =3D new JElseStatement(); } =20 public void addIfStatement(JStatement s) { - _ifStatement.addStatement(s); + ifStatement.addStatement(s); } =20 public JIfStatement getIfStatement() { - return _ifStatement; + return ifStatement; } =20 public Vector getIfStatements() { - return _ifStatement.getStatements(); + return ifStatement.getStatements(); } =20 public void addElseStatement(JStatement s) { - _elseStatement.addStatement(s); + elseStatement.addStatement(s); } =20 public JElseStatement getElseStatement() { - return _elseStatement; + return elseStatement; } =20 public Vector getElseStatements() { - return _elseStatement.getStatements(); + return elseStatement.getStatements(); } =20 public JElseIfStatement getElseIf(JExpression e) { JElseIfStatement rc =3D null; - int index =3D _elseifStatements.indexOf(e); + int index =3D elseifStatements.indexOf(e); =20 if (index >=3D 0) { - rc =3D (JElseIfStatement) _elseifStatements.get(index); + rc =3D (JElseIfStatement) elseifStatements.get(index); } =20 return rc; @@ -71,7 +70,7 @@ =20 if (rc =3D=3D null) { rc =3D new JElseIfStatement(e); - _elseifStatements.add(rc); + elseifStatements.add(rc); } =20 return rc; @@ -88,6 +87,6 @@ } =20 public Vector getElseIfs() { - return _elseifStatements; + return elseifStatements; } } Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/generator/JIfStatement.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/generator/JIfStatement.java?view=3Ddiff&r1=3D15= 8813&r2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JIfStatement.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JIfStatement.java Wed Mar 23 09:56:34 2005 @@ -18,19 +18,19 @@ package org.apache.geronimo.interop.generator; =20 public class JIfStatement extends JBlockStatement { - protected JExpression _expr; + private JExpression expr; =20 public JIfStatement(JExpression e) { super(); - _expr =3D e; + expr =3D e; } =20 public JExpression getExpression() { - return _expr; + return expr; } =20 public int hashCode() { - return _expr.hashCode(); + return expr.hashCode(); } =20 public boolean equals(Object other) { @@ -41,7 +41,7 @@ } else if (other instanceof JIfStatement) { JIfStatement is =3D (JIfStatement) other; =20 - if (is._expr =3D=3D _expr) { + if (is.expr =3D=3D expr) { // Todo: Need equals() rc =3D true; } @@ -49,4 +49,4 @@ =20 return rc; } -} \ No newline at end of file +} Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/generator/JMethod.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/generator/JMethod.java?view=3Ddiff&r1=3D158813&= r2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JMethod.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JMethod.java Wed Mar 23 09:56:34 2005 @@ -20,22 +20,19 @@ import java.lang.reflect.Modifier; import java.util.Vector; =20 - public class JMethod extends JEntity { - protected JReturnType _rt; - protected JParameter _parms[]; - protected Class _thrown[]; - - protected Vector _statements; - protected JBlockStatement _bodyBlockStatement; - - protected String _body; // Yuck + private JReturnType rt; + private JParameter parms[]; + private Class thrown[]; + private Vector statements; + private JBlockStatement bodyBlockStatement; + private String body; // Yuck =20 protected JMethod(String name) { super(name, Modifier.PUBLIC); =20 - _statements =3D new Vector(); - _bodyBlockStatement =3D new JBlockStatement(); + statements =3D new Vector(); + bodyBlockStatement =3D new JBlockStatement(); } =20 protected JMethod(JReturnType rt, String name, JParameter parms[], Cla= ss thrown[]) { @@ -47,87 +44,58 @@ } =20 public void setRT(JReturnType jt) { - _rt =3D jt; + rt =3D jt; } =20 public JReturnType getRT() { - return _rt; + return rt; } =20 public void setParms(JParameter parms[]) { - _parms =3D parms; + this.parms =3D parms; } =20 public JParameter[] getParms() { - return _parms; + return parms; } =20 public void setThrown(Class thrown[]) { - _thrown =3D thrown; - - /* - if (_thrown !=3D null) - { - _thrownType =3D new String[_thrown.length]; - int i; - for( i=3D0; i<_thrown.length; i++ ) - { - _thrownType[i] =3D _thrown[i].getName(); - } - } - else - { - _thrownType =3D null; - } - */ + this.thrown =3D thrown; } =20 public Class[] getThrown() { - return _thrown; - } - - /* - public void setThrownType( String thrownType[] ) - { - _thrownType =3D thrownType; - _thrown =3D null; - } - - public String[] getThrownType() - { - return _thrownType; + return thrown; } - */ =20 public void setBody(String body) { - _body =3D body; + this.body =3D body; } =20 public String getBody() { - return _body; + return body; } =20 public JLocalVariable newLocalVariable(Class type, String name) { - return _bodyBlockStatement.newLocalVariable(type, name); + return bodyBlockStatement.newLocalVariable(type, name); } =20 public JLocalVariable newLocalVariable(Class type, String name, JExpre= ssion initExpr) { - return _bodyBlockStatement.newLocalVariable(type, name, initExpr); + return bodyBlockStatement.newLocalVariable(type, name, initExpr); } =20 public void deleteLocalVariable(JLocalVariable f) { - _bodyBlockStatement.deleteLocalVariable(f); + bodyBlockStatement.deleteLocalVariable(f); } =20 public Vector getLocalVariables() { - return _bodyBlockStatement.getLocalVariables(); + return bodyBlockStatement.getLocalVariables(); } =20 public void addStatement(JStatement s) { - _statements.add(s); + statements.add(s); } =20 public Vector getStatements() { - return _statements; + return statements; } } Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/generator/JPackage.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/generator/JPackage.java?view=3Ddiff&r1=3D158813= &r2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JPackage.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JPackage.java Wed Mar 23 09:56:34 2005 @@ -19,9 +19,8 @@ =20 import java.util.Vector; =20 - public class JPackage extends JEntity { - protected Vector _classes =3D new Vector(); + private Vector classes =3D new Vector(); =20 public JPackage(String name) { super(name); @@ -29,15 +28,15 @@ =20 public JClass newClass(String name) { JClass c =3D new JClass(name, this); - _classes.add(c); + classes.add(c); return c; } =20 public void deleteClass(JClass c) { - _classes.removeElement(c); + classes.removeElement(c); } =20 public Vector getClasses() { - return _classes; + return classes; } } Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/generator/JReturnType.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/generator/JReturnType.java?view=3Ddiff&r1=3D158= 813&r2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JReturnType.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JReturnType.java Wed Mar 23 09:56:34 2005 @@ -17,73 +17,9 @@ */ package org.apache.geronimo.interop.generator; =20 -public class JReturnType { - protected Class _type; - protected String _typeName; - protected boolean _isArray; +public class JReturnType extends JType { =20 public JReturnType(Class type) { - this(type, false); - } - - public JReturnType(Class type, boolean isArray) { - _type =3D type; - _typeName =3D type.getName(); - _isArray =3D isArray; - } - - public JReturnType(String typeName) { - this(typeName, false); - } - - public JReturnType(String typeName, boolean isArray) { - _typeName =3D typeName; - _isArray =3D isArray; - - try { - _type =3D Class.forName(_typeName); - } catch (Exception e) { - // Ignore; - } - } - - public void setType(Class type) { - _type =3D type; - _typeName =3D type.getName(); - } - - public Class getType() { - return _type; - } - - public void setTypeName(String typeName) { - _type =3D null; - _typeName =3D typeName; - } - - public String getTypeName() { - return _typeName; - } - - public boolean isArray() { - return _isArray; - } - - public int hashCode() { - return _type.hashCode(); - } - - public boolean equals(Object other) { - boolean rc =3D false; - - if (other =3D=3D this) { - rc =3D true; - } else if (other instanceof org.apache.geronimo.interop.generator.= JReturnType) { - org.apache.geronimo.interop.generator.JReturnType jr =3D (org.= apache.geronimo.interop.generator.JReturnType) other; - - rc =3D jr._typeName.equals(_typeName); - } - - return rc; + super(type); } } Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/inter= op/generator/JSwitchStatement.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/= org/apache/geronimo/interop/generator/JSwitchStatement.java?view=3Ddiff&r1= =3D158813&r2=3D158814 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JSwitchStatement.java (original) +++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/gen= erator/JSwitchStatement.java Wed Mar 23 09:56:34 2005 @@ -19,30 +19,29 @@ =20 import java.util.Vector; =20 - public class JSwitchStatement extends JStatement { - protected JExpression _switchExpr; - protected Vector _caseStatements; + private JExpression switchExpr; + private Vector caseStatements; =20 public JSwitchStatement(JExpression e) { - _switchExpr =3D e; - _caseStatements =3D new Vector(); + switchExpr =3D e; + caseStatements =3D new Vector(); } =20 public void setVariable(JExpression e) { - _switchExpr =3D e; + switchExpr =3D e; } =20 public JExpression getExpression() { - return _switchExpr; + return switchExpr; } =20 public JCaseStatement getCase(JExpression e) { JCaseStatement rc =3D null; - int index =3D _caseStatements.indexOf(e); + int index =3D caseStatements.indexOf(e); =20 if (index >=3D 0) { - rc =3D (JCaseStatement) _caseStatements.get(index); + rc =3D (JCaseStatement) caseStatements.get(index); } =20 return rc; @@ -53,7 +52,7 @@ =20 if (rc =3D=3D null) { rc =3D new JCaseStatement(e); - _caseStatements.add(rc); + caseStatements.add(rc); } =20 return rc; @@ -70,6 +69,6 @@ } =20 public Vector getCases() { - return _caseStatements; + return caseStatements; } }