geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r158814 [1/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/
Date Wed, 23 Mar 2005 17:56:58 GMT
Author: adc
Date: Wed Mar 23 09:56:34 2005
New Revision: 158814

URL: http://svn.apache.org/viewcvs?view=rev&rev=158814
Log:
Numerous enhancements / fixes to interop
http://issues.apache.org/jira/browse/GERONIMO-613

Added:
    geronimo/trunk/modules/assembly/src/plan/interop-server-plan.xml
    geronimo/trunk/modules/interop/build.xml
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/CorbaObject.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/FinalFieldSetter.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/FinalFieldSetterJdk14.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/StringSeqHelper.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/StringSeqHolder.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/server/RmiIiopServerGBean.java
Modified:
    geronimo/trunk/modules/assembly/maven.xml
    geronimo/trunk/modules/assembly/project.xml
    geronimo/trunk/modules/interop/maven.xml
    geronimo/trunk/modules/interop/project.xml
    geronimo/trunk/modules/interop/src/idl/org-apache-geronimo-interop-rmi-iiop.idl
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/CosNaming/iiop_stubs/NamingContext_Stub.1.txt
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/CosNaming/iiop_stubs/NamingContext_Stub.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/InteropGBean.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/SystemException.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/Adapter.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/AdapterManager.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/client/InitialContextFactory.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/CodeWriter.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/GenException.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/GenOptions.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JBlockStatement.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JCaseStatement.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JCatchStatement.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JClass.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JCodeStatement.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JConstructor.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JDeclareStatement.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JEntity.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JExpression.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JFinallyStatement.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JForStatement.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JIfElseIfElseStatement.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JIfStatement.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JMethod.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JPackage.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JReturnType.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JSwitchStatement.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JTryCatchFinallyStatement.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JTryStatement.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JVariable.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JavaGenerator.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/generator/JavaWriter.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/InitialContext.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/InitialContextFactory.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/NameService.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/NamingContext.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/BooleanProperty.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/ByteProperty.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/DoubleProperty.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/FloatProperty.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/IntProperty.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/LongProperty.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/PropertyLog.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/PropertyType.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/ShortProperty.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/StringProperty.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/SystemProperties.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/properties/SystemPropertyLog.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/repository/Repository.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/Any.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ArrayHelper.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/BadMagicException.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/CdrInputStream.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/CdrOutputStream.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/FieldByNameComparator.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/FieldComparator.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/GiopMessage.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/GiopVersion.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/IDLEntityHelper.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/IiopVersion.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ListenerInfo.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/NameServiceOperations_Skeleton.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ObjectHelper.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ObjectInputStream.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ObjectKey.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ObjectOutputStream.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ObjectRef.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ObjectRefHelper.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/PrimitiveType.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/Protocol.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/RemoteInterface.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/RemoteObject.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/SecurityInfo.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/SimpleObjectInputStream.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/SimpleObjectOutputStream.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/StringHelper.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/StringValueHelper.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/TypeCode.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/UnsupportedProtocolVersionException.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ValueType.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ValueTypeField.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/client/ClientNamingContext.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/client/Connection.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/client/ConnectionPool.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/client/NameBinding.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/client/UrlInfo.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/client/ValueInfo.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler/Compiler.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler/SkelCompiler.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler/SkelFactory.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler/StubClass.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler/StubCompiler.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/compiler/StubFactory.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/server/MessageHandler.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/server/ServerNamingContext.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/server/SocketListener.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/server/IIOPDaemon.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/server/IIOPSDaemon.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/util/JavaClass.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/util/SystemUtil.java

Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?view=diff&r1=158813&r2=158814
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Wed Mar 23 09:56:34 2005
@@ -263,6 +263,14 @@
             <ant:arg value="target/plan/j2ee-server-plan.xml"/>
         </ant:java>
 
+        <!-- build the J2EEInteropServer configuration -->
+        <ant:echo>Building interop server configuration</ant:echo>
+        <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
+            <ant:jvmarg value="-ea"/>
+            <ant:arg value="distribute"/>
+            <ant:arg value="target/plan/interop-server-plan.xml"/>
+        </ant:java>
+
         <!-- build the runtime deployer configuration -->
         <ant:echo>Building runtime deployer configuration</ant:echo>
         <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">

Modified: geronimo/trunk/modules/assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?view=diff&r1=158813&r2=158814
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Wed Mar 23 09:56:34 2005
@@ -181,6 +181,15 @@
 
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>geronimo-interop</artifactId>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <repository>true</repository>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${pom.currentVersion}</version>
             <properties>

Added: geronimo/trunk/modules/assembly/src/plan/interop-server-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/interop-server-plan.xml?view=auto&rev=158814
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/interop-server-plan.xml (added)
+++ geronimo/trunk/modules/assembly/src/plan/interop-server-plan.xml Wed Mar 23 09:56:34 2005
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2004 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 implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 126313 $ $Date: 2005-01-24 16:03:52 -0500 (Mon, 24 Jan 2005) $ -->
+
+<!--
+Configuration for the main ring of a Geronimo Interop server.
+-->
+<configuration
+    xmlns="http://geronimo.apache.org/xml/ns/deployment"
+    configId="org/apache/geronimo/InteropServer"
+    parentId="org/apache/geronimo/Server"
+    >
+
+    <!--runtime dependencies-->
+    <dependency>
+        <uri>geronimo/jars/geronimo-interop-${geronimo_version}.jar</uri>
+    </dependency>
+
+    <!-- This is just a simple testing bean for configuration and a junit test.... -->
+    <gbean name="InteropGBean" class="org.apache.geronimo.interop.InteropGBean">
+      <attribute name="name">This is my name</attribute>
+      <attribute name="strprop">This is a string prop</attribute>
+      <attribute name="properties">
+        
+        A=a
+        B=b
+      
+      </attribute>
+    </gbean>
+
+    <!-- This bean should get a collection of service beans... -->
+    <gbean gbeanName="interop:name=ServiceManager" class="org.apache.geronimo.interop.ServiceManager">
+      <references name="services">
+        <pattern><gbean-name>interop:name=Service,*</gbean-name></pattern>
+        <pattern><gbean-name>interop:name=Service2,*</gbean-name></pattern>
+      </references>
+    </gbean>
+
+    <!-- These are the service beans ... -->
+    <gbean gbeanName="interop:name=Service-A" class="org.apache.geronimo.interop.Service">
+      <attribute name="serviceName">service-a</attribute>
+    </gbean>
+    <gbean gbeanName="interop:name=Service-B,type=Foo" class="org.apache.geronimo.interop.Service">
+      <attribute name="serviceName">service-b</attribute>
+    </gbean>
+    <gbean gbeanName="interop:name=Service-C,type=Bar" class="org.apache.geronimo.interop.Service">
+      <attribute name="serviceName">service-c</attribute>
+    </gbean>
+
+    <!-- RMI-IIOP Protocol -->
+    <gbean gbeanName="interop:name=AdapterManager" class="org.apache.geronimo.interop.adapter.AdapterManager">
+        <references name="containers">
+          <pattern><gbean-name>geronimo.server:j2eeType=StatelessSessionBean,*</gbean-name></pattern>
+          <pattern><gbean-name>geronimo.server:j2eeType=StatefulSessionBean,*</gbean-name></pattern>
+          <pattern><gbean-name>geronimo.server:j2eeType=EntityBean,*</gbean-name></pattern>
+        </references>
+    </gbean>
+
+    <gbean gbeanName="interop:type=NetworkService,name=RMIIIOP" class="org.openejb.server.StandardServiceStackGBean">
+        <attribute name="name">RMIIIOP</attribute>
+        <attribute name="port">9000</attribute>
+        <attribute name="address">127.0.0.1</attribute>
+        <attribute name="allowHosts">127.0.0.1</attribute>
+        <attribute name="priority">5</attribute>
+        <attribute name="threads">20</attribute>
+        <attribute name="logOnSuccess">HOST,NAME,THREADID,USERID</attribute>
+        <attribute name="logOnFailure">HOST,NAME</attribute>
+        <reference name="Server"><gbean-name>interop:type=Server,name=RMIIIOP</gbean-name></reference>
+    </gbean>
+
+    <gbean gbeanName="interop:type=Server,name=RMIIIOP" class="org.apache.geronimo.interop.rmi.iiop.server.RmiIiopServerGBean">
+        <reference name="adapterManager"><gbean-name>interop:name=AdapterManager</gbean-name></reference>
+        <attribute name="writeSystemExceptionStackTrace">false</attribute>
+        <attribute name="simpleIDL">false</attribute>
+        <attribute name="args">-ORBPort, 2001, -ORBInitRef, NameService=corbaloc::localhost:1050/NameService, -ORBCSIv2, -ORBGSSClientUser, "user1,a"</attribute>
+        <attribute name="props">
+
+            org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.transaction.TransactionInitializer
+            org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.security.SecurityInitializer
+
+        </attribute>
+    </gbean>
+
+</configuration>

Added: geronimo/trunk/modules/interop/build.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/build.xml?view=auto&rev=158814
==============================================================================
--- geronimo/trunk/modules/interop/build.xml (added)
+++ geronimo/trunk/modules/interop/build.xml Wed Mar 23 09:56:34 2005
@@ -0,0 +1,65 @@
+<project name="IDLGen" default="idlj">
+
+    <target name="init">
+      <mkdir dir="${maven.build.src}"/>
+    </target>
+
+    <target name="checkidlts">
+      <uptodate property="idl.build.not.required" 
+        srcfile="${maven.src.dir}/idl/${idl.file}.idl"
+        targetfile="${maven.build.src}/${idl.file}.ts"/>
+    </target>
+
+    <target name="idlj" depends="init, checkidlts" unless="idl.build.not.required">
+      <echo message="blah" file="${maven.build.src}/${idl.file}.ts"/>
+      <echo message="Interop :: idlj :: ${idl.file}"/>
+      <exec dir="${maven.basedir}" executable="idlj">
+            <arg value="-td"/>
+            <arg file="${maven.build.src}"/>
+            <arg value="-i"/>
+            <arg file="${java.home}/lib"/>
+            <arg value="-i"/>
+            <arg file="${maven.src.dir}/idl"/>
+            <arg value="${idlj.verbose}"/>
+            <arg value="-pkgPrefix"/>
+            <arg value="IOP"/>
+            <arg value="${pkg.prefix}"/>
+            <arg value="-pkgPrefix"/>
+            <arg value="IIOP"/>
+            <arg value="${pkg.prefix}"/>
+            <arg value="-pkgPrefix"/>
+            <arg value="GIOP"/>
+            <arg value="${pkg.prefix}"/>
+            <arg value="-pkgPrefix"/>
+            <arg value="CosNaming"/>
+            <arg value="${pkg.prefix}"/>
+            <arg value="-pkgPrefix"/>
+            <arg value="CSI"/>
+            <arg value="${pkg.prefix}"/>
+            <arg value="-pkgPrefix"/>
+            <arg value="GSSUP"/>
+            <arg value="${pkg.prefix}"/>
+            <arg value="-pkgPrefix"/>
+            <arg value="CSIIOP"/>
+            <arg value="${pkg.prefix}"/>
+            <arg value="-pkgPrefix"/>
+            <arg value="TimeBase"/>
+            <arg value="${pkg.prefix}"/>
+            <arg value="-pkgPrefix"/>
+            <arg value="SecurityService"/>
+            <arg value="${pkg.prefix}"/>
+            <arg value="-pkgPrefix"/>
+            <arg value="CosTransactions"/>
+            <arg value="${pkg.prefix}"/>
+            <arg value="-pkgPrefix"/>
+            <arg value="CosTSInteroperation"/>
+            <arg value="${pkg.prefix}"/>
+            <arg value="-pkgPrefix"/>
+            <arg value="CosTSPortability"/>
+            <arg value="${pkg.prefix}"/>
+            <arg file="${maven.src.dir}/idl/${idl.file}.idl"/>
+    </exec>
+  </target>
+
+
+</project>

Modified: geronimo/trunk/modules/interop/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/maven.xml?view=diff&r1=158813&r2=158814
==============================================================================
--- geronimo/trunk/modules/interop/maven.xml (original)
+++ geronimo/trunk/modules/interop/maven.xml Wed Mar 23 09:56:34 2005
@@ -24,6 +24,10 @@
     xmlns:ant="jelly:ant"
     >
 
+    <!-- <property name="idlj.verbose" value="-verbose"/> -->
+    <property name="idlj.verbose" value="-verbose"/> 
+    <property name="pkg.prefix" value="org.apache.geronimo.interop"/>
+
     <!--
       #
       # Be carefull about changing the package prefix.  When generating the java
@@ -40,416 +44,168 @@
       #    build goals are almost the same.  Maybe we could figure out how to use a for
       #    script statement....
       #
-      # 2. Run the idlj targets only if the idl files were changed.  Figure out how
-      #    to add a dependency check....
-      #
-      # 3. ....
-      #
     -->
 
     <goal name="interop:idlj:iop">
-        <j:set var="pkg.prefix" value="org.apache.geronimo.interop"/>
-        <ant:echo message="Interop :: idlj :: IOP"/>
-        <ant:exec dir="${basedir}" executable="idlj">
-            <ant:arg value="-td"/>
-            <ant:arg file="${maven.build.src}"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${java.home}/lib"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${maven.src.dir}/idl"/>
-            <ant:arg value="-verbose"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="GIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="CosNaming"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg file="${maven.src.dir}/idl/IOP.idl"/>
-        </ant:exec>
+      <ant:echo message="Interop :: idlj :: IOP">
+      </ant:echo>
+      <ant:ant antfile="build.xml">
+        <ant:property name="maven.build.src" value="${maven.build.src}"/>
+        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
+        <ant:property name="maven.basedir" value="${basedir}"/>
+        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
+        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
+        <ant:property name="idl.file" value="IOP"/>
+      </ant:ant>
     </goal>
 
     <goal name="interop:idlj:giop">
-        <j:set var="pkg.prefix" value="org.apache.geronimo.interop"/>
-        <ant:echo message="Interop :: idlj :: GIOP"/>
-        <ant:exec dir="${basedir}" executable="idlj">
-            <ant:arg value="-td"/>
-            <ant:arg value="${maven.build.src}"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${java.home}/lib"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${maven.src.dir}/idl"/>
-            <ant:arg value="-verbose"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="GIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="CosNaming"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg file="${maven.src.dir}/idl/GIOP.idl"/>
-        </ant:exec>
+      <ant:echo message="Interop :: idlj :: GIOP"/>
+      <ant:ant antfile="build.xml">
+        <ant:property name="maven.build.src" value="${maven.build.src}"/>
+        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
+        <ant:property name="maven.basedir" value="${basedir}"/>
+        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
+        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
+        <ant:property name="idl.file" value="GIOP"/>
+      </ant:ant>
     </goal>
 
     <goal name="interop:idlj:iiop">
-        <j:set var="pkg.prefix" value="org.apache.geronimo.interop"/>
-        <ant:echo message="Interop :: idlj :: IIOP"/>
-        <ant:exec dir="${basedir}" executable="idlj">
-            <ant:arg value="-td"/>
-            <ant:arg value="${maven.build.src}"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${java.home}/lib"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${maven.src.dir}/idl"/>
-            <ant:arg value="-verbose"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="GIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="CosNaming"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg file="${maven.src.dir}/idl/IIOP.idl"/>
-        </ant:exec>
+      <ant:echo message="Interop :: idlj :: IIOP"/>
+      <ant:ant antfile="build.xml">
+        <ant:property name="maven.build.src" value="${maven.build.src}"/>
+        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
+        <ant:property name="maven.basedir" value="${basedir}"/>
+        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
+        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
+        <ant:property name="idl.file" value="IIOP"/>
+      </ant:ant>
     </goal>
 
     <goal name="interop:idlj:cosnaming">
-        <j:set var="pkg.prefix" value="org.apache.geronimo.interop"/>
-        <ant:echo message="Interop :: idlj :: CosNaming"/>
-        <ant:exec dir="${basedir}" executable="idlj">
-            <ant:arg value="-td"/>
-            <ant:arg value="${maven.build.src}"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${java.home}/lib"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${maven.src.dir}/idl"/>
-            <ant:arg value="-verbose"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="GIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="CosNaming"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg file="${maven.src.dir}/idl/CosNaming.idl"/>
-        </ant:exec>
-    </goal>
-
-    <goal name="interop:idlj:interop-rmi-iiop">
-        <j:set var="pkg.prefix" value="org.apache.geronimo.interop"/>
-        <ant:echo message="Interop :: idlj :: interop-rmi-iiop"/>
-        <ant:exec dir="${basedir}" executable="idlj">
-            <ant:arg value="-td"/>
-            <ant:arg value="${maven.build.src}"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${java.home}/lib"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${maven.src.dir}/idl"/>
-            <ant:arg value="-verbose"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="GIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="CosNaming"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg file="${maven.src.dir}/idl/org-apache-geronimo-interop-rmi-iiop.idl"/>
-        </ant:exec>
-    </goal>
-
-    <goal name="interop:idlj:csi">
-        <ant:echo message="Interop :: idlj :: CSIv2 :: CSI"/>
-        <ant:exec dir="${basedir}" executable="idlj">
-            <ant:arg value="-td"/>
-            <ant:arg value="${maven.build.src}"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${java.home}/lib"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${maven.src.dir}/idl"/>
-            <ant:arg value="-verbose"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="GIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="CosNaming"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="CSI"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="GSSUP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="CSIIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg file="${maven.src.dir}/idl/CSI.idl"/>
-        </ant:exec>
-
-        <ant:echo message="Interop :: idlj :: CSIv2 :: GSSUP"/>
-        <ant:exec dir="${basedir}" executable="idlj">
-            <ant:arg value="-td"/>
-            <ant:arg value="${maven.build.src}"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${java.home}/lib"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${maven.src.dir}/idl"/>
-            <ant:arg value="-verbose"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="GIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="CosNaming"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="CSI"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="GSSUP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="CSIIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg file="${maven.src.dir}/idl/GSSUP.idl"/>
-        </ant:exec>
+      <ant:echo message="Interop :: idlj :: CosNaming"/>
+      <ant:ant antfile="build.xml">
+        <ant:property name="maven.build.src" value="${maven.build.src}"/>
+        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
+        <ant:property name="maven.basedir" value="${basedir}"/>
+        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
+        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
+        <ant:property name="idl.file" value="CosNaming"/>
+      </ant:ant>
+    </goal>
+
+    <goal name="interop:idlj:csiv2">
+      <attainGoal name="interop:idlj:csiv2:csi"/>
+      <attainGoal name="interop:idlj:csiv2:gssup"/>
+      <attainGoal name="interop:idlj:csiv2:csiiop"/>
+    </goal>
+
+    <goal name="interop:idlj:csiv2:csi">
+      <ant:echo message="Interop :: idlj :: CSIv2 :: CSI"/>
+      <ant:ant antfile="build.xml">
+        <ant:property name="maven.build.src" value="${maven.build.src}"/>
+        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
+        <ant:property name="maven.basedir" value="${basedir}"/>
+        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
+        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
+        <ant:property name="idl.file" value="CSI"/>
+      </ant:ant>
+    </goal>
+
+    <goal name="interop:idlj:csiv2:gssup">
+      <ant:echo message="Interop :: idlj :: CSIv2 :: GSSUP"/>
+      <ant:ant antfile="build.xml">
+        <ant:property name="maven.build.src" value="${maven.build.src}"/>
+        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
+        <ant:property name="maven.basedir" value="${basedir}"/>
+        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
+        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
+        <ant:property name="idl.file" value="GSSUP"/>
+      </ant:ant>
+    </goal>
         
-	<ant:echo message="Interop :: idlj :: CSIv2 :: CSIIOP"/>
-	<ant:exec dir="${basedir}" executable="idlj">
-	    <ant:arg value="-td"/>
-	    <ant:arg value="${maven.build.src}"/>
-	    <ant:arg value="-i"/>
-	    <ant:arg file="${java.home}/lib"/>
-	    <ant:arg value="-i"/>
-	    <ant:arg file="${maven.src.dir}/idl"/>
-	    <ant:arg value="-verbose"/>
-	    <ant:arg value="-pkgPrefix"/>
-	    <ant:arg value="IOP"/>
-	    <ant:arg value="${pkg.prefix}"/>
-	    <ant:arg value="-pkgPrefix"/>
-	    <ant:arg value="IIOP"/>
-	    <ant:arg value="${pkg.prefix}"/>
-	    <ant:arg value="-pkgPrefix"/>
-	    <ant:arg value="GIOP"/>
-	    <ant:arg value="${pkg.prefix}"/>
-	    <ant:arg value="-pkgPrefix"/>
-	    <ant:arg value="CosNaming"/>
-	    <ant:arg value="${pkg.prefix}"/>
-	    <ant:arg value="-pkgPrefix"/>
-	    <ant:arg value="CSI"/>
-	    <ant:arg value="${pkg.prefix}"/>
-	    <ant:arg value="-pkgPrefix"/>
-	    <ant:arg value="GSSUP"/>
-	    <ant:arg value="${pkg.prefix}"/>
-	    <ant:arg value="-pkgPrefix"/>
-	    <ant:arg value="CSIIOP"/>
-	    <ant:arg value="${pkg.prefix}"/>
-	    <ant:arg file="${maven.src.dir}/idl/CSIIOP.idl"/>
-	</ant:exec>
+    <goal name="interop:idlj:csiv2:csiiop">
+      <ant:echo message="Interop :: idlj :: CSIv2 :: CSIIIOP"/>
+      <ant:ant antfile="build.xml">
+        <ant:property name="maven.build.src" value="${maven.build.src}"/>
+        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
+        <ant:property name="maven.basedir" value="${basedir}"/>
+        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
+        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
+        <ant:property name="idl.file" value="CSIIOP"/>
+      </ant:ant>
     </goal>
 
     <goal name="interop:idlj:security-service">
-        <ant:echo message="Interop :: idlj :: SecurityService :: TimeBase"/>
-        <ant:exec dir="${basedir}" executable="idlj">
-            <ant:arg value="-td"/>
-            <ant:arg value="${maven.build.src}"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${java.home}/lib"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${maven.src.dir}/idl"/>
-            <ant:arg value="-verbose"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="GIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="CosNaming"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="TimeBase"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="SecurityService"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg file="${maven.src.dir}/idl/TimeBase.idl"/>
-        </ant:exec>
-
-        <ant:echo message="Interop :: idlj :: SecurityService :: SecurityService"/>
-        <ant:exec dir="${basedir}" executable="idlj">
-            <ant:arg value="-td"/>
-            <ant:arg value="${maven.build.src}"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${java.home}/lib"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${maven.src.dir}/idl"/>
-            <ant:arg value="-verbose"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="GIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="CosNaming"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="TimeBase"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="SecurityService"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg file="${maven.src.dir}/idl/Security.idl"/>
-        </ant:exec>
-
-        <ant:echo message="Interop :: idlj :: SecurityService :: SSLIOP"/>
-        <ant:exec dir="${basedir}" executable="idlj">
-            <ant:arg value="-td"/>
-            <ant:arg value="${maven.build.src}"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${java.home}/lib"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${maven.src.dir}/idl"/>
-            <ant:arg value="-verbose"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="GIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="CosNaming"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="TimeBase"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="SecurityService"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg file="${maven.src.dir}/idl/SSLIOP.idl"/>
-        </ant:exec>
+      <attainGoal name="interop:idlj:security-service:timebase"/>
+      <attainGoal name="interop:idlj:security-service:securityservice"/>
+      <attainGoal name="interop:idlj:security-service:ssliop"/>
+    </goal>
+
+    <goal name="interop:idlj:security-service:timebase">
+      <ant:echo message="Interop :: idlj :: SecurityService :: TimeBase"/>
+      <ant:ant antfile="build.xml">
+        <ant:property name="maven.build.src" value="${maven.build.src}"/>
+        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
+        <ant:property name="maven.basedir" value="${basedir}"/>
+        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
+        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
+        <ant:property name="idl.file" value="TimeBase"/>
+      </ant:ant>
+    </goal>
+
+    <goal name="interop:idlj:security-service:securityservice">
+      <ant:echo message="Interop :: idlj :: SecurityService :: SecurityService"/>
+      <ant:ant antfile="build.xml">
+        <ant:property name="maven.build.src" value="${maven.build.src}"/>
+        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
+        <ant:property name="maven.basedir" value="${basedir}"/>
+        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
+        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
+        <ant:property name="idl.file" value="Security"/>
+      </ant:ant>
+    </goal>
 
+    <goal name="interop:idlj:security-service:ssliop">
+      <ant:echo message="Interop :: idlj :: SecurityService :: SSLIOP"/>
+      <ant:ant antfile="build.xml">
+        <ant:property name="maven.build.src" value="${maven.build.src}"/>
+        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
+        <ant:property name="maven.basedir" value="${basedir}"/>
+        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
+        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
+        <ant:property name="idl.file" value="SSLIOP"/>
+      </ant:ant>
+    </goal>
+
+    <goal name="interop:idlj:costxn:costransactions">
+      <ant:echo message="Interop :: idlj :: CosTx :: CosTransactions"/>
+      <ant:ant antfile="build.xml">
+        <ant:property name="maven.build.src" value="${maven.build.src}"/>
+        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
+        <ant:property name="maven.basedir" value="${basedir}"/>
+        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
+        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
+        <ant:property name="idl.file" value="CosTransactions"/>
+      </ant:ant>
+    </goal>
+
+    <goal name="interop:idlj:costxn:costsinterop">
+      <ant:echo message="Interop :: idlj :: CosTx :: CosTSInteroperation"/>
+      <ant:ant antfile="build.xml">
+        <ant:property name="maven.build.src" value="${maven.build.src}"/>
+        <ant:property name="maven.src.dir" value="${maven.src.dir}"/>
+        <ant:property name="maven.basedir" value="${basedir}"/>
+        <ant:property name="pkg.prefix" value="${pkg.prefix}"/>
+        <ant:property name="idlj.verbose" value="${idlj.verbose}"/>
+        <ant:property name="idl.file" value="CosTransactions"/>
+      </ant:ant>
     </goal>
 
     <goal name="interop:idlj:costxn">
-        <!-- Are there any CosTransaction IDL files that require generation? -->
-        <j:set var="pkg.prefix" value="org.apache.geronimo.interop"/>
-        <ant:echo message="Interop :: idlj :: CosTransactions"/>
-        <ant:exec dir="${basedir}" executable="idlj">
-            <ant:arg value="-td"/>
-            <ant:arg value="${maven.build.src}"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${java.home}/lib"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${maven.src.dir}/idl"/>
-            <ant:arg value="-verbose"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="GIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="CosNaming"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="TimeBase"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="CosTransactions"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="CosTSInteroperation"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="CosTSPortability"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg file="${maven.src.dir}/idl/CosTransactions.idl"/>
-        </ant:exec>
-        
-        <ant:echo message="Interop :: idlj :: CosTSInteroperation"/>
-        <ant:exec dir="${basedir}" executable="idlj">
-            <ant:arg value="-td"/>
-            <ant:arg value="${maven.build.src}"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${java.home}/lib"/>
-            <ant:arg value="-i"/>
-            <ant:arg file="${maven.src.dir}/idl"/>
-            <ant:arg value="-verbose"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="IIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="GIOP"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="CosNaming"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="TimeBase"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="CosTransactions"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="CosTSInteroperation"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg value="-pkgPrefix"/>
-            <ant:arg value="CosTSPortability"/>
-            <ant:arg value="${pkg.prefix}"/>
-            <ant:arg file="${maven.src.dir}/idl/CosTSInteroperation.idl"/>
-        </ant:exec>
+      <attainGoal name="interop:idlj:costxn:costransactions"/>
+      <attainGoal name="interop:idlj:costxn:costsinterop"/>
     </goal>
 
     <goal name="interop:java:compile">
@@ -463,15 +219,67 @@
         <attainGoal name="interop:idlj:giop"/>
         <attainGoal name="interop:idlj:iiop"/>
         <attainGoal name="interop:idlj:cosnaming"/>
-        <attainGoal name="interop:idlj:interop-rmi-iiop"/>
-        <attainGoal name="interop:idlj:csi"/>
+        <attainGoal name="interop:idlj:csiv2"/>
         <attainGoal name="interop:idlj:security-service"/>
         <attainGoal name="interop:idlj:costxn"/>
     </goal>
 
+    <goal name="interop:stub:generate-compile">
+      <ant:exec dir="${maven.basedir}" executable="java">
+          <ant:arg value="-cp"/>
+          <ant:arg path="${maven.build.dest};${maven.repo.local}\geronimo-spec\jars\geronimo-spec-ejb-2.1-rc3.jar;${maven.repo.local}\commons-logging\jars\commons-logging-1.0.4.jar"/>
+          <ant:arg value="org.apache.geronimo.interop.rmi.iiop.compiler.StubCompiler"/>
+          <ant:arg value="-g"/>
+          <ant:arg value="-c"/>
+          <ant:arg value="-s"/>
+          <ant:arg value="-v"/>
+          <ant:arg value="-o"/>
+          <ant:arg value="-r"/>
+          <ant:arg path="${maven.repo.local}"/>
+          <ant:arg value="-gs"/>
+          <ant:arg path="target/stubs"/>
+          <ant:arg value="-gc"/>
+          <ant:arg path="target/classes"/>
+          <ant:arg value="IDL:org.apache.geronimo.interop.CosNaming.NamingContext"/>
+      </ant:exec>
+    </goal>
+
+    <goal name="interop:skel:generate-compile">
+      <ant:exec dir="${maven.basedir}" executable="java">
+          <ant:arg value="-cp"/>
+          <ant:arg path="${maven.build.dest};${maven.repo.local}\geronimo-spec\jars\geronimo-spec-ejb-2.1-rc3.jar;${maven.repo.local}\commons-logging\jars\commons-logging-1.0.4.jar"/>
+          <ant:arg value="org.apache.geronimo.interop.rmi.iiop.compiler.SkelCompiler"/>
+          <ant:arg value="-g"/>
+          <ant:arg value="-c"/>
+          <ant:arg value="-s"/>
+          <ant:arg value="-v"/>
+          <ant:arg value="-o"/>
+          <ant:arg value="-r"/>
+          <ant:arg path="${maven.repo.local}"/>
+          <ant:arg value="-gs"/>
+          <ant:arg path="target/skels"/>
+          <ant:arg value="-gc"/>
+          <ant:arg path="target/classes"/>
+          <ant:arg value="IDL:org.apache.geronimo.interop.CosNaming.NamingContext"/>
+      </ant:exec>
+    </goal>
+
     <preGoal name="java:compile">
         <attainGoal name="interop:idlj"/>
         <attainGoal name="interop:java:compile"/>
     </preGoal>
+
+    <postGoal name="java:compile">
+      <!--
+      <attainGoal name="interop:stub:generate-compile"/>
+      <attainGoal name="interop:skel:generate-compile"/>
+      -->
+    </postGoal>
+
+    <!--
+    <goal name="showprops">
+      <ant:echoproperties/>
+    </goal>
+    -->
 
 </project>

Modified: geronimo/trunk/modules/interop/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/project.xml?view=diff&r1=158813&r2=158814
==============================================================================
--- geronimo/trunk/modules/interop/project.xml (original)
+++ geronimo/trunk/modules/interop/project.xml Wed Mar 23 09:56:34 2005
@@ -49,9 +49,21 @@
         </dependency>
 
         <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-core</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
             <groupId>geronimo-spec</groupId>
             <artifactId>geronimo-spec-ejb</artifactId>
             <version>${geronimo_spec_ejb_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>openejb</groupId>
+            <artifactId>openejb-core</artifactId>
+            <version>${openejb_version}</version>
         </dependency>
 
         <!-- Thirdparty -->

Modified: geronimo/trunk/modules/interop/src/idl/org-apache-geronimo-interop-rmi-iiop.idl
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/idl/org-apache-geronimo-interop-rmi-iiop.idl?view=diff&r1=158813&r2=158814
==============================================================================
--- geronimo/trunk/modules/interop/src/idl/org-apache-geronimo-interop-rmi-iiop.idl (original)
+++ geronimo/trunk/modules/interop/src/idl/org-apache-geronimo-interop-rmi-iiop.idl Wed Mar 23 09:56:34 2005
@@ -1,30 +0,0 @@
-
-#include "CosNaming.idl"
-
-/* 
- * resolve_host is a custom API that lets the name service send back a logical hostname for
- * a component, which then can be resolved by the server for clustering and loadbalancing
- */
-
-module org
-{
-    module apache
-    {
-        module geronimo
-        {
-            module interop
-            {
-                module rmi
-                {
-                    module iiop
-                    {
-                        interface NameService : ::CosNaming::NamingContextExt
-                        {
-                            string resolve_host(in string host);
-                        };
-                    };
-                };
-            };
-        };
-    };
-};

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/CosNaming/iiop_stubs/NamingContext_Stub.1.txt
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/CosNaming/iiop_stubs/NamingContext_Stub.1.txt?view=diff&r1=158813&r2=158814
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/CosNaming/iiop_stubs/NamingContext_Stub.1.txt (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/CosNaming/iiop_stubs/NamingContext_Stub.1.txt Wed Mar 23 09:56:34 2005
@@ -1,465 +0,0 @@
-
-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
-{
-    // 
-    // Fields
-    // 
-    public java.lang.String[] _ids = { "org.apache.geronimo.interop.CosNaming.NamingContext", "RMI:org.apache.geronimo.interop.CosNaming.NamingContext:0000000000000000"};
-    private static final org.apache.geronimo.interop.rmi.iiop.ValueType vt$0 = org.apache.geronimo.interop.rmi.iiop.ValueType.getInstance(java.lang.String.class);
-    private static final org.apache.geronimo.interop.rmi.iiop.ValueType vt$1 = org.apache.geronimo.interop.rmi.iiop.ValueType.getInstance(org.apache.geronimo.interop.CosNaming.NameComponent[].class);
-    private static final org.apache.geronimo.interop.rmi.iiop.ValueType vt$2 = org.apache.geronimo.interop.rmi.iiop.ValueType.getInstance(org.omg.CORBA.Object.class);
-    private static final org.apache.geronimo.interop.rmi.iiop.ValueType vt$3 = org.apache.geronimo.interop.rmi.iiop.ValueType.getInstance(org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound.class);
-    private static final org.apache.geronimo.interop.rmi.iiop.ValueType vt$4 = org.apache.geronimo.interop.rmi.iiop.ValueType.getInstance(org.apache.geronimo.interop.CosNaming.NamingContextPackage.CannotProceed.class);
-    private static final org.apache.geronimo.interop.rmi.iiop.ValueType vt$5 = org.apache.geronimo.interop.rmi.iiop.ValueType.getInstance(org.apache.geronimo.interop.CosNaming.NamingContextPackage.InvalidName.class);
-    private static final org.apache.geronimo.interop.rmi.iiop.ValueType vt$6 = org.apache.geronimo.interop.rmi.iiop.ValueType.getInstance(org.apache.geronimo.interop.CosNaming.NamingContextPackage.AlreadyBound.class);
-    private static final org.apache.geronimo.interop.rmi.iiop.ValueType vt$7 = org.apache.geronimo.interop.rmi.iiop.ValueType.getInstance(org.apache.geronimo.interop.CosNaming.NamingContext.class);
-    private static final org.apache.geronimo.interop.rmi.iiop.ValueType vt$8 = org.apache.geronimo.interop.rmi.iiop.ValueType.getInstance(org.apache.geronimo.interop.CosNaming.Binding[].class);
-    private static final org.apache.geronimo.interop.rmi.iiop.ValueType vt$9 = org.apache.geronimo.interop.rmi.iiop.ValueType.getInstance(org.apache.geronimo.interop.CosNaming.BindingIterator.class);
-
-    // 
-    // Constructors
-    // 
-    public NamingContext_Stub( )
-    {
-        super();
-    }
-    
-    // 
-    // Methods
-    // 
-    
-    public boolean _is_a( java.lang.String id )
-    {
-        java.lang.Object $key = $getRequestKey();
-        int $retry;
-        
-        for ($retry = 0
-        ; ; $retry++
-        )
-        {
-            
-            try
-            {
-                org.apache.geronimo.interop.rmi.iiop.client.Connection $conn;
-                org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream $out;
-                java.lang.String $et;
-                boolean $rc;
-                org.apache.geronimo.interop.rmi.iiop.ObjectInputStream $in;
-                $conn = this.$connect();
-                $out = $conn.getSimpleOutputStream();
-                $out.writeObject( vt$0, id);
-                $conn.invoke(this, "_is_a", $key, $retry);
-                $in = $conn.getSimpleInputStream();
-                $conn.forget($key);
-                $conn.close();
-                $et = $conn.getExceptionType();
-
-                if ($et != null)
-                {
-                    throw org.apache.geronimo.interop.rmi.iiop.SystemExceptionFactory.getException($conn.getException());
-                }
-                $rc = $in.readBoolean();
-                return $rc;
-            }
-            catch( org.apache.geronimo.interop.rmi.iiop.client.RetryInvokeException $ex )
-            {
-                if ($retry == 3)
-                {
-                    throw $ex.getRuntimeException();
-                }
-            }
-        }
-    }
-    
-    public void list( int p1, org.apache.geronimo.interop.CosNaming.BindingListHolder p2, org.apache.geronimo.interop.CosNaming.BindingIteratorHolder p3 )
-    {
-        java.lang.Object $key = $getRequestKey();
-        for (int $retry = 0; ; $retry++)
-        {
-            try
-            {
-                org.apache.geronimo.interop.rmi.iiop.client.Connection $connection_2 = this.$connect();
-                org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream $output_3 = $connection_2.getSimpleOutputStream();
-                $output_3.writeInt(p1);
-                $output_3.writeObject(vt$9, p2.value);
-                $output_3.writeObject(vt$10, p3.value);
-                $connection_2.invoke(this, "list", $key, $retry);
-                org.apache.geronimo.interop.rmi.iiop.ObjectInputStream $input_4 = $connection_2.getSimpleInputStream();
-                $connection_2.forget($key);
-                $connection_2.close();
-                java.lang.String $et_5 = $connection_2.getExceptionType();
-                if ($et_5 != null)
-                {
-                    throw org.apache.geronimo.interop.rmi.iiop.SystemExceptionFactory.getException($connection_2.getException());
-                }
-                return;
-            }
-            catch (org.apache.geronimo.interop.rmi.iiop.client.RetryInvokeException $ex_6)
-            {
-                if ($retry == 3)
-                {
-                    throw $ex_6.getRuntimeException();
-                }
-            }
-        }
-    }
-
-    public void bind(org.apache.geronimo.interop.CosNaming.NameComponent[] p1, org.omg.CORBA.Object p2) throws org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound, org.apache.geronimo.interop.CosNaming.NamingContextPackage.CannotProceed, org.apache.geronimo.interop.CosNaming.NamingContextPackage.InvalidName, org.apache.geronimo.interop.CosNaming.NamingContextPackage.AlreadyBound
-    {
-        java.lang.Object $key = $getRequestKey();
-        for (int $retry = 0; ; $retry++)
-        {
-            try
-            {
-                org.apache.geronimo.interop.rmi.iiop.client.Connection $connection_2 = this.$connect();
-                org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream $output_3 = $connection_2.getSimpleOutputStream();
-                $output_3.writeObject(vt$2, p1);
-                $output_3.writeObject(vt$3, p2);
-                $connection_2.invoke(this, "bind", $key, $retry);
-                org.apache.geronimo.interop.rmi.iiop.ObjectInputStream $input_4 = $connection_2.getSimpleInputStream();
-                $connection_2.forget($key);
-                $connection_2.close();
-                java.lang.String $et_5 = $connection_2.getExceptionType();
-                if ($et_5 != null)
-                {
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound)$input_4.readException(vt$4);
-                    }
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.CannotProceed"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.CannotProceed)$input_4.readException(vt$5);
-                    }
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.InvalidName"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.InvalidName)$input_4.readException(vt$6);
-                    }
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.AlreadyBound"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.AlreadyBound)$input_4.readException(vt$7);
-                    }
-                    throw org.apache.geronimo.interop.rmi.iiop.SystemExceptionFactory.getException($connection_2.getException());
-                }
-                return;
-            }
-            catch (org.apache.geronimo.interop.rmi.iiop.client.RetryInvokeException $ex_6)
-            {
-                if ($retry == 3)
-                {
-                    throw $ex_6.getRuntimeException();
-                }
-            }
-        }
-    }
-
-    public void bind_context(org.apache.geronimo.interop.CosNaming.NameComponent[] p1, org.apache.geronimo.interop.CosNaming.NamingContext p2) throws org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound, org.apache.geronimo.interop.CosNaming.NamingContextPackage.CannotProceed, org.apache.geronimo.interop.CosNaming.NamingContextPackage.InvalidName, org.apache.geronimo.interop.CosNaming.NamingContextPackage.AlreadyBound
-    {
-        java.lang.Object $key = $getRequestKey();
-        for (int $retry = 0; ; $retry++)
-        {
-            try
-            {
-                org.apache.geronimo.interop.rmi.iiop.client.Connection $connection_2 = this.$connect();
-                org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream $output_3 = $connection_2.getSimpleOutputStream();
-                $output_3.writeObject(vt$2, p1);
-                $output_3.writeObject(vt$8, p2);
-                $connection_2.invoke(this, "bind_context", $key, $retry);
-                org.apache.geronimo.interop.rmi.iiop.ObjectInputStream $input_4 = $connection_2.getSimpleInputStream();
-                $connection_2.forget($key);
-                $connection_2.close();
-                java.lang.String $et_5 = $connection_2.getExceptionType();
-                if ($et_5 != null)
-                {
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound)$input_4.readException(vt$4);
-                    }
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.CannotProceed"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.CannotProceed)$input_4.readException(vt$5);
-                    }
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.InvalidName"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.InvalidName)$input_4.readException(vt$6);
-                    }
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.AlreadyBound"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.AlreadyBound)$input_4.readException(vt$7);
-                    }
-                    throw org.apache.geronimo.interop.rmi.iiop.SystemExceptionFactory.getException($connection_2.getException());
-                }
-                return;
-            }
-            catch (org.apache.geronimo.interop.rmi.iiop.client.RetryInvokeException $ex_6)
-            {
-                if ($retry == 3)
-                {
-                    throw $ex_6.getRuntimeException();
-                }
-            }
-        }
-    }
-
-    public org.apache.geronimo.interop.CosNaming.NamingContext bind_new_context(org.apache.geronimo.interop.CosNaming.NameComponent[] p1) throws org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound, org.apache.geronimo.interop.CosNaming.NamingContextPackage.AlreadyBound, org.apache.geronimo.interop.CosNaming.NamingContextPackage.CannotProceed, org.apache.geronimo.interop.CosNaming.NamingContextPackage.InvalidName
-    {
-        java.lang.Object $key = $getRequestKey();
-        for (int $retry = 0; ; $retry++)
-        {
-            try
-            {
-                org.apache.geronimo.interop.rmi.iiop.client.Connection $connection_2 = this.$connect();
-                org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream $output_3 = $connection_2.getSimpleOutputStream();
-                $output_3.writeObject(vt$2, p1);
-                $connection_2.invoke(this, "bind_new_context", $key, $retry);
-                org.apache.geronimo.interop.rmi.iiop.ObjectInputStream $input_4 = $connection_2.getSimpleInputStream();
-                $connection_2.forget($key);
-                $connection_2.close();
-                java.lang.String $et_5 = $connection_2.getExceptionType();
-                if ($et_5 != null)
-                {
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound)$input_4.readException(vt$4);
-                    }
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.AlreadyBound"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.AlreadyBound)$input_4.readException(vt$7);
-                    }
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.CannotProceed"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.CannotProceed)$input_4.readException(vt$5);
-                    }
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.InvalidName"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.InvalidName)$input_4.readException(vt$6);
-                    }
-                    throw org.apache.geronimo.interop.rmi.iiop.SystemExceptionFactory.getException($connection_2.getException());
-                }
-                org.apache.geronimo.interop.CosNaming.NamingContext $djc_result;
-                $djc_result = (org.apache.geronimo.interop.CosNaming.NamingContext)$input_4.readObject(vt$8);
-                return $djc_result;
-            }
-            catch (org.apache.geronimo.interop.rmi.iiop.client.RetryInvokeException $ex_6)
-            {
-                if ($retry == 3)
-                {
-                    throw $ex_6.getRuntimeException();
-                }
-            }
-        }
-    }
-
-
-    public org.apache.geronimo.interop.CosNaming.NamingContext new_context()
-    {
-        java.lang.Object $key = $getRequestKey();
-        for (int $retry = 0; ; $retry++)
-        {
-            try
-            {
-                org.apache.geronimo.interop.rmi.iiop.client.Connection $connection_2 = this.$connect();
-                $connection_2.invoke(this, "new_context", $key, $retry);
-                org.apache.geronimo.interop.rmi.iiop.ObjectInputStream $input_3 = $connection_2.getSimpleInputStream();
-                $connection_2.forget($key);
-                $connection_2.close();
-                java.lang.String $et_4 = $connection_2.getExceptionType();
-                if ($et_4 != null)
-                {
-                    throw org.apache.geronimo.interop.rmi.iiop.SystemExceptionFactory.getException($connection_2.getException());
-                }
-                org.apache.geronimo.interop.CosNaming.NamingContext $djc_result;
-                $djc_result = (org.apache.geronimo.interop.CosNaming.NamingContext)$input_3.readObject(vt$8);
-                return $djc_result;
-            }
-            catch (org.apache.geronimo.interop.rmi.iiop.client.RetryInvokeException $ex_5)
-            {
-                if ($retry == 3)
-                {
-                    throw $ex_5.getRuntimeException();
-                }
-            }
-        }
-    }
-
-    public void rebind(org.apache.geronimo.interop.CosNaming.NameComponent[] p1, org.omg.CORBA.Object p2) throws 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 = $getRequestKey();
-        for (int $retry = 0; ; $retry++)
-        {
-            try
-            {
-                org.apache.geronimo.interop.rmi.iiop.client.Connection $connection_2 = this.$connect();
-                org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream $output_3 = $connection_2.getSimpleOutputStream();
-                $output_3.writeObject(vt$2, p1);
-                $output_3.writeObject(vt$3, p2);
-                $connection_2.invoke(this, "rebind", $key, $retry);
-                org.apache.geronimo.interop.rmi.iiop.ObjectInputStream $input_4 = $connection_2.getSimpleInputStream();
-                $connection_2.forget($key);
-                $connection_2.close();
-                java.lang.String $et_5 = $connection_2.getExceptionType();
-                if ($et_5 != null)
-                {
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound)$input_4.readException(vt$4);
-                    }
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.CannotProceed"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.CannotProceed)$input_4.readException(vt$5);
-                    }
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.InvalidName"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.InvalidName)$input_4.readException(vt$6);
-                    }
-                    throw org.apache.geronimo.interop.rmi.iiop.SystemExceptionFactory.getException($connection_2.getException());
-                }
-                return;
-            }
-            catch (org.apache.geronimo.interop.rmi.iiop.client.RetryInvokeException $ex_6)
-            {
-                if ($retry == 3)
-                {
-                    throw $ex_6.getRuntimeException();
-                }
-            }
-        }
-    }
-
-    public void rebind_context(org.apache.geronimo.interop.CosNaming.NameComponent[] p1, org.apache.geronimo.interop.CosNaming.NamingContext p2) throws 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 = $getRequestKey();
-        for (int $retry = 0; ; $retry++)
-        {
-            try
-            {
-                org.apache.geronimo.interop.rmi.iiop.client.Connection $connection_2 = this.$connect();
-                org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream $output_3 = $connection_2.getSimpleOutputStream();
-                $output_3.writeObject(vt$2, p1);
-                $output_3.writeObject(vt$8, p2);
-                $connection_2.invoke(this, "rebind_context", $key, $retry);
-                org.apache.geronimo.interop.rmi.iiop.ObjectInputStream $input_4 = $connection_2.getSimpleInputStream();
-                $connection_2.forget($key);
-                $connection_2.close();
-                java.lang.String $et_5 = $connection_2.getExceptionType();
-                if ($et_5 != null)
-                {
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound)$input_4.readException(vt$4);
-                    }
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.CannotProceed"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.CannotProceed)$input_4.readException(vt$5);
-                    }
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.InvalidName"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.InvalidName)$input_4.readException(vt$6);
-                    }
-                    throw org.apache.geronimo.interop.rmi.iiop.SystemExceptionFactory.getException($connection_2.getException());
-                }
-                return;
-            }
-            catch (org.apache.geronimo.interop.rmi.iiop.client.RetryInvokeException $ex_6)
-            {
-                if ($retry == 3)
-                {
-                    throw $ex_6.getRuntimeException();
-                }
-            }
-        }
-    }
-
-    public org.omg.CORBA.Object resolve(org.apache.geronimo.interop.CosNaming.NameComponent[] p1) throws 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 = $getRequestKey();
-        for (int $retry = 0; ; $retry++)
-        {
-            try
-            {
-                org.apache.geronimo.interop.rmi.iiop.client.Connection $connection_2 = this.$connect();
-                org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream $output_3 = $connection_2.getSimpleOutputStream();
-                $output_3.writeObject(vt$2, p1);
-                $connection_2.invoke(this, "resolve", $key, $retry);
-                org.apache.geronimo.interop.rmi.iiop.ObjectInputStream $input_4 = $connection_2.getSimpleInputStream();
-                $connection_2.forget($key);
-                $connection_2.close();
-                java.lang.String $et_5 = $connection_2.getExceptionType();
-                if ($et_5 != null)
-                {
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound)$input_4.readException(vt$4);
-                    }
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.CannotProceed"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.CannotProceed)$input_4.readException(vt$5);
-                    }
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.InvalidName"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.InvalidName)$input_4.readException(vt$6);
-                    }
-                    throw org.apache.geronimo.interop.rmi.iiop.SystemExceptionFactory.getException($connection_2.getException());
-                }
-                org.omg.CORBA.Object $djc_result;
-                $djc_result = (org.omg.CORBA.Object)$input_4.readObject(vt$3);
-                return $djc_result;
-            }
-            catch (org.apache.geronimo.interop.rmi.iiop.client.RetryInvokeException $ex_6)
-            {
-                if ($retry == 3)
-                {
-                    throw $ex_6.getRuntimeException();
-                }
-            }
-        }
-    }
-
-    public void unbind(org.apache.geronimo.interop.CosNaming.NameComponent[] p1) throws 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 = $getRequestKey();
-        for (int $retry = 0; ; $retry++)
-        {
-            try
-            {
-                org.apache.geronimo.interop.rmi.iiop.client.Connection $connection_2 = this.$connect();
-                org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream $output_3 = $connection_2.getSimpleOutputStream();
-                $output_3.writeObject(vt$2, p1);
-                $connection_2.invoke(this, "unbind", $key, $retry);
-                org.apache.geronimo.interop.rmi.iiop.ObjectInputStream $input_4 = $connection_2.getSimpleInputStream();
-                $connection_2.forget($key);
-                $connection_2.close();
-                java.lang.String $et_5 = $connection_2.getExceptionType();
-                if ($et_5 != null)
-                {
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound)$input_4.readException(vt$4);
-                    }
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.CannotProceed"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.CannotProceed)$input_4.readException(vt$5);
-                    }
-                    if ($et_5.equals("org.apache.geronimo.interop.CosNaming.NamingContextPackage.InvalidName"))
-                    {
-                        throw (org.apache.geronimo.interop.CosNaming.NamingContextPackage.InvalidName)$input_4.readException(vt$6);
-                    }
-                    throw org.apache.geronimo.interop.rmi.iiop.SystemExceptionFactory.getException($connection_2.getException());
-                }
-                return;
-            }
-            catch (org.apache.geronimo.interop.rmi.iiop.client.RetryInvokeException $ex_6)
-            {
-                if ($retry == 3)
-                {
-                    throw $ex_6.getRuntimeException();
-                }
-            }
-        }
-    }
-}



Mime
View raw message